Revert "Set relative lock height on etching transactions (ordinals#3414…

…)"

This reverts commit 855e943.

crates/ordinals/src/runestone.rs

@@ -21,7 +21,6 @@ enum Payload {
 
 impl Runestone {
   pub const MAGIC_NUMBER: opcodes::All = opcodes::all::OP_PUSHNUM_13;
-  pub const COMMIT_INTERVAL: u16 = 6;
 
   pub fn from_transaction(transaction: &Transaction) -> Option<Self> {
     Self::decipher(transaction).ok().flatten()

crates/test-bitcoincore-rpc/src/server.rs

@@ -477,30 +477,7 @@ impl Api for Server {
   fn send_raw_transaction(&self, tx: String) -> Result<String, jsonrpc_core::Error> {
     let tx: Transaction = deserialize(&hex::decode(tx).unwrap()).unwrap();
 
-    let mut state = self.state.lock().unwrap();
-
-    for tx_in in &tx.input {
-      if let Some(lock_time) = tx_in.sequence.to_relative_lock_time() {
-        match lock_time {
-          bitcoin::relative::LockTime::Blocks(blocks) => {
-            if state
-              .txid_to_block_height
-              .get(&tx_in.previous_output.txid)
-              .expect("input has not been miined")
-              + u32::from(blocks.value())
-              > u32::try_from(state.hashes.len()).unwrap()
-            {
-              panic!("input is locked");
-            }
-          }
-          bitcoin::relative::LockTime::Time(_) => {
-            panic!("time-based relative locktimes are not implemented")
-          }
-        }
-      }
-    }
-
-    state.mempool.push(tx.clone());
+    self.state.lock().unwrap().mempool.push(tx.clone());
 
     Ok(tx.txid().to_string())
   }

src/index/testing.rs

@@ -163,7 +163,7 @@ impl Context {
       ..default()
     });
 
-    self.mine_blocks(Runestone::COMMIT_INTERVAL.into());
+    self.mine_blocks(RUNE_COMMIT_INTERVAL.into());
 
     let mut witness = Witness::new();
 
@@ -199,7 +199,8 @@ impl Context {
     (
       txid,
       RuneId {
-        block: u64::try_from(block_count + usize::from(Runestone::COMMIT_INTERVAL) + 1).unwrap(),
+        block: u64::try_from(block_count + usize::try_from(RUNE_COMMIT_INTERVAL).unwrap() + 1)
+          .unwrap(),
         tx: 1,
       },
     )

src/index/updater/rune_updater.rs

@@ -387,7 +387,7 @@ impl<'a, 'tx, 'client> RuneUpdater<'a, 'tx, 'client> {
 
         let mature = tx_info
           .confirmations
-          .map(|confirmations| confirmations >= Runestone::COMMIT_INTERVAL.into())
+          .map(|confirmations| confirmations >= RUNE_COMMIT_INTERVAL)
           .unwrap_or_default();
 
         if taproot && mature {

src/lib.rs

@@ -131,6 +131,7 @@ pub mod wallet;
 
 type Result<T = (), E = Error> = std::result::Result<T, E>;
 
+const RUNE_COMMIT_INTERVAL: u32 = 6;
 const TARGET_POSTAGE: Amount = Amount::from_sat(10_000);
 
 static SHUTTING_DOWN: AtomicBool = AtomicBool::new(false);

src/runes.rs

@@ -145,11 +145,8 @@ mod tests {
 
   #[test]
   fn runes_must_be_greater_than_or_equal_to_minimum_for_height() {
-    let minimum = Rune::minimum_at_height(
-      Chain::Regtest.network(),
-      Height((Runestone::COMMIT_INTERVAL + 2).into()),
-    )
-    .0;
+    let minimum =
+      Rune::minimum_at_height(Chain::Regtest.network(), Height(RUNE_COMMIT_INTERVAL + 2)).0;
 
     {
       let context = Context::builder()
@@ -5214,7 +5211,7 @@ mod tests {
       ..default()
     });
 
-    context.mine_blocks(Runestone::COMMIT_INTERVAL.into());
+    context.mine_blocks(RUNE_COMMIT_INTERVAL.into());
 
     let mut witness = Witness::new();
 
@@ -5274,7 +5271,7 @@ mod tests {
       ..default()
     });
 
-    context.mine_blocks((Runestone::COMMIT_INTERVAL - 1).into());
+    context.mine_blocks((RUNE_COMMIT_INTERVAL - 1).into());
 
     let mut witness = Witness::new();
 
@@ -5334,7 +5331,7 @@ mod tests {
       ..default()
     });
 
-    context.mine_blocks(Runestone::COMMIT_INTERVAL.into());
+    context.mine_blocks(RUNE_COMMIT_INTERVAL.into());
 
     let mut witness = Witness::new();
 

src/subcommand/server.rs

@@ -2117,7 +2117,7 @@ mod tests {
         ..default()
       });
 
-      self.mine_blocks(Runestone::COMMIT_INTERVAL.into());
+      self.mine_blocks(RUNE_COMMIT_INTERVAL.into());
 
       let witness = witness.unwrap_or_else(|| {
         let tapscript = script::Builder::new()

src/subcommand/wallet/batch_command.rs

@@ -115,7 +115,7 @@ impl Batch {
 
     let current_height = u32::try_from(bitcoin_client.get_block_count()?).unwrap();
 
-    let reveal_height = current_height + 1 + u32::from(Runestone::COMMIT_INTERVAL);
+    let reveal_height = current_height + 1 + RUNE_COMMIT_INTERVAL;
 
     if let Some(terms) = etching.terms {
       if let Some((start, end)) = terms.offset.and_then(|range| range.start.zip(range.end)) {

src/wallet/batch/plan.rs

@@ -136,9 +136,7 @@ impl Plan {
           .into_option()?;
 
         if let Some(transaction) = transaction {
-          if u32::try_from(transaction.info.confirmations).unwrap()
-            < Runestone::COMMIT_INTERVAL.into()
-          {
+          if u32::try_from(transaction.info.confirmations).unwrap() < RUNE_COMMIT_INTERVAL {
             continue;
           }
         }
@@ -148,7 +146,7 @@ impl Plan {
           .get_tx_out(&commit_tx.txid(), 0, Some(true))?;
 
         if let Some(tx_out) = tx_out {
-          if tx_out.confirmations >= Runestone::COMMIT_INTERVAL.into() {
+          if tx_out.confirmations >= RUNE_COMMIT_INTERVAL {
             break;
           }
         }
@@ -520,7 +518,6 @@ impl Plan {
       reveal_outputs.clone(),
       reveal_inputs.clone(),
       &reveal_script,
-      rune.is_some(),
     );
 
     let mut target_value = reveal_fee;
@@ -565,7 +562,6 @@ impl Plan {
       reveal_outputs.clone(),
       reveal_inputs,
       &reveal_script,
-      rune.is_some(),
     );
 
     for output in reveal_tx.output.iter() {
@@ -717,7 +713,6 @@ impl Plan {
     output: Vec<TxOut>,
     input: Vec<OutPoint>,
     script: &Script,
-    etching: bool,
   ) -> (Transaction, Amount) {
     let reveal_tx = Transaction {
       input: input
@@ -726,11 +721,7 @@ impl Plan {
           previous_output,
           script_sig: script::Builder::new().into_script(),
           witness: Witness::new(),
-          sequence: if etching {
-            Sequence::from_height(Runestone::COMMIT_INTERVAL)
-          } else {
-            Sequence::ENABLE_RBF_NO_LOCKTIME
-          },
+          sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
         })
         .collect(),
       output,

tests/balances.rs

@@ -57,7 +57,7 @@ fn with_runes() {
           SpacedRune::new(Rune(RUNE), 0),
           vec![(
             OutPoint {
-              txid: a.output.reveal,
+              txid: a.inscribe.reveal,
               vout: 1
             },
             Pile {
@@ -73,7 +73,7 @@ fn with_runes() {
           SpacedRune::new(Rune(RUNE + 1), 0),
           vec![(
             OutPoint {
-              txid: b.output.reveal,
+              txid: b.inscribe.reveal,
               vout: 1
             },
             Pile {

tests/json_api.rs

@@ -538,7 +538,7 @@ fn get_runes() {
 
   bitcoin_rpc_server.mine_blocks(1);
 
-  let response = ord_rpc_server.json_request(format!("/rune/{}", a.output.rune.unwrap().rune));
+  let response = ord_rpc_server.json_request(format!("/rune/{}", a.inscribe.rune.unwrap().rune));
   assert_eq!(response.status(), StatusCode::OK);
 
   let rune_json: api::Rune = serde_json::from_str(&response.text().unwrap()).unwrap();
@@ -551,7 +551,7 @@ fn get_runes() {
         burned: 0,
         terms: None,
         divisibility: 0,
-        etching: a.output.reveal,
+        etching: a.inscribe.reveal,
         mints: 0,
         number: 0,
         premine: 1000,
@@ -565,7 +565,7 @@ fn get_runes() {
       id: RuneId { block: 11, tx: 1 },
       mintable: false,
       parent: Some(InscriptionId {
-        txid: a.output.reveal,
+        txid: a.inscribe.reveal,
         index: 0,
       }),
     }
@@ -588,7 +588,7 @@ fn get_runes() {
             burned: 0,
             terms: None,
             divisibility: 0,
-            etching: a.output.reveal,
+            etching: a.inscribe.reveal,
             mints: 0,
             number: 0,
             premine: 1000,
@@ -607,7 +607,7 @@ fn get_runes() {
             burned: 0,
             terms: None,
             divisibility: 0,
-            etching: b.output.reveal,
+            etching: b.inscribe.reveal,
             mints: 0,
             number: 1,
             premine: 1000,
@@ -626,7 +626,7 @@ fn get_runes() {
             burned: 0,
             terms: None,
             divisibility: 0,
-            etching: c.output.reveal,
+            etching: c.inscribe.reveal,
             mints: 0,
             number: 2,
             premine: 1000,
@@ -670,7 +670,7 @@ fn get_runes_balances() {
       rune0,
       vec![(
         OutPoint {
-          txid: e0.output.reveal,
+          txid: e0.inscribe.reveal,
           vout: 1,
         },
         1000,
@@ -682,7 +682,7 @@ fn get_runes_balances() {
       rune1,
       vec![(
         OutPoint {
-          txid: e1.output.reveal,
+          txid: e1.inscribe.reveal,
           vout: 1,
         },
         1000,
@@ -694,7 +694,7 @@ fn get_runes_balances() {
       rune2,
       vec![(
         OutPoint {
-          txid: e2.output.reveal,
+          txid: e2.inscribe.reveal,
           vout: 1,
         },
         1000,

tests/lib.rs

@@ -5,7 +5,7 @@ use {
   bitcoin::{
     address::{Address, NetworkUnchecked},
     blockdata::constants::COIN_VALUE,
-    Network, OutPoint, Sequence, Txid, Witness,
+    Network, OutPoint, Txid, Witness,
   },
   bitcoincore_rpc::bitcoincore_rpc_json::ListDescriptorsResult,
   chrono::{DateTime, Utc},
@@ -157,7 +157,7 @@ fn drain(bitcoin_rpc_server: &test_bitcoincore_rpc::Handle, ord_rpc_server: &Tes
 
 struct Etched {
   id: RuneId,
-  output: Batch,
+  inscribe: Batch,
 }
 
 fn etch(
@@ -215,7 +215,7 @@ fn batch(
 
   bitcoin_rpc_server.mine_blocks(6);
 
-  let output = spawn.run_and_deserialize_output::<Batch>();
+  let inscribe = spawn.run_and_deserialize_output::<Batch>();
 
   bitcoin_rpc_server.mine_blocks(1);
 
@@ -226,8 +226,8 @@ fn batch(
     tx: 1,
   };
 
-  let reveal = output.reveal;
-  let parent = output.inscriptions[0].id;
+  let reveal = inscribe.reveal;
+  let parent = inscribe.inscriptions[0].id;
 
   let batch::Etching {
     divisibility,
@@ -364,7 +364,7 @@ fn batch(
     destination,
     location,
     rune,
-  } = output.rune.clone().unwrap();
+  } = inscribe.rune.clone().unwrap();
 
   if premine.to_integer(divisibility).unwrap() > 0 {
     let destination = destination
@@ -417,7 +417,7 @@ fn batch(
     }
   }
 
-  Etched { output, id }
+  Etched { inscribe, id }
 }
 
 fn envelope(payload: &[&[u8]]) -> Witness {

tests/runes.rs

@@ -56,7 +56,7 @@ fn one_rune() {
           block: 8,
           burned: 0,
           divisibility: 0,
-          etching: etch.output.reveal,
+          etching: etch.inscribe.reveal,
           id: RuneId { block: 8, tx: 1 },
           terms: None,
           mints: 0,
@@ -104,7 +104,7 @@ fn two_runes() {
             block: 8,
             burned: 0,
             divisibility: 0,
-            etching: a.output.reveal,
+            etching: a.inscribe.reveal,
             id: RuneId { block: 8, tx: 1 },
             terms: None,
             mints: 0,
@@ -126,7 +126,7 @@ fn two_runes() {
             block: 16,
             burned: 0,
             divisibility: 0,
-            etching: b.output.reveal,
+            etching: b.inscribe.reveal,
             id: RuneId { block: 16, tx: 1 },
             terms: None,
             mints: 0,