Repository navigation
Description
Part of #20265 → #20257. See plan §11 and §13. This issue moves op-e2e's direct L2 block/tx/receipt reads off ethclient. The shared helpers they use are in #20272. Follow the sources-client rules in #20265, with #23417 as the worked example:
- Headers via
ethclientare fine. - Bodies go through
InfoAndUserTxs*,InfoAndDeposits*andInfoAndFirstDeposit*. - Receipts go through
FetchReceipts/TransactionReceipt, filtered in lockstep by type.
Re-derive the sites with git grep -nE '\.(BlockByNumber|BlockByHash|BlockReceipts)\(' -- op-e2e and classify each by endpoint. L1 sites stay. TransactionByHash on a user tx is fine under upstream.
System and faultproofs tests (can start now, after or with #20272)
- Sites: a couple dozen in total, mostly reading only header fields:
system/{bridge/validity_test, conductor/sequencer_failover_setup, da/{brotli_batcher,eip4844}_test, fees/{eip1559params,l1info}_test, verifier/{basic,confdepth,sequencer_window}_test}faultproofs/{cannon_benchmark,precompile,super}_test
- Body readers:
fees/l1info_test.goandverifier/confdepth_test.godecode the L1-info deposit and should useInfoAndFirstDeposit. - Skip the op-geth-pinned tests (the Regolith case in
fees_test,verifier/legacy_pending_test,da/da_throttling_testandp2p/txpool_test). opgeth-decoupling: retire the in-process op-geth L2 EL in op-e2e system tests and op-devstack/sysgo #21744 migrates or deletes them; migrate the reads only in the ones that survive.
Action tests (blocked on the op-reth-test-engine stack, #21787, and #23417)
The stack (#21786/#21787) rewrites actions/helpers/l2_engine.go and edits most of these tests, and #23417 makes L2Engine own one ethclient and one sources.EthClient. Do this part on top of both.
- Batcher.
helpers/l2_batcher.go(ActL2BatchBuffer, andActAddBlockByNumber) fetches every batched block as a fullethclientblock. Every action test that batches goes through it.ChannelOut.AddBlocktakes an*eth.ExecutionPayload, so fetch withsources.PayloadByNumber.BlockModifieredits an*types.Blockthat holds the deposit at[0], which cannot exist under upstream. It must operate on the payload or raw txs instead.- Its users include
sync_test,holocene_fork_testand many kona proof tests, so coordinate with opgeth-decoupling: migrate the kona proof harness off the in-process op-geth L2 EL #21905.
- Users. In
helpers/user.go, theCrossLayerUserreads need only headers.LastTxReceipt/CheckReceiptreturn upstream receipts, andderivation/system_config_testreads OP fields from them. L2Engine. At the stack tip (#21787 @4cbd8db),L2Engine.BlockByNumber/GenesisBlockreturn an*types.Blockread throughethclient, and many action tests call them. Once the stack merges, move them to headers or to the partitioned sources accessors.- Direct sites:
altda,derivation/reorg,proposer,syncandupgrades/{ecotone,fjord,holocene,span_batch}.
rust/kona/tests/proofs (formerly op-e2e/actions/proofs) is out of scope here; it is covered by #23417 and #21905.
Acceptance criteria
- No op-e2e test fetches L2 block bodies or txs through
*ethclient.Client. - L2 receipts whose OP fields are read come from sources.
- Wherever tests pair tx lists with receipt lists, they filter in lockstep. No accessor returns post-exec (
0x7D) txs (§11), so tests that count a block's txs on Lagoon+ presets must account for that.
🤖 Co-created with Claude Opus 5.5
Activity
[-]opgeth-decoupling: migrate 19 direct L2 ethclient call sites in op-e2e[/-][+]opgeth-decoupling: migrate direct L2 ethclient call sites in op-e2e[/+]sebastianst commentedon Nov 12, 2026
🤖 Fable says: Done by #23862 (system, faultproofs,
L2Engine,user.go, action-test and kona-proof sites) and #23876 (action-test batcher payload path andBlockModifier). The geth-pinned system tests listed above are resolved under #21744.