Skip to content

Commit f39e4ee

Browse files
authored
Merge pull request #1965 from kleros/feat/shutter-dispute-kit
Shutterized Dispute Kit
2 parents 3e8a2f8 + 321a9a5 commit f39e4ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+5965
-175
lines changed

contracts/.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ LOGTAIL_TOKEN_KEEPER_BOT=ABC123ABC123ABC123ABC
1818
LOGTAIL_TOKEN_RELAYER_BOT=ABC123ABC123ABC123ABC
1919
LOGTAIL_TOKEN_DISPUTOR_BOT=ABC123ABC123ABC123ABC
2020
HEARTBEAT_URL_KEEPER_BOT=https://uptime.betterstack.com/api/v1/heartbeat/ABC123ABC123ABC123ABC
21-
HEARTBEAT_URL_RELAYER_BOT=https://uptime.betterstack.com/api/v1/heartbeat/ABC123ABC123ABC123ABC
21+
SHUTTER_API=testnet
22+
SHUTTER_API_KEY=
2223
DISPUTES_TO_SKIP=
2324

2425
# Optionally for debugging

contracts/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
7979
- [DAIFaucet](https://sepolia.arbiscan.io/address/0xB5b39A1bcD2D7097A8824B3cC18Ebd2dFb0D9B5E)
8080
- [DisputeKitClassic: proxy](https://sepolia.arbiscan.io/address/0x2246821E1313A93e2F8CdF7a3422d078f560b457), [implementation](https://sepolia.arbiscan.io/address/0x8Db69EE93365190FE9CA4d59Ae4Cdd4f3688f1Af)
8181
- [DisputeKitClassicUniversity: proxy](https://sepolia.arbiscan.io/address/0xd6E96b7c993763B5CDDa1139C7387B82A7c8B8B5), [implementation](https://sepolia.arbiscan.io/address/0x87e863b94d2CB79A8aB53bD87Dc4A10E11C0918B)
82+
- [DisputeKitShutter: proxy](https://sepolia.arbiscan.io/address/0x09F3d00B995186D76Af9AA8627D06351d0d9f950), [implementation](https://sepolia.arbiscan.io/address/0x6571eE6Ee36d805A8363c09376107844a003073C)
8283
- [DisputeResolver](https://sepolia.arbiscan.io/address/0x524C5541f440204E0B4577334c439277018F971f)
8384
- [DisputeResolverRuler](https://sepolia.arbiscan.io/address/0x199893232ECC74cC7898B24b5Ff58d613029f6B7)
8485
- [DisputeResolverUniversity](https://sepolia.arbiscan.io/address/0x2Aa1a94307E772BeE42E9EfbD137b1053F1fCfd4)

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,15 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
9696
console.error("failed to change currency rates:", e);
9797
}
9898

99+
// Extra dispute kits
100+
const disputeKitShutter = await deployUpgradable(deployments, "DisputeKitShutter", {
101+
from: deployer,
102+
args: [deployer, core.target],
103+
log: true,
104+
});
105+
await core.addNewDisputeKit(disputeKitShutter.address);
106+
await core.enableDisputeKits(1, [2], true); // enable disputeKitShutter on the General Court
107+
99108
await deploy("KlerosCoreSnapshotProxy", {
100109
from: deployer,
101110
args: [deployer, core.target],

contracts/deploy/upgrade-all.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
1515
const chainId = Number(await getChainId());
1616
console.log("upgrading on %s with deployer %s", HomeChains[chainId], deployer);
1717

18-
const { disputeKitClassic, disputeTemplateRegistry, evidence, core, policyRegistry, sortition } =
18+
const { disputeKitClassic, disputeKitShutter, disputeTemplateRegistry, evidence, core, policyRegistry, sortition } =
1919
await getContractNamesFromNetwork(hre);
2020

2121
const upgrade = async (contractName: string, initializer: string, args: any[]) => {
@@ -78,7 +78,8 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
7878
}
7979
};
8080

81-
await upgrade(disputeKitClassic, "initialize6", []);
81+
await upgrade(disputeKitClassic, "initialize7", []);
82+
await upgrade(disputeKitShutter, "initialize8", []);
8283
await upgrade(disputeTemplateRegistry, "initialize2", []);
8384
await upgrade(evidence, "initialize2", []);
8485
await upgrade(core, "initialize5", []);

0 commit comments

Comments
 (0)