wip: xlayer deployment

sendra · sendra · commit 06463858a4e9 · 2025-10-28T11:33:10.000+01:00
diff --git a/deployments/ethereum.json b/deployments/ethereum.json
@@ -1,34 +1,34 @@
 {
-  "arbAdapter": "0x88d6D01e08d3e64513b15fD46528dBbA7d755883",
-  "baseAdapter": "0xa5948b0ac79f72966dFFC5C13E44f6dfDD3D58A0",
-  "bobAdapter": "0x1e2bFEF32EdAbf6b3EF8B674044DC00f082Addff",
-  "ccipAdapter": "0x352C71092fB60ce2f94DFF4ACda330DdffD946B0",
+  "arbAdapter": "0x1726C13FB9d89abaD27787480ae597b3Df4D806C",
+  "baseAdapter": "0x124A93c62dB29C2eF68b79F1709Fe377feAa108D",
+  "bobAdapter": "0xA23EA77E2feE70CD827731cC30157691e868EC26",
+  "ccipAdapter": "0xa85B99E7Ff340dD2bD775f8cBb4BfC80bE65B4Ec",
   "chainId": 1,
   "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
-  "create3Factory": "0xcc3C54B95f3f1867A43009B80ed4DD930E3cE2F7",
-  "crossChainController": "0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1",
-  "crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x8E0cE624befC5226dA99276c5c272f3bf83462E3",
+  "crossChainControllerImpl": "0x04458aBf3844995FA28Fd5503034AE69A3E6a400",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
-  "executor": "0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A",
-  "gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
-  "granularCCCGuardian": "0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4",
+  "executor": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0BED83079C2c994C54112d07110F09C9Be6d485E",
+  "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
-  "hlAdapter": "0x6bda311748E6542d578b167d791A4130f3FbBc67",
-  "inkAdapter": "0x98E78C2cD3013BF13a658E210e27C3732c8Dc48A",
-  "lineaAdapter": "0x8097555ffDa4176C93FEf92dF473b9763e467686",
-  "lzAdapter": "0xBA0Ee375e9d0c815097D9eB7EB9Db20b59c06792",
-  "mantleAdapter": "0xb66FA987fa7975Cac3d12B629c9c44e459e50990",
-  "metisAdapter": "0x6B3Dc800E7c813Db3fe8D0F30fDCaE636935dC14",
-  "mockDestination": "0x19198689FfBE82207F023248dca175a84c52eCE1",
-  "opAdapter": "0x0e24524778fdc67f53eEf144b8cbf50261E930B3",
+  "hlAdapter": "0x834607F5d65451918a8fDD5D22d6eF97f84917ef",
+  "inkAdapter": "0xC21b883bc57e963fd3214FE8E8eb80d71458Aae0",
+  "lineaAdapter": "0x5Dc8724b62F489a98f4f86b3a9629FB3f2552d73",
+  "lzAdapter": "0xa25eC95457536Db32080b3EBaC6d185C44378fe3",
+  "mantleAdapter": "0xD4FE312b920218A5a3D990c85b2a67aAeb8701dc",
+  "metisAdapter": "0x92bce04e8B33c7098AA0bEc7663cA8Eb0930f6a4",
+  "mockDestination": "0x5eB700Fd6aE49fc9890349E4d90737C1420e7E4f",
+  "opAdapter": "0x091A76a70D9E9Ef3eae895D3b72DCD587ae1A460",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
-  "polAdapter": "0x1562F1b2487F892BBA8Ef325aF054Fd157510a71",
-  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "polAdapter": "0x35F0e8e1f349cCA85D0F4A195112De26A57974D6",
+  "proxyAdminCCC": "0x28D7de3839D70FD27E80b5cCE9CDea7a26a55184",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
-  "sameChainAdapter": "0x6cfbd2aA4691fc18B9C209bDd43DC3943C228FCf",
-  "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",
-  "soneiumAdapter": "0xe66973c4571F733CafEb1BDE1fa58Ff35416d901",
-  "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x525EC320AbD05FF316683BA3e38023CEe72f9868",
+  "soneiumAdapter": "0x4e00fD05aBb32F3eAF8C4D0773284ae10675C225",
+  "wormholeAdapter": "0x7458fd003C60D6B581D20249386188eA976e0556",
   "xlayerAdapter": "0x0000000000000000000000000000000000000000",
-  "zksyncAdapter": "0x6aD9d4147467f08b165e1b6364584C5d28898b84"
+  "zksyncAdapter": "0x22b56CC7c45ed007eA7E4Ea10D28967d36E314D6"
 }
diff --git a/deployments/pre_prod_ethereum.json b/deployments/pre_prod_ethereum.json
diff --git a/deployments/prod_ethereum.json b/deployments/prod_ethereum.json
@@ -0,0 +1,34 @@
+{
+  "arbAdapter": "0x88d6D01e08d3e64513b15fD46528dBbA7d755883",
+  "baseAdapter": "0xa5948b0ac79f72966dFFC5C13E44f6dfDD3D58A0",
+  "bobAdapter": "0x1e2bFEF32EdAbf6b3EF8B674044DC00f082Addff",
+  "ccipAdapter": "0x352C71092fB60ce2f94DFF4ACda330DdffD946B0",
+  "chainId": 1,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0xcc3C54B95f3f1867A43009B80ed4DD930E3cE2F7",
+  "crossChainController": "0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1",
+  "crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A",
+  "gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
+  "granularCCCGuardian": "0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0x6bda311748E6542d578b167d791A4130f3FbBc67",
+  "inkAdapter": "0x98E78C2cD3013BF13a658E210e27C3732c8Dc48A",
+  "lineaAdapter": "0x8097555ffDa4176C93FEf92dF473b9763e467686",
+  "lzAdapter": "0xBA0Ee375e9d0c815097D9eB7EB9Db20b59c06792",
+  "mantleAdapter": "0xb66FA987fa7975Cac3d12B629c9c44e459e50990",
+  "metisAdapter": "0x6B3Dc800E7c813Db3fe8D0F30fDCaE636935dC14",
+  "mockDestination": "0x19198689FfBE82207F023248dca175a84c52eCE1",
+  "opAdapter": "0x0e24524778fdc67f53eEf144b8cbf50261E930B3",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x1562F1b2487F892BBA8Ef325aF054Fd157510a71",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
+  "sameChainAdapter": "0x6cfbd2aA4691fc18B9C209bDd43DC3943C228FCf",
+  "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",
+  "soneiumAdapter": "0xe66973c4571F733CafEb1BDE1fa58Ff35416d901",
+  "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x6aD9d4147467f08b165e1b6364584C5d28898b84"
+}
diff --git a/deployments/xlayer.json b/deployments/xlayer.json
@@ -0,0 +1,34 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "bobAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x0000000000000000000000000000000000000000",
+  "chainId": 0,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x0000000000000000000000000000000000000000",
+  "crossChainControllerImpl": "0x0000000000000000000000000000000000000000",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0xE2E8Badc5d50f8a6188577B89f50701cDE2D4e19",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0x0000000000000000000000000000000000000000",
+  "inkAdapter": "0x0000000000000000000000000000000000000000",
+  "lineaAdapter": "0x0000000000000000000000000000000000000000",
+  "lzAdapter": "0x0000000000000000000000000000000000000000",
+  "mantleAdapter": "0x0000000000000000000000000000000000000000",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x0000000000000000000000000000000000000000",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdminCCC": "0x0000000000000000000000000000000000000000",
+  "proxyFactory": "0xEB0682d148e874553008730f0686ea89db7DA412",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "soneiumAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
+}
diff --git a/foundry.toml b/foundry.toml
@@ -69,6 +69,7 @@ ink="${RPC_INK}"
 soneium="${RPC_SONEIUM}"
 bob="${RPC_BOB}"
 plasma="${RPC_PLASMA}"
+xlayer="${RPC_XLAYER}"
 
 [etherscan]
 ethereum={key="${ETHERSCAN_API_KEY}", chain=1 }
@@ -108,6 +109,7 @@ mantle-testnet={key="${ETHERSCAN_API_KEY}", chain=5003, url='https://explorer.te
 ink={key="${ETHERSCAN_API_KEY}", chain=57073, url='https://api.routescan.io/v2/network/mainnet/evm/57073/etherscan'}
 soneium={key="${ETHERSCAN_API_KEY}", chain=1868, url='https://soneium.blockscout.com/api/'}
 bob={key="${ETHERSCAN_API_KEY}", chain=60808, url='https://explorer.gobob.xyz/api/'}
+xlayer={key="any", chain=196, url='https://www.oklink.com/api/v5/explorer/contract/verify-source-code-plugin/xlayer'}
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config
 [fuzz]
diff --git a/scripts/BaseDeployerScript.sol b/scripts/BaseDeployerScript.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
+import 'forge-std/Vm.sol';
 import 'forge-std/Script.sol';
 import 'adi-scripts/BaseScript.sol';
 import {ChainHelpers} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
@@ -128,24 +129,20 @@ library DeployerHelpers {
     json.serialize('soneiumAdapter', addresses.soneiumAdapter);
     json.serialize('wormholeAdapter', addresses.wormholeAdapter);
     json.serialize('xlayerAdapter', addresses.xlayerAdapter);
-    json.serialize('zksyncAdapter', addresses.zksyncAdapter);
+    json = json.serialize('zksyncAdapter', addresses.zksyncAdapter);
     vm.writeJson(json, path);
   }
 }
 
-abstract contract BaseDeployerScript is BaseScript, Script {
-  function getAddresses(uint256 networkId) external view returns (Addresses memory) {
+contract _AddrReader {
+  function get(uint256 networkId, Vm vm) external view returns (Addresses memory) {
     return DeployerHelpers.decodeJson(DeployerHelpers.getPathByChainId(networkId), vm);
   }
+}
 
+abstract contract BaseDeployerScript is BaseScript, Script {
   function _getAddresses(uint256 networkId) internal view returns (Addresses memory) {
-    try this.getAddresses(networkId) returns (Addresses memory addresses) {
-      return addresses;
-    } catch (bytes memory) {
-      Addresses memory empty;
-      empty.chainId = TRANSACTION_NETWORK();
-      return empty;
-    }
+    return DeployerHelpers.decodeJson(DeployerHelpers.getPathByChainId(networkId), vm);
   }
 
   function _execute(Addresses memory addresses) internal virtual;
@@ -155,9 +152,17 @@ abstract contract BaseDeployerScript is BaseScript, Script {
   }
 
   function run() public virtual {
+    // helper exists only in the dry-run VM context (pre-broadcast)
+    _AddrReader reader = new _AddrReader();
+
+    Addresses memory addresses;
+    try reader.get(TRANSACTION_NETWORK(), vm) returns (Addresses memory a) {
+      addresses = a;
+    } catch {
+      // default zeroed struct
+    }
+
     vm.startBroadcast();
-    // ----------------- Persist addresses -----------------------------------------------------------------------------
-    Addresses memory addresses = _getAddresses(TRANSACTION_NETWORK());
     // -----------------------------------------------------------------------------------------------------------------
     _execute(addresses);
     // ----------------- Persist addresses -----------------------------------------------------------------------------
diff --git a/scripts/InitialDeployments.s.sol b/scripts/InitialDeployments.s.sol
@@ -357,6 +357,6 @@ contract Xlayer is BaseInitialDeployment {
   }
 
   function EXECUTOR() internal pure override returns (address) {
-    return address(0); // GovernanceV3Xlayer.EXECUTOR_LVL_1; // TODO: add address when deployed
+    return 0xE2E8Badc5d50f8a6188577B89f50701cDE2D4e19; // GovernanceV3Xlayer.EXECUTOR_LVL_1;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,6 @@ contract Xlayer is BaseInitialDeployment {`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`function EXECUTOR() internal pure override returns (address) {`
`360`		`- return address(0); // GovernanceV3Xlayer.EXECUTOR_LVL_1; // TODO: add address when deployed`
	`360`	`+ return 0xE2E8Badc5d50f8a6188577B89f50701cDE2D4e19; // GovernanceV3Xlayer.EXECUTOR_LVL_1;`
`361`	`361`	`}`
`362`	`362`	`}`