Skip to content

Commit 1cde4db

Browse files
authored
Merge branch 'dev' into fix(web)/crash-popup-error-when-voting
2 parents cc27aae + 4087e7a commit 1cde4db

23 files changed

+2069
-984
lines changed

.github/workflows/contracts-testing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
objects.githubusercontent.com:443
3131
registry.yarnpkg.com:443
3232
registry.npmjs.org:443
33+
54.185.253.63:443
3334
3435
- name: Setup Node.js environment
3536
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c

contracts/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,35 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
5050

5151
#### Chiado
5252

53-
- [ArbitrableExample](https://gnosis-chiado.blockscout.com/address/0x8cbbFDEA310B04368Ad43B8d27575cCdBAda5E9f)
54-
- [DisputeResolver](https://gnosis-chiado.blockscout.com/address/0xbCA5c7fBfB4889083c545D9b042541986A80d17d)
53+
- [ArbitrableExample](https://gnosis-chiado.blockscout.com/address/0xB56A23b396E0eae85414Ce5815da448ba529Cb4A)
54+
- [DisputeResolver](https://gnosis-chiado.blockscout.com/address/0x16f20604a51Ac1e68c9aAd1C0E53e951B62CC1Cb)
5555
- [DisputeTemplateRegistry](https://gnosis-chiado.blockscout.com/address/0x96E49552669ea81B8E9cE8694F7E4A55D8bFb957)
56-
- [ForeignGatewayOnGnosis](https://gnosis-chiado.blockscout.com/address/0xFf7F05aEfA64494C90ba119422506e204fdc2F98)
56+
- [ForeignGatewayOnGnosis](https://gnosis-chiado.blockscout.com/address/0x83F393F2aE68FA6A6701D7c65CBbFf3225f3fDf9)
5757
- [WETH](https://gnosis-chiado.blockscout.com/address/0x2DFC9c3141268e6eac04a7D6d98Fbf64BDe836a8)
5858
- [WETHFaucet](https://gnosis-chiado.blockscout.com/address/0x22CB016c4b57413ca4DF5F1AC44a0E0d3c69811F)
5959
- [WPNKFaucet](https://gnosis-chiado.blockscout.com/address/0x5898aeE045A25B276369914c3448B72a41758B2c)
6060
- [WrappedPinakionV2](https://gnosis-chiado.blockscout.com/address/0xD75E27A56AaF9eE7F8d9A472a8C2EF2f65a764dd)
6161

6262
#### Goerli
6363

64-
- [PNK](https://goerli.etherscan.io/token/0xA3B02bA6E10F55fb177637917B1b472da0110CcC)
64+
- [PinakionV2](https://goerli.etherscan.io/address/0x8EAA3Bc72CD250b9A97B255991e8E58933EFB9ee)
6565

6666
#### Arbitrum Goerli
6767

6868
- [PNK](https://goerli.arbiscan.io/token/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
69-
- [ArbitrableExample](https://goerli.arbiscan.io/address/0x3a08B248Da29e9D3c3E408fE6688dcbfED276442)
69+
- [ArbitrableExample](https://goerli.arbiscan.io/address/0x9B958EBe8057DCe5b9c1a30c935b790826bb511e)
7070
- [DAI](https://goerli.arbiscan.io/address/0xB755843e26F2cD1c6A46659cEBb67CcFAE0f2EeE)
7171
- [DAIFaucet](https://goerli.arbiscan.io/address/0xCEBF1e0A5921767dd97b999ed14801A3770afAfd)
7272
- [DisputeKitClassic](https://goerli.arbiscan.io/address/0x89807AeD661954080dB0ca7e8AcA72Af96E344e5)
73-
- [DisputeResolver](https://goerli.arbiscan.io/address/0x8C3bBbc5CFb56086528f6d3Ab66d858364E95403)
73+
- [DisputeResolver](https://goerli.arbiscan.io/address/0x36DabdE2b4Fe2C50775835B703687193D09DF8E0)
7474
- [DisputeTemplateRegistry](https://goerli.arbiscan.io/address/0xB01eC32bB0ba461ebEA9A61A6172Aba0DDE2B640)
75-
- [HomeGatewayToGnosis](https://goerli.arbiscan.io/address/0xd7e8A50d265e6643fd220E8aafddBb34C484E861)
76-
- [KlerosCore](https://goerli.arbiscan.io/address/0xAa641414e786d0cBe80f4eE716248588E13B4343)
77-
- [PNKFaucet](https://goerli.arbiscan.io/address/0xf859137e6ad9347408c5a96827ED77B6388B67dB)
75+
- [HomeGatewayToGnosis](https://goerli.arbiscan.io/address/0x12633ad7bd757858ada24738a94aeeba08727f1b)
76+
- [KlerosCore](https://goerli.arbiscan.io/address/0x5a2bC1477ABE705dB4955Cda7DE064eA79D563d1)
77+
- [PNKFaucet](https://goerli.arbiscan.io/address/0x05648Ee14941630a649082e0dA5cb80D29cC9002)
7878
- [PinakionV2](https://goerli.arbiscan.io/address/0x3483FA1b87792cd5BE4100822C4eCEC8D3E531ee)
7979
- [PolicyRegistry](https://goerli.arbiscan.io/address/0xa3556bF00c4f9ea235D6D4Bcb1B1c32121C0e935)
8080
- [RandomizerRNG](https://goerli.arbiscan.io/address/0x0FE3869EA01Febb895Bc76DaB143858F84C67024)
81-
- [SortitionModule](https://goerli.arbiscan.io/address/0x07F064F474336C31f22101E2C848e9a00a6Fd0c6)
81+
- [SortitionModule](https://goerli.arbiscan.io/address/0xc3A8621DA59B35dDCD3e01504F182D9AC9F36b5B)
8282
- [WETH](https://goerli.arbiscan.io/address/0xbB5839497dE7e6d4ddaFde093F69abA9be782E07)
8383
- [WETHFaucet](https://goerli.arbiscan.io/address/0xD2d862B060986b25996aaeDB54813002AB791013)
8484

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ const deployERC20AndFaucet = async (hre: HardhatRuntimeEnvironment, deployer: st
145145
});
146146
const funding = hre.ethers.utils.parseUnits("100000", "ether");
147147
const erc20Instance = await hre.ethers.getContract(ticker);
148+
// TODO: skip if already funded
148149
await erc20Instance.balanceOf(deployer).then((balance) => {
149150
if (balance.gte(funding)) {
150151
console.log("Funding %sFaucet with %d", ticker, funding);

contracts/deployments/arbitrumGoerliDevnet/ArbitrableExample.json

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

contracts/deployments/arbitrumGoerliDevnet/DisputeResolver.json

Lines changed: 28 additions & 28 deletions
Large diffs are not rendered by default.

contracts/deployments/arbitrumGoerliDevnet/HomeGatewayToGnosis.json

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

contracts/deployments/arbitrumGoerliDevnet/KlerosCore.json

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

contracts/deployments/arbitrumGoerliDevnet/PNKFaucet.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"address": "0xf859137e6ad9347408c5a96827ED77B6388B67dB",
2+
"address": "0x05648Ee14941630a649082e0dA5cb80D29cC9002",
33
"abi": [
44
{
55
"inputs": [
@@ -124,19 +124,19 @@
124124
"type": "function"
125125
}
126126
],
127-
"transactionHash": "0xe0608ed9443499ebdd9f4d874d15b973f05a2a10aea789195fc8bc89191ca187",
127+
"transactionHash": "0xbb0b584e9a7cee6953b4bb9e6c0310fdfdeae37ef8922ba36f73ba35000a332f",
128128
"receipt": {
129129
"to": null,
130130
"from": "0xF50E77f2A2B6138D16c6c7511562E5C33c4B15A3",
131-
"contractAddress": "0xf859137e6ad9347408c5a96827ED77B6388B67dB",
131+
"contractAddress": "0x05648Ee14941630a649082e0dA5cb80D29cC9002",
132132
"transactionIndex": 1,
133-
"gasUsed": "3544157",
133+
"gasUsed": "3412151",
134134
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
135-
"blockHash": "0x5e01bca5f01d0b6c315289285482d9bbb2b51efc492465f475c9718bdb7f1799",
136-
"transactionHash": "0xe0608ed9443499ebdd9f4d874d15b973f05a2a10aea789195fc8bc89191ca187",
135+
"blockHash": "0x230213da347d48e3940e5feff00a2f022948d32f00b22b6cd2024a38c9a94aca",
136+
"transactionHash": "0xbb0b584e9a7cee6953b4bb9e6c0310fdfdeae37ef8922ba36f73ba35000a332f",
137137
"logs": [],
138-
"blockNumber": 33636276,
139-
"cumulativeGasUsed": "3544157",
138+
"blockNumber": 33636203,
139+
"cumulativeGasUsed": "3412151",
140140
"status": 1,
141141
"byzantium": true
142142
},

contracts/deployments/arbitrumGoerliDevnet/SortitionModule.json

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

contracts/deployments/chiadoDevnet/ArbitrableExample.json

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)