Skip to content

Commit 53432e2

Browse files
authored
go: Update op-geth dependency to include Jovian receipt changes (#18046)
1 parent 2fdd970 commit 53432e2

File tree

4 files changed

+27
-11
lines changed

4 files changed

+27
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ require (
308308
lukechampine.com/blake3 v1.3.0 // indirect
309309
)
310310

311-
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.3-rc.2
311+
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.3-rc.3
312312

313313
// replace github.com/ethereum/go-ethereum => ../op-geth
314314

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A=
238238
github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
239239
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk=
240240
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w=
241-
github.com/ethereum-optimism/op-geth v1.101603.3-rc.2 h1:v0c3vZHGdxrzTRK98sBhTs9FB/6EBpQWC9A5RPt3kS0=
242-
github.com/ethereum-optimism/op-geth v1.101603.3-rc.2/go.mod h1:Wiy9cngs7ll1slc/dcHHRVuGhozWOpF1y6f31xENR7k=
241+
github.com/ethereum-optimism/op-geth v1.101603.3-rc.3 h1:KGpZouRMsMcl9MWOmYKJi+XR1gTT9/2STANv1G7oaNA=
242+
github.com/ethereum-optimism/op-geth v1.101603.3-rc.3/go.mod h1:Wiy9cngs7ll1slc/dcHHRVuGhozWOpF1y6f31xENR7k=
243243
github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af h1:WWz0gJM/boaUImtJnROecPirAerKCLpAU4m6Tx0ArOg=
244244
github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y=
245245
github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=

op-acceptance-tests/tests/jovian/da_footprint_test.go

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ func TestDAFootprint(gt *testing.T) {
141141

142142
for _, tc := range cases {
143143
t.Run(tc.name, func(t devtest.T) {
144+
require := t.Require()
144145
if tc.setScalar != nil {
145146
rec := env.setDAFootprintGasScalarViaSystemConfig(t, *tc.setScalar)
146147
// Wait for change to propagate to L2
@@ -178,7 +179,7 @@ func TestDAFootprint(gt *testing.T) {
178179
info := sys.L2EL.WaitForUnsafe(func(info eth.BlockInfo) (bool, error) {
179180
blockGasUsed := info.GasUsed()
180181
blobGasUsed := info.BlobGasUsed()
181-
t.Require().NotNil(blobGasUsed, "blobGasUsed must not be nil for Jovian chains")
182+
require.NotNil(blobGasUsed, "blobGasUsed must not be nil for Jovian chains")
182183
blockDAFootprint = *blobGasUsed
183184
if blockDAFootprint <= blockGasUsed {
184185
t.Logf("Block %s has DA footprint (%d) <= gasUsed (%d), trying next...",
@@ -194,18 +195,26 @@ func TestDAFootprint(gt *testing.T) {
194195
})
195196

196197
_, txs, err := ethClient.InfoAndTxsByHash(t.Ctx(), info.Hash())
197-
t.Require().NoError(err)
198+
require.NoError(err)
199+
_, receipts, err := sys.L2EL.Escape().L2EthExtendedClient().FetchReceipts(t.Ctx(), info.Hash())
200+
require.NoError(err)
198201

199202
var totalDAFootprint uint64
200-
for _, tx := range txs {
203+
for i, tx := range txs {
201204
if tx.IsDepositTx() {
202205
continue
203206
}
204-
totalDAFootprint += tx.RollupCostData().EstimatedDASize().Uint64() * uint64(tc.expected)
207+
recScalar := receipts[i].DAFootprintGasScalar
208+
require.NotNil(recScalar, "nil receipt DA footprint gas scalar")
209+
require.EqualValues(tc.expected, *recScalar, "DA footprint gas scalar mismatch in receipt")
210+
211+
txDAFootprint := tx.RollupCostData().EstimatedDASize().Uint64() * uint64(tc.expected)
212+
require.Equal(txDAFootprint, receipts[i].BlobGasUsed, "tx DA footprint mismatch with receipt")
213+
totalDAFootprint += txDAFootprint
205214
}
206215
t.Logf("Block %s has header/calculated DA footprint %d/%d",
207216
eth.ToBlockID(info), blockDAFootprint, totalDAFootprint)
208-
t.Require().Equal(totalDAFootprint, blockDAFootprint, "Calculated DA footprint doesn't match block header DA footprint")
217+
require.Equal(totalDAFootprint, blockDAFootprint, "Calculated DA footprint doesn't match block header DA footprint")
209218

210219
// Check base fee calculation of next block
211220
// Calculate expected base fee as:
@@ -226,7 +235,7 @@ func TestDAFootprint(gt *testing.T) {
226235
t.Logf("Expected base fee: %s", baseFee)
227236

228237
next := sys.L2EL.WaitForBlockNumber(info.NumberU64() + 1)
229-
t.Require().Equal(baseFee, next.BaseFee(), "Wrong base fee")
238+
require.Equal(baseFee, next.BaseFee(), "Wrong base fee")
230239
})
231240
}
232241
}

op-e2e/actions/proofs/jovian_dafootprint_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,21 @@ func Test_ProgramAction_JovianDAFootprint(gt *testing.T) {
139139
header := blk.Header()
140140
require.NotNil(t, header.BlobGasUsed, "blobGasUsed must be set on Jovian blocks")
141141
blockDAFootprint := *header.BlobGasUsed
142+
receipts := env.Engine.L2Chain().GetReceiptsByHash(header.Hash())
142143

143144
// Compute expected DA footprint from the actual included txs (skip deposits and system txs)
144145
var expectedDAFootprint uint64
145-
for _, tx := range blk.Transactions() {
146+
for i, tx := range blk.Transactions() {
146147
if tx.IsDepositTx() {
147148
continue
148149
}
149-
expectedDAFootprint += tx.RollupCostData().EstimatedDASize().Uint64() * uint64(effectiveScalar)
150+
recScalar := receipts[i].DAFootprintGasScalar
151+
require.NotNil(t, recScalar, "nil receipt DA footprint gas scalar")
152+
require.EqualValues(t, effectiveScalar, *recScalar, "DA footprint gas scalar mismatch in receipt")
153+
154+
txDAFootprint := tx.RollupCostData().EstimatedDASize().Uint64() * uint64(effectiveScalar)
155+
require.Equal(t, txDAFootprint, receipts[i].BlobGasUsed, "tx DA footprint mismatch with receipt")
156+
expectedDAFootprint += txDAFootprint
150157
}
151158
require.Equal(t, expectedDAFootprint, blockDAFootprint, "DA footprint mismatch with header")
152159
require.Less(t, blockDAFootprint, gasLimit, "DA footprint should be below gas limit")

0 commit comments

Comments
 (0)