Merge branch 'main' into adaptEmergencyPauseCode

lifinance · Dec 5, 2024 · 9bc9d03 · 9bc9d03
2 parents 6c73ed2 + 22d1f51
commit 9bc9d03
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 109 deletions.
diff --git a/config/dexs.json b/config/dexs.json
@@ -42,7 +42,6 @@
     "0x827179dD56d07A7eeA32e3873493835da2866976",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
     "0x7d0ccaa3fac1e5a943c5168b6ced828691b46b36",
     "0x40aA958dd87FC8305b97f2BA922CDdCa374bcD7f",
     "0xFe837A3530dD566401d35beFCd55582AF7c4dfFC"
@@ -90,7 +89,6 @@
     "0xfc506AaA1340b4dedFfd88bE278bEe058952D674",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0xf332761c673b59b21ff6dfa8ada44d78c12def09",
     "0x70cBb871E8f30Fc8Ce23609E9E0Ea87B6b222F58"
   ],
@@ -184,7 +182,6 @@
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
     "0x6b2c0c7be2048daa9b5527982c29f48062b34d58",
     "0x57df6092665eb6058DE53939612413ff4B09114E"
   ],
@@ -272,7 +269,6 @@
     "0x400d75dAb26bBc18D163AEA3e83D9Ea68F6c1804",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0x9333c74bdd1e118634fe5664aca7a9710b108bab",
     "0x2c34A2Fb1d0b4f55de51E1d0bDEfaDDce6b7cDD6",
     "0x0343C5757Fb98aD9eF39824e08B852aF61C71c64"
@@ -372,7 +368,7 @@
     "0x3D2f8ae0344d38525d2AE96Ab750B83480c0844F",
     "0x2214A42d8e2A1d20635c2cb0664422c528B6A432",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55"
+    "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0xf332761c673b59b21ff6dfa8ada44d78c12def09",
     "0x70cBb871E8f30Fc8Ce23609E9E0Ea87B6b222F58"
   ],
@@ -541,7 +537,6 @@
     "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
     "0xd0f95fafa06de1b21e79db03c649919501e99ea9",
     "0xbd0ebe49779e154e5042b34d5bcfbc498e4b3249",
     "0x78bF01555bCF05e6B1d4dad017dBD0A105652DC9"
@@ -659,14 +654,12 @@
     "0x96E04591579f298681361C6122Dc4Ef405c19385",
     "0x4C5D5234f232BD2D76B96aA33F5AE4FCF0E4BFAb",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
-    "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
+    "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3"
   ],
   "opbnb": [
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0xf332761c673b59b21ff6dfa8ada44d78c12def09",
-    "0x68D6B739D2020067D1e2F713b999dA97E4d54812"
+    "0x68D6B739D2020067D1e2F713b999dA97E4d54812",
     "0x6A2420650139854F17964b8C3Bb60248470aB57E",
     "0xEc41F702d36b43a1E1d017Cb4da92F431dFA7a0E",
     "0x077A38b812e57E2e76849954c880E1a2f5e0A68d"
@@ -719,7 +712,6 @@
     "0x0a6e511Fe663827b9cA7e2D2542b20B37fC217A6",
     "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0xa748d6573aca135af68f2635be60cb80278bd855",
     "0x3B86917369B83a6892f553609F3c2F439C184e31",
     "0x46AFE01D758a46d64c7d8E0791314D5db3E2e683"
@@ -779,7 +771,6 @@
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
     "0x78bF01555bCF05e6B1d4dad017dBD0A105652DC9",
     "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F",
     "0x6b2c0c7be2048daa9b5527982c29f48062b34d58",
     "0x57df6092665eb6058DE53939612413ff4B09114E"
   ],
@@ -788,8 +779,7 @@
     "0xff2F39692A90262b8Ed4DFD92799bB450425773F",
     "0xD989E929517B0e5eD0c8EfE7607Fa167B697cBa8",
     "0xcaA342e4f781d63EF41E220D7622B97E66BAEcF3",
-    "0x0ec6D2eEb94541C51620830D151995fCFf83Aa74",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
+    "0x0ec6D2eEb94541C51620830D151995fCFf83Aa74"
   ],
   "velas": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -814,6 +804,7 @@
   "worldchain": [
     "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
     "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1",
+    "0x76aE215b11797b32397d878e6f3E65081ff58b13",
     "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a"
   ],
   "zksync": [
@@ -833,7 +824,6 @@
     "0x6fd4383cb451173d5f9304f041c7bcbf27d561ff",
     "0x1F683faf1E2a770aa75f7B2e92117A5c11183E9C",
     "0x4000f76450d9d40558fd60F66863F583B7A5BCCb",
-    "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
     "0xb9061e38fee7d30134f56aef7117e2f6d1580666",
     "0xc67879F4065d3B9fe1C09EE990B891Aa8E3a4c2f"
   ],

diff --git a/config/gaszip.json b/config/gaszip.json
@@ -18,6 +18,7 @@
     "polygon": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762",
     "scroll": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762",
     "taiko": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762",
+    "worldchain": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762",
     "xlayer": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762",
     "zksync": "0x252fb662e4d7435d2a5ded8ec94d8932cf76c178"
   }

diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
@@ -25439,6 +25439,20 @@
           }
         ]
       }
+    },
+    "worldchain": {
+      "production": {
+        "2.0.0": [
+          {
+            "ADDRESS": "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-12-04 16:13:55",
+            "CONSTRUCTOR_ARGS": "0x0000000000000000000000002a37d63eadfe4b4682a3c28c1c2cd4f109cc2762",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   },
   "GasZipPeriphery": {
@@ -25719,6 +25733,20 @@
           }
         ]
       }
+    },
+    "worldchain": {
+      "production": {
+        "1.0.0": [
+          {
+            "ADDRESS": "0x76aE215b11797b32397d878e6f3E65081ff58b13",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-12-04 16:18:00",
+            "CONSTRUCTOR_ARGS": "0x0000000000000000000000002a37d63eadfe4b4682a3c28c1c2cd4f109cc27620000000000000000000000002321f1a63a683a1f3634dbe1cba0d657d5f56d54000000000000000000000000a6e64bc059ddaa72ec374c50b1a5c6b3a27d64ce",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
+        ]
+      }
     }
   }
 }
diff --git a/deployments/worldchain.diamond.json b/deployments/worldchain.diamond.json
@@ -3,74 +3,79 @@
     "Facets": {
       "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d": {
         "Name": "DiamondCutFacet",
-        "Version": ""
+        "Version": "2.0.0"
       },
       "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f": {
         "Name": "DiamondLoupeFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455": {
         "Name": "OwnershipFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1": {
         "Name": "WithdrawFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0xE154389c1bAE241F220661131b7AfDc1514C55c7": {
         "Name": "DexManagerFacet",
-        "Version": ""
+        "Version": "1.0.1"
       },
       "0x314E1E760316050B0D6338bCf3d689b8D301F593": {
         "Name": "AccessManagerFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453": {
         "Name": "PeripheryRegistryFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713": {
         "Name": "LIFuelFacet",
-        "Version": ""
+        "Version": "1.0.1"
       },
       "0xd2B3b3605e630232c13111458Ae3a97d13c8F477": {
         "Name": "GenericSwapFacet",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0xBa713B18c806EcdEEE49FAec623dE2D872192872": {
         "Name": "GenericSwapFacetV3",
         "Version": "1.0.1"
       },
       "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E": {
         "Name": "StandardizedCallFacet",
-        "Version": ""
+        "Version": "1.1.0"
       },
       "0x1feB868BF64AdC552E051fB7387681F78b988a81": {
         "Name": "CalldataVerificationFacet",
-        "Version": ""
+        "Version": "1.1.2"
       },
       "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844": {
         "Name": "EmergencyPauseFacet",
-        "Version": ""
+        "Version": "1.0.1"
       },
       "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92": {
         "Name": "AcrossFacetV3",
-        "Version": ""
+        "Version": "1.0.0"
       },
       "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57": {
         "Name": "AcrossFacetPackedV3",
-        "Version": ""
+        "Version": "1.0.0"
+      },
+      "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19": {
+        "Name": "GasZipFacet",
+        "Version": "2.0.0"
       }
     },
     "Periphery": {
       "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0",
       "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B",
       "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
+      "GasZipPeriphery": "0x76aE215b11797b32397d878e6f3E65081ff58b13",
       "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54",
       "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1",
       "Permit2Proxy": "",
-      "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd",
       "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb",
+      "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd",
       "ReceiverStargateV2": "",
       "RelayerCelerIM": "",
       "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a"

diff --git a/deployments/worldchain.json b/deployments/worldchain.json
@@ -1,26 +1,28 @@
 {
-    "DiamondCutFacet": "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d",
-    "DiamondLoupeFacet": "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f",
-    "OwnershipFacet": "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455",
-    "DexManagerFacet": "0xE154389c1bAE241F220661131b7AfDc1514C55c7",
-    "AccessManagerFacet": "0x314E1E760316050B0D6338bCf3d689b8D301F593",
-    "WithdrawFacet": "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1",
-    "PeripheryRegistryFacet": "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453",
-    "GenericSwapFacet": "0xd2B3b3605e630232c13111458Ae3a97d13c8F477",
-    "GenericSwapFacetV3": "0xBa713B18c806EcdEEE49FAec623dE2D872192872",
-    "LIFuelFacet": "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713",
-    "CalldataVerificationFacet": "0x1feB868BF64AdC552E051fB7387681F78b988a81",
-    "StandardizedCallFacet": "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E",
-    "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
-    "EmergencyPauseFacet": "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844",
-    "AcrossFacetV3": "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92",
-    "AcrossFacetPackedV3": "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57",
-    "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0",
-    "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B",
-    "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
-    "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd",
-    "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1",
-    "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a",
-    "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54",
-    "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb"
+  "DiamondCutFacet": "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d",
+  "DiamondLoupeFacet": "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f",
+  "OwnershipFacet": "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455",
+  "DexManagerFacet": "0xE154389c1bAE241F220661131b7AfDc1514C55c7",
+  "AccessManagerFacet": "0x314E1E760316050B0D6338bCf3d689b8D301F593",
+  "WithdrawFacet": "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1",
+  "PeripheryRegistryFacet": "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453",
+  "GenericSwapFacet": "0xd2B3b3605e630232c13111458Ae3a97d13c8F477",
+  "GenericSwapFacetV3": "0xBa713B18c806EcdEEE49FAec623dE2D872192872",
+  "LIFuelFacet": "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713",
+  "CalldataVerificationFacet": "0x1feB868BF64AdC552E051fB7387681F78b988a81",
+  "StandardizedCallFacet": "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E",
+  "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
+  "EmergencyPauseFacet": "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844",
+  "AcrossFacetV3": "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92",
+  "AcrossFacetPackedV3": "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57",
+  "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0",
+  "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B",
+  "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
+  "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd",
+  "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1",
+  "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a",
+  "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54",
+  "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb",
+  "GasZipFacet": "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19",
+  "GasZipPeriphery": "0x76aE215b11797b32397d878e6f3E65081ff58b13"
 }