Some fixes in the rust code, so that in can compile without Ledger support. Remove the useless "[features]" section from the root Cargo.toml. The tokio-console feature is now present in node-gui and node-daemon and they propagate it to utils/logging.

Author: ImplOfAnImpl

Cargo.toml

@@ -335,12 +335,6 @@ overflow-checks = true
 [profile.test.package.script]
 opt-level = 2
 
-[features]
-tokio-console = []
-trezor = []
-ledger = []
-default = ["trezor", "ledger"]
-
 [patch.crates-io]
 # Using fontconfig-parser v0.5.8 completely breaks UI in node-gui on Linux - most of the text disappears and the few
 # characters that remain have broken spacing, so we force the usage of v0.5.7 via "patch".

node-daemon/Cargo.toml

@@ -19,3 +19,6 @@ rpc-description = { path = "../rpc/description" }
 
 assert_cmd.workspace = true
 expect-test.workspace = true
+
+[features]
+tokio-console = ["utils/tokio-console"]

node-gui/Cargo.toml

@@ -39,6 +39,7 @@ tokio.workspace = true
 winres = "0.1"
 
 [features]
+tokio-console = ["utils/tokio-console"]
 trezor = [
   "wallet-controller/trezor",
   "wallet-types/trezor",

node-gui/src/main_window/main_widget/tabs/wallet/mod.rs

@@ -472,7 +472,9 @@ impl Tab for WalletTab {
         let text = match node_state.wallets.get(&self.wallet_id) {
             Some(wallet_info) => match wallet_info.extra_info {
                 wallet_controller::types::WalletExtraInfo::SoftwareWallet => "Software wallet",
+                #[cfg(feature = "trezor")]
                 wallet_controller::types::WalletExtraInfo::TrezorWallet { .. } => "Trezor wallet",
+                #[cfg(feature = "ledger")]
                 wallet_controller::types::WalletExtraInfo::LedgerWallet { .. } => "Ledger wallet",
             },
             None => "No wallet",

node-gui/src/main_window/main_widget/tabs/wallet/status_bar.rs

@@ -31,13 +31,17 @@ const HORIZONTAL_PADDING: f32 = 10.;
 
 #[allow(clippy::float_arithmetic)]
 pub fn estimate_status_bar_height(wallet_info: &WalletExtraInfo) -> f32 {
+    #[cfg(any(feature = "trezor", feature = "ledger"))]
+    let height_for_hw_wallet = TEXT_SIZE + 2. * VERTICAL_PADDING
+            // For some reason, the status bar gets a bit of additional height.
+            + 4.;
+
     match wallet_info {
         WalletExtraInfo::SoftwareWallet => 0.,
-        WalletExtraInfo::TrezorWallet { .. } | WalletExtraInfo::LedgerWallet { .. } => {
-            TEXT_SIZE + 2. * VERTICAL_PADDING
-            // For some reason, the status bar gets a bit of additional height.
-            + 4.
-        }
+        #[cfg(feature = "trezor")]
+        WalletExtraInfo::TrezorWallet { .. } => height_for_hw_wallet,
+        #[cfg(feature = "ledger")]
+        WalletExtraInfo::LedgerWallet { .. } => height_for_hw_wallet,
     }
 }
 

utils/Cargo.toml

@@ -40,7 +40,7 @@ tempfile.workspace = true
 loom.workspace = true
 
 [features]
-tokio-console = []
+tokio-console = ["logging/tokio-console"]
 
 [[bench]]
 name = "benches"

wallet/Cargo.toml

@@ -76,15 +76,18 @@ tracing = { workspace = true }
 
 [features]
 trezor = ["dep:trezor-client", "wallet-types/trezor"]
-enable-trezor-device-tests = []
-enable-ledger-device-tests = []
-# Note: currently this is used in certain external tests (in particular, in the bridge), so we only
-# allow it for regtest. TODO: it's better to have some regtest-specific options for the wallet,
-# similar to what we have for the node.
-use-deterministic-signatures-in-software-signer-for-regtest = []
+enable-trezor-device-tests = ["trezor"]
+
 ledger = [
   "dep:ledger-lib",
   "dep:mintlayer-ledger-messages",
   "wallet-types/ledger",
 ]
+enable-ledger-device-tests = ["ledger"]
+
+# Note: currently this is used in certain external tests (in particular, in the bridge), so we only
+# allow it for regtest. TODO: it's better to have some regtest-specific options for the wallet,
+# similar to what we have for the node.
+use-deterministic-signatures-in-software-signer-for-regtest = []
+
 default = ["trezor", "ledger"]

wallet/types/src/hw_data.rs

@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use core::fmt;
-
 use serialization::{Decode, Encode};
 
 /// This is the data that will be stored in the wallet db.
@@ -56,8 +54,9 @@ pub enum LedgerModel {
     Unknown { usb_pid: Option<u16> },
 }
 
-impl fmt::Display for LedgerModel {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+#[cfg(feature = "ledger")]
+impl std::fmt::Display for LedgerModel {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             LedgerModel::NanoS => write!(f, "Nano S"),
             LedgerModel::NanoSPlus => write!(f, "Nano S Plus"),

wallet/wallet-cli-commands/src/command_handler/mod.rs

@@ -281,6 +281,7 @@ where
                             force_change_wallet_type,
                             None,
                         ),
+                        #[cfg(feature = "trezor")]
                         OpenWalletSubCommand::Trezor {
                             wallet_path,
                             encryption_password,
@@ -291,6 +292,7 @@ where
                             false,
                             Some(HardwareWalletType::Trezor { device_id }),
                         ),
+                        #[cfg(feature = "ledger")]
                         OpenWalletSubCommand::Ledger {
                             wallet_path,
                             encryption_password,
@@ -372,6 +374,7 @@ where
                 let info = self.non_empty_wallet().await?.wallet_info().await?;
                 let wallet_description = match info.extra_info {
                     WalletExtraInfo::SoftwareWallet => "This is a software wallet".to_owned(),
+                    #[cfg(feature = "trezor")]
                     WalletExtraInfo::TrezorWallet {
                         device_name,
                         device_id,
@@ -382,6 +385,7 @@ where
                             device_name, device_id, firmware_version
                         )
                     }
+                    #[cfg(feature = "ledger")]
                     WalletExtraInfo::LedgerWallet { app_version, model } => format!(
                         "This is a Ledger wallet; model: {model}, running app version {}",
                         app_version

wallet/wallet-cli-commands/src/lib.rs

@@ -88,6 +88,7 @@ pub enum CreateWalletSubCommand {
     /// Cannot specify a mnemonic or passphrase here, the mnemonic must have been entered on
     /// the device during its initial setup and the passphrase will have to be entered every
     /// time the device is connected to the host machine.
+    #[cfg(feature = "trezor")]
     #[command()]
     Trezor {
         /// File path of the wallet file
@@ -107,6 +108,7 @@ pub enum CreateWalletSubCommand {
     /// Cannot specify a mnemonic or passphrase here, both are managed on the device.
     /// Depending on its configuration, the passphrase may need to be entered manually
     /// each time or may be applied automatically after unlocking with a secondary PIN.
+    #[cfg(feature = "ledger")]
     #[command()]
     Ledger {
         /// File path of the wallet file
@@ -134,11 +136,13 @@ impl CreateWalletSubCommand {
                 )
             }
 
+            #[cfg(feature = "trezor")]
             Self::Trezor {
                 wallet_path,
                 device_id,
             } => (wallet_path, WalletTypeArgs::Trezor { device_id }),
 
+            #[cfg(feature = "ledger")]
             Self::Ledger { wallet_path } => (wallet_path, WalletTypeArgs::Ledger),
         }
     }
@@ -177,6 +181,7 @@ pub enum RecoverWalletSubCommand {
     /// Cannot specify a mnemonic or passphrase here, the mnemonic must have been entered on
     /// the device during its initial setup and the passphrase will have to be entered every
     /// time the device is connected to the host machine.
+    #[cfg(feature = "trezor")]
     #[command()]
     Trezor {
         /// File path of the wallet file
@@ -196,6 +201,7 @@ pub enum RecoverWalletSubCommand {
     /// Cannot specify a mnemonic or passphrase here, both are managed on the device.
     /// Depending on its configuration, the passphrase may need to be entered manually
     /// each time or may be applied automatically after unlocking with a secondary PIN.
+    #[cfg(feature = "ledger")]
     #[command()]
     Ledger {
         /// File path of the wallet file
@@ -223,11 +229,13 @@ impl RecoverWalletSubCommand {
                 )
             }
 
+            #[cfg(feature = "trezor")]
             Self::Trezor {
                 wallet_path,
                 device_id,
             } => (wallet_path, WalletTypeArgs::Trezor { device_id }),
 
+            #[cfg(feature = "ledger")]
             Self::Ledger { wallet_path } => (wallet_path, WalletTypeArgs::Ledger),
         }
     }
@@ -247,6 +255,7 @@ pub enum OpenWalletSubCommand {
         force_change_wallet_type: bool,
     },
     /// (Beta) Open a wallet file that is connected to a Trezor hardware wallet.
+    #[cfg(feature = "trezor")]
     #[command()]
     Trezor {
         /// File path of the wallet file
@@ -263,6 +272,7 @@ pub enum OpenWalletSubCommand {
     },
 
     /// (Beta) Open a wallet file that is connected to a Ledger hardware wallet.
+    #[cfg(feature = "ledger")]
     #[command()]
     Ledger {
         /// File path of the wallet file
@@ -1301,6 +1311,7 @@ pub trait ChoiceMenu: DynClone + Debug {
 }
 dyn_clone::clone_trait_object!(ChoiceMenu);
 
+// TODO: this is Trezor-specific, so it should be either renamed or generalized.
 #[derive(Debug, Clone)]
 pub struct CreateWalletDeviceSelectMenu {
     available_devices: Vec<FoundDevice>,
@@ -1354,6 +1365,7 @@ impl ChoiceMenu for CreateWalletDeviceSelectMenu {
     }
 }
 
+// TODO: this is Trezor-specific, so it should be either renamed or generalized.
 #[derive(Debug, Clone)]
 pub struct OpenWalletDeviceSelectMenu {
     available_devices: Vec<FoundDevice>,