Fix remaining compile errors

We get some new warnings which we may want to fix, which are related to using C++17 features:

wallet/wallet.cpp: In member function ‘std::pair<std::map<SaplingOutPoint, SaplingNoteData>, std::map<libzcash::SaplingPaymentAddress, libzcash::SaplingIncomingViewingKey> > CWallet::FindMySaplingNotesAsync(const CTransaction&, int) const’:
wallet/wallet.cpp:1865:22: warning: decomposition declaration only available with -std=c++1z or -std=gnu++1z
     for (const auto& [ivk, fvk] : mapSaplingFullViewingKeys)
                      ^
wallet/wallet.cpp:1870:22: warning: decomposition declaration only available with -std=c++1z or -std=gnu++1z
     for (const auto& [address, ivk] : mapSaplingIncomingViewingKeys)
                      ^
wallet/wallet.cpp:1901:23: warning: decomposition declaration only available with -std=c++1z or -std=gnu++1z
             for (auto [address, ivk] : result_pair.second)
                       ^

src/wallet/wallet.cpp

@@ -2348,8 +2348,7 @@ boost::optional<std::pair<
 
 boost::optional<std::pair<
     SaplingNotePlaintext,
-    SaplingPaymentAddress>> CWalletTx::RecoverSaplingNote(
-        SaplingOutPoint op, std::set<uint256>& ovks) const
+    SaplingPaymentAddress>> CWalletTx::RecoverSaplingNote(const Consensus::Params& params, int height, SaplingOutPoint op, std::set<uint256>& ovks) const
 {
     auto output = this->vShieldedOutput[op.n];
 
@@ -2365,6 +2364,8 @@ boost::optional<std::pair<
         }
 
         auto maybe_pt = SaplingNotePlaintext::decrypt(
+	    params,
+	    height,
             output.encCiphertext,
             output.ephemeralKey,
             outPt->esk,
@@ -5018,6 +5019,8 @@ void CWallet::GetFilteredNotes(
             SaplingNoteData nd = pair.second;
 
             auto maybe_pt = SaplingNotePlaintext::decrypt(
+		Params().GetConsensus(),
+		chainActive.Height(),
                 wtx.vShieldedOutput[op.n].encCiphertext,
                 nd.ivk,
                 wtx.vShieldedOutput[op.n].ephemeralKey,