Merge pull request #2902 from OffchainLabs/flatcalltracer-fix

fix for flatcalltracer originally just on v3.3.x branch
OffchainLabs · Jan 28, 2025 · ae0109b · ae0109b
2 parents fa80b55 + 8466b01
commit ae0109b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/go-ethereum b/go-ethereum
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")
 	}