Descriptor support

src/app.rs

@@ -36,19 +36,23 @@ impl App {
     pub fn boot(config: Config) -> Result<Self> {
         debug!("{:?}", config);
 
-        let wallets = HDWallet::from_xpubs(
+        let rpc = Arc::new(RpcClient::new(
+            config.bitcoind_url(),
+            config.bitcoind_auth()?,
+        )?);
+
+        let wallets = HDWallet::from_config(
+            &config.descriptors[..],
             &config.xpubs[..],
             &config.bare_xpubs[..],
             config.network,
             config.gap_limit,
             config.initial_import_size,
+            rpc.clone(),
         )?;
+
         let watcher = HDWatcher::new(wallets);
 
-        let rpc = Arc::new(RpcClient::new(
-            config.bitcoind_url(),
-            config.bitcoind_auth()?,
-        )?);
         let indexer = Arc::new(RwLock::new(Indexer::new(rpc.clone(), watcher)));
         let query = Arc::new(Query::new(config.network, rpc.clone(), indexer.clone()));
 

src/config.rs

@@ -56,7 +56,7 @@ pub struct Config {
     pub bitcoind_wallet: Option<String>,
 
     #[structopt(
-        short = "d",
+        short = "D",
         long,
         help = "Path to bitcoind directory (used for cookie file) [default: ~/.bitcoin]",
         env,
@@ -96,6 +96,16 @@ pub struct Config {
     )]
     pub bitcoind_cookie: Option<path::PathBuf>,
 
+    #[structopt(
+        short = "d",
+        long = "descriptor",
+        help = "Output script descriptor to track and since when (rescans from genesis by default, use <desc>:<yyyy-mm-dd> or <desc>:<unix-epoch> to specify a timestmap, or <desc>:none to disable rescan)",
+        parse(try_from_str = parse_descriptor),
+        env, hide_env_values(true), use_delimiter(true),
+        display_order(20)
+    )]
+    pub descriptors: Vec<(String, RescanSince)>,
+
     #[structopt(
         short = "x",
         long = "xpub",
@@ -346,6 +356,16 @@ fn parse_xpub(s: &str) -> Result<(XyzPubKey, RescanSince)> {
     Ok((xpub, rescan))
 }
 
+fn parse_descriptor(s: &str) -> Result<(String, RescanSince)> {
+    let mut parts = s.splitn(2, ':');
+    let descriptor = String::from(parts.next().unwrap());
+    let rescan = parts
+        .next()
+        .map_or(Ok(RescanSince::Timestamp(0)), parse_rescan)
+        .unwrap();
+    Ok((descriptor, rescan))
+}
+
 fn parse_rescan(s: &str) -> Result<RescanSince> {
     Ok(match s {
         "none" => RescanSince::Now,