Respect locked coins (#2618)

src/index.rs

@@ -20,7 +20,7 @@ use {
     Database, MultimapTable, MultimapTableDefinition, ReadableMultimapTable, ReadableTable, Table,
     TableDefinition, WriteTransaction,
   },
-  std::collections::HashMap,
+  std::collections::{BTreeSet, HashMap},
   std::io::{BufWriter, Read, Write},
 };
 
@@ -331,12 +331,28 @@ impl Index {
     })
   }
 
+  pub(crate) fn get_locked_outputs(&self, _wallet: Wallet) -> Result<BTreeSet<OutPoint>> {
+    #[derive(Deserialize)]
+    pub(crate) struct JsonOutPoint {
+      txid: bitcoin::Txid,
+      vout: u32,
+    }
+
+    Ok(
+      self
+        .client
+        .call::<Vec<JsonOutPoint>>("listlockunspent", &[])?
+        .into_iter()
+        .map(|outpoint| OutPoint::new(outpoint.txid, outpoint.vout))
+        .collect(),
+    )
+  }
   #[cfg(test)]
   fn set_durability(&mut self, durability: redb::Durability) {
     self.durability = durability;
   }
 
-  pub(crate) fn get_unspent_outputs(&self, _wallet: Wallet) -> Result<BTreeMap<OutPoint, Amount>> {
+  pub(crate) fn get_unspent_outputs(&self, wallet: Wallet) -> Result<BTreeMap<OutPoint, Amount>> {
     let mut utxos = BTreeMap::new();
     utxos.extend(
       self
@@ -351,19 +367,18 @@ impl Index {
         }),
     );
 
-    #[derive(Deserialize)]
-    pub(crate) struct JsonOutPoint {
-      txid: bitcoin::Txid,
-      vout: u32,
-    }
+    let locked_utxos: BTreeSet<OutPoint> = self.get_locked_outputs(wallet)?;
 
-    for JsonOutPoint { txid, vout } in self
-      .client
-      .call::<Vec<JsonOutPoint>>("listlockunspent", &[])?
-    {
+    for outpoint in locked_utxos {
       utxos.insert(
-        OutPoint { txid, vout },
-        Amount::from_sat(self.client.get_raw_transaction(&txid, None)?.output[vout as usize].value),
+        outpoint,
+        Amount::from_sat(
+          self
+            .client
+            .get_raw_transaction(&outpoint.txid, None)?
+            .output[TryInto::<usize>::try_into(outpoint.vout).unwrap()]
+          .value,
+        ),
       );
     }
     let rtx = self.database.begin_read()?;

src/subcommand/wallet/inscribe.rs

@@ -115,6 +115,8 @@ impl Inscribe {
 
     let utxos = index.get_unspent_outputs(Wallet::load(&options)?)?;
 
+    let locked_utxos = index.get_locked_outputs(Wallet::load(&options)?)?;
+
     let client = options.bitcoin_rpc_client_for_wallet_command(false)?;
 
     let chain = options.chain();
@@ -183,7 +185,7 @@ impl Inscribe {
       reveal_fee_rate: self.fee_rate,
       satpoint: self.satpoint,
     }
-    .inscribe(chain, &index, &client, &utxos)
+    .inscribe(chain, &index, &client, &locked_utxos, &utxos)
   }
 
   fn parse_metadata(cbor: Option<PathBuf>, json: Option<PathBuf>) -> Result<Option<Vec<u8>>> {
@@ -271,6 +273,7 @@ mod tests {
     .create_batch_inscription_transactions(
       BTreeMap::new(),
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       change,
     )
@@ -310,6 +313,7 @@ mod tests {
     .create_batch_inscription_transactions(
       BTreeMap::new(),
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       change,
     )
@@ -352,6 +356,7 @@ mod tests {
     .create_batch_inscription_transactions(
       inscriptions,
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -401,6 +406,7 @@ mod tests {
     .create_batch_inscription_transactions(
       inscriptions,
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -444,6 +450,7 @@ mod tests {
     .create_batch_inscription_transactions(
       inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -524,6 +531,7 @@ mod tests {
     .create_batch_inscription_transactions(
       inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )
@@ -604,6 +612,7 @@ mod tests {
     .create_batch_inscription_transactions(
       inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -660,6 +669,7 @@ mod tests {
     .create_batch_inscription_transactions(
       BTreeMap::new(),
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -698,6 +708,7 @@ mod tests {
     .create_batch_inscription_transactions(
       BTreeMap::new(),
       Chain::Mainnet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(1)],
     )
@@ -866,6 +877,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )
@@ -961,6 +973,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )
@@ -1034,6 +1047,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     );
@@ -1070,6 +1084,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )
@@ -1121,6 +1136,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )
@@ -1196,6 +1212,7 @@ inscriptions:
     .create_batch_inscription_transactions(
       wallet_inscriptions,
       Chain::Signet,
+      BTreeSet::new(),
       utxos.into_iter().collect(),
       [commit_address, change(2)],
     )

src/subcommand/wallet/inscribe/batch.rs

@@ -40,6 +40,7 @@ impl Batch {
     chain: Chain,
     index: &Index,
     client: &Client,
+    locked_utxos: &BTreeSet<OutPoint>,
     utxos: &BTreeMap<OutPoint, Amount>,
   ) -> SubcommandResult {
     let wallet_inscriptions = index.get_inscriptions(utxos)?;
@@ -53,6 +54,7 @@ impl Batch {
       .create_batch_inscription_transactions(
         wallet_inscriptions,
         chain,
+        locked_utxos.clone(),
         utxos.clone(),
         commit_tx_change,
       )?;
@@ -176,6 +178,7 @@ impl Batch {
     &self,
     wallet_inscriptions: BTreeMap<SatPoint, InscriptionId>,
     chain: Chain,
+    locked_utxos: BTreeSet<OutPoint>,
     mut utxos: BTreeMap<OutPoint, Amount>,
     change: [Address; 2],
   ) -> Result<(Transaction, Transaction, TweakedKeyPair, u64)> {
@@ -217,7 +220,7 @@ impl Batch {
 
       utxos
         .keys()
-        .find(|outpoint| !inscribed_utxos.contains(outpoint))
+        .find(|outpoint| !inscribed_utxos.contains(outpoint) && !locked_utxos.contains(outpoint))
         .map(|outpoint| SatPoint {
           outpoint: *outpoint,
           offset: 0,
@@ -321,6 +324,7 @@ impl Batch {
       satpoint,
       wallet_inscriptions,
       utxos.clone(),
+      locked_utxos.clone(),
       commit_tx_address.clone(),
       change,
       self.commit_fee_rate,

src/subcommand/wallet/send.rs

@@ -34,6 +34,8 @@ impl Send {
 
     let unspent_outputs = index.get_unspent_outputs(Wallet::load(&options)?)?;
 
+    let locked_outputs = index.get_locked_outputs(Wallet::load(&options)?)?;
+
     let inscriptions = index.get_inscriptions(&unspent_outputs)?;
 
     let satpoint = match self.outgoing {
@@ -70,6 +72,7 @@ impl Send {
       satpoint,
       inscriptions,
       unspent_outputs,
+      locked_outputs,
       address.clone(),
       change,
       self.fee_rate,