Skip to content

fix(kona): remove obsolete replacement deposit tx from consolidation #19894

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
ajsutton merged 2 commits into from
Apr 2, 2026
Merged

fix(kona): remove obsolete replacement deposit tx from consolidation #19894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd695f
fix(kona): remove obsolete replacement deposit tx from consolidation
ajsutton Apr 2, 2026
2bec720
keep test skipped until dependencies are merged
ajsutton Apr 2, 2026
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
5 changes: 2 additions & 3 deletions op-acceptance-tests/tests/interop/proofs/serial/interop_fault_proofs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ func TestInteropFaultProofs_VariedBlockTimes_FasterChainB(gt *testing.T) {

func TestInteropFaultProofs_InvalidBlock(gt *testing.T) {
t := devtest.SerialT(gt)
// TODO(#19411): Re-enable once the invalid-block supernode proof expectations match the
// native Kona FPP and challenger provider behavior again.
t.Skip("Temporarily skipped while investigating invalid-block supernode proof mismatches")
// TODO(#19411): Re-enable once #19880 is merged.
t.Skip("Requires #19880 (supernode denylist output as optimistic)")
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithChallengerCannonKonaEnabled())
sfp.RunInvalidBlockTest(t, sys)
}
47 changes: 4 additions & 43 deletions rust/kona/crates/proof/proof-interop/src/consolidation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@
use crate::{BootInfo, OptimisticBlock, OracleInteropProvider, PreState};
use alloc::{collections::BTreeSet, vec::Vec};
use alloy_consensus::{Header, Sealed};
use alloy_eips::Encodable2718;
use alloy_evm::{EvmFactory, FromRecoveredTx, FromTxWithEncoded};
use alloy_op_evm::block::OpTxEnv;
use alloy_primitives::{Address, B256, Bytes, Sealable, TxKind, U256, address};
use alloy_primitives::Sealable;
use alloy_rpc_types_engine::PayloadAttributes;
use core::fmt::Debug;
use kona_executor::{Eip1559ValidationError, ExecutorError, StatelessL2Builder};
use kona_interop::{MessageGraph, MessageGraphError};
use kona_mpt::OrderedListWalker;
use kona_preimage::CommsClient;
use kona_proof::{errors::OracleProviderError, l2::OracleL2ChainProvider};
use kona_protocol::OutputRoot;
use kona_registry::{HashMap, ROLLUP_CONFIGS};
use op_alloy_consensus::{InteropBlockReplacementDepositSource, OpTxEnvelope, OpTxType, TxDeposit};
use op_alloy_consensus::{OpTxEnvelope, OpTxType};
use op_alloy_rpc_types_engine::OpPayloadAttributes;
use op_revm::OpSpecId;
use revm::context::BlockEnv;
Expand Down Expand Up @@ -186,18 +184,12 @@ where
.find(|block| block.block_hash == header.hash())
.ok_or(MessageGraphError::EmptyDependencySet)?;

// Filter out all transactions that are not deposits to start.
let mut transactions = transactions
// Filter out all transactions that are not deposits.
let transactions = transactions
.into_iter()
.filter(|t| !t.is_empty() && t[0] == OpTxType::Deposit)
.collect::<Vec<_>>();

// Add the deposit replacement system transaction at the end of the list.
transactions.push(Self::craft_replacement_transaction(
&header,
original_optimistic_block.output_root,
));

// Re-craft the execution payload, trimming off all non-deposit transactions.
let deposit_only_payload = OpPayloadAttributes {
payload_attributes: PayloadAttributes {
Expand Down Expand Up @@ -264,37 +256,6 @@ where

Ok(())
}

/// Forms the replacement transaction inserted into a deposit-only block in the event that a
/// block is reduced due to invalid messages.
///
/// <https://specs.optimism.io/interop/derivation.html#optimistic-block-deposited-transaction>
fn craft_replacement_transaction(old_header: &Sealed<Header>, old_output_root: B256) -> Bytes {
const REPLACEMENT_SENDER: Address = address!("deaddeaddeaddeaddeaddeaddeaddeaddead0002");
const REPLACEMENT_GAS: u64 = 36000;

let source = InteropBlockReplacementDepositSource::new(old_output_root);
let output_root = OutputRoot::from_parts(
old_header.state_root,
old_header.withdrawals_root.unwrap_or_default(),
old_header.hash(),
);
let replacement_tx = OpTxEnvelope::Deposit(
TxDeposit {
source_hash: source.source_hash(),
from: REPLACEMENT_SENDER,
to: TxKind::Call(Address::ZERO),
mint: 0,
value: U256::ZERO,
gas_limit: REPLACEMENT_GAS,
is_system_transaction: false,
input: output_root.encode().into(),
}
.seal(),
);

replacement_tx.encoded_2718().into()
}
}

/// An error type for the [`SuperchainConsolidator`] struct.
Expand Down
Loading