From db1804ca250a81a4230319fb1cfbb4f132ef1418 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 28 Feb 2024 20:30:48 -0500 Subject: [PATCH] Fix some compile errors --- src/wallet/rpchushwallet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wallet/rpchushwallet.cpp b/src/wallet/rpchushwallet.cpp index bda64a84a..cb7bfe3a4 100644 --- a/src/wallet/rpchushwallet.cpp +++ b/src/wallet/rpchushwallet.cpp @@ -93,7 +93,7 @@ void zsTxSpendsToJSON(const CWalletTx& wtx, UniValue& spends, CAmount& totalSpen const CWalletTx* parent = pwalletMain->GetWalletTx(pwalletMain->mapSaplingNullifiersToNotes[spendDesc.nullifier].hash); const OutputDescription& output = parent->vShieldedOutput[op.n]; auto nd = pwalletMain->mapWallet[pwalletMain->mapSaplingNullifiersToNotes[spendDesc.nullifier].hash].mapSaplingNoteData[op]; - auto pt = libzcash::SaplingNotePlaintext::decrypt(output.encCiphertext,nd.ivk,output.ephemeralKey,output.cm); + auto pt = libzcash::SaplingNotePlaintext::decrypt(Params().GetConsensus(), chainActive.Height(), output.encCiphertext,nd.ivk,output.ephemeralKey,output.cm); if (pt) { auto note = pt.get(); @@ -197,7 +197,7 @@ void zsTxReceivedToJSON(const CWalletTx& wtx, UniValue& received, CAmount& total for (auto addr : addresses) { libzcash::SaplingExtendedSpendingKey extsk; if (pwalletMain->GetSaplingExtendedSpendingKey(addr, extsk)) { - auto pt = libzcash::SaplingNotePlaintext::decrypt( + auto pt = libzcash::SaplingNotePlaintext::decrypt( Params().GetConsensus(), chainActive.Height(), outputDesc.encCiphertext, extsk.expsk.full_viewing_key().in_viewing_key(), outputDesc.ephemeralKey, outputDesc.cm); if (pt) { @@ -311,7 +311,7 @@ void zsTxSendsToJSON(const CWalletTx& wtx, UniValue& sends, CAmount& totalSends, if (opt) { auto opt_unwrapped = opt.get(); - auto pt = libzcash::SaplingNotePlaintext::decrypt( + auto pt = libzcash::SaplingNotePlaintext::decrypt( Params().GetConsensus(), chainActive.Height(), outputDesc.encCiphertext,outputDesc.ephemeralKey,opt_unwrapped.esk,opt_unwrapped.pk_d,outputDesc.cm); if (pt) { @@ -342,7 +342,7 @@ void zsTxSendsToJSON(const CWalletTx& wtx, UniValue& sends, CAmount& totalSends, if (opt) { auto opt_unwrapped = opt.get(); - auto pt = libzcash::SaplingNotePlaintext::decrypt( + auto pt = libzcash::SaplingNotePlaintext::decrypt( Params().GetConsensus(), chainActive.Height(), outputDesc.encCiphertext,outputDesc.ephemeralKey,opt_unwrapped.esk,opt_unwrapped.pk_d,outputDesc.cm); if (pt) {