Merge branch 'main' into deploy-updated-calldata-verification

lifinance · Sep 1, 2023 · 64c6699 · 64c6699
2 parents fd0b2c2 + 716f770
commit 64c6699
Show file tree

Hide file tree

Showing 13 changed files with 1,185 additions and 13 deletions.
diff --git a/config/across.json b/config/across.json
@@ -26,5 +26,9 @@
   "mumbai": {
     "acrossSpokePool": "0x45fF03629D024b7763275e732a2d80202c18b31C",
     "weth": "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889"
+  },
+  "zksync": {
+    "acrossSpokePool": "0xE0B015E54d54fc84a6cB9B666099c46adE9335FF",
+    "weth": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
   }
 }
diff --git a/config/celerCircle.json b/config/celerCircle.json
@@ -13,5 +13,10 @@
     "circleBridgeProxy": "0x9744ae566c64B6B6f7F9A4dD50f7496Df6Fef990",
     "usdc": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
     "domain": 1
+  },
+  "optimism": {
+    "circleBridgeProxy": "0x697aC93c9263346c5Ad0412F9356D5789a3AA687",
+    "usdc": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+    "domain": 2
   }
 }
diff --git a/config/dexs.json b/config/dexs.json
@@ -1,5 +1,6 @@
 {
   "mainnet": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -20,9 +21,11 @@
     "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
     "0x5f509a3C3F16dF2Fba7bF84dEE1eFbce6BB85587",
     "0x50f9bDe1c76bba997a5d6e7FEFff695ec8536194",
-    "0xB4B0ea46Fe0E9e8EAB4aFb765b527739F2718671"
+    "0xB4B0ea46Fe0E9e8EAB4aFb765b527739F2718671",
+    "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD"
   ],
   "arbitrum": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -44,9 +47,11 @@
     "0xD01319f4b65b79124549dE409D36F25e04B3e551",
     "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     "0x7d13268144adcdbEBDf94F654085CC15502849Ff",
-    "0xe05dd51e4eb5636f4f0e8e7fbe82ea31a2ecef16"
+    "0xe05dd51e4eb5636f4f0e8e7fbe82ea31a2ecef16",
+    "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD"
   ],
   "aurora": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -62,6 +67,7 @@
     "0x7449Cd63C2b1A06C36945eD83f0626D303781B6E"
   ],
   "avalanche": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -86,6 +92,7 @@
     "0x1F076a800005c758a505E759720eb6737136e893"
   ],
   "boba": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -100,6 +107,7 @@
     "0x64842A3EbC09bB69429c1a34ae181375fea5f17F"
   ],
   "bsc": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -122,9 +130,11 @@
     "0x30aE282CF477E2eF28B14d0125aCEAd57Fe1d7a1",
     "0x1956005bA9690B7A00b09c78769675C0cE1457AF",
     "0xcF0feBd3f17CEf5b47b0cD257aCf6025c5BFf3b7",
-    "0x0656fD85364d03b103CEEda192FB2D3906A6ac15"
+    "0x0656fD85364d03b103CEEda192FB2D3906A6ac15",
+    "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
   ],
   "celo": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -134,9 +144,11 @@
     "0x6352a56caadc4f1e25cd6c75970fa768a3304e64",
     "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     "0x1421bDe4B10e8dd459b3BCb598810B1337D56842",
-    "0xE3D8bd6Aed4F159bc8000a9cD47CffDb95F96121"
+    "0xE3D8bd6Aed4F159bc8000a9cD47CffDb95F96121",
+    "0x5Dc88340E1c5c6366864Ee415d6034cadd1A9897"
   ],
   "cronos": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -150,6 +162,7 @@
     "0x145863Eb42Cf62847A6Ca784e6416C1682b1b2Ae"
   ],
   "evmos": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -163,6 +176,7 @@
     "0x64C3b10636baBb3Ef46a7E2E5248b0dE43198fCB"
   ],
   "fantom": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -182,6 +196,7 @@
     "0x6D0176C5ea1e44b08D3dd001b0784cE42F47a3A7"
   ],
   "fuse": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -192,6 +207,7 @@
     "0xE3F85aAd0c8DD7337427B9dF5d0fB741d65EEEB5"
   ],
   "gnosis": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -210,6 +226,7 @@
     "0xe43e60736b1cb4a75ad25240e2f9a62bff65c0c0"
   ],
   "harmony": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -223,6 +240,7 @@
     "0xf012702a5f0e54015362cBCA26a26fc90AA832a3"
   ],
   "heco": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -238,6 +256,7 @@
     "0xbc3a8f63f311f3b005ff8afc1a26272faaba8d36"
   ],
   "metis": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -249,6 +268,7 @@
     "0x6352a56caadc4f1e25cd6c75970fa768a3304e64"
   ],
   "moonbeam": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -259,6 +279,7 @@
     "0xd0a01ec574d1fc6652edf79cb2f880fd47d34ab1"
   ],
   "moonriver": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -274,6 +295,7 @@
     "0x003B18357460e789e711849749A793c430d14f97"
   ],
   "nova": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -285,6 +307,7 @@
     "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506"
   ],
   "okx": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -302,6 +325,7 @@
     "0x5381382257c761dac6f1509b1ba1b70ddaa6862a"
   ],
   "optimism": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -318,9 +342,11 @@
     "0xfD9D2827AD469B72B69329dAA325ba7AfbDb3C98",
     "0xE592427A0AEce92De3Edee1F18E0157C05861564",
     "0xa492d6eabcdc3e204676f15b950bbdd448080364",
-    "0x716fcc67dcA500A91B4a28c9255262c398D8f971"
+    "0x716fcc67dcA500A91B4a28c9255262c398D8f971",
+    "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD"
   ],
   "polygon": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x9cc3164f01ED3796Fdf7Da538484D634608D2203",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
@@ -350,9 +376,11 @@
     "0x67dC2703D306F72E94DbB0cE0aa0CB86149EAc70",
     "0xC0788A3aD43d79aa53B09c2EaCc313A787d1d607",
     "0xe7F5FF6da6DdF45F43aE7c8217AEC3ec5a0569c5",
-    "0x39E3e49C99834C9573c9FC7Ff5A4B226cD7B0E63"
+    "0x39E3e49C99834C9573c9FC7Ff5A4B226cD7B0E63",
+    "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD"
   ],
   "polygonzkevm": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
     "0x9ca271A532392230EAe919Fb5460aEa9D9718424",
@@ -369,9 +397,12 @@
     "0x0222D030e8DFAEDE2a4e7B5F181Ac1A4206A75f0",
     "0x9ca271A532392230EAe919Fb5460aEa9D9718424",
     "0xB49EaD76FE09967D7CA0dbCeF3C3A06eb3Aa0cB4",
-    "0x36a1acbbcafca2468b85011ddd16e7cb4d673230"
+    "0x36a1acbbcafca2468b85011ddd16e7cb4d673230",
+    "0x6e2b76966cbd9cf4cc2fa0d76d24d5241e0abc2f",
+    "0x5aEaF2883FBf30f3D62471154eDa3C0c1b05942d"
   ],
   "velas": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0xf068cc770f32042Ff4a8fD196045641234dFaa47",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x4b0B89b90fF83247aEa12469CeA9A6222e09d54c",
@@ -380,9 +411,12 @@
     "0x3D1c58B6d4501E34DF37Cf0f664A58059a188F00"
   ],
   "base": [
-    "0xdef1c0ded9bec7f1a1670819833240f027b25eff"
+    "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+    "0x1111111254eeb25477b68fb85ed929f73a960582",
+    "0x198EF79F1F515F02dFE9e3115eD9fC07183f02fC"
   ],
   "goerli": [
+    "0xC85c2B19958D116d79C654ecE73b359c08802A76",
     "0x353a5303dD2a39aB59aEd09fb971D359b94658C7",
     "0xd2981E8c29be81a8a6655764c2a60825bf1BB631",
     "0x7a250d5630b4cf539739df2c5dacb4c659f2488d",
@@ -393,6 +427,7 @@
   "avalancheFujiTestnet": [],
   "bscTestnet": ["0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"],
   "localanvil": [],
+  "linea": ["0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb"],
   "mumbai": [
     "0xfD0af5274aA16C72B7c463B22a435C06DEBbe894",
     "0xf471d32cb40837bf24529fcf17418fc1a4807626",

diff --git a/config/sigs.json b/config/sigs.json
@@ -4,6 +4,8 @@
     "0xdd343700",
     "0x04204ceb",
     "0xc6aabf84",
+    "0xf8be52e1",
+    "0x1eacd35f",
     "0x91695586",
     "0xa5be382e",
     "0xfc374157",
@@ -81,6 +83,8 @@
     "0xa8676443",
     "0x301a3720",
     "0x7a1eb1b9",
-    "0xb22f4db8"
+    "0xb22f4db8",
+    "0x3593564c",
+    "0x24856bc3"
   ]
 }
diff --git a/deploy/012_deploy_across_facet.ts b/deploy/012_deploy_across_facet.ts
@@ -0,0 +1,35 @@
+import { HardhatRuntimeEnvironment } from 'hardhat/types'
+import { DeployFunction } from 'hardhat-deploy/types'
+import { network } from 'hardhat'
+import { diamondContractName, deployFacet } from './9999_utils'
+import config from '../config/across.json'
+
+interface AcrossConfig {
+  [network: string]: {
+    acrossSpokePool?: string
+    weth?: string
+  }
+}
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  if (!(config as AcrossConfig)[network.name]) {
+    console.log(`No Across config set for ${network.name}. Skipping...`)
+    return
+  }
+
+  const SPOKE_POOL = (config as AcrossConfig)[network.name].acrossSpokePool
+  const WETH = (config as AcrossConfig)[network.name].weth
+
+  await deployFacet(hre, 'AcrossFacet', { args: [SPOKE_POOL, WETH] })
+}
+
+export default func
+
+func.id = 'deploy_across_facet'
+func.tags = ['DeployAcrossFacet']
+func.dependencies = [
+  // 'InitialFacets',
+  // diamondContractName,
+  // 'InitFacets',
+  // 'DeployDexManagerFacet',
+]
diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
@@ -9963,6 +9963,20 @@
           }
         ]
       }
+    },
+    "optimism": {
+      "production": {
+        "1.0.1": [
+          {
+            "ADDRESS": "0x16d7Cff1992F17E46fa98284CCaAC1A19788B6B9",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2023-08-31 12:35:19",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000697ac93c9263346c5ad0412f9356d5789a3aa6870000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff85",
+            "SALT": "31082023",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "WormholeFacet": {

diff --git a/deployments/optimism.diamond.json b/deployments/optimism.diamond.json
@@ -88,6 +88,10 @@
       "0xaE77c9aD4af61fAec96f04bD6723F6F6A804a567": {
         "Name": "CalldataVerificationFacet",
         "Version": "1.1.0"
+      },
+      "0x16d7Cff1992F17E46fa98284CCaAC1A19788B6B9": {
+        "Name": "CelerCircleBridgeFacet",
+        "Version": "1.0.1"
       }
     },
     "Periphery": {

diff --git a/deployments/optimism.json b/deployments/optimism.json
@@ -33,5 +33,6 @@
   "CelerIMFacetMutable": "0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64",
   "RelayerCelerIM": "0x1C97BE47f6Da4d2e09B3A11B0A17C513dfD0e896",
   "StandardizedCallFacet": "0x2E61751366B7e006f8D53becB4b697890B30144F",
-  "CalldataVerificationFacet": "0xaE77c9aD4af61fAec96f04bD6723F6F6A804a567"
+  "CalldataVerificationFacet": "0xaE77c9aD4af61fAec96f04bD6723F6F6A804a567",
+  "CelerCircleBridgeFacet": "0x16d7Cff1992F17E46fa98284CCaAC1A19788B6B9"
 }
diff --git a/deployments/zksync.diamond.json b/deployments/zksync.diamond.json
@@ -20,6 +20,10 @@
       "0x862FB4813657A40D1828Cac1e28a600625D78fC0": {
         "Name": "PeripheryRegistryFacet",
         "Version": "1.0.0"
+      },
+      "0x7dEfADC99d3E3f5f8d0C7dCFA7D2495B898ef5D8": {
+        "Name": "AcrossFacet",
+        "Version": "2.0.0"
       }
     },
     "Periphery": {
@@ -30,4 +34,4 @@
       "ServiceFeeCollector": "0x682dBe3f437f040535e728454D7F7f19Ead738b3"
     }
   }
-}
+}
diff --git a/deployments/zksync.json b/deployments/zksync.json
@@ -8,5 +8,6 @@
   "Executor": "0xa9bfa49F26733271f4FD34A4b57bB7C563Ae056A",
   "Receiver": "0xdeDB2DAe4a9BC63910a722a3b7DC930C7E6f6421",
   "FeeCollector": "0x8dBf6f59187b2EB36B980F3D8F4cFC6DC4E4642e",
-  "ServiceFeeCollector": "0x682dBe3f437f040535e728454D7F7f19Ead738b3"
-}
+  "ServiceFeeCollector": "0x682dBe3f437f040535e728454D7F7f19Ead738b3",
+  "AcrossFacet": "0x7dEfADC99d3E3f5f8d0C7dCFA7D2495B898ef5D8"
+}