diff --git a/bold b/bold index 60b5e36725..80915fb685 160000 --- a/bold +++ b/bold @@ -1 +1 @@ -Subproject commit 60b5e36725da9551b005d6171e75eda30a63d49a +Subproject commit 80915fb685759d5d757aac9805b5b1d1e7279c42 diff --git a/system_tests/common_test.go b/system_tests/common_test.go index 391111dc2a..94218c7fa9 100644 --- a/system_tests/common_test.go +++ b/system_tests/common_test.go @@ -1337,15 +1337,17 @@ func deployOnParentChain( ReplenishRateInBasis: 500, // 5% } cfg := rollupgen.Config{ - MiniStakeValues: miniStakeValues, - ConfirmPeriodBlocks: 120, - StakeToken: stakeToken, - BaseStake: big.NewInt(1), - WasmModuleRoot: wasmModuleRoot, - Owner: parentChainTransactionOpts.From, - LoserStakeEscrow: parentChainTransactionOpts.From, - ChainId: chainConfig.ChainID, - ChainConfig: string(serializedChainConfig), + MiniStakeValues: miniStakeValues, + ConfirmPeriodBlocks: 120, + StakeToken: stakeToken, + BaseStake: big.NewInt(1), + WasmModuleRoot: wasmModuleRoot, + Owner: parentChainTransactionOpts.From, + LoserStakeEscrow: parentChainTransactionOpts.From, + MinimumAssertionPeriod: big.NewInt(75), + ValidatorAfkBlocks: 201600, + ChainId: chainConfig.ChainID, + ChainConfig: string(serializedChainConfig), SequencerInboxMaxTimeVariation: rollupgen.ISequencerInboxMaxTimeVariation{ DelayBlocks: big.NewInt(60 * 60 * 24 / 15), FutureBlocks: big.NewInt(12), diff --git a/system_tests/debugapi_test.go b/system_tests/debugapi_test.go index fd1aa746a3..1cc466fff2 100644 --- a/system_tests/debugapi_test.go +++ b/system_tests/debugapi_test.go @@ -95,7 +95,7 @@ func TestPrestateTracingSimple(t *testing.T) { value := big.NewInt(1e6) tx := builder.L2Info.PrepareTx("Owner", "User2", builder.L2Info.TransferGas, value, nil) Require(t, builder.L2.Client.SendTransaction(ctx, tx)) - _, err = builder.L2.EnsureTxSucceeded(tx) + receipt, err := builder.L2.EnsureTxSucceeded(tx) Require(t, err) l2rpc := builder.L2.Stack.Attach() @@ -116,9 +116,17 @@ func TestPrestateTracingSimple(t *testing.T) { if !arbmath.BigEquals(result.Pre[receiver].Balance.ToInt(), user2OldBalance) { Fatal(t, "Unexpected initial balance of receiver") } - if !arbmath.BigEquals(result.Post[sender].Balance.ToInt(), arbmath.BigSub(ownerOldBalance, value)) { + expBalance := arbmath.BigSub(ownerOldBalance, value) + gas := arbmath.BigMulByUint(receipt.EffectiveGasPrice, receipt.GasUsed) + expBalance = arbmath.BigSub(expBalance, gas) + if !arbmath.BigEquals(result.Post[sender].Balance.ToInt(), expBalance) { Fatal(t, "Unexpected final balance of sender") } + onchain, err := builder.L2.Client.BalanceAt(ctx, sender, receipt.BlockNumber) + Require(t, err) + if !arbmath.BigEquals(result.Post[sender].Balance.ToInt(), onchain) { + Fatal(t, "Final balance of sender does not fit chain") + } if !arbmath.BigEquals(result.Post[receiver].Balance.ToInt(), value) { Fatal(t, "Unexpected final balance of receiver") }