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

Define additional booleans for readability

Browse Source
This commit is contained in:
Jack Grigg
2018-08-30 09:42:21 +01:00
parent e54c4d2ca1
commit 07d85a6455
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/rpcwallet.cpp
View File

@@ -3626,9 +3626,10 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
} }
// Remember whether this is a Sprout or Sapling address // Remember whether this is a Sprout or Sapling address
// !fromTaddr && !fromSapling -> Sprout
fromSapling = boost::get<libzcash::SaplingPaymentAddress>(&res) != nullptr; fromSapling = boost::get<libzcash::SaplingPaymentAddress>(&res) != nullptr;
} }
// This logic will need to be updated if we add a new shielded pool
bool fromSprout = !(fromTaddr || fromSapling);
UniValue outputs = params[1].get_array(); UniValue outputs = params[1].get_array();
@@ -3639,7 +3640,7 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
set<std::string> setAddress; set<std::string> setAddress;
// Track whether we see any Sprout addresses // Track whether we see any Sprout addresses
bool noSproutAddrs = fromTaddr || fromSapling; bool noSproutAddrs = !fromSprout;
// Recipients // Recipients
std::vector<SendManyRecipient> taddrRecipients; std::vector<SendManyRecipient> taddrRecipients;
@@ -3666,17 +3667,18 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
isZaddr = true; isZaddr = true;
bool toSapling = boost::get<libzcash::SaplingPaymentAddress>(&res) != nullptr; bool toSapling = boost::get<libzcash::SaplingPaymentAddress>(&res) != nullptr;
bool toSprout = !toSapling;
noSproutAddrs = noSproutAddrs && toSapling; noSproutAddrs = noSproutAddrs && toSapling;
// If we are sending from a shielded address, all recipient // If we are sending from a shielded address, all recipient
// shielded addresses must be of the same type. // shielded addresses must be of the same type.
if (!fromTaddr) { if (!fromTaddr) {
if (!fromSapling && toSapling) { if (fromSprout && toSapling) {
throw JSONRPCError( throw JSONRPCError(
RPC_INVALID_PARAMETER, RPC_INVALID_PARAMETER,
"Cannot send from a Sprout address to a Sapling address using z_sendmany"); "Cannot send from a Sprout address to a Sapling address using z_sendmany");
} }
if (fromSapling && !toSapling) { if (fromSapling && toSprout) {
throw JSONRPCError( throw JSONRPCError(
RPC_INVALID_PARAMETER, RPC_INVALID_PARAMETER,
"Cannot send from a Sapling address to a Sprout address using z_sendmany"); "Cannot send from a Sapling address to a Sprout address using z_sendmany");