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

fix occasional RangeError caused by merging when outputs confirmed

Browse Source
This commit is contained in:
woodser
2021-01-11 09:29:57 -05:00
parent 7e59970ade
commit ab831e23bc
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/monero_daemon_model.cpp
+6 -11
View File
@@ -404,20 +404,15 @@ namespace monero {
if (this != self.get()) throw std::runtime_error("this != self");
if (self == other) return;
// merge blocks if they're different which comes back to merging txs
// merge blocks if they're different
if (m_block != other->m_block) {
if (m_block == boost::none) {
m_block = std::make_shared<monero_block>();
m_block.get()->m_txs.push_back(self);
m_block.get()->m_height = other->get_height();
m_block = other->m_block;
std::replace(m_block.get()->m_txs.begin(), m_block.get()->m_txs.end(), other, self); // update block to point to this tx
} else if (other->m_block == boost::none) {
m_block.get()->merge(m_block.get(), other->m_block.get()); // comes back to merging txs
return;
}
if (other->m_block == boost::none) {
other->m_block = std::make_shared<monero_block>();
other->m_block.get()->m_txs.push_back(other);
other->m_block.get()->m_height = self->get_height();
}
m_block.get()->merge(m_block.get(), other->m_block.get());
return;
}
// otherwise merge tx fields