From f3e6253805c7b5247d9f828fe7b933db01cf7b4d Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Fri, 15 Mar 2024 15:03:16 +0100 Subject: [PATCH] use transfer fee not gas limit for sending funds, modify defaults for missing networks --- integration-tests/actions/seth/actions.go | 2 +- integration-tests/utils/seth.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/integration-tests/actions/seth/actions.go b/integration-tests/actions/seth/actions.go index 5e482c1d9a4..5c37d9a0db2 100644 --- a/integration-tests/actions/seth/actions.go +++ b/integration-tests/actions/seth/actions.go @@ -116,7 +116,7 @@ func SendFunds(logger zerolog.Logger, client *seth.Client, payload FundsToSendPa return nil, err } - gasLimit := uint64(client.Cfg.Network.GasLimit) + gasLimit := uint64(client.Cfg.Network.TransferGasFee) if payload.GasLimit != nil { gasLimit = *payload.GasLimit } diff --git a/integration-tests/utils/seth.go b/integration-tests/utils/seth.go index c2d4f743a6b..89193c8a889 100644 --- a/integration-tests/utils/seth.go +++ b/integration-tests/utils/seth.go @@ -52,11 +52,10 @@ func MergeSethAndEvmNetworkConfigs(l zerolog.Logger, evmNetwork blockchain.EVMNe sethNetwork.URLs = evmNetwork.URLs sethNetwork.EIP1559DynamicFees = evmNetwork.SupportsEIP1559 sethNetwork.ChainID = fmt.Sprint(evmNetwork.ChainID) - // Sepolia settings - sethNetwork.GasLimit = 14_000_000 - sethNetwork.GasPrice = 1_000_000_000 - sethNetwork.GasFeeCap = 25_000_000_000 - sethNetwork.GasTipCap = 5_000_000_000 + sethNetwork.GasLimit = evmNetwork.DefaultGasLimit + sethNetwork.GasPrice = 400_000_000_000 + sethNetwork.GasFeeCap = 400_000_000_000 //400 Gwei + sethNetwork.GasTipCap = 200_000_000_000 //200 Gwei sethNetwork.TransferGasFee = 21_000 sethNetwork.TxnTimeout = seth.MustMakeDuration(evmNetwork.Timeout.Duration) }