fix: check of evm chain being available

Author: ecPablo

experimental/proposalutils/testhelpers/test_helpers.go

@@ -157,20 +157,26 @@ func ExecuteMCMSProposalV2(t *testing.T, env cldf.Environment, proposal *mcmslib
 		}
 
 		if family == chainsel.FamilyEVM {
-			chain := env.BlockChains.EVMChains()[uint64(chainSelector)]
+			evmChain, ok := env.BlockChains.EVMChains()[uint64(chainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSProposalV2] EVM chain not found for selector %d", chainSelector)
+			}
 			evmTransaction, ok := root.RawData.(*gethtypes.Transaction)
 			if !ok {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] unexpected RawData type %T", root.RawData)
 			}
 			t.Logf("[ExecuteMCMSProposalV2] SetRoot EVM tx hash: %s", evmTransaction.Hash().String())
-			if _, err = chain.Confirm(evmTransaction); err != nil {
+			if _, err = evmChain.Confirm(evmTransaction); err != nil {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] Confirm failed: %w", err)
 			}
 		}
 		if family == chainsel.FamilyAptos {
-			chain := env.BlockChains.AptosChains()[uint64(chainSelector)]
+			aptosChain, ok := env.BlockChains.AptosChains()[uint64(chainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSProposalV2] Aptos chain not found for selector %d", chainSelector)
+			}
 			t.Logf("[ExecuteMCMSProposalV2] SetRoot Aptos tx hash: %s", root.Hash)
-			if err = chain.Confirm(root.Hash); err != nil {
+			if err = aptosChain.Confirm(root.Hash); err != nil {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] Confirm failed: %w", err)
 			}
 		}
@@ -189,20 +195,26 @@ func ExecuteMCMSProposalV2(t *testing.T, env cldf.Environment, proposal *mcmslib
 		}
 
 		if family == chainsel.FamilyEVM {
-			chain := env.BlockChains.EVMChains()[uint64(op.ChainSelector)]
+			evmChain, ok := env.BlockChains.EVMChains()[uint64(op.ChainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSProposalV2] EVM chain not found for selector %d", op.ChainSelector)
+			}
 			evmTransaction, ok := result.RawData.(*gethtypes.Transaction)
 			if !ok {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] unexpected RawData type %T", result.RawData)
 			}
 			t.Logf("[ExecuteMCMSProposalV2] Operation %d EVM tx hash: %s", i, evmTransaction.Hash().String())
-			if _, err = chain.Confirm(evmTransaction); err != nil {
+			if _, err = evmChain.Confirm(evmTransaction); err != nil {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] Confirm failed: %w", err)
 			}
 		}
 		if family == chainsel.FamilyAptos {
-			chain := env.BlockChains.AptosChains()[uint64(op.ChainSelector)]
+			aptosChain, ok := env.BlockChains.AptosChains()[uint64(op.ChainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSProposalV2] Aptos chain not found for selector %d", op.ChainSelector)
+			}
 			t.Logf("[ExecuteMCMSProposalV2] Operation %d Aptos tx hash: %s", i, result.Hash)
-			if err = chain.Confirm(result.Hash); err != nil {
+			if err = aptosChain.Confirm(result.Hash); err != nil {
 				return fmt.Errorf("[ExecuteMCMSProposalV2] Confirm failed: %w", err)
 			}
 		}
@@ -267,18 +279,24 @@ func ExecuteMCMSTimelockProposalV2(t *testing.T, env cldf.Environment, timelockP
 		t.Logf("[ExecuteMCMSTimelockProposalV2] Executed timelock operation index=%d on chain %d (tx %v)", i, uint64(op.ChainSelector), tx.Hash)
 
 		if family == chainsel.FamilyEVM {
-			chain := env.BlockChains.EVMChains()[uint64(op.ChainSelector)]
+			evmChain, ok := env.BlockChains.EVMChains()[uint64(op.ChainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSTimelockProposalV2] EVM chain not found for selector %d", op.ChainSelector)
+			}
 			evmTransaction, ok := tx.RawData.(*gethtypes.Transaction)
 			if !ok {
 				return fmt.Errorf("[ExecuteMCMSTimelockProposalV2] unexpected RawData type %T", tx.RawData)
 			}
-			if _, err = chain.Confirm(evmTransaction); err != nil {
+			if _, err = evmChain.Confirm(evmTransaction); err != nil {
 				return fmt.Errorf("[ExecuteMCMSTimelockProposalV2] Confirm on EVM failed: %w", err)
 			}
 		}
 		if family == chainsel.FamilyAptos {
-			chain := env.BlockChains.AptosChains()[uint64(op.ChainSelector)]
-			if err = chain.Confirm(tx.Hash); err != nil {
+			aptosChain, ok := env.BlockChains.AptosChains()[uint64(op.ChainSelector)]
+			if !ok {
+				return fmt.Errorf("[ExecuteMCMSTimelockProposalV2] Aptos chain not found for selector %d", op.ChainSelector)
+			}
+			if err = aptosChain.Confirm(tx.Hash); err != nil {
 				return fmt.Errorf("[ExecuteMCMSTimelockProposalV2] Confirm on Aptos failed: %w", err)
 			}
 		}
@@ -310,7 +328,12 @@ func SingleGroupTimelockConfigV2(t *testing.T) proposalutils.MCMSWithTimelockCon
 }
 
 func findCallProxyAddress(env cldf.Environment, chainSelector uint64, timelockAddr string) (string, error) {
-	timelock, err := bindings.NewRBACTimelock(common.HexToAddress(timelockAddr), env.BlockChains.EVMChains()[chainSelector].Client)
+	evmChain, ok := env.BlockChains.EVMChains()[chainSelector]
+	if !ok {
+		return "", fmt.Errorf("EVM chain not found for selector %d", chainSelector)
+	}
+
+	timelock, err := bindings.NewRBACTimelock(common.HexToAddress(timelockAddr), evmChain.Client)
 	if err != nil {
 		return "", fmt.Errorf("failed to create timelock binding: %w", err)
 	}