Merge branch 'main' into LF-4961-Implementing-CCIP-support

lifinance · Jan 18, 2024 · 24806fb · 24806fb
2 parents 96dc26f + dbd1a63
commit 24806fb
Show file tree

Hide file tree

Showing 39 changed files with 1,344 additions and 565 deletions.
diff --git a/.github/workflows/forge.yml b/.github/workflows/forge.yml
@@ -19,17 +19,17 @@ jobs:
       POLYGON_FORK_NUMBER: ${{ secrets.POLYGON_FORK_NUMBER }}
       FORK_NUMBER_POLYGON: 36004499
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         with:
           submodules: recursive
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4.0.0
         with:
-          node-version: '16'
+          node-version: 20
       - name: Install dev dependencies
         run: yarn install
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@v1.0.10
         with:
           version: nightly
 

diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -4,8 +4,8 @@ jobs:
   analyze:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: crytic/slither-action@v0.1.1
+      - uses: actions/checkout@v4.1.1
+      - uses: crytic/slither-action@v0.3.0
         with:
-          node-version: 16
+          node-version: 20
         continue-on-error: true
diff --git a/.github/workflows/types.yaml b/.github/workflows/types.yaml
@@ -25,9 +25,9 @@ jobs:
         run: forge install
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4.0.0
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install Node deps
         run: yarn install
@@ -89,7 +89,7 @@ jobs:
         id: bump_version
         uses: christian-draeger/increment-semantic-version@1.1.0
         with:
-          current-version: "${{ env.LATEST_TAG }}"
+          current-version: '${{ env.LATEST_TAG }}'
           version-fragment: "${{ env.BRANCH_NAME == 'main' && (contains(github.event.head_commit.message, 'major') && 'major' || contains(github.event.head_commit.message, 'feat') && 'feature' || 'bug') || 'beta' }}"
 
       - name: Push tag

diff --git a/config/allbridge.json b/config/allbridge.json
@@ -13,5 +13,8 @@
   },
   "polygon": {
     "allBridge": "0x7775d63836987f444E2F14AA0fA2602204D7D3E0"
+  },
+  "optimism": {
+    "allBridge": "0x97E5BF5068eA6a9604Ee25851e6c9780Ff50d5ab"
   }
 }
diff --git a/config/amarok.json b/config/amarok.json
@@ -56,8 +56,8 @@
     "domain": "0"
   },
   "linea": {
-    "connextHandler": "0x0000000000000000000000000000000000000000",
-    "domain": "0"
+    "connextHandler": "0xa05eF29e9aC8C75c530c2795Fa6A800e188dE0a9",
+    "domain": "1818848877"
   },
   "localanvil": {
     "connextHandler": "0x0000000000000000000000000000000000000000",

diff --git a/config/cbridge.json b/config/cbridge.json
@@ -36,6 +36,9 @@
       "0x49d5c2bdffac6ce2bfdb6640f4f80f226bc10bab"
     ]
   },
+  "base": {
+    "cBridge": "0x7d43AABC515C356145049227CeE54B608342c0ad"
+  },
   "boba": {
     "cBridge": "0x841ce48F9446C8E281D3F1444cB859b4A6D0738C"
   },

diff --git a/config/celerCircle.json b/config/celerCircle.json
@@ -14,9 +14,19 @@
     "usdc": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
     "domain": 1
   },
+  "base": {
+    "circleBridgeProxy": "0x243b40e96c6bF21511E53d85c86F6Ec982f9a879",
+    "usdc": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    "domain": 6
+  },
   "optimism": {
     "circleBridgeProxy": "0x697aC93c9263346c5Ad0412F9356D5789a3AA687",
     "usdc": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
     "domain": 2
+  },
+  "polygon": {
+    "circleBridgeProxy": "0xB876cc05c3C3C8ECBA65dAc4CF69CaF871F2e0DD",
+    "usdc": "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+    "domain": 7
   }
 }
diff --git a/config/dexs.json b/config/dexs.json
@@ -26,9 +26,11 @@
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
     "0x6777f6ebec76d796cb3999a69cd5980bd86ccfe5",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e",
     "0xcf5540fffcdc3d510b18bfca6d2b9987b0772559",
-    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5",
+    "0x9501165EF2962e5C0612D6C5A4b39d606b27E22f",
+    "0x14f2b6ca0324cd2B013aD02a7D85541d215e2906"
   ],
   "arbitrum": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -57,7 +59,7 @@
     "0xe05dd51e4eb5636f4f0e8e7fbe82ea31a2ecef16",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e",
     "0xa669e7a0d4b3e4fa48af2de86bd4cd7126be4e13",
     "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
@@ -154,7 +156,7 @@
     "0x0656fD85364d03b103CEEda192FB2D3906A6ac15",
     "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e",
     "0x89b8aa89fdd0507a99d334cbe3c808fafc7d850e",
     "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
@@ -262,7 +264,7 @@
     "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
     "0xe43e60736b1cb4a75ad25240e2f9a62bff65c0c0",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52"
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e"
   ],
   "harmony": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -394,7 +396,7 @@
     "0x716fcc67dcA500A91B4a28c9255262c398D8f971",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e",
     "0xca423977156bb05b13a2ba3b76bc5419e2fe9680",
     "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
@@ -432,7 +434,7 @@
     "0x39E3e49C99834C9573c9FC7Ff5A4B226cD7B0E63",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
     "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
-    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x80eba3855878739f4710233a8a19d89bdd2ffb8e",
     "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf",
     "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
@@ -460,7 +462,8 @@
     "0x3F0bD05C9A09FE07DB88aA2DD97f9d9fAf82994d",
     "0x006a5501fc45219ffdc353106d2946bd1dc08161",
     "0x4bba932e9792a2b917d47830c93a9bc79320e4f7",
-    "0x3f95ef3f2eaca871858dbe20a93c01daf6c2e923"
+    "0x3f95ef3f2eaca871858dbe20a93c01daf6c2e923",
+    "0xe832e655E4C3c36b2be5256915ECF8536a642f59"
   ],
   "velas": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",

diff --git a/config/hop.json b/config/hop.json
@@ -785,6 +785,43 @@
       }
     ]
   },
+  "polygonzkevm": {
+    "chainId": 1101,
+    "tokens": [
+      {
+        "name": "ETH",
+        "bridge": "0x0ce6c85cF43553DE10FC56cecA0aef6Ff0DD444d",
+        "token": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9",
+        "ammWrapper": "0xbd72882120508518FCba2AE58E134EceaD18d979"
+      },
+      {
+        "name": "HOP",
+        "bridge": "0x9ec9551d4A1a1593b0ee8124D98590CC71b3B09D",
+        "token": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
+        "ammWrapper": "0x0000000000000000000000000000000000000000"
+      }
+    ],
+    "approvals": [
+      {
+        "a_tokenAddress": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9",
+        "b_contractAddress": "0xbd72882120508518FCba2AE58E134EceaD18d979",
+        "c_tokenName": "ETH",
+        "d_contractName": "l2AmmWrapper"
+      },
+      {
+        "a_tokenAddress": "0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9",
+        "b_contractAddress": "0x0a6b1904369fE59E002ad0713ae89d4E3dF5A7Cf",
+        "c_tokenName": "ETH",
+        "d_contractName": "l2SaddleSwap"
+      },
+      {
+        "a_tokenAddress": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
+        "b_contractAddress": "0x9ec9551d4A1a1593b0ee8124D98590CC71b3B09D",
+        "c_tokenName": "HOP",
+        "d_contractName": "l2Bridge"
+      }
+    ]
+  },
   "goerli": {
     "chainId": 5,
     "tokens": [

diff --git a/config/optimism.json b/config/optimism.json
@@ -4,15 +4,15 @@
     "tokens": [
       {
         "assetId": "0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f",
-        "bridge": "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4"
+        "bridge": "0x39Ea01a0298C315d149a490E34B59Dbf2EC7e48F"
       },
       {
         "assetId": "0x6b175474e89094c44da98b954eedeac495271d0f",
-        "bridge": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1"
+        "bridge": "0x10E6593CDda8c58a1d0f14C5164B376352a55f2F"
       },
       {
         "assetId": "0xdac17f958d2ee523a2206206994597c13d831ec7",
-        "bridge": "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1"
+        "bridge": "0xaBA2c5F108F7E820C049D5Af70B16ac266c8f128"
       },
       {
         "assetId": "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
@@ -68,7 +68,7 @@
       },
       {
         "assetId": "0x3c513db8bdc3806e4489d62c3d549a5aaf6a4e97",
-        "bridge": "0xc98B98d17435AA00830c87eA02474C5007E1f272"
+        "bridge": "0xaBA2c5F108F7E820C049D5Af70B16ac266c8f128"
       },
       {
         "assetId": "0x01ba67aac7f75f647d94220cc98fb30fcc5105bf",
@@ -88,7 +88,7 @@
       },
       {
         "assetId": "0x0a5e677a6a24b2f1a2bf4f3bffc443231d2fdec8",
-        "bridge": "0xbfD291DA8A403DAAF7e5E9DC1ec0aCEaCd4848B9"
+        "bridge": "0xC5b1EC605738eF73a4EFc562274c1c0b6609cF59"
       },
       {
         "assetId": "0x0391d2021f89dc339f60fff84546ea23e337750f",
@@ -173,6 +173,14 @@
       {
         "assetId": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
         "bridge": "0xd8f365c2c85648f9b89d9f1bf72c0ae4b1c36cfd"
+      },
+      {
+        "assetId": "0x8dbf9a4c99580fc7fd4024ee08f3994420035727",
+        "bridge": "0xAa029BbdC947F5205fBa0F3C11b592420B58f824"
+      },
+      {
+        "assetId": "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0",
+        "bridge": "0x76943C0D61395d8F2edF9060e1533529cAe05dE6"
       }
     ]
   },
@@ -185,7 +193,7 @@
       },
       {
         "assetId": "0x6b175474e89094c44da98b954eedeac495271d0f",
-        "bridge": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1"
+        "bridge": "0x10E6593CDda8c58a1d0f14C5164B376352a55f2F"
       },
       {
         "assetId": "0xdac17f958d2ee523a2206206994597c13d831ec7",

diff --git a/config/sigs.json b/config/sigs.json
@@ -107,11 +107,16 @@
     "0x4629fd85",
     "0x476357fe",
     "0x6e5129d1",
-    "0x8fd8d1bb",
+    "0x083001ba",
+    "0xb35d7e73",
+    "0xda1a5f42",
+    "0x0a512416",
     "0x33320de3",
     "0x3b635ce4",
     "0x83bd37f9",
     "0x7bf2d6d4",
-    "0x84a7f3dd"
+    "0x84a7f3dd",
+    "0x7515d97c",
+    "0x117aa677"
   ]
 }
diff --git a/deploy/014_deploy_access_manager_facet.ts b/deploy/014_deploy_access_manager_facet.ts
@@ -0,0 +1,43 @@
+import { HardhatRuntimeEnvironment } from 'hardhat/types'
+import { DeployFunction } from 'hardhat-deploy/types'
+import { ethers, network } from 'hardhat'
+import { addOrReplaceFacets } from '../utils/diamond'
+import {
+  diamondContractName,
+  updateDeploymentLogs,
+  verifyContract,
+} from './9999_utils'
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  // Protect against unwanted redeployments
+  if (network.name !== 'zksync' && network.name !== 'zksyncGoerli') {
+    return
+  }
+
+  const { deployments, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  const deployedFacet = await deploy('AccessManagerFacet', {
+    from: deployer,
+    log: true,
+    skipIfAlreadyDeployed: true,
+  })
+
+  const accessManagerFacet = await ethers.getContract('AccessManagerFacet')
+  const diamond = await ethers.getContract(diamondContractName)
+
+  await addOrReplaceFacets([accessManagerFacet], diamond.address)
+
+  const isVerified = await verifyContract(hre, 'AccessManagerFacet', {
+    address: accessManagerFacet.address,
+  })
+
+  await updateDeploymentLogs('AccessManagerFacet', deployedFacet, isVerified)
+}
+
+export default func
+
+func.id = 'deploy_access_manager_facet'
+func.tags = ['DeployAccessManagerFacet']
+func.dependencies = ['InitialFacets', diamondContractName, 'InitFacets']