Skip to content

wave5: LockTime::ZERO/Sequence::MAX canonicalization + double_sha256 dedup #1362

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
metaphorics merged 1 commit into from
Oct 2, 2026
Merged

wave5: LockTime::ZERO/Sequence::MAX canonicalization + double_sha256 dedup #1362

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
4 changes: 2 additions & 2 deletions crates/chain/src/regtest_fixture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ pub fn coinbase(height: u32) -> Tx {
script_sig.extend_from_slice(&script_num_push(0));
Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
Expand Down
4 changes: 2 additions & 2 deletions crates/chainstate/tests/unit/apply/persistence_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ pub(crate) fn coinbase(height: u32) -> Tx {
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(vec![1, encoded_height, 0]),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
}
}

Expand Down
8 changes: 4 additions & 4 deletions crates/chainstate/tests/unit/durable_replay_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ fn restored_chainstate() -> Result<(Chainstate, Block), Box<dyn std::error::Erro
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(vec![1, 1, 0]),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let mut leaves = vec![*tx.txid().as_bytes()];
let merkle = bitcoin_rs_consensus::verify_block::compute_merkle_root(&mut leaves)
Expand Down Expand Up @@ -388,14 +388,14 @@ fn mined_child(
]
.concat(),
),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let mut leaves = vec![*tx.txid().as_bytes()];
let merkle = bitcoin_rs_consensus::verify_block::compute_merkle_root(&mut leaves)
Expand Down
20 changes: 10 additions & 10 deletions crates/consensus/src/sigops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ mod tests {
let script_sig = [vec![opcode::OP_DUP], push_data(&[opcode::OP_CHECKSIG])].concat();
let tx = Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![TxIn {
previous_output: outpoint,
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
Expand Down Expand Up @@ -159,14 +159,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid::default(), 0),
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let prevouts = [(
tx.inputs[0].previous_output,
Expand All @@ -190,15 +190,15 @@ mod tests {
.map(|vout| TxIn {
previous_output: OutPoint::new(Txid::default(), vout),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(vec![vec![
opcode::OP_PUSHNUM_1 + 1,
opcode::OP_CHECKMULTISIG,
]]),
})
.collect(),
outputs: Vec::new(),
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let prevouts = [
(
Expand Down Expand Up @@ -237,12 +237,12 @@ mod tests {
.map(|vout| TxIn {
previous_output: OutPoint::new(Txid::default(), vout),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
})
.collect(),
outputs: Vec::new(),
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let mut prevouts: Vec<_> = tx
.inputs
Expand Down Expand Up @@ -296,14 +296,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: outpoint,
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(witness),
}],
outputs: vec![TxOut {
value: Amount::from_sat(9_000),
script_pubkey: Script::from_bytes(vec![opcode::OP_CHECKSIG]),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let prevouts = [(
outpoint,
Expand Down
16 changes: 8 additions & 8 deletions crates/consensus/src/verify_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,14 +619,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid(Hash256::from_le_bytes(&[1; 32])), 0),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let block = Block {
header: Header {
Expand Down Expand Up @@ -1181,14 +1181,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(vec![1, 1]),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(50),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
}
}

Expand All @@ -1198,14 +1198,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid(Hash256::from_le_bytes(&[2; 32])), 0),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(vec![vec![1; 32]]),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
}
}

Expand All @@ -1215,14 +1215,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid(Hash256::from_le_bytes(&[seed; 32])), 0),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
value: Amount::from_sat(1),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
}
}

Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/src/verify_tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,14 +873,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: outpoint,
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(vec![vec![0xac; usize::try_from(cost)?]]),
}],
outputs: vec![TxOut {
value: Amount::from_sat(9_000),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
let prevouts = hashbrown::HashMap::from([(
outpoint,
Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/tests/overhaul_prepared_inputs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn plain_input(byte: u8) -> TxIn {
TxIn {
previous_output: outpoint(byte),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}
}
Expand All @@ -51,7 +51,7 @@ fn two_input_tx() -> (Tx, Coins) {
}
let tx = Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![plain_input(1), plain_input(2)],
outputs: vec![TxOut {
value: Amount::from_sat(100),
Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/tests/witness_activation_rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn coinbase(with_witness: bool, with_commitment: bool) -> Tx {
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(vec![1, 1]),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: if with_witness {
Witness::from_stack(vec![vec![0; 32]])
} else {
Expand All @@ -47,7 +47,7 @@ fn coinbase(with_witness: bool, with_commitment: bool) -> Tx {
value: Amount::from_sat(50),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
if with_commitment {
tx.outputs.push(commitment_output());
Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/tests/witness_sigop_activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl WitnessFixture {
inputs.push(TxIn {
previous_output: outpoint,
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(vec![script]),
});
prevouts.push((
Expand All @@ -68,7 +68,7 @@ impl WitnessFixture {
value: Amount::from_sat(1),
script_pubkey: Script::from_bytes(vec![opcode::OP_PUSHNUM_1]),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
},
prevouts,
}
Expand Down
4 changes: 2 additions & 2 deletions crates/consensus/tests/witness_staging_gate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ fn coinbase(witness: Option<Vec<Vec<u8>>>, commitment: Option<[u8; 32]>) -> Tx {
inputs: vec![TxIn {
previous_output: OutPoint::null(),
script_sig: Script::from_bytes(vec![1, 1]),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: witness.map_or_else(Witness::new, Witness::from_stack),
}],
outputs: vec![TxOut {
value: Amount::from_sat(50),
script_pubkey: Script::new(),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
};
if let Some(commitment) = commitment {
tx.outputs.push(commitment_output(commitment));
Expand Down
4 changes: 2 additions & 2 deletions crates/mempool/src/accounting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid::default(), 0),
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(witness),
}],
outputs: vec![TxOut {
value: Amount::from_sat(9_000),
script_pubkey: Script::from_bytes(output),
}],
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
}
}

Expand Down
16 changes: 8 additions & 8 deletions crates/mempool/src/admission.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,11 +845,11 @@ mod tests {
script.extend_from_slice(&[0x88, 0xac]);
Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![TxIn {
previous_output: outpoint,
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
Expand Down Expand Up @@ -1420,7 +1420,7 @@ mod tests {
// gateway must reject those tokens and rebuild from the pool.
Coins(vec![]).snapshot(&Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![],
outputs: vec![],
})
Expand Down Expand Up @@ -1802,11 +1802,11 @@ mod tests {
for (script_pubkey, script_sig, witness, input_cost) in cases {
let parent = Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![TxIn {
previous_output: OutPoint::new(Txid(Hash256::from_le_bytes(&[9; 32])), 0),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![
Expand All @@ -1822,11 +1822,11 @@ mod tests {
};
let child = Tx {
version: 2,
lock_time: LockTime::from_consensus(0),
lock_time: LockTime::ZERO,
inputs: vec![TxIn {
previous_output: OutPoint::new(parent.txid(), 1),
script_sig: Script::from_bytes(script_sig),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::from_stack(witness),
}],
outputs: vec![TxOut {
Expand Down Expand Up @@ -2342,7 +2342,7 @@ mod tests {
tx.inputs.push(TxIn {
previous_output: OutPoint::null(),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
});
let tx = Arc::new(tx);
Expand Down
2 changes: 1 addition & 1 deletion crates/mempool/src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ mod wire_metadata_tests {
TxIn {
previous_output: OutPoint::new(Txid(Hash256::from_le_bytes(&[0x22; 32])), 7),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
},
],
Expand Down
2 changes: 1 addition & 1 deletion crates/mempool/src/orphan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ mod tests {
inputs: vec![TxIn {
previous_output: OutPoint::new(parent, 0),
script_sig: Script::new(),
sequence: Sequence::from_consensus(u32::MAX),
sequence: Sequence::MAX,
witness: Witness::new(),
}],
outputs: vec![TxOut {
Expand Down
Loading
Loading