From 5560b99c22851bb6041cc3ab4b3aae3f06636def Mon Sep 17 00:00:00 2001 From: lumtis Date: Mon, 1 Sep 2025 18:59:30 +0200 Subject: [PATCH 1/3] add gas limit option --- e2e/runner/zevm.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, From dbb0a1a7f72f6dd87607f56dd8a35e57c12929ba Mon Sep 17 00:00:00 2001 From: lumtis Date: Mon, 1 Sep 2025 18:59:49 +0200 Subject: [PATCH 2/3] use option for tests --- e2e/e2etests/e2etests.go | 12 +++++++++--- e2e/e2etests/test_zevm_to_evm_call.go | 4 +++- e2e/e2etests/test_zevm_to_evm_call_revert.go | 4 +++- .../test_zevm_to_evm_call_revert_and_abort.go | 4 +++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/e2e/e2etests/e2etests.go b/e2e/e2etests/e2etests.go index be2f4a2618..a781ccac82 100644 --- a/e2e/e2etests/e2etests.go +++ b/e2e/e2etests/e2etests.go @@ -681,20 +681,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 b457937fe4..44b47a2153 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 a999e897a6..060d9d1014 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 42fd6febb6..f049e6e211 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 From 30c5fcd8329f956ebdfbde2679e1db6ba73afeb5 Mon Sep 17 00:00:00 2001 From: lumtis Date: Fri, 5 Sep 2025 09:24:22 +0200 Subject: [PATCH 3/3] increase further upgrade height --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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