|
|
@ -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) { |
|
|
|