Merge branch 'dev' into feat/arbSep-to-sep-testnet

kleros · Oct 15, 2024 · f313f3a · f313f3a
2 parents 63c93b0 + e22031e
commit f313f3a
Show file tree

Hide file tree

Showing 36 changed files with 2,218 additions and 843 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,11 +1,11 @@
 # Default
-*                          @jaybuidl @shotaronowhere
+*                          @jaybuidl @mani99brar
 
 # Veascan
 veascan-subgraph-inbox/    @jaybuidl @alcercu
 veascan-subgraph-outbox/   @jaybuidl @alcercu
 veascan-web/               @jaybuidl @alcercu
 
 # Owned by everyone
-yarn.lock                  @jaybuidl @shotaronowhere @alcercu
-.gitignore                 @jaybuidl @shotaronowhere @alcercu
+yarn.lock                  @jaybuidl @mani99brar @alcercu
+.gitignore                 @jaybuidl @mani99brar @alcercu
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -20,16 +20,17 @@ jobs:
       runs-on: ubuntu-latest
       steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
+
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@9c0534dd12d09f22d69fbb301a1955249e49d910 # master
+        uses: sonarsource/sonarcloud-github-action@eb211723266fe8e83102bac7361f0a05c3ac1d1b # v3.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,15 @@
+# misc
+.DS_Store
+.env
+.env.test
+.env.testnet
+.env.devnet
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+
 #------------------------------------
 # FILE GENERATED AS FOLLOWS
 # curl -sL https://www.toptal.com/developers/gitignore/api/vim,node,visualstudiocode,yarn | sed 's|\(!.yarn/cache\)|#\1|' > .gitignore

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,5 +10,8 @@
   ],
   "prettier.configPath": ".prettierrc.json",
   "eslint.alwaysShowStatus": true,
-  "eslint.packageManager": "yarn"
+  "eslint.packageManager": "yarn",
+  "shellcheck.customArgs": [
+    "--external-sources"
+  ]
 }
diff --git a/contracts/README.md b/contracts/README.md
@@ -10,11 +10,11 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 
 #### Sepolia
 
-- [VeaOutboxArbToEthDevnet](https://sepolia.etherscan.io/address/0x5AD255400913515C8DA7E82E6b8A109fA5c46135)
+- [VeaOutboxArbToEthDevnet](https://sepolia.etherscan.io/address/0xb8BF3B6bd3E1a0Cc9E2dB77dd492503310514674)
 
 #### Arbitrum Sepolia
 
-- [VeaInboxArbToEthDevnet](https://sepolia.arbiscan.io/address/0x77e95F54032f467eC45c48C6affc203f93858783)
+- [VeaInboxArbToEthDevnet](https://sepolia.arbiscan.io/address/0x0B5851fE2a931F619F73E739E5435C43976f1D68)
 
 #### Chiado
 

diff --git a/contracts/deploy/01-outbox/01-arb-sepolia-to-chiado-outbox.ts b/contracts/deploy/01-outbox/01-arb-sepolia-to-chiado-outbox.ts
@@ -15,7 +15,7 @@ const paramsByChainId = {
     epochPeriod: 1800, // 30 min
     minChallengePeriod: 0, // 30 min
     numEpochTimeout: 10000000000000, // never
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
     sequencerLimit: 86400,
     maxMissingBlocks: 10000000000000,
     routerChainId: 11155111,

diff --git a/contracts/deploy/01-outbox/01-arb-to-gnosis-outbox.ts b/contracts/deploy/01-outbox/01-arb-to-gnosis-outbox.ts
@@ -31,7 +31,7 @@ const paramsByChainId = {
     numEpochTimeout: 1000000, // never
     maxMissingBlocks: 1000000, // any
     routerChainId: 11155111,
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
     WETH: "0x8d74e5e4DA11629537C4575cB0f33b4F0Dfa42EB",
     sequencerLimit: 86400, // 24 hours
   },

diff --git a/contracts/deploy/02-inbox/02-chiado-to-arb-sepolia-inbox.ts b/contracts/deploy/02-inbox/02-chiado-to-arb-sepolia-inbox.ts
@@ -10,7 +10,7 @@ enum SenderChains {
 const paramsByChainId = {
   GNOSIS_CHIADO: {
     epochPeriod: 1800, // 30 minutes
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
   },
   HARDHAT: {
     amb: ethers.constants.AddressZero,

diff --git a/contracts/deploy/02-inbox/02-gnosis-to-arb-inbox.ts b/contracts/deploy/02-inbox/02-gnosis-to-arb-inbox.ts
@@ -15,7 +15,7 @@ const paramsByChainId = {
   },
   GNOSIS_CHIADO: {
     epochPeriod: 7200, // 2 hours
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d",
   },
   HARDHAT: {
     epochPeriod: 600, // 10 minutes

diff --git a/contracts/deploy/03-routers/03-arb-to-gnosis-router.ts b/contracts/deploy/03-routers/03-arb-to-gnosis-router.ts
@@ -15,7 +15,7 @@ const paramsByChainId = {
   },
   ETHEREUM_SEPOLIA: {
     arbitrumBridge: "0x38f918D0E9F1b721EDaA41302E399fa1B79333a9", // https://developer.arbitrum.io/useful-addresses
-    amb: "0x87A19d769D875964E9Cd41dDBfc397B2543764E6",
+    amb: "0xf2546D6648BD2af6a008A7e7C1542BB240329E11", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
   },
   HARDHAT: {
     arbitrumInbox: ethers.constants.AddressZero,

diff --git a/contracts/deploy/03-routers/03-chiado-to-arb-sepolia-router.ts b/contracts/deploy/03-routers/03-chiado-to-arb-sepolia-router.ts
@@ -10,7 +10,7 @@ enum RouterChains {
 const paramsByChainId = {
   ETHEREUM_SEPOLIA: {
     arbitrumBridge: "0x38f918D0E9F1b721EDaA41302E399fa1B79333a9", // https://developer.arbitrum.io/useful-addresses
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0xf2546D6648BD2af6a008A7e7C1542BB240329E11", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
   },
   HARDHAT: {
     arbitrumBridge: ethers.constants.AddressZero,

diff --git a/contracts/deploy/03-routers/03-gnosis-to-arb-router.ts b/contracts/deploy/03-routers/03-gnosis-to-arb-router.ts
@@ -15,7 +15,7 @@ const paramsByChainId = {
   },
   ETHEREUM_SEPOLIA: {
     arbitrumBridge: "0x38f918D0E9F1b721EDaA41302E399fa1B79333a9", // https://developer.arbitrum.io/useful-addresses
-    amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
+    amb: "0xf2546D6648BD2af6a008A7e7C1542BB240329E11", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
   },
   HARDHAT: {
     arbitrumBridge: ethers.constants.AddressZero,

diff --git a/contracts/deployments/arbitrumSepolia/VeaInboxArbToEthDevnet.json b/contracts/deployments/arbitrumSepolia/VeaInboxArbToEthDevnet.json