feat: Add transfer admin role workflow and scripts for multi-chain su…

.env.template

@@ -37,3 +37,8 @@ ETHERSCAN_API_KEY=
 # ===========================================
 # Recipient address for cross-chain transfers
 RECIPIENT_ADDRESS=
+
+# ===========================================
+# ADMIN CONFIGURATION
+# ===========================================
+NEW_DEFAULT_ADMIN=

.github/workflows/transfer-admin.yml → .github/workflows/transfer-admin-role.yml

@@ -1,4 +1,4 @@
-name: Transfer Admin Role
+name: Transfer Default Admin Role
 
 on:
   workflow_dispatch:
@@ -13,10 +13,13 @@ on:
           - sepolia
           - arbitrum_sepolia
         default: sepolia
+      new_default_admin_address:
+        description: 'New admin address'
+        required: true
+        type: string
 
 jobs:
   transfer-admin:
-    needs: build-and-test
     runs-on: ubuntu-latest
     environment: ${{ inputs.network }}
 
@@ -31,11 +34,10 @@ jobs:
           version: stable
           cache: true
 
-      - name: Transfer admin role
+      - name: Transfer default admin role
         env:
           ADMIN_PRIVATE_KEY: ${{ secrets.ADMIN_PRIVATE_KEY }}
           CHAIN: ${{ inputs.network }}
           RPC_URL: ${{ secrets.RPC_URL }}
-          NEW_ADMIN: ${{ vars.NEW_ADMIN_ADDRESS }}
-        run: |
-          make transfer-admin-single-chain
+          NEW_DEFAULT_ADMIN: ${{ inputs.new_default_admin_address }}
+        run: make begin-default-admin-transfer

Makefile

@@ -199,20 +199,19 @@ send-tokens-to-ethereum-mainnet:
 #
 
 # Transfer admin role for a single chain
-transfer-admin-single-chain: # CHAIN, RPC_URL, NEW_ADMIN
-	@echo "Transferring admin role on $(CHAIN) to: $(NEW_ADMIN)"
-	CHAIN=$(CHAIN) forge script script/TransferAdminRole.s.sol:TransferAdminRole \
+begin-default-admin-transfer: # CHAIN, RPC_URL, NEW_DEFAULT_ADMIN
+	@echo "Transferring admin role on $(CHAIN) to: $(NEW_DEFAULT_ADMIN)"
+	CHAIN=$(CHAIN) NEW_DEFAULT_ADMIN=$(NEW_DEFAULT_ADMIN) forge script script/TransferAdminRole.s.sol:BeginTransferAdminRole \
 		--rpc-url $(RPC_URL) \
 		$$(if [ "$(CI)" = "true" ]; then echo "--private-key $(ADMIN_PRIVATE_KEY)"; else echo "--account $(ACCOUNT)"; fi) \
 		--broadcast \
-		--sig "run(address)" $(NEW_ADMIN) \
 		-vvv
 
 # Accept admin role for a single chain (run by new admin)
-accept-admin-single-chain: # CHAIN, RPC_URL
+accept-default-admin-transfer: # CHAIN, RPC_URL
 	@echo "Accepting admin role on $(CHAIN)"
 	CHAIN=$(CHAIN) forge script script/TransferAdminRole.s.sol:AcceptAdminRole \
 		--rpc-url $(RPC_URL) \
-		$$(if [ "$(CI)" = "true" ]; then echo "--private-key $(NEW_ADMIN_PRIVATE_KEY)"; else echo "--account $(ACCOUNT)"; fi) \
+		$$(if [ "$(CI)" = "true" ]; then echo "--private-key $(NEW_DEFAULT_ADMIN_PRIVATE_KEY)"; else echo "--account $(ACCOUNT)"; fi) \
 		--broadcast \
 		-vvv

script/TransferAdminRole.s.sol

@@ -13,19 +13,49 @@ import {RLCCrosschainToken} from "../src/RLCCrosschainToken.sol";
 import {IexecLayerZeroBridge} from "../src/bridges/layerZero/IexecLayerZeroBridge.sol";
 
 /**
- * @title TransferAdminRole
+ * @title BeginTransferAdminRole
  * @dev Script to transfer the default admin role to a new admin address
  * for all deployed smart contracts on the current chain.
  */
-contract TransferAdminRole is Script {
+contract BeginTransferAdminRole is Script {
+    /**
+     * @notice Validates that the new admin is different from the current admin
+     * @param currentDefaultAdmin The current admin address
+     * @param newAdmin The new admin address
+     */
+    function validateAdminTransfer(address currentDefaultAdmin, address newAdmin) internal pure {
+        require(
+            currentDefaultAdmin != newAdmin, "BeginTransferAdminRole: New admin must be different from current admin"
+        );
+    }
+
+    /**
+     * @notice Transfers the default admin role for any contract implementing AccessControlDefaultAdminRulesUpgradeable
+     * @param contractAddress The address of the contract
+     * @param newAdmin The new admin address
+     * @param contractName The name of the contract for logging purposes
+     */
+    function transferContractAdmin(address contractAddress, address newAdmin, string memory contractName) internal {
+        AccessControlDefaultAdminRulesUpgradeable adminContract =
+            AccessControlDefaultAdminRulesUpgradeable(contractAddress);
+
+        address currentAdmin = adminContract.defaultAdmin();
+        console.log("Current admin for", contractName, ":", currentAdmin);
+        validateAdminTransfer(currentAdmin, newAdmin);
+
+        adminContract.beginDefaultAdminTransfer(newAdmin);
+
+        console.log("Admin transfer initiated for", contractName, "at:", contractAddress);
+    }
+
     /**
      * @notice Transfers the default admin role to a new admin for all contracts on the current chain
-     * @param newAdmin The address that will become the new default admin
      * @dev This function automatically detects which contracts are deployed on the current chain
      * based on the configuration and transfers admin roles accordingly
      */
-    function run(address newAdmin) external {
-        require(newAdmin != address(0), "TransferAdminRole: New admin cannot be zero address");
+    function run() external {
+        address newAdmin = vm.envAddress("NEW_DEFAULT_ADMIN");
+        require(newAdmin != address(0), "BeginTransferAdminRole: New admin cannot be zero address");
 
         string memory chain = vm.envString("CHAIN");
         console.log("Starting admin role transfer on chain:", chain);
@@ -35,66 +65,34 @@ contract TransferAdminRole is Script {
 
         vm.startBroadcast();
         if (params.approvalRequired) {
-            transferRLCLiquidityUnifierAdmin(params.rlcLiquidityUnifierAddress, newAdmin);
+            transferContractAdmin(params.rlcLiquidityUnifierAddress, newAdmin, "RLCLiquidityUnifier");
         } else {
-            transferRLCCrosschainTokenAdmin(params.rlcCrosschainTokenAddress, newAdmin);
+            transferContractAdmin(params.rlcCrosschainTokenAddress, newAdmin, "RLCCrosschainToken");
         }
-        transferIexecLayerZeroBridgeAdmin(params.iexecLayerZeroBridgeAddress, newAdmin);
+        transferContractAdmin(params.iexecLayerZeroBridgeAddress, newAdmin, "IexecLayerZeroBridge");
         vm.stopBroadcast();
     }
-
-    /**
-     * @notice Transfers admin role for RLCLiquidityUnifier contract
-     * @param contractAddress The address of the RLCLiquidityUnifier contract
-     * @param newAdmin The new admin address
-     */
-    function transferRLCLiquidityUnifierAdmin(address contractAddress, address newAdmin) internal {
-        RLCLiquidityUnifier liquidityUnifier = RLCLiquidityUnifier(contractAddress);
-
-        address currentAdmin = liquidityUnifier.owner();
-        console.log("Current admin:", currentAdmin);
-
-        liquidityUnifier.beginDefaultAdminTransfer(newAdmin);
-        console.log("Admin transfer initiated for RLCLiquidityUnifier at:", contractAddress);
-    }
-
-    /**
-     * @notice Transfers admin role for RLCCrosschainToken contract
-     * @param contractAddress The address of the RLCCrosschainToken contract
-     * @param newAdmin The new admin address
-     */
-    function transferRLCCrosschainTokenAdmin(address contractAddress, address newAdmin) internal {
-        RLCCrosschainToken crosschainToken = RLCCrosschainToken(contractAddress);
-
-        address currentAdmin = crosschainToken.owner();
-        console.log("Current admin:", currentAdmin);
-
-        crosschainToken.beginDefaultAdminTransfer(newAdmin);
-        console.log("Admin transfer initiated for RLCCrosschainToken at:", contractAddress);
-    }
-
-    /**
-     * @notice Transfers admin role for IexecLayerZeroBridge contract
-     * @param contractAddress The address of the IexecLayerZeroBridge contract
-     * @param newAdmin The new admin address
-     */
-    function transferIexecLayerZeroBridgeAdmin(address contractAddress, address newAdmin) internal {
-        IexecLayerZeroBridge bridge = IexecLayerZeroBridge(contractAddress);
-
-        address currentAdmin = bridge.owner();
-        console.log("Current admin:", currentAdmin);
-
-        bridge.beginDefaultAdminTransfer(newAdmin);
-        console.log("Admin transfer initiated for IexecLayerZeroBridge at:", contractAddress);
-    }
 }
 
 /**
  * @title AcceptAdminRole
  * @dev Script to accept the default admin role transfer for all contracts on the current chain.
- * This script should be run by the new admin after the TransferAdminRole script has been executed.
+ * This script should be run by the new admin after the BeginTransferAdminRole script has been executed.
  */
 contract AcceptAdminRole is Script {
+    /**
+     * @notice Accepts the default admin role transfer for any contract implementing AccessControlDefaultAdminRulesUpgradeable
+     * @param contractAddress The address of the contract
+     * @param contractName The name of the contract for logging purposes
+     */
+    function acceptContractAdmin(address contractAddress, string memory contractName) internal {
+        console.log("Accepting admin role for", contractName, "at:", contractAddress);
+        AccessControlDefaultAdminRulesUpgradeable adminContract =
+            AccessControlDefaultAdminRulesUpgradeable(contractAddress);
+        adminContract.acceptDefaultAdminTransfer();
+        console.log("New admin for", contractName, ":", adminContract.defaultAdmin());
+    }
+
     /**
      * @notice Accepts the default admin role transfer for all contracts on the current chain
      * @dev This function should be called by the new admin to complete the transfer process
@@ -106,50 +104,11 @@ contract AcceptAdminRole is Script {
 
         vm.startBroadcast();
         if (params.approvalRequired) {
-            acceptRLCLiquidityUnifierAdmin(params.rlcLiquidityUnifierAddress);
+            acceptContractAdmin(params.rlcLiquidityUnifierAddress, "RLCLiquidityUnifier");
         } else {
-            acceptRLCCrosschainTokenAdmin(params.rlcCrosschainTokenAddress);
+            acceptContractAdmin(params.rlcCrosschainTokenAddress, "RLCCrosschainToken");
         }
-        acceptIexecLayerZeroBridgeAdmin(params.iexecLayerZeroBridgeAddress);
+        acceptContractAdmin(params.iexecLayerZeroBridgeAddress, "IexecLayerZeroBridge");
         vm.stopBroadcast();
     }
-
-    /**
-     * @notice Accepts admin role for RLCLiquidityUnifier contract
-     * @param contractAddress The address of the RLCLiquidityUnifier contract
-     */
-    function acceptRLCLiquidityUnifierAdmin(address contractAddress) internal {
-        console.log("Accepting admin role for RLCLiquidityUnifier at:", contractAddress);
-
-        RLCLiquidityUnifier liquidityUnifier = RLCLiquidityUnifier(contractAddress);
-
-        liquidityUnifier.acceptDefaultAdminTransfer();
-        console.log("New admin:", liquidityUnifier.owner());
-    }
-
-    /**
-     * @notice Accepts admin role for RLCCrosschainToken contract
-     * @param contractAddress The address of the RLCCrosschainToken contract
-     */
-    function acceptRLCCrosschainTokenAdmin(address contractAddress) internal {
-        console.log("Accepting admin role for RLCCrosschainToken at:", contractAddress);
-
-        RLCCrosschainToken crosschainToken = RLCCrosschainToken(contractAddress);
-
-        crosschainToken.acceptDefaultAdminTransfer();
-        console.log("New admin:", crosschainToken.owner());
-    }
-
-    /**
-     * @notice Accepts admin role for IexecLayerZeroBridge contract
-     * @param contractAddress The address of the IexecLayerZeroBridge contract
-     */
-    function acceptIexecLayerZeroBridgeAdmin(address contractAddress) internal {
-        console.log("Accepting admin role for IexecLayerZeroBridge at:", contractAddress);
-
-        IexecLayerZeroBridge bridge = IexecLayerZeroBridge(contractAddress);
-
-        bridge.acceptDefaultAdminTransfer();
-        console.log("New admin:", bridge.owner());
-    }
 }