milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#3459: feat: replace ENABLE_RBF_NO_LOCKTIME with ENABLE_LOCKTIME_AND_RBF 

3565f70df9 feat: replace ENABLE_RBF_NO_LOCKTIME with ENABLE_LOCKTIME_AND_RBF (ChrisCho-H)

Pull request description:

  follow up https://github.com/rust-bitcoin/rust-bitcoin/pull/3455.
  Replace all `ENABLE_RBF_NO_LOCKTIME`(deprecated) with `ENABLE_LOCKTIME_AND_RBF`

ACKs for top commit:
  apoelstra:
    ACK 3565f70df9 successfully ran local tests
  tcharding:
    ACK 3565f70df9

Tree-SHA512: 4c6c6ad9ac89efe042cf239ce68594e715dbc827c1ae430819e2f16d2191f82d81f1e55b348f8176fc21454cf9d25fc9da1a414982cd3483d5f9f39834441f6c
This commit is contained in:
merge-script 2024-10-13 14:09:42 +00:00
parent 65e290a0ce 3565f70df9
commit 4717f4d1af
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/examples/ecdsa-psbt-simple.rs
View File

@ -155,7 +155,7 @@ fn main() {
.map(|(outpoint, _)| TxIn { .map(|(outpoint, _)| TxIn {
previous_output: outpoint, previous_output: outpoint,
script_sig: ScriptBuf::default(), script_sig: ScriptBuf::default(),
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME, sequence: Sequence::ENABLE_LOCKTIME_AND_RBF,
witness: Witness::default(), witness: Witness::default(),
}) })
.collect(); .collect();

2
bitcoin/examples/sign-tx-segwit-v0.rs
View File

@ -33,7 +33,7 @@ fn main() {
let input = TxIn { let input = TxIn {
previous_output: dummy_out_point, // The dummy output we are spending. previous_output: dummy_out_point, // The dummy output we are spending.
script_sig: ScriptBuf::default(), // For a p2wpkh script_sig is empty. script_sig: ScriptBuf::default(), // For a p2wpkh script_sig is empty.
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME, sequence: Sequence::ENABLE_LOCKTIME_AND_RBF,
witness: Witness::default(), // Filled in after signing. witness: Witness::default(), // Filled in after signing.
}; };

2
bitcoin/examples/sign-tx-taproot.rs
View File

@ -34,7 +34,7 @@ fn main() {
let input = TxIn { let input = TxIn {
previous_output: dummy_out_point, // The dummy output we are spending. previous_output: dummy_out_point, // The dummy output we are spending.
script_sig: ScriptBuf::default(), // For a p2tr script_sig is empty. script_sig: ScriptBuf::default(), // For a p2tr script_sig is empty.
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME, sequence: Sequence::ENABLE_LOCKTIME_AND_RBF,
witness: Witness::default(), // Filled in after signing. witness: Witness::default(), // Filled in after signing.
}; };

2
bitcoin/examples/taproot-psbt-simple.rs
View File

@ -175,7 +175,7 @@ fn main() {
.map(|(outpoint, _)| TxIn { .map(|(outpoint, _)| TxIn {
previous_output: outpoint, previous_output: outpoint,
script_sig: ScriptBuf::default(), script_sig: ScriptBuf::default(),
sequence: Sequence::ENABLE_RBF_NO_LOCKTIME, sequence: Sequence::ENABLE_LOCKTIME_AND_RBF,
witness: Witness::default(), witness: Witness::default(),
}) })
.collect(); .collect();

2
primitives/src/sequence.rs
View File

@ -282,7 +282,7 @@ impl<'a> Arbitrary<'a> for Sequence {
0 => Ok(Sequence::MAX), 0 => Ok(Sequence::MAX),
1 => Ok(Sequence::ZERO), 1 => Ok(Sequence::ZERO),
2 => Ok(Sequence::MIN_NO_RBF), 2 => Ok(Sequence::MIN_NO_RBF),
3 => Ok(Sequence::ENABLE_RBF_NO_LOCKTIME), 3 => Ok(Sequence::ENABLE_LOCKTIME_AND_RBF),
_ => Ok(Sequence(u.arbitrary()?)), _ => Ok(Sequence(u.arbitrary()?)),
} }
} }