chore: update dependencies patches to use master branches

cli/src/command.rs

@@ -862,21 +862,18 @@ impl Exec for RgbArgs {
                 // TODO: Support lock time and RBFs
                 let params = TransferParams::with(*fee, *sats);
 
-                let (psbt, _, transfer) =
+                let (mut psbt, _, transfer) =
                     wallet.pay(invoice, params).map_err(|err| err.to_string())?;
 
                 transfer.save_file(out_file)?;
 
-                let ver = if *v2 { PsbtVer::V2 } else { PsbtVer::V0 };
+                psbt.version = if *v2 { PsbtVer::V2 } else { PsbtVer::V0 };
                 match psbt_file {
                     Some(file_name) => {
                         let mut psbt_file = File::create(file_name)?;
-                        psbt.encode(ver, &mut psbt_file)?;
+                        psbt.encode(psbt.version, &mut psbt_file)?;
                     }
-                    None => match ver {
-                        PsbtVer::V0 => println!("{psbt}"),
-                        PsbtVer::V2 => println!("{psbt:#}"),
-                    },
+                    None => println!("{psbt}"),
                 }
             }
             Command::Inspect { file, dir, path } => {

src/indexers/any.rs

@@ -34,7 +34,7 @@ use crate::{Txid, XChain};
 
 // We need to repeat methods of `WitnessResolve` trait here to avoid making
 // wrappers around resolver types. TODO: Use wrappers instead
-pub trait RgbResolver {
+pub trait RgbResolver: Send {
     fn check(&self, network: Network, expected_block_hash: String) -> Result<(), String>;
     fn resolve_pub_witness(&self, txid: Txid) -> Result<Option<Tx>, String>;
     fn resolve_pub_witness_ord(&self, txid: Txid) -> Result<WitnessOrd, String>;

src/indexers/esplora_blocking.rs

@@ -38,6 +38,9 @@ impl RgbResolver for BlockingClient {
     }
 
     fn resolve_pub_witness_ord(&self, txid: Txid) -> Result<WitnessOrd, String> {
+        if self.tx(&txid)?.is_none() {
+            return Ok(WitnessOrd::Archived);
+        }
         let status = self.tx_status(&txid)?;
         let ord = match status
             .block_height
@@ -46,8 +49,7 @@ impl RgbResolver for BlockingClient {
             Some((h, t)) => {
                 WitnessOrd::Mined(WitnessPos::new(h, t as i64).ok_or(Error::InvalidServerData)?)
             }
-            // TODO: Figure out how to detect mempool transactions
-            None => WitnessOrd::Archived,
+            None => WitnessOrd::Tentative,
         };
         Ok(ord)
     }

src/pay.rs

@@ -313,9 +313,9 @@ where Self::Descr: DescriptorRgb<K>
                     pay2vout.method,
                     Outpoint::new(witness_txid, vout),
                 ));
-                (vec![], vec![seal])
+                (None, vec![seal])
             }
-            Beneficiary::BlindedSeal(seal) => (vec![XChain::Bitcoin(seal)], vec![]),
+            Beneficiary::BlindedSeal(seal) => (Some(XChain::Bitcoin(seal)), vec![]),
         };
 
         struct FasciaResolver {