feat: descriptor wallet support

Author: sander2

bitcoin/src/error.rs

@@ -79,6 +79,8 @@ pub enum Error {
     AddressError(#[from] AddressError),
     #[error("Failed to fetch coinbase tx")]
     CoinbaseFetchingFailure,
+    #[error("InvalidDescriptor")]
+    InvalidDescriptor,
 }
 
 impl Error {

bitcoin/src/lib.rs

@@ -13,6 +13,10 @@ mod iter;
 
 use async_trait::async_trait;
 use backoff::{backoff::Backoff, future::retry, ExponentialBackoff};
+use bitcoincore_rpc::{
+    bitcoin::consensus::encode::serialize_hex,
+    bitcoincore_rpc_json::{GetDescriptorInfoResult, ImportDescriptors, ScanningDetails, Timestamp},
+};
 pub use bitcoincore_rpc::{
     bitcoin as bitcoin_primitives,
     bitcoin::{
@@ -74,7 +78,7 @@ pub const DEFAULT_MAX_TX_COUNT: usize = 100_000_000;
 /// the bitcoin core version.
 /// See https://github.com/bitcoin/bitcoin/blob/833add0f48b0fad84d7b8cf9373a349e7aef20b4/src/rpc/net.cpp#L627
 /// and https://github.com/bitcoin/bitcoin/blob/833add0f48b0fad84d7b8cf9373a349e7aef20b4/src/clientversion.h#L33-L37
-pub const BITCOIN_CORE_VERSION_23: usize = 230_000;
+pub const BITCOIN_CORE_VERSION_26: usize = 260_000;
 const NOT_IN_MEMPOOL_ERROR_CODE: i32 = BitcoinRpcError::RpcInvalidAddressOrKey as i32;
 
 // Time to sleep before retry on startup.
@@ -283,7 +287,7 @@ async fn connect(rpc: &Client, connection_timeout: Duration) -> Result<Network,
                     info!("Connected to {}", chain);
                     info!("Bitcoin version {}", version);
 
-                    if version >= BITCOIN_CORE_VERSION_23 {
+                    if version >= BITCOIN_CORE_VERSION_26 {
                         return Err(Error::IncompatibleVersion(version))
                     }
 
@@ -623,9 +627,38 @@ impl BitcoinCore {
         .await
     }
 
-    pub async fn import_private_key(&self, privkey: PrivateKey) -> Result<(), Error> {
-        self.with_wallet(|| async { Ok(self.rpc.import_private_key(&privkey, None, None)?) })
-            .await
+    pub fn import_private_key(&self, privkey: &PrivateKey, label: Option<&str>) -> Result<(), Error> {
+        let wallet_info = self.rpc.get_wallet_info()?;
+        let using_descriptor_wallet = true;
+        if using_descriptor_wallet {
+            let bare_descriptor = format!("wpkh({})", privkey.to_string());
+
+            let descriptor = match self.rpc.get_descriptor_info(&bare_descriptor)? {
+                GetDescriptorInfoResult {
+                    has_private_keys: true,
+                    is_solvable: true,
+                    checksum: Some(checksum),
+                    ..
+                } => {
+                    format!("{bare_descriptor}#{checksum}")
+                }
+                _ => {
+                    return Err(Error::InvalidDescriptor);
+                }
+            };
+            let desc = ImportDescriptors {
+                descriptor,
+                timestamp: Timestamp::Now,
+                label: label.map(|x| x.to_string()),
+                ..Default::default()
+            };
+
+            self.rpc.import_descriptors(desc)?;
+        } else {
+            self.rpc.import_private_key(&privkey, label, Some(false))?;
+        }
+
+        Ok(())
     }
 
     pub async fn wait_for_rescan(&self) -> Result<(), Error> {
@@ -794,6 +827,7 @@ impl BitcoinCoreApi for BitcoinCore {
             .require_network(self.network)?;
         let address_info = self.rpc.get_address_info(&address)?;
         let public_key = address_info.pubkey.ok_or(Error::MissingPublicKey)?;
+        warn!("public key: {}", public_key.to_string());
         Ok(public_key)
     }
 
@@ -815,15 +849,13 @@ impl BitcoinCoreApi for BitcoinCore {
         let private_key = self.rpc.dump_private_key(&address)?;
         let deposit_secret_key =
             addr::calculate_deposit_secret_key(private_key.inner, SecretKey::from_slice(&secret_key)?)?;
-        self.rpc.import_private_key(
+        self.import_private_key(
             &PrivateKey {
                 compressed: private_key.compressed,
                 network: self.network,
                 inner: deposit_secret_key,
             },
             Some(DEPOSIT_LABEL),
-            // rescan true by default
-            Some(false),
         )?;
         Ok(())
     }