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

Fix copyright

Browse Source
This commit is contained in:
Duke Leto
2020-06-17 22:32:00 -04:00
parent 83be5195e9
commit 4800f497aa
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/asyncrpcoperation_saplingconsolidation.cpp
View File

@@ -95,15 +95,22 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
// an anchor at height N-10 for each SpendDescription // an anchor at height N-10 for each SpendDescription
// Consider, should notes be sorted? // Consider, should notes be sorted?
pwalletMain->GetFilteredNotes(saplingEntries, "", 11); pwalletMain->GetFilteredNotes(saplingEntries, "", 11);
if(saplingEntries.size() == 0) {
LogPrint("zrpcunsafe", "%s: Nothing to consolidate, done.\n",opid);
return true;
}
if (fConsolidationMapUsed) { if (fConsolidationMapUsed) {
const vector<string>& v = mapMultiArgs["-consolidatesaplingaddress"]; const vector<string>& v = mapMultiArgs["-consolidatesaplingaddress"];
for(int i = 0; i < v.size(); i++) { for(int i = 0; i < v.size(); i++) {
auto zAddress = DecodePaymentAddress(v[i]); auto zAddress = DecodePaymentAddress(v[i]);
if (boost::get<libzcash::SaplingPaymentAddress>(&zAddress) != nullptr) { if (boost::get<libzcash::SaplingPaymentAddress>(&zAddress) != nullptr) {
libzcash::SaplingPaymentAddress saplingAddress = boost::get<libzcash::SaplingPaymentAddress>(zAddress); libzcash::SaplingPaymentAddress saplingAddress = boost::get<libzcash::SaplingPaymentAddress>(zAddress);
addresses.insert(saplingAddress ); addresses.insert(saplingAddress);
} else { } else {
//TODO: how to handle invalid zaddrs? LogPrint("zrpcunsafe", "%s: Invalid zaddr, exiting\n", opid);
return false;
} }
} }
} else { } else {

2
src/wallet/asyncrpcoperation_saplingconsolidation.h
View File

@@ -1,5 +1,5 @@
// Copyright (c) 2020 The Hush developers // Copyright (c) 2020 The Hush developers
// TODO: Forge should add his preferred copyright line here // Copyright (c) 2019 CryptoForge
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.

3
src/wallet/wallet.cpp
View File

@@ -1733,8 +1733,7 @@ void CWallet::GetSaplingNoteWitnesses(std::vector<SaplingOutPoint> notes,
//fprintf(stderr,"%s: rt=%s\n",__func__,rt.GetHash().ToString().c_str()); //fprintf(stderr,"%s: rt=%s\n",__func__,rt.GetHash().ToString().c_str());
//fprintf(stderr,"%s: witnesses[%d]->root()=%s\n",__func__,i,witnesses[i]->root().GetHash().ToString().c_str()); //fprintf(stderr,"%s: witnesses[%d]->root()=%s\n",__func__,i,witnesses[i]->root().GetHash().ToString().c_str());
// Something is fucky // Something is fucky
std::string err = "CWallet::GetSaplingNoteWitnesses: Invalid witness root! i="; std::string err = "CWallet::GetSaplingNoteWitnesses: Invalid witness root!";
err += i;
throw std::logic_error(err); throw std::logic_error(err);
} }