zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6470 from sellout/error-on-tmemos 

Improve taddr no-memo check.
This commit is contained in:
Kris Nuttycombe 2023-03-29 09:17:23 -06:00 committed by GitHub
parent 2fe569ec45 7bf5f598ee
commit 4892bf327d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qa/rpc-tests/wallet_z_sendmany.py
View File

@ -152,6 +152,11 @@ class WalletZSendmanyTest(BitcoinTestFramework):
# The following assertion might fail nondeterministically
# assert_equal(node2balance, Decimal('16.99799000'))
# try sending with a memo to a taddr, which should fail
recipients = [{"address":self.nodes[0].getnewaddress(), "amount":1, "memo":"DEADBEEF"}]
opid = self.nodes[2].z_sendmany(myzaddr, recipients, 1, DEFAULT_FEE, 'AllowRevealedRecipients')
wait_and_assert_operationid_status(self.nodes[2], opid, 'failed', 'Failed to build transaction: Memos cannot be sent to transparent addresses.')
recipients = []
recipients.append({"address":self.nodes[0].getnewaddress(), "amount":1})
recipients.append({"address":self.nodes[2].getnewaddress(), "amount":1.0})

9
src/wallet/rpcwallet.cpp
View File

@ -4736,7 +4736,8 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
" [{\n"
" \"address\":address (string, required) The address is a taddr, zaddr, or Unified Address\n"
" \"amount\":amount (numeric, required) The numeric amount in " + CURRENCY_UNIT + " is the value\n"
" \"memo\":memo (string, optional) If the address is a zaddr, raw data represented in hexadecimal string format\n"
" \"memo\":memo (string, optional) If the address is a zaddr, raw data represented in hexadecimal string format. If\n"
" the output is being sent to a transparent address, it’s an error to include this field.\n"
" }, ... ]\n"
"3. minconf (numeric, optional, default=" + strprintf("%u", DEFAULT_NOTE_CONFIRMATIONS) + ") Only use funds confirmed at least this many times.\n"
"4. fee (numeric, optional, default=" + strprintf("%s", FormatMoney(DEFAULT_FEE)) + ") The fee amount to attach to this transaction.\n"
@ -4841,12 +4842,6 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
std::optional<Memo> memo;
if (!memoValue.isNull()) {
auto memoHex = memoValue.get_str();
if (!std::visit(libzcash::HasShieldedRecipient(), addr.value())) {
throw JSONRPCError(
RPC_INVALID_PARAMETER,
"Invalid parameter, memos cannot be sent to transparent addresses.");
}
std::visit(match {
[&](MemoError err) {
switch (err) {

52
src/wallet/wallet_tx_builder.cpp
View File

@ -548,25 +548,39 @@ TransactionBuilderResult TransactionEffects::ApproveAndBuild(
}
// Add outputs
for (const auto& r : payments.GetResolvedPayments()) {
std::visit(match {
[&](const CKeyID& keyId) {
builder.AddTransparentOutput(keyId, r.amount);
},
[&](const CScriptID& scriptId) {
builder.AddTransparentOutput(scriptId, r.amount);
},
[&](const libzcash::SaplingPaymentAddress& addr) {
builder.AddSaplingOutput(
r.isInternal ? internalOVK : externalOVK, addr, r.amount,
r.memo.has_value() ? r.memo.value().ToBytes() : Memo::NoMemo().ToBytes());
},
[&](const libzcash::OrchardRawAddress& addr) {
builder.AddOrchardOutput(
r.isInternal ? internalOVK : externalOVK, addr, r.amount,
r.memo.has_value() ? std::optional(r.memo.value().ToBytes()) : std::nullopt);
}
}, r.address);
try {
for (const auto& r : payments.GetResolvedPayments()) {
std::visit(match {
[&](const CKeyID& keyId) {
if (r.memo.has_value()) {
throw TransactionBuilderResult(
"Memos cannot be sent to transparent addresses.");
} else {
builder.AddTransparentOutput(keyId, r.amount);
}
},
[&](const CScriptID& scriptId) {
if (r.memo.has_value()) {
throw TransactionBuilderResult(
"Memos cannot be sent to transparent addresses.");
} else {
builder.AddTransparentOutput(scriptId, r.amount);
}
},
[&](const libzcash::SaplingPaymentAddress& addr) {
builder.AddSaplingOutput(
r.isInternal ? internalOVK : externalOVK, addr, r.amount,
r.memo.has_value() ? r.memo.value().ToBytes() : Memo::NoMemo().ToBytes());
},
[&](const libzcash::OrchardRawAddress& addr) {
builder.AddOrchardOutput(
r.isInternal ? internalOVK : externalOVK, addr, r.amount,
r.memo.has_value() ? std::optional(r.memo.value().ToBytes()) : std::nullopt);
}
}, r.address);
}
} catch (const TransactionBuilderResult& result) {
return result;
}
// Add transparent utxos