diff --git a/go-ethereum b/go-ethereum index efaa6d0eb7..657dcf6626 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit efaa6d0eb73bbb6ac4c5436d68eb5140aca6a0d2 +Subproject commit 657dcf66263e940e86f9e89325c5100899d5ab58 diff --git a/system_tests/retryable_test.go b/system_tests/retryable_test.go index 4e7bd2c7d8..be0ecc590f 100644 --- a/system_tests/retryable_test.go +++ b/system_tests/retryable_test.go @@ -157,7 +157,10 @@ func TestSubmitRetryableImmediateSuccess(t *testing.T) { ) Require(t, err, "failed to estimate retryable submission") estimate := tx.Gas() - colors.PrintBlue("estimate: ", estimate) + expectedEstimate := params.TxGas + params.TxDataNonZeroGasEIP2028*4 + if estimate != expectedEstimate { + t.Errorf("estimated retryable ticket at %v gas but expected %v", estimate, expectedEstimate) + } // submit & auto redeem the retryable using the gas estimate usertxoptsL1 := builder.L1Info.GetDefaultTransactOpts("Faucet", ctx) @@ -336,6 +339,12 @@ func TestSubmitRetryableFailThenRetry(t *testing.T) { receipt, err = builder.L2.EnsureTxSucceeded(tx) Require(t, err) + redemptionL2Gas := receipt.GasUsed - receipt.GasUsedForL1 + var maxRedemptionL2Gas uint64 = 1_000_000 + if redemptionL2Gas > maxRedemptionL2Gas { + t.Errorf("manual retryable redemption used %v gas, more than expected max %v gas", redemptionL2Gas, maxRedemptionL2Gas) + } + retryTxId := receipt.Logs[0].Topics[2] // check the receipt for the retry