Update wallet.cpp

src/wallet/wallet.cpp

@@ -1820,7 +1820,7 @@ static std::pair<mapSaplingNoteData_t, SaplingIncomingViewingKeyMap> DecryptSapl
     mapSaplingNoteData_t noteData;
     SaplingIncomingViewingKeyMap viewingKeysToAdd;
 
-    auto result = SaplingNotePlaintext::decrypt(consensus_params, height, outdesc.encCiphertext, ivk, outdesc.ephemeralKey, outdesc.cmu);
+    auto result = SaplingNotePlaintext::decrypt(consensus_params, height, outdesc.encCiphertext, ivk, outdesc.ephemeralKey, outdesc.cm);
     if (result)
     {
         // We don't cache the nullifier here as computing it requires knowledge of the note position
@@ -2878,7 +2878,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 
             BOOST_FOREACH(CTransaction& tx, block.vtx)
             {
-                if (AddToWalletIfInvolvingMe(tx, &block, pindex->nHeight, fUpdate)) {
+                if (AddToWalletIfInvolvingMe(tx, &block, pindex->GetHeight(), fUpdate)) {
                     involvesMe = true;
                     ret++;
                 }