Merge pull request #58 from bgd-labs/feat/x-layer

sendra · web-flow · commit 1f638972d8e1 · 2025-10-24T12:42:15.000+02:00
Update and prepare scripts for X Layer network deployment
diff --git a/Makefile b/Makefile
@@ -68,11 +68,11 @@ deploy-emergency-registry:
 
 # Deploy Proxy Factories on all networks
 deploy-initial:
-	$(call deploy_fn,InitialDeployments,ethereum avalanche polygon optimism arbitrum metis base binance gnosis zkevm)
+	$(call deploy_fn,InitialDeployments,xlayer)
 
 # Deploy Cross Chain Infra on all networks
 deploy-cross-chain-infra:
-	$(call deploy_fn,ccc/Deploy_CCC,ethereum avalanche polygon optimism arbitrum metis base binance gnosis zkevm)
+	$(call deploy_fn,ccc/Deploy_CCC,xlayer)
 
 ## Deploy CCIP bridge adapters on all networks
 deploy-ccip-bridge-adapters:
@@ -135,24 +135,27 @@ deploy-soneium-adapters:
 deploy-bob-adapters:
 	$(call deploy_fn,adapters/DeployBobAdapter,ethereum bob)
 
+deploy-xlayer-adapters:
+	$(call deploy_fn,adapters/DeployXLayerAdapter,ethereum xlayer)
+
 ## Set sender bridge dapters. Only eth pol avax are needed as other networks will only receive
 set-ccf-sender-adapters:
 	$(call deploy_fn,ccc/Set_CCF_Sender_Adapters,ethereum)
 
 # Set the bridge adapters allowed to receive messages
 set-ccr-receiver-adapters:
-	$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,ethereum polygon avalanche binance arbitrum optimism base metis gnosis zkevm)
+	$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,xlayer)
 
 # Sets the required confirmations
 set-ccr-confirmations:
-	$(call deploy_fn,CCC/Set_CCR_Confirmations,ethereum polygon avalanche optimism arbitrum metis base binance gnosis zkevm)
+	$(call deploy_fn,CCC/Set_CCR_Confirmations,xlayer)
 
 
 # ------------------------------------------------------------------------------------------------------------------
 # ----------------------------------------- ACCESS CONTROL SCRIPTS ---------------------------------------------------------
 
 deploy_ccc_granular_guardian:
-	$(call deploy_fn,access_control/network_scripts/GranularGuardianNetworkDeploys,plasma)
+	$(call deploy_fn,access_control/network_scripts/GranularGuardianNetworkDeploys,xlayer)
 
 # ------------------------------------------------------------------------------------------------------------------
 # ----------------------------------------- HELPER SCRIPTS ---------------------------------------------------------
@@ -163,7 +166,7 @@ send-direct-message:
 	$(call deploy_fn,helpers/Send_Direct_CCMessage,ethereum)
 
 deploy_mock_destination:
-	$(call deploy_fn,helpers/Deploy_Mock_destination,plasma)
+	$(call deploy_fn,helpers/Deploy_Mock_destination,xlayer)
 
 set-approved-ccf-senders:
 	$(call deploy_fn,helpers/Set_Approved_Senders,ethereum)
@@ -181,4 +184,4 @@ update-owners-and-guardians:
 	$(call deploy_fn,helpers/Update_Ownership,zksync)
 
 update-ccc-permissions:
-	$(call deploy_fn,helpers/UpdateCCCPermissions,plasma)
+	$(call deploy_fn,helpers/UpdateCCCPermissions,xlayer)
diff --git a/deployments/arbitrum.json b/deployments/arbitrum.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}
diff --git a/deployments/avalanche.json b/deployments/avalanche.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/base.json b/deployments/base.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/binance.json b/deployments/binance.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/bob.json b/deployments/bob.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/celo.json b/deployments/celo.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x3F006299eC88985c18E6e885EeA29A49eC579882",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/ethereum.json b/deployments/ethereum.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",
   "soneiumAdapter": "0xe66973c4571F733CafEb1BDE1fa58Ff35416d901",
   "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x6aD9d4147467f08b165e1b6364584C5d28898b84"
 }
diff --git a/deployments/gnosis.json b/deployments/gnosis.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/ink.json b/deployments/ink.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/linea.json b/deployments/linea.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/mantle.json b/deployments/mantle.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/metis.json b/deployments/metis.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/optimism.json b/deployments/optimism.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/plasma.json b/deployments/plasma.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/polygon.json b/deployments/polygon.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/pre_prod_ethereum.json b/deployments/pre_prod_ethereum.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x525EC320AbD05FF316683BA3e38023CEe72f9868",
   "soneiumAdapter": "0x4e00fD05aBb32F3eAF8C4D0773284ae10675C225",
   "wormholeAdapter": "0x7458fd003C60D6B581D20249386188eA976e0556",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x22b56CC7c45ed007eA7E4Ea10D28967d36E314D6"
 }
diff --git a/deployments/scroll.json b/deployments/scroll.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x3C06dce358add17aAf230f2234bCCC4afd50d090",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/soneium.json b/deployments/soneium.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x5698e43Ef1be85C68Dec568B5925dD5DB7903e39",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/sonic.json b/deployments/sonic.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/zksync.json b/deployments/zksync.json
@@ -29,5 +29,6 @@
   "scrollAdapter": "0x0000000000000000000000000000000000000000",
   "soneiumAdapter": "0x0000000000000000000000000000000000000000",
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "xlayerAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x1BC5C10CAe378fDbd7D52ec4F9f34590a619c68E"
 }
diff --git a/foundry.lock b/foundry.lock
@@ -0,0 +1,8 @@
+{
+  "lib/aave-delivery-infrastructure": {
+    "rev": "3d430b0441eab83f5825501077e8a02227d31634"
+  },
+  "lib/aave-helpers": {
+    "rev": "bf2206bc6ae5a32fccfc4a10f51b76894ab73c36"
+  }
+}
diff --git a/lib/aave-delivery-infrastructure b/lib/aave-delivery-infrastructure
@@ -1 +1 @@
-Subproject commit 656b87642ba119961c4643e0e2a1f28209e6bae2
+Subproject commit 3d430b0441eab83f5825501077e8a02227d31634
diff --git a/lib/aave-helpers b/lib/aave-helpers
@@ -1 +1 @@
-Subproject commit 54b1915c1b74e316d99860e7fdc916ec69b65e8d
+Subproject commit bf2206bc6ae5a32fccfc4a10f51b76894ab73c36
diff --git a/scripts/BaseDeployerScript.sol b/scripts/BaseDeployerScript.sol
@@ -36,6 +36,7 @@ struct Addresses {
   address scrollAdapter;
   address soneiumAdapter;
   address wormholeAdapter;
+  address xlayerAdapter;
   address zksyncAdapter;
 }
 
@@ -87,7 +88,8 @@ library DeployerHelpers {
       zksyncAdapter: abi.decode(persistedJson.parseRaw('.zksyncAdapter'), (address)),
       mantleAdapter: abi.decode(persistedJson.parseRaw('.mantleAdapter'), (address)),
       bobAdapter: abi.decode(persistedJson.parseRaw('.bobAdapter'), (address)),
-      granularCCCGuardian: abi.decode(persistedJson.parseRaw('.granularCCCGuardian'), (address))
+      granularCCCGuardian: abi.decode(persistedJson.parseRaw('.granularCCCGuardian'), (address)),
+      xlayerAdapter: abi.decode(persistedJson.parseRaw('.xlayerAdapter'), (address))
     });
 
     return addresses;
@@ -125,7 +127,8 @@ library DeployerHelpers {
     json.serialize('scrollAdapter', addresses.scrollAdapter);
     json.serialize('soneiumAdapter', addresses.soneiumAdapter);
     json.serialize('wormholeAdapter', addresses.wormholeAdapter);
-    json = json.serialize('zksyncAdapter', addresses.zksyncAdapter);
+    json.serialize('xlayerAdapter', addresses.xlayerAdapter);
+    json.serialize('zksyncAdapter', addresses.zksyncAdapter);
     vm.writeJson(json, path);
   }
 }
diff --git a/scripts/InitialDeployments.s.sol b/scripts/InitialDeployments.s.sol
@@ -21,6 +21,7 @@ import {MiscLinea} from 'aave-address-book/MiscLinea.sol';
 import {MiscInk} from 'aave-address-book/MiscInk.sol';
 import {MiscSoneium} from 'aave-address-book/MiscSoneium.sol';
 import {MiscPlasma} from 'aave-address-book/MiscPlasma.sol';
+import {MiscBob} from 'aave-address-book/MiscBob.sol';
 import {GovernanceV3Arbitrum} from 'aave-address-book/GovernanceV3Arbitrum.sol';
 import {GovernanceV3Avalanche} from 'aave-address-book/GovernanceV3Avalanche.sol';
 import {GovernanceV3Base} from 'aave-address-book/GovernanceV3Base.sol';
@@ -39,6 +40,7 @@ import {GovernanceV3Linea} from 'aave-address-book/GovernanceV3Linea.sol';
 import {GovernanceV3Ink} from 'aave-address-book/GovernanceV3Ink.sol';
 import {GovernanceV3Soneium} from 'aave-address-book/GovernanceV3Soneium.sol';
 import {GovernanceV3Plasma} from 'aave-address-book/GovernanceV3Plasma.sol';
+import {GovernanceV3Bob} from 'aave-address-book/GovernanceV3Bob.sol';
 
 abstract contract BaseInitialDeployment is BaseDeployerScript {
   function OWNER() internal virtual returns (address) {
@@ -323,11 +325,11 @@ contract Bob is BaseInitialDeployment {
   }
 
   function TRANSPARENT_PROXY_FACTORY() internal pure override returns (address) {
-    return 0xEB0682d148e874553008730f0686ea89db7DA412;
+    return MiscBob.TRANSPARENT_PROXY_FACTORY;
   }
 
   function EXECUTOR() internal pure override returns (address) {
-    return 0x90800d1F54384523723eD3962c7Cd59d7866c83d;
+    return GovernanceV3Bob.EXECUTOR_LVL_1;
   }
 }
 
@@ -344,3 +346,17 @@ contract Plasma is BaseInitialDeployment {
     return GovernanceV3Plasma.EXECUTOR_LVL_1;
   }
 }
+
+contract Xlayer is BaseInitialDeployment {
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.XLAYER;
+  }
+
+  function TRANSPARENT_PROXY_FACTORY() internal pure override returns (address) {
+    return 0xEB0682d148e874553008730f0686ea89db7DA412; //MiscXlayer.TRANSPARENT_PROXY_FACTORY;
+  }
+
+  function EXECUTOR() internal pure override returns (address) {
+    return address(0); // GovernanceV3Xlayer.EXECUTOR_LVL_1; // TODO: add address when deployed
+  }
+}
diff --git a/scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol b/scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol
@@ -364,3 +364,21 @@ contract Plasma is DeployGranularGuardian {
     return ChainIds.PLASMA;
   }
 }
+
+contract Xlayer is DeployGranularGuardian {
+  function DEFAULT_ADMIN() internal pure override returns (address) {
+    return address(0); //GovernanceV3XLayer.EXECUTOR_LVL_1;
+  }
+
+  function RETRY_GUARDIAN() internal pure override returns (address) {
+    return 0x734c3fF8DE95c3745770df69053A31FDC92F2526; //  bgd guardian
+  }
+
+  function SOLVE_EMERGENCY_GUARDIAN() internal pure override returns (address) {
+    return 0xeB55A63bf9993d80c86D47f819B5eC958c7C127B; // dao governance guardian
+  }
+
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.XLAYER;
+  }
+}
diff --git a/scripts/adapters/DeployXLayerAdapter.s.sol b/scripts/adapters/DeployXLayerAdapter.s.sol
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import 'adi-scripts/Adapters/DeployXLayer.sol';
+import '../BaseDeployerScript.sol';
+
+abstract contract DeployXLayerAdapter is BaseDeployerScript, BaseXLayerAdapter {
+  function _execute(Addresses memory addresses) internal override {
+    addresses.xlayerAdapter = _deployAdapter(addresses.crossChainController);
+  }
+}
+
+// @dev addresses taken from TODO: add link to docs
+contract Ethereum is DeployXLayerAdapter {
+  function OVM() internal pure override returns (address) {
+    return address(0); // TODO: add address when deployed
+  }
+
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.ETHEREUM;
+  }
+
+  function REMOTE_CCC_BY_NETWORK() internal pure override returns (RemoteCCC[] memory) {
+    return new RemoteCCC[](0);
+  }
+}
+
+contract Xlayer is DeployXLayerAdapter {
+  function OVM() internal pure override returns (address) {
+    return 0x4200000000000000000000000000000000000007;
+  }
+
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.XLAYER;
+  }
+
+  function REMOTE_CCC_BY_NETWORK() internal view override returns (RemoteCCC[] memory) {
+    RemoteCCC[] memory remoteCCCByNetwork = new RemoteCCC[](1);
+    remoteCCCByNetwork[0].chainId = ChainIds.ETHEREUM;
+    remoteCCCByNetwork[0].crossChainController = _getAddresses(ChainIds.ETHEREUM)
+      .crossChainController;
+
+    return remoteCCCByNetwork;
+  }
+}
diff --git a/scripts/ccc/DeployCCC.s.sol b/scripts/ccc/DeployCCC.s.sol
@@ -195,3 +195,13 @@ contract Plasma is BaseCCCNetworkDeployment {
     return ChainIds.PLASMA;
   }
 }
+
+contract Xlayer is BaseCCCNetworkDeployment {
+  function CL_EMERGENCY_ORACLE() internal pure override returns (address) {
+    return address(0); // TODO: add address when deployed
+  }
+
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.XLAYER;
+  }
+}
diff --git a/scripts/ccc/Set_CCF_Sender_Adapters.s.sol b/scripts/ccc/Set_CCF_Sender_Adapters.s.sol
diff --git a/scripts/ccc/Set_CCR_Confirmations.s.sol b/scripts/ccc/Set_CCR_Confirmations.s.sol
diff --git a/scripts/ccc/Set_CCR_Receivers_Adapters.s.sol b/scripts/ccc/Set_CCR_Receivers_Adapters.s.sol
diff --git a/scripts/helpers/Deploy_Mock_destination.s.sol b/scripts/helpers/Deploy_Mock_destination.s.sol
diff --git a/scripts/helpers/Send_Direct_CCMessage.s.sol b/scripts/helpers/Send_Direct_CCMessage.s.sol
diff --git a/scripts/helpers/UpdateCCCPermissions.s.sol b/scripts/helpers/UpdateCCCPermissions.s.sol

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@`
`29`	`29`	`"scrollAdapter": "0x0000000000000000000000000000000000000000",`
`30`	`30`	`"soneiumAdapter": "0x0000000000000000000000000000000000000000",`
`31`	`31`	`"wormholeAdapter": "0x0000000000000000000000000000000000000000",`
	`32`	`+ "xlayerAdapter": "0x0000000000000000000000000000000000000000",`
`32`	`33`	`"zksyncAdapter": "0x0000000000000000000000000000000000000000"`
`33`	`34`	`}`