refactor: streamline deployment targets in Makefile and update workflow to use new commands

Author: Le-Caignec

.github/workflows/deploy.yml

@@ -28,6 +28,8 @@ jobs:
   deploy:
     needs: build-and-test
     runs-on: ubuntu-latest
+    env:
+      CI: true
     permissions:
       contents: write # Required to commit deployment files.
     environment: ${{ inputs.network }}
@@ -45,7 +47,6 @@ jobs:
       - name: Deploy contracts on Anvil (All networks)
         if: inputs.network == 'anvil'
         env:
-          CI: true
           PRIVATE_KEY: ${{ vars.ANVIL_PRIVATE_KEY }}
           SEPOLIA_RPC_URL: ${{ vars.SEPOLIA_RPC_URL }}
           ARBITRUM_SEPOLIA_RPC_URL: ${{ vars.ARBITRUM_SEPOLIA_RPC_URL }}
@@ -57,24 +58,20 @@ jobs:
       - name: Deploy contracts on Sepolia/EthereumMainnet
         if: inputs.network == 'sepolia' || inputs.network == 'ethereum'
         env:
-          CI: true
           PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           CHAIN: ${{ inputs.network }}
           RPC_URL: ${{ secrets.RPC_URL }}
         run: |
-          CONTRACT=RLCLiquidityUnifier make deploy-contract
-          CONTRACT=bridges/layerZero/IexecLayerZeroBridge make deploy-contract
+          make deploy-liquidity-unifier-and-bridge
 
       - name: Deploy contracts on ChainX
         if: inputs.network != 'sepolia' && inputs.network != 'ethereum'
         env:
-          CI: true
           PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           CHAIN: ${{ inputs.network }}
           RPC_URL: ${{ secrets.RPC_URL }}
         run: |
-          CONTRACT=RLCCrosschainToken make deploy-contract
-          CONTRACT=bridges/layerZero/IexecLayerZeroBridge make deploy-contract
+          make deploy-crosschain-token-and-bridge
 
       - name: Save deployment artifacts
         if: inputs.network != 'anvil'

Makefile

@@ -66,11 +66,17 @@ deploy-on-testnets:
 		TARGET_CHAIN=arbitrumSepolia TARGET_RPC=$(ARBITRUM_SEPOLIA_RPC_URL) \
 		OPTIONS="--verify --verifier etherscan --verifier-api-key $(ETHERSCAN_API_KEY) --verifier-url $(ETHERSCAN_API_URL)"
 
-deploy-all: # SOURCE_CHAIN, SOURCE_RPC, TARGET_CHAIN, TARGET_RPC, OPTIONS
+deploy-liquidity-unifier-and-bridge:
 	$(MAKE) deploy-contract CONTRACT=RLCLiquidityUnifier CHAIN=$(SOURCE_CHAIN) RPC_URL=$(SOURCE_RPC) OPTIONS="$(OPTIONS)"
 	$(MAKE) deploy-contract CONTRACT=bridges/layerZero/IexecLayerZeroBridge CHAIN=$(SOURCE_CHAIN) RPC_URL=$(SOURCE_RPC) OPTIONS="$(OPTIONS)"
+
+deploy-crosschain-token-and-bridge:
 	$(MAKE) deploy-contract CONTRACT=RLCCrosschainToken CHAIN=$(TARGET_CHAIN) RPC_URL=$(TARGET_RPC) OPTIONS="$(OPTIONS)"
 	$(MAKE) deploy-contract CONTRACT=bridges/layerZero/IexecLayerZeroBridge CHAIN=$(TARGET_CHAIN) RPC_URL=$(TARGET_RPC) OPTIONS="$(OPTIONS)"
+
+deploy-all: # SOURCE_CHAIN, SOURCE_RPC, TARGET_CHAIN, TARGET_RPC, OPTIONS
+	$(MAKE) deploy-liquidity-unifier-and-bridge CHAIN=$(SOURCE_CHAIN) RPC_URL=$(SOURCE_RPC) OPTIONS=$(OPTIONS)
+	$(MAKE) deploy-crosschain-token-and-bridge CHAIN=$(TARGET_CHAIN) RPC_URL=$(TARGET_RPC) OPTIONS=$(OPTIONS)
 	$(MAKE) configure-bridge SOURCE_CHAIN=$(SOURCE_CHAIN) TARGET_CHAIN=$(TARGET_CHAIN) RPC_URL=$(SOURCE_RPC)
 	$(MAKE) configure-bridge SOURCE_CHAIN=$(TARGET_CHAIN) TARGET_CHAIN=$(SOURCE_CHAIN) RPC_URL=$(TARGET_RPC)
 	@echo "Deployment completed."