Merge branch 'fixScCoreDevReviewAction' of github.com:lifinance/contr…

…acts into fixScCoreDevReviewAction
lifinance · Sep 26, 2024 · 7c03f29 · 7c03f29
2 parents a251636 + 23a5832
commit 7c03f29
Show file tree

Hide file tree

Showing 24 changed files with 563 additions and 20 deletions.
diff --git a/.env.example b/.env.example
@@ -30,6 +30,7 @@ ETH_NODE_URI_ROOTSTOCK=https://rootstock.drpc.org #[pre-commit-checker: not a se
 ETH_NODE_URI_SEI=https://evm-rpc.sei-apis.com #[pre-commit-checker: not a secret].io
 ETH_NODE_URI_SCROLL=https://1rpc.io/scroll #[pre-commit-checker: not a secret].io
 ETH_NODE_URI_TAIKO=https://rpc.taiko.tools #[pre-commit-checker: not a secret].io
+ETH_NODE_URI_XLAYER=https://rpc.xlayer.tech #[pre-commit-checker: not a secret].io
 ETH_NODE_URI_ZKSYNC=https://zksync2-mainnet.zksync #[pre-commit-checker: not a secret].io
 
 # Testnet RPCs
@@ -68,6 +69,7 @@ POLYGON_ETHERSCAN_API_KEY=
 POLYGONZKEVM_ETHERSCAN_API_KEY=
 SCROLL_ETHERSCAN_API_KEY=
 SEI_ETHERSCAN_API_KEY=
+XLAYER_ETHERSCAN_API_KEY=
 TAIKO_ETHERSCAN_API_KEY=
 
 

diff --git a/...y/facets/DeployLiFiDiamondImmutable.s.sol → .../scripts/DeployLiFiDiamondImmutable.s.sol b/...y/facets/DeployLiFiDiamondImmutable.s.sol → .../scripts/DeployLiFiDiamondImmutable.s.sol
diff --git a/script/tasks/diamondMakeImmutable.sh → archive/scripts/diamondMakeImmutable.sh b/script/tasks/diamondMakeImmutable.sh → archive/scripts/diamondMakeImmutable.sh
diff --git a/src/LiFiDiamondImmutable.sol → archive/src/LiFiDiamondImmutable.sol b/src/LiFiDiamondImmutable.sol → archive/src/LiFiDiamondImmutable.sol
diff --git a/test/solidity/LiFiDiamondImmutable.t.sol → archive/test/LiFiDiamondImmutable.t.sol b/test/solidity/LiFiDiamondImmutable.t.sol → archive/test/LiFiDiamondImmutable.t.sol
diff --git a/config/amarok.json b/config/amarok.json
@@ -119,9 +119,7 @@
     "chainId": 34443,
     "connextHandler": "0x7380511493DD4c2f1dD75E9CCe5bD52C787D4B51",
     "domain": "1836016741",
-    "tokensToApprove": [
-      "0x4200000000000000000000000000000000000006"
-    ]
+    "tokensToApprove": ["0x4200000000000000000000000000000000000006"]
   },
   "arbitrum": {
     "chainId": 42161,
@@ -300,5 +298,11 @@
     "connextHandler": "0x0000000000000000000000000000000000000000",
     "domain": "",
     "tokensToApprove": []
+  },
+  "xlayer": {
+    "chainId": 196,
+    "connextHandler": "0x0000000000000000000000000000000000000000",
+    "domain": "",
+    "tokensToApprove": []
   }
-}
+}
diff --git a/config/cbridge.json b/config/cbridge.json
@@ -122,6 +122,9 @@
     "cBridge": "0xD46F8E428A06789B5884df54E029e738277388D1",
     "messageBus": "0x9Bb46D5100d2Db4608112026951c9C965b233f4D"
   },
+  "xlayer": {
+    "cBridge": "0xf5C6825015280CdfD0b56903F9F8B5A2233476F5"
+  },
   "zksync": {
     "cBridge": "0x54069e96C4247b37C2fbd9559CA99f08CD1CD66c",
     "messageBus": "0x9a98a376D30f2c9A0A7332715c15D940dE3da0e2",
@@ -139,9 +142,7 @@
   },
   "scroll": {
     "cBridge": "0x9B36f165baB9ebe611d491180418d8De4b8f3a1f",
-    "tokensToApprove": [
-      "0x5300000000000000000000000000000000000004"
-    ]
+    "tokensToApprove": ["0x5300000000000000000000000000000000000004"]
   },
   "goerli": {
     "cBridge": "0x358234B325EF9eA8115291A8b81b7d33A2Fa762D",
@@ -159,4 +160,4 @@
   "optimisticKovan": {
     "cBridge": "0x265B25e22bcd7f10a5bD6E6410F10537Cc7567e8"
   }
-}
+}
diff --git a/config/dexs.json b/config/dexs.json
@@ -675,5 +675,11 @@
     "0xaB359008620d9368DD0D67A61D654DcdF095155c",
     "0xE275759e85e5497A1B07EA65529187FD7E987509",
     "0x111111125421ca6dc452d289314280a0f8842a65"
+  ],
+  "xlayer": [
+    "0xC69994fd72824ca98F8a0B1E2ABc954E65a91cf4",
+    "0x12904D12A84702f9F079E1e393fdAbD313496e97",
+    "0x833Be894C596b15FAe740C2D522d660084c48B05",
+    "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54"
   ]
-}
+}
diff --git a/config/global.json b/config/global.json
@@ -66,6 +66,7 @@
     "scroll": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "sei": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "taiko": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "xlayer": "0x3fD21B437b5E0a903A8376D33824F9BA658756C2",
     "zksync": "0x02f1272aEaCaf7BD8b30278bc2AA381Cc623A744"
   },
   "safeOwners": [
@@ -106,6 +107,7 @@
     "scroll": "https://safe-transaction-scroll.safe.global/api",
     "sei": "https://transaction.sei-safe.protofire.io/api",
     "taiko": "https://transaction.safe.taiko.xyz/api",
+    "xlayer": "https://safe-transaction-xlayer.safe.global/api",
     "zksync": "https://safe-transaction-zksync.safe.global/api"
   },
   "nativeAddress": {
@@ -137,6 +139,7 @@
     "rootstock": "0x0000000000000000000000000000000000000000",
     "scroll": "0x0000000000000000000000000000000000000000",
     "sei": "0x0000000000000000000000000000000000000000",
+    "xlayer": "0x0000000000000000000000000000000000000000",
     "taiko": "0x0000000000000000000000000000000000000000",
     "zksync": "0x0000000000000000000000000000000000000000"
   },
@@ -146,4 +149,4 @@
     "TokenWrapper",
     "LiFiDEXAggregator"
   ]
-}
+}
diff --git a/config/networks.json b/config/networks.json
@@ -251,6 +251,15 @@
     "status": "active",
     "type": "mainnet"
   },
+  "xlayer": {
+    "name": "X Layer",
+    "chainId": 196,
+    "nativeAddress": "0x0000000000000000000000000000000000000000",
+    "nativeCurrency": "OKB",
+    "wrappedNativeAddress": "0xe538905cf8410324e03a5a23c1c177a474d59b2b",
+    "status": "active",
+    "type": "mainnet"
+  },
   "zksync": {
     "name": "zkSync Era Mainnet",
     "chainId": 324,
@@ -305,4 +314,4 @@
     "status": "active",
     "type": "testnet"
   }
-}
+}
diff --git a/config/stargate.json b/config/stargate.json
@@ -35,6 +35,7 @@
     "mantle": "0x1a44076050125825900e736c501f859c50fE728c",
     "scroll": "0x1a44076050125825900e736c501f859c50fE728c",
     "taiko": "0x1a44076050125825900e736c501f859c50fE728c",
+    "xlayer": "0x0000000000000000000000000000000000000000",
     "zksync": "0xd07C30aF3Ff30D96BDc9c6044958230Eb797DDBF",
     "sei": "0x1a44076050125825900e736c501f859c50fE728c",
     "localanvil": "0x0000000000000000000000000000000000000000",
@@ -224,6 +225,7 @@
     "mode": "0x0000000000000000000000000000000000000000",
     "mantle": "0x296F55F8Fb28E498B858d0BcDA06D955B2Cb3f97",
     "scroll": "0x0000000000000000000000000000000000000000",
+    "xlayer": "0x0000000000000000000000000000000000000000",
     "taiko": "0x0000000000000000000000000000000000000000",
     "localanvil": "0x0000000000000000000000000000000000000000",
     "mumbai": "0x0000000000000000000000000000000000000000",
@@ -263,9 +265,10 @@
     "mantle": "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590",
     "metis": "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590",
     "scroll": "0x36d4686e19c052787D7f24E6913cEbC025714895",
+    "xlayer": "0x0000000000000000000000000000000000000000",
     "taiko": "0x0000000000000000000000000000000000000000",
     "localanvil": "0x0000000000000000000000000000000000000000",
     "mumbai": "0x817436a076060D158204d955E5403b6Ed0A5fac0",
     "sepolia": "0x0000000000000000000000000000000000000000"
   }
-}
+}
diff --git a/config/tokenwrapper.json b/config/tokenwrapper.json
@@ -40,6 +40,7 @@
   "blast": "0x4300000000000000000000000000000000000004",
   "rootstock": "0x542fda317318ebf1d3deaf76e0b632741a7e677d",
   "sei": "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7",
+  "xlayer": "0xe538905cf8410324e03a5a23c1c177a474d59b2b",
   "taiko": "0xA51894664A773981C6C112C43ce576f315d5b1B6",
   "immutablezkevm": "0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d"
-}
+}