Merge pull request #27 from immutable/SMR-1815-WIMX-withdraw

Smr 1815 wimx withdraw
immutable · Nov 14, 2023 · 5a46b04 · 5a46b04
2 parents 0b523d4 + 68d1b32
commit 5a46b04
Show file tree

Hide file tree

Showing 25 changed files with 1,111 additions and 165 deletions.
diff --git a/.env.sample b/.env.sample
@@ -7,6 +7,8 @@ ROOT_PRIVATE_KEY=
 ROOT_GATEWAY_ADDRESS=
 ROOT_GAS_SERVICE_ADDRESS=
 ROOT_CHAIN_NAME=
+CHILD_CHAIN_NAME=
+CHILD_WIMX_ADDRESS=
 ROOT_IMX_ADDRESS=
 ROOT_WETH_ADDRESS=
 INITIAL_IMX_CUMULATIVE_DEPOSIT_LIMIT= # 0 for unlimited

diff --git a/script/DeployChildContracts.s.sol b/script/DeployChildContracts.s.sol
@@ -22,21 +22,14 @@ contract DeployChildContracts is Script {
         vm.createSelectFork(childRpcUrl);
         vm.startBroadcast(deployerPrivateKey);
 
+        WIMX wrappedIMX = new WIMX();
+
         ProxyAdmin proxyAdmin = new ProxyAdmin();
 
         ChildERC20 childTokenTemplate = new ChildERC20();
         childTokenTemplate.initialize(address(123), "TEMPLATE", "TPT", 18);
 
-        IChildERC20Bridge.InitializationRoles memory roles = IChildERC20Bridge.InitializationRoles({
-            defaultAdmin: address(0x1111),
-            pauser: address(0x2222),
-            unpauser: address(0x3333),
-            variableManager: address(0x4444),
-            adaptorManager: address(0x5555)
-        });
-
         ChildERC20Bridge childERC20BridgeImplementation = new ChildERC20Bridge();
-        childERC20BridgeImplementation.initialize(roles, address(1), "0x123", address(1), "root", address(1));
 
         TransparentUpgradeableProxy childERC20BridgeProxy = new TransparentUpgradeableProxy(
             address(childERC20BridgeImplementation),
@@ -54,8 +47,6 @@ contract DeployChildContracts is Script {
             ""
         );
 
-        WIMX wrappedIMX = new WIMX();
-
         vm.stopBroadcast();
 
         console2.log("====CHILD ADDRESSES====");

diff --git a/script/InitializeChildContracts.s.sol b/script/InitializeChildContracts.s.sol
@@ -19,6 +19,7 @@ struct InitializeChildContractsParams {
     address rootERC20BridgeAdaptor;
     string rootChainName;
     address rootIMXToken;
+    address wIMXToken;
     string childRpcUrl;
     uint256 deployerPrivateKey;
     address childGasService;
@@ -30,12 +31,13 @@ contract InitializeChildContracts is Script {
             childAdminAddress: vm.envAddress("CHILD_ADMIN_ADDRESS"),
             childPauserAddress: vm.envAddress("CHILD_PAUSER_ADDRESS"),
             childUnpauserAddress: vm.envAddress("CHILD_UNPAUSER_ADDRESS"),
-            childERC20Bridge: ChildERC20Bridge(vm.envAddress("CHILD_ERC20_BRIDGE")),
+            childERC20Bridge: ChildERC20Bridge(payable(vm.envAddress("CHILD_ERC20_BRIDGE"))),
             childAxelarBridgeAdaptor: ChildAxelarBridgeAdaptor(vm.envAddress("CHILD_BRIDGE_ADAPTOR")),
             childTokenTemplate: vm.envAddress("CHILDCHAIN_CHILD_TOKEN_TEMPLATE"),
             rootERC20BridgeAdaptor: vm.envAddress("ROOT_BRIDGE_ADAPTOR"),
             rootChainName: vm.envString("ROOT_CHAIN_NAME"),
             rootIMXToken: vm.envAddress("ROOT_IMX_ADDRESS"),
+            wIMXToken: vm.envAddress("CHILD_WIMX_ADDRESS"),
             childRpcUrl: vm.envString("CHILD_RPC_URL"),
             deployerPrivateKey: vm.envUint("CHILD_PRIVATE_KEY"),
             childGasService: vm.envAddress("CHILD_GAS_SERVICE_ADDRESS")
@@ -65,7 +67,8 @@ contract InitializeChildContracts is Script {
             rootBridgeAdaptorString,
             params.childTokenTemplate,
             params.rootChainName,
-            params.rootIMXToken
+            params.rootIMXToken,
+            params.wIMXToken
         );
 
         params.childAxelarBridgeAdaptor.initialize(