From 82a21aacc086315b69b3e2d5763c53f8d74077dc Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 12 Dec 2019 23:30:27 -0500 Subject: [PATCH] ExtractVoutDestination is only needed for timelocked utxos --- src/wallet/rpcwallet.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index a65347174..02c7a1f25 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1882,10 +1882,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe entry.push_back(Pair("account", account)); CTxDestination dest; - if (CScriptExt::ExtractVoutDestination(wtx, r.vout, dest)) - MaybePushAddress(entry, dest); - else - MaybePushAddress(entry, r.destination); + MaybePushAddress(entry, r.destination); if (bIsCoinbase) { @@ -4114,7 +4111,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp, const CPubKey& my return result; } -UniValue z_viewtransaction(const UniValue& params, bool fHelp) +UniValue z_viewtransaction(const UniValue& params, bool fHelp, const CPubKey& mypk) { if (!EnsureWalletIsAvailable(fHelp)) return NullUniValue;