Merge pull request #3654 from OffchainLabs/gas_floor_legacy_fix

joshuacolvin0 · web-flow · commit 4d9a400cda95 · 2025-09-17T18:54:31.000-07:00
batch_posting report: fix addition of batchExtraGas
diff --git a/arbos/internal_tx.go b/arbos/internal_tx.go
@@ -134,11 +134,11 @@ func ApplyInternalTxUpdate(tx *types.ArbitrumInternalTx, state *arbosState.Arbos
 				Length:   batchCalldataLength,
 				NonZeros: batchCalldataNonZeros,
 			})
-			gasSpent = arbmath.SaturatingUAdd(gasSpent, batchExtraGas)
 			if batchLegacyGas != ^uint64(0) && batchLegacyGas != gasSpent {
 				log.Error("legacy gas doesn't fit local compute", "local", gasSpent, "legacy", batchLegacyGas, "timestamp", batchTimestamp)
 			}
 		}
+		gasSpent = arbmath.SaturatingUAdd(gasSpent, batchExtraGas)
 
 		l1p := state.L1PricingState()
 

Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,11 @@ func ApplyInternalTxUpdate(tx types.ArbitrumInternalTx, state arbosState.Arbos`
`134`	`134`	`Length: batchCalldataLength,`
`135`	`135`	`NonZeros: batchCalldataNonZeros,`
`136`	`136`	`})`
`137`		`- gasSpent = arbmath.SaturatingUAdd(gasSpent, batchExtraGas)`
`138`	`137`	`if batchLegacyGas != ^uint64(0) && batchLegacyGas != gasSpent {`
`139`	`138`	`log.Error("legacy gas doesn't fit local compute", "local", gasSpent, "legacy", batchLegacyGas, "timestamp", batchTimestamp)`
`140`	`139`	`}`
`141`	`140`	`}`
	`141`	`+ gasSpent = arbmath.SaturatingUAdd(gasSpent, batchExtraGas)`
`142`	`142`
`143`	`143`	`l1p := state.L1PricingState()`
`144`	`144`