diff --git a/Makefile b/Makefile index 666a9a1a60..0e5ab31a03 100644 --- a/Makefile +++ b/Makefile @@ -378,7 +378,7 @@ endif start-upgrade-test: zetanode-upgrade solana @echo "--> Starting upgrade test" export LOCALNET_MODE=upgrade && \ - export UPGRADE_HEIGHT=250 && \ + export UPGRADE_HEIGHT=260 && \ export E2E_ARGS="--test-solana --test-sui" && \ cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade --profile solana --profile sui -f docker-compose-upgrade.yml up -d diff --git a/e2e/e2etests/e2etests.go b/e2e/e2etests/e2etests.go index 0fc8b07f79..7019b2e282 100644 --- a/e2e/e2etests/e2etests.go +++ b/e2e/e2etests/e2etests.go @@ -682,20 +682,26 @@ var AllE2ETests = []runner.E2ETest{ runner.NewE2ETest( TestZEVMToEVMCallName, "zevm -> evm call", - []runner.ArgDefinition{}, + []runner.ArgDefinition{ + {Description: "gas limit for call", DefaultValue: "250000"}, + }, TestZEVMToEVMCall, ), runner.NewE2ETest( TestZEVMToEVMCallRevertName, "zevm -> evm call that reverts and call onRevert", - []runner.ArgDefinition{}, + []runner.ArgDefinition{ + {Description: "gas limit for call", DefaultValue: "250000"}, + }, TestZEVMToEVMCallRevert, runner.WithMinimumVersion("v29.0.0"), ), runner.NewE2ETest( TestZEVMToEVMCallRevertAndAbortName, "zevm -> evm call that reverts and abort with onAbort", - []runner.ArgDefinition{}, + []runner.ArgDefinition{ + {Description: "gas limit for call", DefaultValue: "250000"}, + }, TestZEVMToEVMCallRevertAndAbort, runner.WithMinimumVersion("v29.0.0"), ), diff --git a/e2e/e2etests/test_zevm_to_evm_call.go b/e2e/e2etests/test_zevm_to_evm_call.go index 0473e42933..75d3705bcc 100644 --- a/e2e/e2etests/test_zevm_to_evm_call.go +++ b/e2e/e2etests/test_zevm_to_evm_call.go @@ -13,7 +13,8 @@ import ( ) func TestZEVMToEVMCall(r *runner.E2ERunner, args []string) { - require.Len(r, args, 0) + require.Len(r, args, 1) + gasLimit := utils.ParseBigInt(r, args[0]) payload := randomPayload(r) @@ -29,6 +30,7 @@ func TestZEVMToEVMCall(r *runner.E2ERunner, args []string) { gatewayzevm.RevertOptions{ OnRevertGasLimit: big.NewInt(0), }, + gasLimit, ) // wait for the cctx to be mined diff --git a/e2e/e2etests/test_zevm_to_evm_call_revert.go b/e2e/e2etests/test_zevm_to_evm_call_revert.go index 6c6b880e52..dfa3e9991a 100644 --- a/e2e/e2etests/test_zevm_to_evm_call_revert.go +++ b/e2e/e2etests/test_zevm_to_evm_call_revert.go @@ -14,7 +14,8 @@ import ( ) func TestZEVMToEVMCallRevert(r *runner.E2ERunner, args []string) { - require.Len(r, args, 0) + require.Len(r, args, 1) + gasLimit := utils.ParseBigInt(r, args[0]) payload := randomPayload(r) @@ -30,6 +31,7 @@ func TestZEVMToEVMCallRevert(r *runner.E2ERunner, args []string) { RevertMessage: []byte(payload), OnRevertGasLimit: big.NewInt(200000), }, + gasLimit, ) // wait for the cctx to be mined diff --git a/e2e/e2etests/test_zevm_to_evm_call_revert_and_abort.go b/e2e/e2etests/test_zevm_to_evm_call_revert_and_abort.go index 295e61fde4..7f62c3e008 100644 --- a/e2e/e2etests/test_zevm_to_evm_call_revert_and_abort.go +++ b/e2e/e2etests/test_zevm_to_evm_call_revert_and_abort.go @@ -15,7 +15,8 @@ import ( ) func TestZEVMToEVMCallRevertAndAbort(r *runner.E2ERunner, args []string) { - require.Len(r, args, 0) + require.Len(r, args, 1) + gasLimit := utils.ParseBigInt(r, args[0]) r.ApproveETHZRC20(r.GatewayZEVMAddr) @@ -34,6 +35,7 @@ func TestZEVMToEVMCallRevertAndAbort(r *runner.E2ERunner, args []string) { OnRevertGasLimit: big.NewInt(200000), AbortAddress: testAbortAddr, }, + gasLimit, ) // wait for the cctx to be mined diff --git a/e2e/runner/zevm.go b/e2e/runner/zevm.go index 79a5cc7836..e746a09d38 100644 --- a/e2e/runner/zevm.go +++ b/e2e/runner/zevm.go @@ -361,6 +361,7 @@ func (r *E2ERunner) ZEVMToEMVCall( receiver ethcommon.Address, payload []byte, revertOptions gatewayzevm.RevertOptions, + gasLimit *big.Int, ) *ethtypes.Transaction { tx, err := r.GatewayZEVM.Call( r.ZEVMAuth, @@ -368,7 +369,7 @@ func (r *E2ERunner) ZEVMToEMVCall( r.ETHZRC20Addr, payload, gatewayzevm.CallOptions{ - GasLimit: defaultGasLimit, + GasLimit: gasLimit, IsArbitraryCall: false, }, revertOptions,