github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-23 01:58:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

compiling with daemon model merge definition

Browse Source
This commit is contained in:
woodser
2019-06-11 13:18:52 -04:00
parent 3757513f62
commit d43b2d5479
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+3 -3
View File
@@ -209,16 +209,16 @@ namespace monero {
(*tx->block)->txs = txs;
(*tx->block)->height = *aTx->getHeight();
}
//aTx->block->merge(tx->block);
(*aTx->block)->merge(**tx->block);
} else {
//aTx->merge(*tx);
aTx->merge(*tx);
}
return;
}
// merge common block of different txs
if (tx->getHeight() != boost::none && *tx->getHeight() == *aTx->getHeight()) {
//(*aTx-block)->merge(*tx->block);
(*aTx->block)->merge(**tx->block);
//if (aTx.getIsConfirmed()) assertTrue(aTx.getBlock().getTxs().contains(aTx));
}
}