Skip to content

Commit 2efb5a9

Browse files
alcercualcercu
authored
Merge branch 'dev' into feat(web)/dashboard-pixelart
2 parents 11dfc46 + e5b545c commit 2efb5a9

File tree

72 files changed

+10757
-3911
lines changed

Some content is hidden

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

72 files changed

+10757
-3911
lines changed

‎contracts/README.md

+16-15
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
2929
#### Arbitrum Goerli
3030

3131
- [PNK](https://goerli.arbiscan.io/token/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
32-
- [ArbitrableExample](https://goerli.arbiscan.io/address/0xa0aE7170fc6303f64FA0999f2A73059992F19fCB)
32+
- [ArbitrableExample](https://goerli.arbiscan.io/address/0x983Ac51c7aDa934651dd1ee58176111FccfBFA5B)
3333
- [BlockHashRNG](https://goerli.arbiscan.io/address/0x68eE49dfD9d76f3386257a3D0e0A85c0A5519bBD)
3434
- [DAI](https://goerli.arbiscan.io/address/0x70A704Dce4cCC00568Cc142C86D07Ec71C944a39)
3535
- [DAIFaucet](https://goerli.arbiscan.io/address/0xB7C693623437cC46a8E50DF234d90Ab9F57DdE63)
36-
- [DisputeKitClassic](https://goerli.arbiscan.io/address/0x439f92b61783A752462527f9dA9C6c6180C9253a)
37-
- [DisputeResolver](https://goerli.arbiscan.io/address/0x7D7AF1893fB196E5624E8F8b5d771Ac46fFD4D44)
38-
- [DisputeTemplateRegistry](https://goerli.arbiscan.io/address/0x22A58a17F12A718d18C9B6Acca3E311Da1b00A04)
39-
- [HomeGatewayToGnosis](https://goerli.arbiscan.io/address/0xdd69c7e8d5B3a6185DE84bBbCacb480153E4e1d8)
40-
- [KlerosCore](https://goerli.arbiscan.io/address/0x791812B0B9f2ba260B2DA432BB02Ee23BC1bB509)
41-
- [PNKFaucet](https://goerli.arbiscan.io/address/0x05648Ee14941630a649082e0dA5cb80D29cC9002)
36+
- [DisputeKitClassic: proxy](https://goerli.arbiscan.io/address/0x448F5B93b054BD33A765168d3447cA96D5aD4818), [implementation](https://goerli.arbiscan.io/address/0xACCeDd7cF1dAc4d0E4d149E3395F6Fe83cE7af31)
37+
- [DisputeResolver](https://goerli.arbiscan.io/address/0xCf1da8f2b4BC9d35146433c7F69f4204Cf6b7655)
38+
- [DisputeTemplateRegistry: proxy](https://goerli.arbiscan.io/address/0x9c0b277C0B14c80bC5c560Cd56941816B6Fe7703), [implementation](https://goerli.arbiscan.io/address/0x32D001F8Cf32086ba8937f920b2f3A2820Ba69F2)
39+
- [EvidenceModule: proxy](https://goerli.arbiscan.io/address/0x36e1e5C2644Ec9ba0C3d85B89182f8EDD5696248), [implementation](https://goerli.arbiscan.io/address/0xa94d95084c7Cb165C565CBF4FD024Bc5e6E9DDb8)
40+
- [KlerosCore: proxy](https://goerli.arbiscan.io/address/0x7d6b24d4DC36a6BC3F0E3B40B9383782Bcd0aDd7), [implementation](https://goerli.arbiscan.io/address/0x821af5f921E392Ce623c706CADc37d5b84ccE3C3)
41+
- [PNKFaucet](https://goerli.arbiscan.io/address/0x28638dD9515fB1a74909C81e1c9A7cdf698Ff962)
4242
- [PinakionV2](https://goerli.arbiscan.io/address/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
43-
- [PolicyRegistry](https://goerli.arbiscan.io/address/0x4c129b9836E4CC3Cf6D833b39a4B7cfA25D86c86)
44-
- [RandomizerRNG](https://goerli.arbiscan.io/address/0xa90f7D2e35718FDE9AD96c8B6667AFcAa4BEfd4d)
45-
- [SortitionModule](https://goerli.arbiscan.io/address/0xdE8b56f8CeC9bBCEf196c3b0159467eeCE6c2243)
43+
- [PolicyRegistry: proxy](https://goerli.arbiscan.io/address/0x9c5dD8bBe4342dFC53f47Bd5ba0808e0B4d825e8), [implementation](https://goerli.arbiscan.io/address/0xE92BEd1c2704217b446C4a065bbAEE23D406699D)
44+
- [RandomizerRNG: proxy](https://goerli.arbiscan.io/address/0x5BF61114fc88F405A523A410b6371Ea223785870), [implementation](https://goerli.arbiscan.io/address/0x32F0db14e66eAC97f202679cEB1DF74EA1b887D9)
45+
- [SortitionModule: proxy](https://goerli.arbiscan.io/address/0xe2536798227fdd68fD8cf74d87D050D667eCaC0F), [implementation](https://goerli.arbiscan.io/address/0xf91915e0f20Ab032D856DC52825a281571053CDD)
4646
- [WETH](https://goerli.arbiscan.io/address/0xddE1b84E43505432Fdf5F810ebB9373dD37e9230)
4747
- [WETHFaucet](https://goerli.arbiscan.io/address/0x16FD9d82ccA652EE7d85443f82062013aC0A4Ab8)
4848

@@ -66,19 +66,20 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
6666
#### Arbitrum Goerli
6767

6868
- [PNK](https://goerli.arbiscan.io/token/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
69-
- [ArbitrableExample](https://goerli.arbiscan.io/address/0x437cbF6F0A62238b392715aC55bdC5abdA148eD8)
69+
- [ArbitrableExample](https://goerli.arbiscan.io/address/0x2f3e9594cD762d270b4546dfc62ab98dB595DA59)
7070
- [BlockHashRNG](https://goerli.arbiscan.io/address/0xCea37c9A838831F6B4eE3BffbDC21b945113AD0C)
7171
- [DAI](https://goerli.arbiscan.io/address/0xB755843e26F2cD1c6A46659cEBb67CcFAE0f2EeE)
7272
- [DAIFaucet](https://goerli.arbiscan.io/address/0xCEBF1e0A5921767dd97b999ed14801A3770afAfd)
73-
- [DisputeKitClassic: proxy](https://goerli.arbiscan.io/address/0xc9aF9335327cAe0Cd45EC96ad9bDcD4304772729), [implementation](https://goerli.arbiscan.io/address/0x2757458b91faaB4240A6eAE72185C8185683a642)
74-
- [DisputeResolver](https://goerli.arbiscan.io/address/0x20433D10d3865e19af45956ed5bFe30c56536431)
73+
- [DisputeKitClassic: proxy](https://goerli.arbiscan.io/address/0x67f3b472F345119692d575E59190400E371946f6), [implementation](https://goerli.arbiscan.io/address/0x5a41ebCD0b78eD6C42E0AD23A7b7a8001c45bEC9)
74+
- [DisputeResolver](https://goerli.arbiscan.io/address/0x881319f439F65e4926c08F38303FE676488914Bd)
7575
- [DisputeTemplateRegistry: proxy](https://goerli.arbiscan.io/address/0x8d17Ed667512412D9c194d178699f68159f250A2), [implementation](https://goerli.arbiscan.io/address/0x2F4c6c23C516A9247a413186cDcA693E1C078A1D)
76-
- [KlerosCore: proxy](https://goerli.arbiscan.io/address/0x544afd5A8AbC40ba5d38BbA8d47f30502896b050), [implementation](https://goerli.arbiscan.io/address/0x241C37152D43f60a0142bCbb2D765e908dd03D9D)
76+
- [EvidenceModule: proxy](https://goerli.arbiscan.io/address/0xF679E4a92AE843fd5cD0717A7417C3A773Dfd55F), [implementation](https://goerli.arbiscan.io/address/0x5d5488ed34dC07EE547A39f6631d6f8595a7f618)
77+
- [KlerosCore: proxy](https://goerli.arbiscan.io/address/0xB88643fd1e4351dAF9eA7292db126207FDE42e45), [implementation](https://goerli.arbiscan.io/address/0x5A8f51e70b77cCa3c309f7AC0f55f3b630D46B6c)
7778
- [PNKFaucet](https://goerli.arbiscan.io/address/0x05648Ee14941630a649082e0dA5cb80D29cC9002)
7879
- [PinakionV2](https://goerli.arbiscan.io/address/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
7980
- [PolicyRegistry: proxy](https://goerli.arbiscan.io/address/0x37FFaF5506BB16327B4a32191Bb39d739fCE55a3), [implementation](https://goerli.arbiscan.io/address/0x3ab4C2906E3Cbc44C3e282affDb66272BCae6482)
8081
- [RandomizerRNG: proxy](https://goerli.arbiscan.io/address/0x105C019c2724F08BFA41Ff0D0bD77030E1DEA177), [implementation](https://goerli.arbiscan.io/address/0xc90d73C64997699d835a1122D47d4A231965740C)
81-
- [SortitionModule: proxy](https://goerli.arbiscan.io/address/0x5c9E4e7e85157DFD16D400dd358C541b65DaA83f), [implementation](https://goerli.arbiscan.io/address/0xec7C6C1b2FC93bBeF0fA4e301165144702c126F9)
82+
- [SortitionModule: proxy](https://goerli.arbiscan.io/address/0x45480bFF7AE062205AB16f4e014ecee942640779), [implementation](https://goerli.arbiscan.io/address/0x7FebBE9de959f83D67A89ee9e4E31Cf11bC2B258)
8283
- [WETH](https://goerli.arbiscan.io/address/0xbB5839497dE7e6d4ddaFde093F69abA9be782E07)
8384
- [WETHFaucet](https://goerli.arbiscan.io/address/0xD2d862B060986b25996aaeDB54813002AB791013)
8485

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

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
5454

5555
await deployUpgradable(deployments, "PolicyRegistry", { from: deployer, args: [deployer], log: true });
5656

57+
await deployUpgradable(deployments, "EvidenceModule", { from: deployer, args: [deployer], log: true });
58+
5759
const randomizer = randomizerByChain.get(Number(await getChainId())) ?? AddressZero;
5860
const rng = await deployUpgradable(deployments, "RandomizerRNG", {
5961
from: deployer,

‎contracts/deploy/00-home-chain-pnk-faucet.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
1818

1919
const pnkAddress = pnkByChain.get(chainId);
2020
if (pnkAddress) {
21-
// await deploy("PNKFaucet", {
22-
// from: deployer,
23-
// contract: "Faucet",
24-
// args: [pnkAddress],
25-
// log: true,
26-
// });
21+
await deploy("PNKFaucet", {
22+
from: deployer,
23+
contract: "Faucet",
24+
args: [pnkAddress],
25+
log: true,
26+
});
2727
await execute(
2828
"PNKFaucet",
2929
{ from: deployer, log: true },

‎contracts/deploy/utils/deployUpgradable.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const deployUpgradable = async (
2929
options: DeployUpgradableOptions
3030
): Promise<DeployResult> => {
3131
const { deploy } = deployments;
32-
const { newImplementation, initializer, args: initializerArgs, ...otherOptions } = options;
32+
const { newImplementation, initializer, args: initializerArgs, proxy: proxyOverrides, ...otherOptions } = options;
3333

3434
const methodName = initializer ?? "initialize";
3535
const args = initializerArgs ?? [];
@@ -52,6 +52,7 @@ export const deployUpgradable = async (
5252
proxy: {
5353
...PROXY_OPTIONS,
5454
...implementationName,
55+
...((proxyOverrides as ProxyOptions) ?? {}),
5556
execute: {
5657
init: {
5758
methodName,

‎contracts/deployments/arbitrumGoerli/ArbitrableExample.json

+38-38
Large diffs are not rendered by default.

‎contracts/deployments/arbitrumGoerli/DisputeKitClassic.json

+164-559
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)