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

Use reserve key for transparent change when sending to Sapling

This commit is contained in:
Eirik0 2019-05-30 09:56:45 -06:00
parent 27f91abf00
commit 4120aff037
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/asyncrpcoperation_sendmany.cpp
View File

@ -386,11 +386,11 @@ bool AsyncRPCOperation_sendmany::main_impl() {
// Set change address if we are using transparent funds
// TODO: Should we just use fromtaddr_ as the change address?
CReserveKey keyChange(pwalletMain);
if (isfromtaddr_) {
LOCK2(cs_main, pwalletMain->cs_wallet);
EnsureWalletIsUnlocked();
CReserveKey keyChange(pwalletMain);
CPubKey vchPubKey;
bool ret = keyChange.GetReservedKey(vchPubKey);
if (!ret) {
@ -460,8 +460,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
// Build the transaction
tx_ = builder_.Build().GetTxOrThrow();
// TODO use CReserveKey keyChange if isfromtaddr_
UniValue sendResult = SendTransaction(tx_, boost::none, testmode);
UniValue sendResult = SendTransaction(tx_, keyChange, testmode);
set_result(sendResult);
return true;