Merge branch 'dev' into feat/atlas-siwe

Author: tractorss

README.md

@@ -9,10 +9,6 @@
 </p>
 
 <p align="center">
-  <a href="https://app.netlify.com/sites/kleros-v2/deploys"><img src="https://api.netlify.com/api/v1/badges/86d94ae8-f655-46a4-a859-d68696173f3a/deploy-status" alt="Netlify Build Status"></a>
-  <a href="https://app.netlify.com/sites/kleros-v2-university/deploys"><img src="https://api.netlify.com/api/v1/badges/085e1305-e434-4d36-91a4-88e8cbc3aa46/deploy-status" alt="Netlify Build Status"></a>
-  <a href="https://www.gitpoap.io/gh/kleros/kleros-v2"><img src="https://public-api.gitpoap.io/v1/repo/kleros/kleros-v2/badge" alt="GitPoap badge"></a>
-  </br>
   <a href="https://api.securityscorecards.dev/projects/github.com/kleros/kleros-v2"><img src="https://api.securityscorecards.dev/projects/github.com/kleros/kleros-v2/badge" alt="OpenSSF Scorecard"></a>
   <a href="https://sonarcloud.io/summary/new_code?id=kleros_kleros-v2"><img src="https://sonarcloud.io/api/project_badges/measure?project=kleros_kleros-v2&metric=security_rating" alt="Security Rating"></a>
   <a href="https://sonarcloud.io/summary/new_code?id=kleros_kleros-v2"><img src="https://sonarcloud.io/api/project_badges/measure?project=kleros_kleros-v2&metric=alert_status" alt="Quality Gate Status"></a>
@@ -24,6 +20,8 @@
   <a href="https://conventionalcommits.org"><img src="https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg" alt="Conventional Commits"></a>
   <a href="http://commitizen.github.io/cz-cli/"><img src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg" alt="Commitizen Friendly"></a>
   <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/styled_with-prettier-ff69b4.svg" alt="Styled with Prettier"></a>
+  </br>
+  <a href="https://www.gitpoap.io/gh/kleros/kleros-v2"><img src="https://public-api.gitpoap.io/v1/repo/kleros/kleros-v2/badge" alt="GitPoap badge"></a>
 </p>
 
 ---
@@ -34,7 +32,7 @@
 
 ##### 🗃️ [Subgraph endpoints](subgraph/README.md#deployments)
 
-##### ⚖️ [Web frontend](https://app.netlify.com/sites/kleros-v2/deploys)
+##### ⚖️ [Web frontend](web/README.md#court-deployments)
 
 ## Content
 

contracts/README.md

@@ -20,6 +20,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 - [PolicyRegistry: proxy](https://arbiscan.io/address/0x26c1980120F1C82cF611D666CE81D2b54d018547), [implementation](https://arbiscan.io/address/0x2AC2EdFD336732bc6963f1AD03ED98B22dB949da)
 - [RandomizerRNG: proxy](https://arbiscan.io/address/0xC3dB344755b15c8Edfd834db79af4f8860029FB4), [implementation](https://arbiscan.io/address/0xA995C172d286f8F4eE137CC662e2844E59Cf4836)
 - [SortitionModuleNeo: proxy](https://arbiscan.io/address/0x614498118850184c62f82d08261109334bFB050f), [implementation](https://arbiscan.io/address/0xf327200420F21BAafce8F1C03B1EEdF926074B95)
+- [TransactionBatcher](https://arbiscan.io/address/0xBC5ef8d9ad307154447AE148c088f083d2dEa4eF)
 
 ### Official Testnet
 
@@ -88,6 +89,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 - [SortitionModule: proxy](https://sepolia.arbiscan.io/address/0x19cb28BAB40C3585955798f5EEabd71Eec14471C), [implementation](https://sepolia.arbiscan.io/address/0xBC82B29e5aE8a749D82b7919118Ab7C0D41fA3D3)
 - [SortitionModuleNeo: proxy](https://sepolia.arbiscan.io/address/0x809533c303c10915BB5c0585f2d8D738e2a4fB64), [implementation](https://sepolia.arbiscan.io/address/0xD9ddceb7C399518F23b69D155a67C6AFF13f9fF0)
 - [SortitionModuleUniversity: proxy](https://sepolia.arbiscan.io/address/0xBEEb15EF1DEf96c569c97A703E649B0251ceFB04), [implementation](https://sepolia.arbiscan.io/address/0xaA2833b174D4e29ae2aFc0b11dF9160EDB28BF9d)
+- [TransactionBatcher](https://sepolia.arbiscan.io/address/0x35f93986950804ac1F93519BF68C2a7Dd776db0E)
 - [WETH](https://sepolia.arbiscan.io/address/0x3829A2486d53ee984a0ca2D76552715726b77138)
 - [WETHFaucet](https://sepolia.arbiscan.io/address/0x6F8C10E0030aDf5B8030a5E282F026ADdB6525fd)
 

contracts/deploy/00-home-chain-arbitration-ruler.ts

@@ -0,0 +1,81 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+import { BigNumber, BigNumberish } from "ethers";
+import { deployUpgradable } from "./utils/deployUpgradable";
+import { HomeChains, isSkipped } from "./utils";
+import { deployERC20AndFaucet } from "./utils/deployERC20AndFaucet";
+import { KlerosCore } from "../typechain-types";
+import { getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
+
+const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const { ethers, deployments, getNamedAccounts, getChainId } = hre;
+  const { deploy } = deployments;
+
+  // fallback to hardhat node signers on local network
+  const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
+  const chainId = Number(await getChainId());
+  console.log("deploying to %s with deployer %s", HomeChains[chainId], deployer);
+
+  const pnk = await deployERC20AndFaucet(hre, deployer, "PNK");
+  const dai = await deployERC20AndFaucet(hre, deployer, "DAI");
+  const weth = await deployERC20AndFaucet(hre, deployer, "WETH");
+
+  const minStake = 0;
+  const alpha = 10000;
+  const feeForJuror = BigNumber.from(10).pow(17);
+  const jurorsForCourtJump = 16;
+  const klerosCore = await deployUpgradable(deployments, "KlerosCoreRuler", {
+    from: deployer,
+    args: [
+      deployer, // governor
+      pnk.address,
+      [minStake, alpha, feeForJuror, jurorsForCourtJump],
+    ],
+    log: true,
+  });
+
+  const changeCurrencyRate = async (
+    erc20: string,
+    accepted: boolean,
+    rateInEth: BigNumberish,
+    rateDecimals: BigNumberish
+  ) => {
+    const core = (await ethers.getContract("KlerosCoreRuler")) as KlerosCore;
+    const pnkRate = await core.currencyRates(erc20);
+    if (pnkRate.feePaymentAccepted !== accepted) {
+      console.log(`core.changeAcceptedFeeTokens(${erc20}, ${accepted})`);
+      await core.changeAcceptedFeeTokens(erc20, accepted);
+    }
+    if (!pnkRate.rateInEth.eq(rateInEth) || pnkRate.rateDecimals !== rateDecimals) {
+      console.log(`core.changeCurrencyRates(${erc20}, ${rateInEth}, ${rateDecimals})`);
+      await core.changeCurrencyRates(erc20, rateInEth, rateDecimals);
+    }
+  };
+
+  try {
+    await changeCurrencyRate(pnk.address, true, 12225583, 12);
+    await changeCurrencyRate(dai.address, true, 60327783, 11);
+    await changeCurrencyRate(weth.address, true, 1, 1);
+  } catch (e) {
+    console.error("failed to change currency rates:", e);
+  }
+
+  const disputeTemplateRegistry = await getContractOrDeployUpgradable(hre, "DisputeTemplateRegistry", {
+    from: deployer,
+    args: [deployer],
+    log: true,
+  });
+
+  await deploy("DisputeResolverRuler", {
+    from: deployer,
+    args: [klerosCore.address, disputeTemplateRegistry.address],
+    log: true,
+  });
+};
+
+deployArbitration.tags = ["ArbitrationRuler"];
+deployArbitration.skip = async ({ network }) => {
+  return isSkipped(network, !HomeChains[network.config.chainId ?? 0]);
+};
+
+export default deployArbitration;

contracts/deploy/00-transaction-batcher.ts

@@ -0,0 +1,26 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+import { HomeChains, isSkipped } from "./utils";
+
+const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const { deployments, getNamedAccounts, getChainId } = hre;
+  const { deploy } = deployments;
+
+  // fallback to hardhat node signers on local network
+  const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
+  const chainId = Number(await getChainId());
+  console.log("deploying to %s with deployer %s", HomeChains[chainId], deployer);
+
+  await deploy("TransactionBatcher", {
+    from: deployer,
+    args: [],
+    log: true,
+  });
+};
+
+deployArbitration.tags = ["TransactionBatcher"];
+deployArbitration.skip = async ({ network }) => {
+  return isSkipped(network, !HomeChains[network.config.chainId ?? 0]);
+};
+
+export default deployArbitration;