Merge pull request zingolabs#1842 from Oscar-Pepper/improve_spendable_with_new_blocks

increase min confirmations to 3

Author: juanky201271

zingocli/src/lib.rs

@@ -466,7 +466,7 @@ pub fn startup(
                 transparent_address_discovery: TransparentAddressDiscovery::minimal(),
                 performance_level: PerformanceLevel::High,
             },
-            min_confirmations: NonZeroU32::try_from(1).unwrap(),
+            min_confirmations: NonZeroU32::try_from(3).unwrap(),
         },
         1.try_into().unwrap(),
     )

zingolib/src/commands.rs

@@ -3,6 +3,7 @@
 
 use std::collections::HashMap;
 use std::convert::TryInto;
+use std::num::NonZeroU32;
 use std::str::FromStr;
 
 use indoc::indoc;
@@ -1621,8 +1622,11 @@ impl Command for SettingsCommand {
             If there are no arguments the full list of current settings will be shown.
             To set, pass the setting as an argument followed by the value.
 
+            Minimum confirmations must be 1 or greater.
+
             Settings:
             performance [ low | medium | high | maximum ]
+            min_confirmations 3
 
             Usage:
             settings
@@ -1643,8 +1647,10 @@ impl Command for SettingsCommand {
                 return format!(
                     r#"
 performance: {}
+min confirmations: {}
             "#,
-                    wallet.wallet_settings.sync_config.performance_level
+                    wallet.wallet_settings.sync_config.performance_level,
+                    wallet.wallet_settings.min_confirmations,
                 );
             }
 
@@ -1654,15 +1660,33 @@ performance: {}
                     "medium" => wallet.wallet_settings.sync_config.performance_level = PerformanceLevel::Medium,
                     "high" => wallet.wallet_settings.sync_config.performance_level = PerformanceLevel::High,
                     "maximum" => wallet.wallet_settings.sync_config.performance_level = PerformanceLevel::Maximum,
-                _ => {
-            return "Error: invalid arguments\nTry 'help settings' for correct usage and examples"
-                .to_string();}
-                },
+                    _ => {
+                return "Error: invalid arguments\nTry 'help settings' for correct usage and examples"
+                    .to_string();}
+                    },
+                "min_confirmations" => {
+                    let min_confirmations = match args[1].parse::<u32>() {
+                        Ok(m) => match NonZeroU32::try_from(m) {
+                            Ok(m) => m,
+                            Err(_) => {
+                                return "Error: invalid arguments\nTry 'help settings' for correct usage and examples"
+                                    .to_string();
+                            }
+                        },
+                        Err(_) => {
+                            return "Error: invalid arguments\nTry 'help settings' for correct usage and examples"
+                                .to_string();
+                        }
+                    };
+                    wallet.wallet_settings.min_confirmations = min_confirmations
+                }
                 _ => {
             return "Error: invalid arguments\nTry 'help settings' for correct usage and examples"
                 .to_string();}
             }
 
+            wallet.save_required = true;
+
             "Successfully updated settings.".to_string()
         })
     }

zingolib/src/config.rs

@@ -251,7 +251,7 @@ impl Default for ZingoConfigBuilder {
                         pepper_sync::config::TransparentAddressDiscovery::minimal(),
                     performance_level: pepper_sync::config::PerformanceLevel::High,
                 },
-                min_confirmations: NonZeroU32::try_from(1).unwrap(),
+                min_confirmations: NonZeroU32::try_from(3).unwrap(),
             },
             no_of_accounts: NonZeroU32::try_from(1).expect("hard coded non-zero integer"),
         }

zingolib/src/wallet/disk.rs

@@ -338,7 +338,7 @@ impl LightWallet {
                     transparent_address_discovery: TransparentAddressDiscovery::minimal(),
                     performance_level: PerformanceLevel::High,
                 },
-                min_confirmations: NonZeroU32::try_from(1).unwrap(),
+                min_confirmations: NonZeroU32::try_from(3).unwrap(),
             },
         };
 
@@ -527,7 +527,7 @@ impl LightWallet {
                     NonZeroU32::try_from(reader.read_u32::<LittleEndian>()?)
                         .expect("only valid non-zero u32s stored")
                 } else {
-                    NonZeroU32::try_from(1).expect("only valid non-zero u32s stored")
+                    NonZeroU32::try_from(3).expect("only valid non-zero u32s stored")
                 },
             }
         } else {
@@ -536,7 +536,7 @@ impl LightWallet {
                     transparent_address_discovery: TransparentAddressDiscovery::minimal(),
                     performance_level: PerformanceLevel::High,
                 },
-                min_confirmations: NonZeroU32::try_from(1).unwrap(),
+                min_confirmations: NonZeroU32::try_from(3).unwrap(),
             }
         };
 

zingolib/src/wallet/propose.rs

@@ -1,7 +1,5 @@
 //! creating proposals from wallet data
 
-use std::num::NonZeroU32;
-
 use zcash_client_backend::{
     data_api::wallet::input_selection::GreedyInputSelector,
     fees::{DustAction, DustOutputPolicy},
@@ -59,8 +57,7 @@ impl LightWallet {
             &input_selector,
             &change_strategy,
             request,
-            // TODO: update anchor height selection
-            NonZeroU32::MIN,
+            self.wallet_settings.min_confirmations,
         )
         .map_err(ProposeSendError::Proposal)
     }