From f41ccaf244cc09d679888fa216a5b45185597d51 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Mon, 9 May 2022 09:30:02 -0600 Subject: [PATCH 1/2] Fix typos in release notes & Orchard wallet internal API doc. --- doc/release-notes.md | 2 +- src/rust/src/wallet.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index 2b47c198e..b714b9c88 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -72,7 +72,7 @@ RPC Interface ------------- - The default `minconf` value for `z_sendmany` is now 10 confirmations instead - of 1. If `minconf` and specifies a value less than that provided for + of 1. If `minconf` specifies a value less than that provided for `-anchorconfirmations`, it will also override that value as it is not possible to spend notes that are more recent than the anchor. Selecting `minconf` values less than 3 is not recommended, as it allows the transaction diff --git a/src/rust/src/wallet.rs b/src/rust/src/wallet.rs index 6fd693b2a..25d2d6fb5 100644 --- a/src/rust/src/wallet.rs +++ b/src/rust/src/wallet.rs @@ -688,7 +688,7 @@ impl Wallet { .collect() } - /// Returns the note of the Orchard note commitment tree, as of the specified checkpoint + /// Returns the root of the Orchard note commitment tree, as of the specified checkpoint /// depth. A depth of 0 corresponds to the chain tip. pub fn note_commitment_tree_root(&self, checkpoint_depth: usize) -> Option { self.witness_tree.root(checkpoint_depth) From 75055882d4f10f233c747ad721afc985ffec51a0 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Mon, 9 May 2022 10:13:39 -0600 Subject: [PATCH 2/2] Add missing parenthesis to -reindex help. --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index c04d1fb97..a18306586 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -363,7 +363,7 @@ std::string HelpMessage(HelpMessageMode mode) "Warning: Reverting this setting requires re-downloading the entire blockchain. " "(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); #ifdef ENABLE_WALLET - strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks (implies -rescan unless pruning or unless -rescan=0 is explicitly specified")); + strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks (implies -rescan unless pruning or unless -rescan=0 is explicitly specified)")); strUsage += HelpMessageOpt("-reindex", _("Rebuild chain state and block index from the blk*.dat files on disk (implies -rescan unless pruning or unless -rescan=0 is explicitly specified)")); #else strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks"));