feat: integrate CreateX for proxy deployment in RLCAdapter and RLCOFT scripts

Author: Le-Caignec

.env.template

@@ -1,3 +1,7 @@
+# CreateX Factory Address
+CREATE_X_FACTORY_ADDRESS=0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed
+SALT=0x<salt-value> 
+
 # Ethereum Sepolia Configuration
 SEPOLIA_RPC_URL="https://gateway.tenderly.co/public/sepolia"
 LAYER_ZERO_SEPOLIA_ENDPOINT_ADDRESS=0x6EDCE65403992e310A62460808c4b910D972f10f

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/createx"]
+	path = lib/createx
+	url = https://github.com/pcaversaccio/createx

foundry.toml

@@ -22,6 +22,7 @@ remappings = [
     '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/',
     '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/',
     '@openzeppelin-foundry/contracts/=lib/openzeppelin-foundry-upgrades/src/',
+    '@createx/contracts/=lib/createx/src/',
 ]
 
 

script/RLCAdapter.s.sol

@@ -7,6 +7,7 @@ import {Upgrades, Options} from "@openzeppelin-foundry/contracts/Upgrades.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {RLCAdapter} from "../src/RLCAdapter.sol";
 import {EnvUtils} from "./UpdateEnvUtils.sol";
+import {ICreateX} from "@createx/contracts/ICreateX.sol";
 
 contract Deploy is Script {
     function run() external {
@@ -21,9 +22,12 @@ contract Deploy is Script {
         console.log("RLCAdapter implementation deployed at:", address(rlcAdapterImplementation));
 
         // Deploy the proxy contract
-        ERC1967Proxy rlcAdapterProxy = new ERC1967Proxy(
-            address(rlcAdapterImplementation),
-            abi.encodeWithSelector(rlcAdapterImplementation.initialize.selector, ownerAddress)
+        ICreateX createX = ICreateX(vm.envAddress("CREATE_X_FACTORY_ADDRESS"));
+        address rlcAdapterProxy = createX.deployCreate2AndInit(
+            vm.envBytes32("SALT"), // salt
+            abi.encodePacked(type(ERC1967Proxy).creationCode, abi.encode(address(rlcAdapterImplementation), "")), // initCode
+            abi.encodeWithSelector(rlcAdapterImplementation.initialize.selector, ownerAddress), // data for initialize
+            ICreateX.Values({constructorAmount: 0, initCallAmount: 0}) // values for CreateX
         );
         console.log("RLCAdapter proxy deployed at:", address(rlcAdapterProxy));
 

script/RLCOFT.s.sol

@@ -7,6 +7,7 @@ import {Upgrades, Options} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {RLCOFT} from "../src/RLCOFT.sol";
 import {EnvUtils} from "./UpdateEnvUtils.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import {ICreateX} from "@createx/contracts/ICreateX.sol";
 
 contract Deploy is Script {
     function run() external {
@@ -20,16 +21,19 @@ contract Deploy is Script {
         RLCOFT rlcOFTImplementation = new RLCOFT(lzEndpoint);
         console.log("RLCOFT implementation deployed at:", address(rlcOFTImplementation));
 
-        // Deploy the proxy contract
-        ERC1967Proxy rlcOFTProxy = new ERC1967Proxy(
-            address(rlcOFTImplementation),
-            abi.encodeWithSelector(rlcOFTImplementation.initialize.selector, name, symbol, owner)
+        // Use CreateX Factory to deploy the proxy contract
+        ICreateX createX = ICreateX(vm.envAddress("CREATE_X_FACTORY_ADDRESS"));
+        address rlcOFTProxy = createX.deployCreate2AndInit(
+            vm.envBytes32("SALT"), // salt
+            abi.encodePacked(type(ERC1967Proxy).creationCode, abi.encode(address(rlcOFTImplementation), "")), // initCode
+            abi.encodeWithSelector(rlcOFTImplementation.initialize.selector, name, symbol, owner), // data for initialize
+            ICreateX.Values({constructorAmount: 0, initCallAmount: 0}) // values for CreateX
         );
-        console.log("RLCOFT proxy deployed at:", address(rlcOFTProxy));
+        console.log("RLCOFT proxy deployed at:", rlcOFTProxy);
 
         vm.stopBroadcast();
 
-        EnvUtils.updateEnvVariable("RLC_ARBITRUM_SEPOLIA_OFT_ADDRESS", address(rlcOFTProxy));
+        EnvUtils.updateEnvVariable("RLC_ARBITRUM_SEPOLIA_OFT_ADDRESS", rlcOFTProxy);
     }
 }