Merge #585: 1.1 backports

81a40b8 daemon: bump version to 1.1 (Antoine Poinsot)
c87ab80 ci: work around rustc 1.71 bug (Antoine Poinsot)
5fa5ccd Update proc-macro2 to fix a nightly compilation bug (Antoine Poinsot)
aab880f bitcoind: create watchonly wallet with load_on_startup = true (Antoine Poinsot)
8c4536b gui: update async-hwi 0.0.7 (edouard)

Pull request description:

  Some bug fixes for 1.0 to be released before 2.0 is out.

  The first commit is from #551 to fix a connection bug to the Specter DIY.

ACKs for top commit:
  darosior:
    self-ACK 81a40b8

Tree-SHA512: 74205b0f3a8ccb6803d71de50cde9fdc02792d67c77196a5ee76f6f01cad3fc393820b19051ab6bc3e9e837bc194461d12159d5c5f5e18ee09a3d364456b2c2f

.cirrus.yml

@@ -1,7 +1,7 @@
 task:
   name: 'Functional tests'
   container:
-    image: rust:1-bookworm
+    image: rust:1.70-bookworm
   timeout_in: 90m  # https://cirrus-ci.org/faq/#instance-timed-out
 
   env:

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Liana daemon and GUI release notes
 
+## 1.1
+
+This is a tiny patch release for 1.0.
+
+### Features
+
+N/A
+
+### Fixes
+
+- Set `load_on_startup = true` when creating a watchonly wallet on `bitcoind`.
+
+#### GUI-specific
+
+- Fix an intermittent connection bug to the Specter DIY.
+
+
 ## 1.0
 
 This is the first non-beta release of Liana.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "liana"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["Antoine Poinsot <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/wizardsardine/liana"

gui/Cargo.toml

@@ -14,7 +14,7 @@ name = "liana-gui"
 path = "src/main.rs"
 
 [dependencies]
-async-hwi = "0.0.6"
+async-hwi = "0.0.7"
 liana = { git = "https://github.com/wizardsardine/liana", branch = "1.0", default-features = false }
 liana_ui = { path = "ui" }
 backtrace = "0.3"

gui/src/hw.rs

@@ -7,7 +7,7 @@ use liana::miniscript::bitcoin::{
     util::bip32::Fingerprint,
 };
 use serde::{Deserialize, Serialize};
-use tracing::debug;
+use tracing::{debug, warn};
 
 #[derive(Debug, Clone)]
 pub enum HardwareWallet {
@@ -102,18 +102,18 @@ pub async fn list_hardware_wallets(wallet: &Wallet) -> Vec<HardwareWallet> {
             debug!("{}", e);
         }
     }
-    match specter::Specter::try_connect_serial().await {
-        Ok(device) => match HardwareWallet::new(Arc::new(device), Some(&wallet.keys_aliases)).await
-        {
-            Ok(hw) => hws.push(hw),
-            Err(e) => {
-                debug!("{}", e);
+    match specter::Specter::enumerate().await {
+        Ok(devices) => {
+            for device in devices {
+                match HardwareWallet::new(Arc::new(device), Some(&wallet.keys_aliases)).await {
+                    Ok(hw) => hws.push(hw),
+                    Err(e) => {
+                        debug!("{}", e);
+                    }
+                }
             }
-        },
-        Err(HWIError::DeviceNotFound) => {}
-        Err(e) => {
-            debug!("{}", e);
         }
+        Err(e) => warn!("Error while listing specter wallets: {}", e),
     }
     match ledger::LedgerSimulator::try_connect().await {
         Ok(mut device) => match device.get_master_fingerprint().await {
@@ -249,17 +249,18 @@ pub async fn list_unregistered_hardware_wallets(
             debug!("{}", e);
         }
     }
-    match specter::Specter::try_connect_serial().await {
-        Ok(device) => match HardwareWallet::new(Arc::new(device), aliases).await {
-            Ok(hw) => hws.push(hw),
-            Err(e) => {
-                debug!("{}", e);
+    match specter::Specter::enumerate().await {
+        Ok(devices) => {
+            for device in devices {
+                match HardwareWallet::new(Arc::new(device), aliases).await {
+                    Ok(hw) => hws.push(hw),
+                    Err(e) => {
+                        debug!("{}", e);
+                    }
+                }
             }
-        },
-        Err(HWIError::DeviceNotFound) => {}
-        Err(e) => {
-            debug!("{}", e);
         }
+        Err(e) => warn!("Error while listing specter wallets: {}", e),
     }
     match ledger::LedgerSimulator::try_connect().await {
         Ok(device) => match device.get_master_fingerprint().await {

src/bitcoin/d/mod.rs

@@ -481,13 +481,19 @@ impl BitcoinD {
     }
 
     fn create_wallet(&self, wallet_path: String) -> Result<(), String> {
+        // NOTE: we set load_on_startup to make sure the wallet will get updated before the
+        // historical blocks are deleted in case the bitcoind is pruned.
         let res = self
             .make_fallible_node_request(
                 "createwallet",
                 &params!(
                     Json::String(wallet_path),
-                    Json::Bool(true), // watchonly
-                    Json::Bool(true), // blank
+                    Json::Bool(true),  // watchonly
+                    Json::Bool(true),  // blank
+                    Json::Null,        // passphrase
+                    Json::Bool(false), // avoid_reuse
+                    Json::Bool(true),  // descriptors
+                    Json::Bool(true)   // load_on_startup
                 ),
             )
             .map_err(|e| e.to_string())?;

src/lib.rs

@@ -79,7 +79,7 @@ impl fmt::Display for Version {
 
 pub const VERSION: Version = Version {
     major: 1,
-    minor: 0,
+    minor: 1,
     patch: 0,
 };
 

tests/test_rpc.py

@@ -20,7 +20,7 @@
 
 def test_getinfo(lianad):
     res = lianad.rpc.getinfo()
-    assert res["version"] == "1.0.0"
+    assert res["version"] == "1.1.0"
     assert res["network"] == "regtest"
     wait_for(lambda: lianad.rpc.getinfo()["block_height"] == 101)
     res = lianad.rpc.getinfo()