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

update reconcile error msgs

Browse Source
This commit is contained in:
woodser
2020-11-04 03:41:21 -05:00
parent c4e236b196
commit 478de96f4b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/monero_daemon_model.cpp
+3 -3
View File
@@ -217,8 +217,8 @@ namespace monero {
monero_block_header::merge(self, other);
// merge reconcilable block extensions
m_hex = gen_utils::reconcile(m_hex, other->m_hex, "monero block m_hex");
m_tx_hashes = gen_utils::reconcile(m_tx_hashes, other->m_tx_hashes, "monero block m_tx_hahes");
m_hex = gen_utils::reconcile(m_hex, other->m_hex, "block m_hex");
m_tx_hashes = gen_utils::reconcile(m_tx_hashes, other->m_tx_hashes, "block m_tx_hahes");
// merge miner tx
if (m_miner_tx == boost::none) m_miner_tx = other->m_miner_tx;
@@ -424,7 +424,7 @@ namespace monero {
m_hash = gen_utils::reconcile(m_hash, other->m_hash, "tx m_hash");
m_version = gen_utils::reconcile(m_version, other->m_version, "tx m_version");
m_payment_id = gen_utils::reconcile(m_payment_id, other->m_payment_id, "tx m_payment_id");
m_fee = gen_utils::reconcile(m_fee, other->m_fee, "tx tx m_fee");
m_fee = gen_utils::reconcile(m_fee, other->m_fee, "tx m_fee");
m_ring_size = gen_utils::reconcile(m_ring_size, other->m_ring_size, "tx m_ring_size");
m_is_confirmed = gen_utils::reconcile(m_is_confirmed, other->m_is_confirmed, "tx m_is_confirmed");
m_is_miner_tx = gen_utils::reconcile(m_is_miner_tx, other->m_is_miner_tx, "tx m_is_miner_tx");
src/wallet/monero_wallet_model.cpp
+1 -1
View File
@@ -654,7 +654,7 @@ namespace monero {
}
// otherwise merge transfer fields
m_account_index = gen_utils::reconcile(m_account_index, other->m_account_index, "transfer acountIndex");
m_account_index = gen_utils::reconcile(m_account_index, other->m_account_index, "transfer m_account_index");
// TODO monero core: failed m_tx in pool (after testUpdateLockedDifferentAccounts()) causes non-originating saved wallets to return duplicate incoming transfers but one has amount of 0
if (m_amount != boost::none && other->m_amount != boost::none && *m_amount != *other->m_amount && (*m_amount == 0 || *other->m_amount == 0)) {