Pass AccountUuid to commands instead of assuming first account

src/commands/balance.rs

@@ -4,8 +4,9 @@ use gumdrop::Options;
 use iso_currency::Currency;
 use rust_decimal::{prelude::FromPrimitive, Decimal};
 use tracing::{info, warn};
+use uuid::Uuid;
 use zcash_client_backend::{data_api::WalletRead, tor};
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_protocol::value::{Zatoshis, COIN};
 
 use crate::{
@@ -16,6 +17,13 @@ use crate::{
 // Options accepted for the `balance` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(
+        free,
+        required,
+        help = "the UUID of the account for which to get a balance"
+    )]
+    account_id: Uuid,
+
     #[options(help = "Convert ZEC values into the given currency")]
     convert: Option<Currency>,
 }
@@ -26,10 +34,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let db_data = WalletDb::for_path(db_data, params)?;
-        let account_id = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
 
         let address = db_data
             .get_current_address(account_id)?

src/commands/list_unspent.rs

@@ -1,29 +1,34 @@
 use anyhow::anyhow;
 use gumdrop::Options;
 
+use uuid::Uuid;
 use zcash_client_backend::{
     data_api::{InputSource, WalletRead},
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_protocol::value::{Zatoshis, MAX_MONEY};
 
 use crate::{config::get_wallet_network, data::get_db_paths, error, ui::format_zec};
 
-// Options accepted for the `balance` command
+// Options accepted for the `list-unspent` command
 #[derive(Debug, Options)]
-pub(crate) struct Command {}
+pub(crate) struct Command {
+    #[options(
+        free,
+        required,
+        help = "the UUID of the account for which to list unspent funds"
+    )]
+    account_id: Uuid,
+}
 
 impl Command {
     pub(crate) fn run(self, wallet_dir: Option<String>) -> Result<(), anyhow::Error> {
         let params = get_wallet_network(wallet_dir.as_ref())?;
 
         let (_, db_data) = get_db_paths(wallet_dir);
         let db_data = WalletDb::for_path(db_data, params)?;
-        let account = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
 
         // Use the height of the maximum scanned block as the anchor height, to emulate a
         // zero-conf transaction in order to select every note in the wallet.
@@ -34,7 +39,7 @@ impl Command {
             .block_height();
 
         let notes = db_data.select_spendable_notes(
-            account,
+            account_id,
             Zatoshis::const_from_u64(MAX_MONEY),
             &[ShieldedProtocol::Sapling, ShieldedProtocol::Orchard],
             anchor_height,

src/commands/pczt/create.rs

@@ -5,19 +5,17 @@ use anyhow::anyhow;
 use gumdrop::Options;
 
 use tokio::io::{stdout, AsyncWriteExt};
+use uuid::Uuid;
 use zcash_address::ZcashAddress;
 use zcash_client_backend::{
-    data_api::{
-        wallet::{
-            create_pczt_from_proposal, input_selection::GreedyInputSelector, propose_transfer,
-        },
-        WalletRead,
+    data_api::wallet::{
+        create_pczt_from_proposal, input_selection::GreedyInputSelector, propose_transfer,
     },
     fees::{standard::MultiOutputChangeStrategy, DustOutputPolicy, SplitPolicy, StandardFeeRule},
     wallet::OvkPolicy,
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_protocol::{
     memo::{Memo, MemoBytes},
     value::Zatoshis,
@@ -29,6 +27,9 @@ use crate::{config::WalletConfig, data::get_db_paths, error, MIN_CONFIRMATIONS};
 // Options accepted for the `pczt create` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(free, required, help = "the UUID of the account to send funds from")]
+    account_id: Uuid,
+
     #[options(
         required,
         help = "the recipient's Unified, Sapling or transparent address"
@@ -61,10 +62,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let account_id = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
 
         // Create the PCZT.
         let change_strategy = MultiOutputChangeStrategy::new(

src/commands/pczt/shield.rs

@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use gumdrop::Options;
 
 use tokio::io::{stdout, AsyncWriteExt};
+use uuid::Uuid;
 use zcash_client_backend::{
     data_api::{
         wallet::{
@@ -15,14 +16,17 @@ use zcash_client_backend::{
     wallet::OvkPolicy,
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_protocol::value::Zatoshis;
 
 use crate::{config::WalletConfig, data::get_db_paths, error};
 
 // Options accepted for the `pczt shield` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(free, required, help = "the UUID of the account to shield funds in")]
+    account_id: Uuid,
+
     #[options(
         help = "note management: the number of notes to maintain in the wallet",
         default = "4"
@@ -43,10 +47,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let account_id = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
 
         // Create the PCZT.
         let change_strategy = MultiOutputChangeStrategy::new(

src/commands/propose.rs

@@ -3,23 +3,24 @@ use std::{num::NonZeroUsize, str::FromStr};
 use anyhow::anyhow;
 use gumdrop::Options;
 
+use uuid::Uuid;
 use zcash_address::ZcashAddress;
 use zcash_client_backend::{
-    data_api::{
-        wallet::{input_selection::GreedyInputSelector, propose_transfer},
-        WalletRead,
-    },
+    data_api::wallet::{input_selection::GreedyInputSelector, propose_transfer},
     fees::{zip317::MultiOutputChangeStrategy, DustOutputPolicy, SplitPolicy, StandardFeeRule},
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_protocol::value::Zatoshis;
 use zip321::{Payment, TransactionRequest};
 
 use crate::{config::get_wallet_network, data::get_db_paths, error, MIN_CONFIRMATIONS};
 // Options accepted for the `propose` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(free, required, help = "the UUID of the account to send funds from")]
+    account_id: Uuid,
+
     #[options(
         required,
         help = "the recipient's Unified, Sapling or transparent address"
@@ -48,10 +49,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let account = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or_else(|| anyhow!("Wallet has no accounts."))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
 
         let change_strategy = MultiOutputChangeStrategy::new(
             StandardFeeRule::Zip317,
@@ -75,7 +73,7 @@ impl Command {
         let proposal = propose_transfer(
             &mut db_data,
             &params,
-            account,
+            account_id,
             &input_selector,
             &change_strategy,
             request,

src/commands/send.rs

@@ -5,6 +5,7 @@ use anyhow::anyhow;
 use gumdrop::Options;
 use secrecy::ExposeSecret;
 
+use uuid::Uuid;
 use zcash_address::ZcashAddress;
 use zcash_client_backend::{
     data_api::{
@@ -19,7 +20,7 @@ use zcash_client_backend::{
     wallet::OvkPolicy,
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_proofs::prover::LocalTxProver;
 use zcash_protocol::value::Zatoshis;
 use zip321::{Payment, TransactionRequest};
@@ -35,6 +36,9 @@ use crate::{
 // Options accepted for the `send` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(free, required, help = "the UUID of the account to send funds from")]
+    account_id: Uuid,
+
     #[options(
         required,
         help = "age identity file to decrypt the mnemonic phrase with"
@@ -80,10 +84,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let account_id = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
         let account = db_data
             .get_account(account_id)?
             .ok_or(anyhow!("Account missing: {:?}", account_id))?;

src/commands/shield.rs

@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use gumdrop::Options;
 use secrecy::ExposeSecret;
 
+use uuid::Uuid;
 use zcash_client_backend::{
     data_api::{
         wallet::{
@@ -17,7 +18,7 @@ use zcash_client_backend::{
     wallet::OvkPolicy,
     ShieldedProtocol,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{AccountUuid, WalletDb};
 use zcash_proofs::prover::LocalTxProver;
 use zcash_protocol::value::Zatoshis;
 
@@ -31,6 +32,9 @@ use crate::{
 // Options accepted for the `shield` command
 #[derive(Debug, Options)]
 pub(crate) struct Command {
+    #[options(free, required, help = "the UUID of the account to shield funds in")]
+    account_id: Uuid,
+
     #[options(
         required,
         help = "age identity file to decrypt the mnemonic phrase with"
@@ -67,10 +71,7 @@ impl Command {
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let account_id = *db_data
-            .get_account_ids()?
-            .first()
-            .ok_or(anyhow!("Wallet has no accounts"))?;
+        let account_id = AccountUuid::from_uuid(self.account_id);
         let account = db_data
             .get_account(account_id)?
             .ok_or(anyhow!("Account missing: {:?}", account_id))?;