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

Rename z_inputs_ to z_sprout_inputs_

Browse Source
This commit is contained in:
Jack Grigg
2018-09-03 01:13:18 +01:00
parent 07d85a6455
commit 1ec06e93b1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet/asyncrpcoperation_sendmany.cpp
View File

@@ -246,7 +246,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
} }
CAmount z_inputs_total = 0; CAmount z_inputs_total = 0;
for (SendManyInputJSOP & t : z_inputs_) { for (SendManyInputJSOP & t : z_sprout_inputs_) {
z_inputs_total += std::get<2>(t); z_inputs_total += std::get<2>(t);
} }
for (auto t : z_sapling_inputs_) { for (auto t : z_sapling_inputs_) {
@@ -548,7 +548,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
// Copy zinputs and zoutputs to more flexible containers // Copy zinputs and zoutputs to more flexible containers
std::deque<SendManyInputJSOP> zInputsDeque; // zInputsDeque stores minimum numbers of notes for target amount std::deque<SendManyInputJSOP> zInputsDeque; // zInputsDeque stores minimum numbers of notes for target amount
CAmount tmp = 0; CAmount tmp = 0;
for (auto o : z_inputs_) { for (auto o : z_sprout_inputs_) {
zInputsDeque.push_back(o); zInputsDeque.push_back(o);
tmp += std::get<2>(o); tmp += std::get<2>(o);
if (tmp >= targetAmount) { if (tmp >= targetAmount) {
@@ -563,9 +563,9 @@ bool AsyncRPCOperation_sendmany::main_impl() {
// When spending notes, take a snapshot of note witnesses and anchors as the treestate will // When spending notes, take a snapshot of note witnesses and anchors as the treestate will
// change upon arrival of new blocks which contain joinsplit transactions. This is likely // change upon arrival of new blocks which contain joinsplit transactions. This is likely
// to happen as creating a chained joinsplit transaction can take longer than the block interval. // to happen as creating a chained joinsplit transaction can take longer than the block interval.
if (z_inputs_.size() > 0) { if (z_sprout_inputs_.size() > 0) {
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
for (auto t : z_inputs_) { for (auto t : z_sprout_inputs_) {
JSOutPoint jso = std::get<0>(t); JSOutPoint jso = std::get<0>(t);
std::vector<JSOutPoint> vOutPoints = { jso }; std::vector<JSOutPoint> vOutPoints = { jso };
uint256 inputAnchor; uint256 inputAnchor;
@@ -1053,7 +1053,7 @@ bool AsyncRPCOperation_sendmany::find_unspent_notes() {
} }
for (CSproutNotePlaintextEntry & entry : sproutEntries) { for (CSproutNotePlaintextEntry & entry : sproutEntries) {
z_inputs_.push_back(SendManyInputJSOP(entry.jsop, entry.plaintext.note(boost::get<libzcash::SproutPaymentAddress>(frompaymentaddress_)), CAmount(entry.plaintext.value()))); z_sprout_inputs_.push_back(SendManyInputJSOP(entry.jsop, entry.plaintext.note(boost::get<libzcash::SproutPaymentAddress>(frompaymentaddress_)), CAmount(entry.plaintext.value())));
std::string data(entry.plaintext.memo().begin(), entry.plaintext.memo().end()); std::string data(entry.plaintext.memo().begin(), entry.plaintext.memo().end());
LogPrint("zrpcunsafe", "%s: found unspent Sprout note (txid=%s, vjoinsplit=%d, ciphertext=%d, amount=%s, memo=%s)\n", LogPrint("zrpcunsafe", "%s: found unspent Sprout note (txid=%s, vjoinsplit=%d, ciphertext=%d, amount=%s, memo=%s)\n",
getId(), getId(),
@@ -1076,12 +1076,12 @@ bool AsyncRPCOperation_sendmany::find_unspent_notes() {
HexStr(data).substr(0, 10)); HexStr(data).substr(0, 10));
} }
if (z_inputs_.empty() && z_sapling_inputs_.empty()) { if (z_sprout_inputs_.empty() && z_sapling_inputs_.empty()) {
return false; return false;
} }
// sort in descending order, so big notes appear first // sort in descending order, so big notes appear first
std::sort(z_inputs_.begin(), z_inputs_.end(), [](SendManyInputJSOP i, SendManyInputJSOP j) -> bool { std::sort(z_sprout_inputs_.begin(), z_sprout_inputs_.end(), [](SendManyInputJSOP i, SendManyInputJSOP j) -> bool {
return ( std::get<2>(i) > std::get<2>(j)); return ( std::get<2>(i) > std::get<2>(j));
}); });
std::sort(z_sapling_inputs_.begin(), z_sapling_inputs_.end(), std::sort(z_sapling_inputs_.begin(), z_sapling_inputs_.end(),

2
src/wallet/asyncrpcoperation_sendmany.h
View File

@@ -102,7 +102,7 @@ private:
std::vector<SendManyRecipient> t_outputs_; std::vector<SendManyRecipient> t_outputs_;
std::vector<SendManyRecipient> z_outputs_; std::vector<SendManyRecipient> z_outputs_;
std::vector<SendManyInputUTXO> t_inputs_; std::vector<SendManyInputUTXO> t_inputs_;
std::vector<SendManyInputJSOP> z_inputs_; std::vector<SendManyInputJSOP> z_sprout_inputs_;
std::vector<SaplingNoteEntry> z_sapling_inputs_; std::vector<SaplingNoteEntry> z_sapling_inputs_;
TransactionBuilder builder_; TransactionBuilder builder_;