Merge branch 'master' into express-lane-timeboost

OffchainLabs · Jan 28, 2025 · 385e7c9 · 385e7c9
2 parents 4c8f61a + 3235413
commit 385e7c9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/bold b/bold
diff --git 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
@@ -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")
 	}
+1 −1		assertions/manager.go
+1 −1		chain-abstraction/interfaces.go
+17 −7		chain-abstraction/sol-implementation/assertion_chain.go
+59 −1		chain-abstraction/sol-implementation/assertion_chain_test.go
+1 −1		contracts
+4 −4		solgen/go/assertionStakingPoolgen/assertionStakingPoolgen.go
+104 −134		solgen/go/bridgegen/bridgegen.go
+1 −1		solgen/go/chaingen/chaingen.go
+64 −2		solgen/go/challengeV2gen/challengeV2gen.go
+16 −0		solgen/go/express_lane_auctiongen/BUILD.bazel
+7,693 −0		solgen/go/express_lane_auctiongen/express_lane_auctiongen.go
+175 −2		solgen/go/librariesgen/librariesgen.go
+1,247 −13		solgen/go/mocksgen/mocksgen.go
+14 −14		solgen/go/precompilesgen/precompilesgen.go
+253 −757		solgen/go/rollupgen/rollupgen.go
+2 −2		solgen/go/test_helpersgen/test_helpersgen.go
+1 −1		testing/mocks/mocks.go
+11 −9		testing/rollup_config.go