Skip to content

op-acceptance-tests: Improve DA footprint test stability #18098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
geoknee merged 1 commit into from
Oct 31, 2025
Merged

op-acceptance-tests: Improve DA footprint test stability #18098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions op-acceptance-tests/tests/jovian/da_footprint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ func (env *daFootprintEnv) setDAFootprintGasScalarViaSystemConfig(t devtest.T, s
return rec
}

func (env *daFootprintEnv) getDAFootprintGasScalarOfSystemConfig(t devtest.T) uint16 {
scalar, err := contractio.Read(env.systemConfig.DAFootprintGasScalar(), t.Ctx())
t.Require().NoError(err)
return scalar
}

// expectL1BlockDAFootprintGasScalar expects the given DA footprint gas scalar to be set in the L1Block contract.
func (env *daFootprintEnv) expectL1BlockDAFootprintGasScalar(t devtest.T, expected uint16) {
current, err := contractio.Read(env.l1Block.DAFootprintGasScalar(), t.Ctx())
Expand Down Expand Up @@ -150,6 +156,10 @@ func TestDAFootprint(gt *testing.T) {
// https://github.com/ethereum-optimism/optimism/issues/18061
env.l2EL.WaitL1OriginReached(eth.Unsafe, rec.BlockNumber.Uint64(), 100)
} else {
scalar := env.getDAFootprintGasScalarOfSystemConfig(t)
if scalar != 0 {
t.Skipf("Skipping default scalar test because SystemConfig DA footprint gas scalar is set to %d != 0", scalar)
}
sys.L2EL.WaitForBlockNumber(1) // make sure we don't assert on genesis
}
env.expectL1BlockDAFootprintGasScalar(t, tc.expected)
Expand Down
9 changes: 8 additions & 1 deletion op-devstack/dsl/el.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,16 @@ func (el *elNode) WaitForUnsafeRef(predicate func(eth.BlockInfo) (bool, error))
}

func (el *elNode) WaitForBlockNumber(targetBlock uint64) eth.BlockInfo {
return el.WaitForUnsafe(func(info eth.BlockInfo) (bool, error) {
info := el.WaitForUnsafe(func(info eth.BlockInfo) (bool, error) {
return info.NumberU64() >= targetBlock, nil
})
if info.NumberU64() == targetBlock {
return info
}
// we've gone too far
info, err := el.inner.EthClient().InfoByNumber(el.ctx, targetBlock)
el.require.NoError(err, "Expected to get info by number after waiting")
return info
}

func (el *elNode) WaitForOnline() {
Expand Down