Import multiple descriptors at a time (ordinals#3091)

Cargo.toml

@@ -47,7 +47,7 @@ mime = "0.3.16"
 mime_guess = "2.0.4"
 miniscript = "10.0.0"
 mp4 = "0.14.0"
-ord-bitcoincore-rpc = "0.17.1"
+ord-bitcoincore-rpc = "0.17.2"
 ordinals = { version = "0.0.2", path = "crates/ordinals" }
 redb = "1.5.0"
 regex = "1.6.0"

crates/test-bitcoincore-rpc/Cargo.toml

@@ -14,7 +14,7 @@ hex = "0.4.3"
 jsonrpc-core = "18.0.0"
 jsonrpc-derive = "18.0.0"
 jsonrpc-http-server = "18.0.0"
-ord-bitcoincore-rpc = "0.17.1"
+ord-bitcoincore-rpc = "0.17.2"
 reqwest = { version = "0.11.10", features = ["blocking"] }
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = { version = "1.0.81" }

src/wallet.rs

@@ -407,9 +407,10 @@ impl Wallet {
 
  client.create_wallet(&self.name, None, Some(true), None, None)?;
 
- for descriptor in descriptors {
- client.import_descriptors(ImportDescriptors {
- descriptor: descriptor.desc,
+ let descriptors = descriptors
+ .into_iter()
+ .map(|descriptor| ImportDescriptors {
+ descriptor: descriptor.desc.clone(),
  timestamp: descriptor.timestamp,
  active: Some(true),
  range: descriptor.range.map(|(start, end)| {
@@ -423,8 +424,10 @@ impl Wallet {
  .map(|next| usize::try_from(next).unwrap_or(0)),
  internal: descriptor.internal,
  label: None,
- })?;
- }
+ })
+ .collect::<Vec<ImportDescriptors>>();
+
+ client.import_descriptors(descriptors)?;
 
  Ok(())
  }
@@ -493,15 +496,15 @@ impl Wallet {
  self
  .options
  .bitcoin_rpc_client(Some(self.name.clone()))?
- .import_descriptors(ImportDescriptors {
+ .import_descriptors(vec![ImportDescriptors {
  descriptor: descriptor.to_string_with_secret(&key_map),
  timestamp: Timestamp::Now,
  active: Some(true),
  range: None,
  next_index: None,
  internal: Some(change),
  label: None,
- })?;
+ }])?;
 
  Ok(())
  }

src/wallet/inscribe/batch.rs

@@ -455,15 +455,15 @@ impl Batch {
  let info =
  bitcoin_client.get_descriptor_info(&format!("rawtr({})", recovery_private_key.to_wif()))?;
 
- let response = bitcoin_client.import_descriptors(ImportDescriptors {
+ let response = bitcoin_client.import_descriptors(vec![ImportDescriptors {
  descriptor: format!("rawtr({})#{}", recovery_private_key.to_wif(), info.checksum),
  timestamp: Timestamp::Now,
  active: Some(false),
  range: None,
  next_index: None,
  internal: Some(false),
  label: Some("commit tx recovery key".to_string()),
- })?;
+ }])?;
 
  for result in response {
  if !result.success {