Port PR93 from @denioD

2020-03-07 13:55:12 -05:00
parent 21ec2e7260
commit a2b3316664
18 changed files with 186 additions and 106 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -588,9 +588,7 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase,

 void CWallet::ChainTip(const CBlockIndex *pindex,
                       const CBlock *pblock,
-                       SproutMerkleTree sproutTree,
-                       SaplingMerkleTree saplingTree,
-                       bool added)
+                       boost::optional<std::pair<SproutMerkleTree, SaplingMerkleTree>> added)
 {
    if (added) {
           // Prevent witness cache building && consolidation transactions