Merge branch 'main' of github.com:lifinance/contracts into LF-4961-Im…

…plementing-CCIP-support
lifinance · Nov 10, 2023 · 96dc26f · 96dc26f
2 parents f9211b6 + 203609c
commit 96dc26f
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 26 deletions.
diff --git a/config/allbridge.json b/config/allbridge.json
@@ -5,6 +5,9 @@
   "arbitrum": {
     "allBridge": "0x9Ce3447B58D58e8602B7306316A5fF011B92d189"
   },
+  "avalanche": {
+    "allBridge": "0x9068E1C28941D0A680197Cc03be8aFe27ccaeea9"
+  },
   "bsc": {
     "allBridge": "0x3C4FA639c8D7E65c603145adaD8bD12F2358312f"
   },

diff --git a/config/dexs.json b/config/dexs.json
@@ -24,7 +24,11 @@
     "0x50f9bDe1c76bba997a5d6e7FEFff695ec8536194",
     "0xB4B0ea46Fe0E9e8EAB4aFb765b527739F2718671",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x6777f6ebec76d796cb3999a69cd5980bd86ccfe5",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0xcf5540fffcdc3d510b18bfca6d2b9987b0772559",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "arbitrum": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -52,7 +56,10 @@
     "0x7d13268144adcdbEBDf94F654085CC15502849Ff",
     "0xe05dd51e4eb5636f4f0e8e7fbe82ea31a2ecef16",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0xa669e7a0d4b3e4fa48af2de86bd4cd7126be4e13",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "aurora": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -70,7 +77,8 @@
     "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     "0x2CB45Edb4517d5947aFdE3BEAbF95A582506858B",
     "0x7449Cd63C2b1A06C36945eD83f0626D303781B6E",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "avalanche": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -97,7 +105,9 @@
     "0x409e377a7affb1fd3369cfc24880ad58895d1dd9",
     "0xe54ca86531e17ef3616d22ca28b0d458b6c89106",
     "0x1F076a800005c758a505E759720eb6737136e893",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x88de50b233052e4fb783d4f6db78cc34fea3e9fc",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "boba": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -143,7 +153,10 @@
     "0xcF0feBd3f17CEf5b47b0cD257aCf6025c5BFf3b7",
     "0x0656fD85364d03b103CEEda192FB2D3906A6ac15",
     "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x89b8aa89fdd0507a99d334cbe3c808fafc7d850e",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "celo": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -173,7 +186,8 @@
     "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     "0x721deBc2cA1FF57A2E9C7dE2A397a34117239998",
     "0x9B736bB8f336f61E16454DCA4dE130703D151042",
-    "0x145863Eb42Cf62847A6Ca784e6416C1682b1b2Ae"
+    "0x145863Eb42Cf62847A6Ca784e6416C1682b1b2Ae",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "evmos": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -211,7 +225,9 @@
     "0x1111111254eeb25477b68fb85ed929f73a960582",
     "0x6b3d631b87fe27af29efec61d2ab8ce4d621ccbf",
     "0x6D0176C5ea1e44b08D3dd001b0784cE42F47a3A7",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0xd0c22a5435f4e8e5770c1fafb5374015fc12f7cd",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "fuse": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -245,7 +261,8 @@
     "0x9e308cb079ae130790F604b1030cDf386670f199",
     "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
     "0xe43e60736b1cb4a75ad25240e2f9a62bff65c0c0",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52"
   ],
   "harmony": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -350,7 +367,6 @@
     "0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c",
     "0xd9deC7c3C06e62a4c1BeEB07CadF568f496b14c2",
     "0x6B4Fa0bc61Eddc928e0Df9c7f01e407BfcD3e5EF",
-    "0xc0006Be82337585481044a7d11941c0828FFD2D4",
     "0xc97b81b8a38b9146010df85f1ac714afe1554343",
     "0x6352a56caadc4f1e25cd6c75970fa768a3304e64",
     "0x5381382257c761dac6f1509b1ba1b70ddaa6862a",
@@ -377,7 +393,10 @@
     "0xa492d6eabcdc3e204676f15b950bbdd448080364",
     "0x716fcc67dcA500A91B4a28c9255262c398D8f971",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0xca423977156bb05b13a2ba3b76bc5419e2fe9680",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "polygon": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -412,7 +431,10 @@
     "0xe7F5FF6da6DdF45F43aE7c8217AEC3ec5a0569c5",
     "0x39E3e49C99834C9573c9FC7Ff5A4B226cD7B0E63",
     "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x38147794ff247e5fc179edbae6c37fff88f68c52",
+    "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "polygonzkevm": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -424,7 +446,8 @@
     "0x6dd434082eab5cd134b33719ec1ff05fe985b97b",
     "0xc4212b4f901C8Afac75A27C8E8be7b9fa82D74d8",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5"
   ],
   "zksync": [
     "0xbE07Edbb7d0fc7eb941078486F6b59061bF0336C",
@@ -434,7 +457,10 @@
     "0x682dBe3f437f040535e728454D7F7f19Ead738b3",
     "0x8dBf6f59187b2EB36B980F3D8F4cFC6DC4E4642e",
     "0x4A751A91647CA1749d7ec505026427FF601C6966",
-    "0x3F0bD05C9A09FE07DB88aA2DD97f9d9fAf82994d"
+    "0x3F0bD05C9A09FE07DB88aA2DD97f9d9fAf82994d",
+    "0x006a5501fc45219ffdc353106d2946bd1dc08161",
+    "0x4bba932e9792a2b917d47830c93a9bc79320e4f7",
+    "0x3f95ef3f2eaca871858dbe20a93c01daf6c2e923"
   ],
   "velas": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -455,7 +481,9 @@
     "0x0A6d96E7f4D7b96CFE42185DF61E64d255c12DFf",
     "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
     "0x2626664c2603336e57b271c5c0b26f421741e481",
-    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+    "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+    "0x19ceead7105607cd444f5ad10dd51356436095a1",
+    "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "goerli": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",

diff --git a/config/hop.json b/config/hop.json
@@ -1035,6 +1035,37 @@
       }
     ]
   },
+  "linea": {
+    "chainId": 59144,
+    "tokens": [
+      {
+        "name": "ETH",
+        "bridge": "0xCbb852A6274e03fA00fb4895dE0463f66dF27a11",
+        "token": "0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f",
+        "ammWrapper": "0xC8A4FB931e8D77df8497790381CA7d228E68a41b"
+      },
+      {
+        "name": "ETH",
+        "bridge": "0xCbb852A6274e03fA00fb4895dE0463f66dF27a11",
+        "token": "0x0000000000000000000000000000000000000000",
+        "ammWrapper": "0xC8A4FB931e8D77df8497790381CA7d228E68a41b"
+      }
+    ],
+    "approvals": [
+      {
+        "a_tokenAddress": "0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f",
+        "b_contractAddress": "0xC8A4FB931e8D77df8497790381CA7d228E68a41b",
+        "c_tokenName": "ETH",
+        "d_contractName": "l2AmmWrapper"
+      },
+      {
+        "a_tokenAddress": "0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f",
+        "b_contractAddress": "0x2935173357c010F8B56c8719a44f9FbdDa90f67c",
+        "c_tokenName": "ETH",
+        "d_contractName": "l2SaddleSwap"
+      }
+    ]
+  },
   "mumbai": {
     "chainId": 80001,
     "tokens": [

diff --git a/config/sigs.json b/config/sigs.json
@@ -101,12 +101,17 @@
     "0x9b2c0a37",
     "0xd4ef38de",
     "0x1c58db4f",
-    "0x715018a6",
-    "0x78e3214f",
     "0xe21fd0e9",
     "0x59e50fed",
     "0x8af033fb",
-    "0xf2fde38b",
-    "0x33320de3"
+    "0x4629fd85",
+    "0x476357fe",
+    "0x6e5129d1",
+    "0x8fd8d1bb",
+    "0x33320de3",
+    "0x3b635ce4",
+    "0x83bd37f9",
+    "0x7bf2d6d4",
+    "0x84a7f3dd"
   ]
 }
diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
@@ -5444,6 +5444,20 @@
           }
         ]
       }
+    },
+    "linea": {
+      "production": {
+        "2.0.0": [
+          {
+            "ADDRESS": "0xf812bA858d9Fa57788dF0F792eF35752d54863F1",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2023-11-07 10:29:58",
+            "CONSTRUCTOR_ARGS": "0x",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "HopFacet": {
@@ -5612,6 +5626,20 @@
           }
         ]
       }
+    },
+    "linea": {
+      "production": {
+        "2.0.0": [
+          {
+            "ADDRESS": "0xf4E632a8be2164F93427603F6c9A73e182923b02",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2023-11-07 10:20:36",
+            "CONSTRUCTOR_ARGS": "0x",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "HyphenFacet": {
@@ -10781,6 +10809,20 @@
           }
         ]
       }
+    },
+    "linea": {
+      "production": {
+        "1.0.6": [
+          {
+            "ADDRESS": "0x71327AF4f53E8831BD7E1adDbeD9D2b6dacE64a2",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2023-11-07 12:35:12",
+            "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f11121df7256c40339393b0fb045321022ce44000000000000000000000000c8a4fb931e8d77df8497790381ca7d228e68a41b",
+            "SALT": "07112023",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "AmarokFacet": {
@@ -11359,6 +11401,20 @@
           }
         ]
       }
+    },
+    "avalanche": {
+      "production": {
+        "2.0.0": [
+          {
+            "ADDRESS": "0x85f9c55B22bd2c389b560130F878CeB8b289C4c4",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2023-11-01 11:34:36",
+            "CONSTRUCTOR_ARGS": "0x0000000000000000000000009068e1c28941d0a680197cc03be8afe27ccaeea9",
+            "SALT": "01112023",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "ArbitrumBridgeFacet": {

diff --git a/deployments/avalanche.diamond.json b/deployments/avalanche.diamond.json
@@ -68,16 +68,20 @@
       "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0": {
         "Name": "CalldataVerificationFacet",
         "Version": "1.1.1"
+      },
+      "0x85f9c55B22bd2c389b560130F878CeB8b289C4c4": {
+        "Name": "AllBridgeFacet",
+        "Version": "2.0.0"
       }
     },
     "Periphery": {
       "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51",
       "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D",
       "FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
+      "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
       "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657",
       "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97",
-      "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
-      "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+      "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D"
     }
   }
-}
+}
diff --git a/deployments/avalanche.json b/deployments/avalanche.json
@@ -34,5 +34,6 @@
   "RelayerCelerIM": "0x1C97BE47f6Da4d2e09B3A11B0A17C513dfD0e896",
   "StandardizedCallFacet": "0x2E61751366B7e006f8D53becB4b697890B30144F",
   "CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0",
-  "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE"
+  "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE",
+  "AllBridgeFacet": "0x85f9c55B22bd2c389b560130F878CeB8b289C4c4"
 }
diff --git a/deployments/linea.diamond.json b/deployments/linea.diamond.json
@@ -56,16 +56,28 @@
       "0x6F1330cC587a2be7eC61e04ba64267ff90cC0315": {
         "Name": "CalldataVerificationFacet",
         "Version": "1.1.1"
+      },
+      "0xf4E632a8be2164F93427603F6c9A73e182923b02": {
+        "Name": "HopFacet",
+        "Version": "2.0.0"
+      },
+      "0x71327AF4f53E8831BD7E1adDbeD9D2b6dacE64a2": {
+        "Name": "HopFacetPacked",
+        "Version": "1.0.6"
+      },
+      "0xf812bA858d9Fa57788dF0F792eF35752d54863F1": {
+        "Name": "HopFacetOptimized",
+        "Version": "2.0.0"
       }
     },
     "Periphery": {
       "ERC20Proxy": "0x57ec2C57fA654aABAeCc63c8dad47cb6efaCCC24",
       "Executor": "0x2a202Ed587F0BC7dfa80ea1DD943d8470492Dd0F",
       "FeeCollector": "0xA4A24BdD4608D7dFC496950850f9763B674F0DB2",
+      "LiFuelFeeCollector": "0x6CC48E94C1148A0787D7F137745af58e3Eb47780",
       "Receiver": "0xc10d6962bFF9516ec1584D334A482f36Af98B191",
       "RelayerCelerIM": "",
-      "ServiceFeeCollector": "0xA8Fe73F7b3a825fF51f2200af12c16B3BA95394d",
-      "LiFuelFeeCollector": "0x6CC48E94C1148A0787D7F137745af58e3Eb47780"
+      "ServiceFeeCollector": "0xA8Fe73F7b3a825fF51f2200af12c16B3BA95394d"
     }
   }
-}
+}
diff --git a/deployments/linea.json b/deployments/linea.json
@@ -20,5 +20,8 @@
   "StandardizedCallFacet": "0xC543CEdA9362748Be1EEC5c82B4d91845F725a7b",
   "StargateFacet": "0xEDB61cDace9733f9F2dD18eb414dEa613cc0226d",
   "CalldataVerificationFacet": "0x6F1330cC587a2be7eC61e04ba64267ff90cC0315",
-  "LiFuelFeeCollector": "0x6CC48E94C1148A0787D7F137745af58e3Eb47780"
+  "LiFuelFeeCollector": "0x6CC48E94C1148A0787D7F137745af58e3Eb47780",
+  "HopFacet": "0xf4E632a8be2164F93427603F6c9A73e182923b02",
+  "HopFacetPacked": "0x71327AF4f53E8831BD7E1adDbeD9D2b6dacE64a2",
+  "HopFacetOptimized": "0xf812bA858d9Fa57788dF0F792eF35752d54863F1"
 }