DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #1451 from radix42/FSM

Browse Source 
Add support for importing and exporting sapling ivk
This commit is contained in:
jl777
2019-04-22 18:14:14 -11:00
committed by GitHub
parent f1690fcb7d 191fc2e152
commit 84e4635be2
11 changed files with 364 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/rpcwallet.cpp
View File

@@ -3915,7 +3915,8 @@ UniValue z_listreceivedbyaddress(const UniValue& params, bool fHelp)
}
// Visitor to support Sprout and Sapling addrs
if (!boost::apply_visitor(PaymentAddressBelongsToWallet(pwalletMain), zaddr)) {
if (!boost::apply_visitor(PaymentAddressBelongsToWallet(pwalletMain), zaddr) &&
!boost::apply_visitor(IncomingViewingKeyBelongsToWallet(pwalletMain), zaddr)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "From address does not belong to this node, zaddr spending key or viewing key not found.");
}