couple of renames and streamlines

integration-tests/actions/seth/actions.go

@@ -131,12 +131,15 @@ func SendFunds(logger zerolog.Logger, client *seth.Client, payload FundsToSendPa
 	}
 
 	if client.Cfg.Network.EIP1559DynamicFees {
+		// if any of the dynamic fees are not set, we need to either estimate them or read them from config
 		if payload.GasFeeCap == nil || payload.GasTipCap == nil {
+			// estimatior or config reading happens here
 			txOptions := client.NewTXOpts()
 			gasFeeCap = txOptions.GasFeeCap
 			gasTipCap = txOptions.GasTipCap
 		}
 
+		// override with payload values if they are set
 		if payload.GasFeeCap != nil {
 			gasFeeCap = payload.GasFeeCap
 		}
@@ -155,30 +158,29 @@ func SendFunds(logger zerolog.Logger, client *seth.Client, payload FundsToSendPa
 		}
 	}
 
-	var signedTx *types.Transaction
+	var rawTx types.TxData
 
 	if client.Cfg.Network.EIP1559DynamicFees {
-		rawTx := &types.DynamicFeeTx{
+		rawTx = &types.DynamicFeeTx{
 			Nonce:     nonce,
 			To:        &payload.ToAddress,
 			Value:     payload.Amount,
 			Gas:       gasLimit,
 			GasFeeCap: gasFeeCap,
 			GasTipCap: gasTipCap,
 		}
-		// in the future we might need to dynamically set the signer to reflect the hard fork for given chain
-		signedTx, err = types.SignNewTx(payload.PrivateKey, types.NewLondonSigner(big.NewInt(client.ChainID)), rawTx)
 	} else {
-		rawTx := &types.LegacyTx{
+		rawTx = &types.LegacyTx{
 			Nonce:    nonce,
 			To:       &payload.ToAddress,
 			Value:    payload.Amount,
 			Gas:      gasLimit,
 			GasPrice: gasPrice,
 		}
-		signedTx, err = types.SignNewTx(payload.PrivateKey, types.NewEIP155Signer(big.NewInt(client.ChainID)), rawTx)
 	}
 
+	signedTx, err := types.SignNewTx(payload.PrivateKey, types.LatestSignerForChainID(big.NewInt(client.ChainID)), rawTx)
+
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to sign tx")
 	}

integration-tests/actions/seth/refund.go

@@ -274,6 +274,7 @@ func ReturnFunds(log zerolog.Logger, sethClient *seth.Client, chainlinkNodes []c
 				return err
 			}
 
+			// if not set, it will be just set to empty string, which is okay as long as gas estimation is disabled
 			txPriority := sethClient.Cfg.Network.GasEstimationTxPriority
 			txTimeout := sethClient.Cfg.Network.TxnTimeout.Duration()
 
@@ -291,19 +292,19 @@ func ReturnFunds(log zerolog.Logger, sethClient *seth.Client, chainlinkNodes []c
 				Priority:             txPriority,
 			})
 
-			var totalGasCost *big.Int
+			var maxTotalGasCost *big.Int
 			if sethClient.Cfg.Network.EIP1559DynamicFees {
-				totalGasCost = new(big.Int).Mul(big.NewInt(0).SetInt64(sethClient.Cfg.Network.TransferGasFee), estimations.GasFeeCap)
+				maxTotalGasCost = new(big.Int).Mul(big.NewInt(0).SetInt64(sethClient.Cfg.Network.TransferGasFee), estimations.GasFeeCap)
 			} else {
-				totalGasCost = new(big.Int).Mul(big.NewInt(0).SetInt64(sethClient.Cfg.Network.TransferGasFee), estimations.GasPrice)
+				maxTotalGasCost = new(big.Int).Mul(big.NewInt(0).SetInt64(sethClient.Cfg.Network.TransferGasFee), estimations.GasPrice)
 			}
 
-			toSend := new(big.Int).Sub(balance, totalGasCost)
+			toSend := new(big.Int).Sub(balance, maxTotalGasCost)
 
 			if toSend.Cmp(big.NewInt(0)) <= 0 {
 				log.Warn().
 					Str("Address", fromAddress.String()).
-					Str("Estimated total cost", totalGasCost.String()).
+					Str("Estimated maximum total gas cost", maxTotalGasCost.String()).
 					Str("Balance", balance.String()).
 					Str("To send", toSend.String()).
 					Msg("Not enough balance to cover gas cost. Skipping return.")

integration-tests/docker/test_env/test_env_builder.go

@@ -311,7 +311,10 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 
 			if b.hasSeth {
 				readSethCfg := b.testConfig.GetSethConfig()
-				sethCfg := utils.MergeSethAndEvmNetworkConfigs(b.l, networkConfig, *readSethCfg)
+				sethCfg, err := utils.MergeSethAndEvmNetworkConfigs(networkConfig, *readSethCfg)
+				if err != nil {
+					return nil, err
+				}
 				err = utils.ValidateSethNetworkConfig(sethCfg.Network)
 				if err != nil {
 					return nil, err