Merge branch 'main' into LF-10933-deploy-to-lisk

lifinance · Dec 5, 2024 · a9ef7ad · a9ef7ad
2 parents a8f867d + 22d1f51
commit a9ef7ad
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 39 deletions.
diff --git a/config/dexs.json b/config/dexs.json
@@ -811,6 +811,7 @@
   "worldchain": [
     "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
     "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1",
+    "0x76aE215b11797b32397d878e6f3E65081ff58b13",
     "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a"
   ],
   "zksync": [

diff --git a/config/gaszip.json b/config/gaszip.json
@@ -19,6 +19,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
@@ -25789,6 +25789,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": {
@@ -26083,6 +26097,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"
 }