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

Chill out on the logspam

Browse Source
This commit is contained in:
Duke Leto
2020-06-18 06:41:26 -04:00
parent 9bcf13bf4a
commit a7cd2b3750
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/wallet.cpp
View File

@@ -1719,22 +1719,24 @@ void CWallet::GetSaplingNoteWitnesses(std::vector<SaplingOutPoint> notes,
boost::optional<uint256> rt; boost::optional<uint256> rt;
int i = 0; int i = 0;
for (SaplingOutPoint note : notes) { for (SaplingOutPoint note : notes) {
fprintf(stderr,"%s: i=%d\n", __func__,i); //fprintf(stderr,"%s: i=%d\n", __func__,i);
auto noteData = mapWallet[note.hash].mapSaplingNoteData; auto noteData = mapWallet[note.hash].mapSaplingNoteData;
auto nWitnesses = noteData[note].witnesses.size(); auto nWitnesses = noteData[note].witnesses.size();
if (mapWallet.count(note.hash) && noteData.count(note) && nWitnesses > 0) { if (mapWallet.count(note.hash) && noteData.count(note) && nWitnesses > 0) {
fprintf(stderr,"%s: Found %lu witnesses for note %s\n", __func__, nWitnesses, note.hash.ToString().c_str() ); fprintf(stderr,"%s: Found %lu witnesses for note %s\n", __func__, nWitnesses, note.hash.ToString().c_str() );
witnesses[i] = noteData[note].witnesses.front(); witnesses[i] = noteData[note].witnesses.front();
if (!rt) { if (!rt) {
fprintf(stderr,"%s: Setting witness root\n",__func__); //fprintf(stderr,"%s: Setting witness root\n",__func__);
rt = witnesses[i]->root(); rt = witnesses[i]->root();
} else { } else {
if(*rt == witnesses[i]->root()) { if(*rt == witnesses[i]->root()) {
//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 = std::string("CWallet::GetSaplingNoteWitnesses: Invalid witness root! rt=") + rt.get().ToString(); std::string err = string("CWallet::GetSaplingNoteWitnesses: Invalid witness root! rt=") + rt.get().ToString();
throw std::logic_error(err); err += string("\n!= witness[i]->root()=") + witnesses[i]->root().ToString();
//throw std::logic_error(err);
fprintf(stderr,"%s: IGNORING %s\n", __func__,err.c_str());
} }
} }
@@ -1744,6 +1746,7 @@ void CWallet::GetSaplingNoteWitnesses(std::vector<SaplingOutPoint> notes,
// All returned witnesses have the same anchor // All returned witnesses have the same anchor
if (rt) { if (rt) {
final_anchor = *rt; final_anchor = *rt;
//fprintf(stderr,"%s: final_anchor=%s\n", __func__, rt.get().ToString().c_str() );
} }
} }