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

Use the correct empty memo for Sapling outputs

Browse Source
This commit is contained in:
Jack Grigg
2018-09-13 22:04:00 +01:00
parent bcdb4344f0
commit ba63dacbbb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/transaction_builder.cpp
View File

@@ -128,7 +128,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
// Send change to the specified change address. If no change address // Send change to the specified change address. If no change address
// was set, send change to the first Sapling address given as input. // was set, send change to the first Sapling address given as input.
if (zChangeAddr) { if (zChangeAddr) {
AddSaplingOutput(zChangeAddr->first, zChangeAddr->second, change, {}); AddSaplingOutput(zChangeAddr->first, zChangeAddr->second, change);
} else if (tChangeAddr) { } else if (tChangeAddr) {
// tChangeAddr has already been validated. // tChangeAddr has already been validated.
assert(AddTransparentOutput(tChangeAddr.value(), change)); assert(AddTransparentOutput(tChangeAddr.value(), change));
@@ -136,7 +136,7 @@ boost::optional<CTransaction> TransactionBuilder::Build()
auto fvk = spends[0].expsk.full_viewing_key(); auto fvk = spends[0].expsk.full_viewing_key();
auto note = spends[0].note; auto note = spends[0].note;
libzcash::SaplingPaymentAddress changeAddr(note.d, note.pk_d); libzcash::SaplingPaymentAddress changeAddr(note.d, note.pk_d);
AddSaplingOutput(fvk.ovk, changeAddr, change, {}); AddSaplingOutput(fvk.ovk, changeAddr, change);
} else { } else {
return boost::none; return boost::none;
} }

2
src/transaction_builder.h
View File

@@ -86,7 +86,7 @@ public:
uint256 ovk, uint256 ovk,
libzcash::SaplingPaymentAddress to, libzcash::SaplingPaymentAddress to,
CAmount value, CAmount value,
std::array<unsigned char, ZC_MEMO_SIZE> memo); std::array<unsigned char, ZC_MEMO_SIZE> memo = {{0xF6}});
// Assumes that the value correctly corresponds to the provided UTXO. // Assumes that the value correctly corresponds to the provided UTXO.
void AddTransparentInput(COutPoint utxo, CScript scriptPubKey, CAmount value); void AddTransparentInput(COutPoint utxo, CScript scriptPubKey, CAmount value);