Don't opt-in to RBF (ordinals#685)

popcnt1 · Oct 21, 2022 · 0c491b8 · 0c491b8
1 parent ef7285a
commit 0c491b8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/src/index.rs b/src/index.rs
@@ -1066,7 +1066,7 @@ mod tests {
     assert_eq!(
       context.index.find(50 * COIN_VALUE).unwrap().unwrap(),
       SatPoint {
-        outpoint: "9068a11b8769174363376b606af9a4b8b29dd7b13d013f4b0cbbd457db3c3ce5:0"
+        outpoint: "0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0"
           .parse()
           .unwrap(),
         offset: 0,

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -1244,8 +1244,8 @@ mod tests {
 <h2>1 Output</h2>
 <ul class=monospace>
   <li>
-    <a href=/output/9068a11b8769174363376b606af9a4b8b29dd7b13d013f4b0cbbd457db3c3ce5:0 class=monospace>
-      9068a11b8769174363376b606af9a4b8b29dd7b13d013f4b0cbbd457db3c3ce5:0
+    <a href=/output/0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0 class=monospace>
+      0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0
     </a>
     <dl>
       <dt>value</dt><dd>5000000000</dd>

diff --git a/src/subcommand/server/templates/input.rs b/src/subcommand/server/templates/input.rs
@@ -31,7 +31,7 @@ mod tests {
             .parse()
             .unwrap(),
           script_sig: script::Builder::new().push_scriptint(4).into_script(),
-          sequence: Sequence(0),
+          sequence: Sequence::MAX,
           witness,
         }
       }
@@ -40,7 +40,6 @@ mod tests {
       <h1>Input /1/2/3</h1>
       <dl>
         <dt>previous output</dt><dd class=monospace>0000000000000000000000000000000000000000000000000000000000000000:0</dd>
-        <dt>sequence</dt><dd>0</dd>
         <dt>witness</dt><dd class=data>010101</dd>
         <dt>script sig</dt><dd class=data>OP_PUSHBYTES_1 04</dd>
         <dt>text</dt><dd>\x01\x04</dd>

diff --git a/src/subcommand/wallet/transaction_builder.rs b/src/subcommand/wallet/transaction_builder.rs
@@ -262,7 +262,7 @@ impl TransactionBuilder {
             .push_slice(&[0; 71])
             .push_slice(&[0; 65])
             .into_script(),
-          sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
+          sequence: Sequence::MAX,
           witness: Witness::new(),
         })
         .collect(),
@@ -294,7 +294,7 @@ impl TransactionBuilder {
         .map(|outpoint| TxIn {
           previous_output: *outpoint,
           script_sig: Script::new(),
-          sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
+          sequence: Sequence::MAX,
           witness: Witness::new(),
         })
         .collect(),
@@ -549,7 +549,7 @@ mod tests {
     TxIn {
       previous_output,
       script_sig: Script::new(),
-      sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
+      sequence: Sequence::MAX,
       witness: Witness::new(),
     }
   }

diff --git a/test-bitcoincore-rpc/src/server.rs b/test-bitcoincore-rpc/src/server.rs
@@ -152,7 +152,7 @@ impl Api for Server {
         .map(|input| TxIn {
           previous_output: OutPoint::new(input.txid, input.vout),
           script_sig: Script::new(),
-          sequence: Sequence(0),
+          sequence: Sequence::MAX,
           witness: Witness::new(),
         })
         .collect(),

diff --git a/test-bitcoincore-rpc/src/state.rs b/test-bitcoincore-rpc/src/state.rs
@@ -38,7 +38,7 @@ impl State {
         script_sig: script::Builder::new()
           .push_scriptint(self.blocks.len().try_into().unwrap())
           .into_script(),
-        sequence: Sequence(0),
+        sequence: Sequence::MAX,
         witness: Witness::new(),
       }],
       output: vec![TxOut {
@@ -102,7 +102,7 @@ impl State {
       input.push(TxIn {
         previous_output: OutPoint::new(tx.txid(), *vout as u32),
         script_sig: Script::new(),
-        sequence: Sequence(0),
+        sequence: Sequence::MAX,
         witness: Witness::new(),
       });
     }