Use transaction version 2 (#2873)

ordinals · Dec 18, 2023 · bdc06cc · bdc06cc
1 parent 1fd865d
commit bdc06cc
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 51 deletions.
diff --git a/fuzz/fuzz_targets/runestone_decipher.rs b/fuzz/fuzz_targets/runestone_decipher.rs
@@ -29,7 +29,7 @@ fuzz_target!(|input: Vec<Vec<u8>>| {
       script_pubkey: builder.into_script(),
       value: 0,
     }],
-    version: 0,
+    version: 2,
   };
 
   Runestone::from_transaction(&tx);

diff --git a/src/envelope.rs b/src/envelope.rs
@@ -294,7 +294,7 @@ mod tests {
 
   fn parse(witnesses: &[Witness]) -> Vec<ParsedEnvelope> {
     ParsedEnvelope::from_transaction(&Transaction {
-      version: 0,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: witnesses
         .iter()

diff --git a/src/index.rs b/src/index.rs
@@ -2245,7 +2245,7 @@ mod tests {
     assert_eq!(
       context.index.find(Sat(50 * COIN_VALUE)).unwrap().unwrap(),
       SatPoint {
-        outpoint: "30f2f037629c6a21c1f40ed39b9bd6278df39762d68d07f49582b23bcb23386a:0"
+        outpoint: "84aca0d43f45ac753d4744f40b2f54edec3a496b298951735d450e601386089d:0"
           .parse()
           .unwrap(),
         offset: 0,

diff --git a/src/runes/runestone.rs b/src/runes/runestone.rs
@@ -247,7 +247,7 @@ mod tests {
         value: 0,
       }],
       lock_time: LockTime::ZERO,
-      version: 0,
+      version: 2,
     })
     .unwrap()
     .unwrap()
@@ -273,7 +273,7 @@ mod tests {
           value: 0,
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       None
     );
@@ -286,7 +286,7 @@ mod tests {
         input: Vec::new(),
         output: Vec::new(),
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(None)
     );
@@ -302,7 +302,7 @@ mod tests {
           value: 0
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(None)
     );
@@ -320,7 +320,7 @@ mod tests {
           value: 0
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(None)
     );
@@ -339,7 +339,7 @@ mod tests {
           value: 0
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(None)
     );
@@ -354,7 +354,7 @@ mod tests {
         value: 0,
       }],
       lock_time: LockTime::ZERO,
-      version: 0,
+      version: 2,
     })
     .unwrap_err();
   }
@@ -376,7 +376,7 @@ mod tests {
         value: 0,
       }],
       lock_time: LockTime::ZERO,
-      version: 0,
+      version: 2,
     })
     .unwrap_err();
   }
@@ -394,7 +394,7 @@ mod tests {
         value: 0,
       }],
       lock_time: LockTime::ZERO,
-      version: 0,
+      version: 2,
     })
     .unwrap();
   }
@@ -415,7 +415,7 @@ mod tests {
           value: 0,
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       })
       .unwrap()
       .unwrap(),
@@ -443,7 +443,7 @@ mod tests {
           value: 0
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(Some(Runestone::default()))
     );
@@ -478,7 +478,7 @@ mod tests {
         },
       ],
       lock_time: LockTime::ZERO,
-      version: 0,
+      version: 2,
     })
     .unwrap_err();
   }
@@ -986,7 +986,7 @@ mod tests {
           value: 0
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(Some(Runestone {
         edicts: vec![Edict {
@@ -1027,7 +1027,7 @@ mod tests {
           }
         ],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(Some(Runestone {
         edicts: vec![Edict {
@@ -1067,7 +1067,7 @@ mod tests {
           }
         ],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       }),
       Ok(Some(Runestone {
         edicts: vec![Edict {
@@ -1372,7 +1372,7 @@ mod tests {
           value: 0,
         }],
         lock_time: LockTime::ZERO,
-        version: 0,
+        version: 2,
       };
 
       let payload = Runestone::payload(&transaction).unwrap().unwrap();

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

diff --git a/src/subcommand/wallet/etch.rs b/src/subcommand/wallet/etch.rs
@@ -86,7 +86,7 @@ impl Etch {
     );
 
     let unfunded_transaction = Transaction {
-      version: 1,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: Vec::new(),
       output: vec![

diff --git a/src/subcommand/wallet/inscribe/batch.rs b/src/subcommand/wallet/inscribe/batch.rs
@@ -492,7 +492,7 @@ impl Batch {
         .collect(),
       output: outputs,
       lock_time: LockTime::ZERO,
-      version: 1,
+      version: 2,
     };
 
     let fee = {

diff --git a/src/subcommand/wallet/send.rs b/src/subcommand/wallet/send.rs
@@ -235,7 +235,7 @@ impl Send {
     };
 
     let unfunded_transaction = Transaction {
-      version: 1,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: input
         .into_iter()

diff --git a/src/subcommand/wallet/transaction_builder.rs b/src/subcommand/wallet/transaction_builder.rs
@@ -428,7 +428,7 @@ impl TransactionBuilder {
 
   fn estimate_vbytes_with(inputs: usize, outputs: Vec<Address>) -> usize {
     Transaction {
-      version: 1,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: (0..inputs)
         .map(|_| TxIn {
@@ -456,7 +456,7 @@ impl TransactionBuilder {
   fn build(self) -> Result<Transaction> {
     let recipient = self.recipient.script_pubkey();
     let transaction = Transaction {
-      version: 1,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: self
         .inputs
@@ -787,7 +787,7 @@ mod tests {
     pretty_assert_eq!(
       tx_builder.build(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1)), tx_in(outpoint(2)), tx_in(outpoint(3))],
         output: vec![
@@ -837,7 +837,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(4901, recipient())],
@@ -889,7 +889,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1)), tx_in(outpoint(2))],
         output: vec![tx_out(4_950, change(1)), tx_out(4_862, recipient())],
@@ -963,7 +963,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1)), tx_in(outpoint(2))],
         output: vec![
@@ -1104,7 +1104,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![
@@ -1155,7 +1155,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(3_333, change(1)), tx_out(6_537, recipient())],
@@ -1184,7 +1184,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(2)), tx_in(outpoint(1))],
         output: vec![tx_out(10_001, change(1)), tx_out(9_811, recipient())],
@@ -1456,7 +1456,7 @@ mod tests {
     pretty_assert_eq!(
       transaction,
       Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(10_000 - fee.to_sat(), recipient())],
@@ -1482,7 +1482,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(1000, recipient()), tx_out(3870, change(1))],
@@ -1511,7 +1511,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1)), tx_in(outpoint(2))],
         output: vec![tx_out(1500, recipient()), tx_out(312, change(1))],
@@ -1631,7 +1631,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(901, recipient())],
@@ -1657,7 +1657,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(20_000, recipient())],
@@ -1683,7 +1683,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(1005, recipient())],
@@ -1772,7 +1772,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(1802, recipient())],
@@ -1798,7 +1798,7 @@ mod tests {
       )
       .build_transaction(),
       Ok(Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![tx_out(20250, recipient())],
@@ -1992,7 +1992,7 @@ mod tests {
     pretty_assert_eq!(
       transaction,
       Transaction {
-        version: 1,
+        version: 2,
         lock_time: LockTime::ZERO,
         input: vec![tx_in(outpoint(1))],
         output: vec![

diff --git a/src/templates/transaction.rs b/src/templates/transaction.rs
@@ -42,7 +42,7 @@ mod tests {
   #[test]
   fn html() {
     let transaction = Transaction {
-      version: 0,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: vec![TxIn {
         sequence: Default::default(),
@@ -105,7 +105,7 @@ mod tests {
   #[test]
   fn with_blockhash() {
     let transaction = Transaction {
-      version: 0,
+      version: 2,
       lock_time: LockTime::ZERO,
       input: Vec::new(),
       output: vec![