github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-21 09:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

identify and handle bug in monero core: failed tx in pool (after

Browse Source 
testUpdateLockedDifferentAccounts()) associated with non-originating
saved wallets returning duplicate incoming transfers but one has
amount/numSuggestedConfirmations of 0.  Resolved by rescan_bc;
MoneroUtils::reconcile() supports optional custom error message for
debugging
This commit is contained in:
woodser
2019-07-20 18:22:53 -04:00
parent 26ea3fa2b7
commit fcf9da67a3
3 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWalletModel.cpp
+12 -4
View File
@@ -289,9 +289,17 @@ namespace monero {
}
// otherwise merge transfer fields
amount = MoneroUtils::reconcile(amount, other->amount);
accountIndex = MoneroUtils::reconcile(accountIndex, other->accountIndex);
numSuggestedConfirmations = MoneroUtils::reconcile(numSuggestedConfirmations, other->numSuggestedConfirmations, boost::none, boost::none, false);
accountIndex = MoneroUtils::reconcile(accountIndex, other->accountIndex, "acountIndex");
// TODO monero core: failed tx in pool (after testUpdateLockedDifferentAccounts()) causes non-originating saved wallets to return duplicate incoming transfers but one has amount/numSuggestedConfirmations of 0
if (amount != boost::none && other->amount != boost::none && *amount != *other->amount && (*amount == 0 || *other->amount == 0)) {
accountIndex = MoneroUtils::reconcile(accountIndex, other->accountIndex, boost::none, boost::none, true, "acountIndex");
numSuggestedConfirmations = MoneroUtils::reconcile(numSuggestedConfirmations, other->numSuggestedConfirmations, boost::none, boost::none, true, "numSuggestedConfirmations");
cout << "WARNING: failed tx in pool causes non-originating wallets to return duplicate incoming transfers but with one amount/numSuggestedConfirmations of 0" << endl;
} else {
amount = MoneroUtils::reconcile(amount, other->amount, "transfer amount");
numSuggestedConfirmations = MoneroUtils::reconcile(numSuggestedConfirmations, other->numSuggestedConfirmations, boost::none, boost::none, false, "numSuggestedConfirmations");
}
}
// ----------------------- MONERO INCOMING TRANSFER -------------------------
@@ -314,7 +322,7 @@ namespace monero {
//cout << "MoneroIncomingTransfer::merge" << endl;
if (self == other) return;
MoneroTransfer::merge(self, other);
subaddressIndex = MoneroUtils::reconcile(subaddressIndex, other->subaddressIndex);
subaddressIndex = MoneroUtils::reconcile(subaddressIndex, other->subaddressIndex, "incoming transfer subaddressIndex");
address = MoneroUtils::reconcile(address, other->address);
}