From 6ee84ba5d238142e19bd62293a5e222fcfffbe1a Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 23 Jan 2025 11:55:42 -0600 Subject: [PATCH 1/6] update bold --- bold | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bold b/bold index 60b5e36725..e724bf7a4d 160000 --- a/bold +++ b/bold @@ -1 +1 @@ -Subproject commit 60b5e36725da9551b005d6171e75eda30a63d49a +Subproject commit e724bf7a4d9f5da7dc6e0ee0630f66dd5754dc29 From c5d9bbed9073df4a3764a40fea70ed3b55c650aa Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Mon, 27 Jan 2025 09:06:00 -0600 Subject: [PATCH 2/6] update pin --- bold | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bold b/bold index e724bf7a4d..80915fb685 160000 --- a/bold +++ b/bold @@ -1 +1 @@ -Subproject commit e724bf7a4d9f5da7dc6e0ee0630f66dd5754dc29 +Subproject commit 80915fb685759d5d757aac9805b5b1d1e7279c42 From 35bbb3b3e62e785cae89091bd44187a5ca8c62c9 Mon Sep 17 00:00:00 2001 From: Joshua Colvin Date: Mon, 27 Jan 2025 15:05:20 -0700 Subject: [PATCH 3/6] fix for flatcalltracer originally just on v3.3.x branch fixes NIT-3071 Pulls in https://github.com/OffchainLabs/go-ethereum/pull/401 --- go-ethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-ethereum b/go-ethereum index cbb47d194b..4b72c5a0c6 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit cbb47d194bd2e87322d35b09af36a83320345814 +Subproject commit 4b72c5a0c67e9f1309352ef8b340adfb8cd5488d From 9725b9dade4d0d379dfcd82a701c335b88f824c2 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 27 Jan 2025 18:35:57 -0700 Subject: [PATCH 4/6] fix TestPrestateTracingSimple --- system_tests/debugapi_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/system_tests/debugapi_test.go b/system_tests/debugapi_test.go index fd1aa746a3..8e490df2b2 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,8 +116,11 @@ 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)) { - Fatal(t, "Unexpected final balance of sender") + 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 ", "expected: ", expBalance, " got: ", result.Post[sender].Balance.ToInt(), " diff: ", arbmath.BigSub(result.Post[sender].Balance.ToInt(), expBalance), " gas: ", receipt.GasUsed) } if !arbmath.BigEquals(result.Post[receiver].Balance.ToInt(), value) { Fatal(t, "Unexpected final balance of receiver") From 8466b01682799c22ad6e280ed2df5457ec51efc8 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 27 Jan 2025 19:38:21 -0700 Subject: [PATCH 5/6] further fix TestPrestateTracingSimple --- system_tests/debugapi_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system_tests/debugapi_test.go b/system_tests/debugapi_test.go index 8e490df2b2..1cc466fff2 100644 --- a/system_tests/debugapi_test.go +++ b/system_tests/debugapi_test.go @@ -120,7 +120,12 @@ func TestPrestateTracingSimple(t *testing.T) { 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 ", "expected: ", expBalance, " got: ", result.Post[sender].Balance.ToInt(), " diff: ", arbmath.BigSub(result.Post[sender].Balance.ToInt(), expBalance), " gas: ", receipt.GasUsed) + 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") From b4c15eda0da6eef430c0797e3a5f82540861541b Mon Sep 17 00:00:00 2001 From: Pepper Lebeck-Jobe Date: Tue, 28 Jan 2025 11:27:02 +0100 Subject: [PATCH 6/6] Add two new fields that were added to the rollup config --- system_tests/common_test.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/system_tests/common_test.go b/system_tests/common_test.go index d3d4b33ab9..7be218f3cb 100644 --- a/system_tests/common_test.go +++ b/system_tests/common_test.go @@ -1336,15 +1336,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),