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

implement monero_output_wallet::merge()

Browse Source
This commit is contained in:
woodser
2019-08-22 12:36:28 -04:00
parent 18853fcf06
commit 99361dc7b3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/monero_wallet_model.cpp
+11 -4
View File
@@ -358,9 +358,6 @@ namespace monero {
}
shared_ptr<monero_incoming_transfer> monero_incoming_transfer::copy(const shared_ptr<monero_incoming_transfer>& src, const shared_ptr<monero_incoming_transfer>& tgt) const {
throw runtime_error("monero_incoming_transfer::copy(inTransfer) not implemented");
};
@@ -569,7 +566,17 @@ namespace monero {
}
void monero_output_wallet::merge(const shared_ptr<monero_output_wallet>& self, const shared_ptr<monero_output_wallet>& other) {
throw runtime_error("monero_output_wallet::merge(self, other) not implemented");
MTRACE("monero_output_wallet::merge(self, other)");
if (this != self.get()) throw runtime_error("this != self");
if (self == other) return;
// merge base classes
monero_output::merge(self, other);
// merge output wallet extensions
m_account_index = monero_utils::reconcile(m_account_index, other->m_account_index);
m_subaddress_index = monero_utils::reconcile(m_subaddress_index, other->m_subaddress_index);
m_is_spent = monero_utils::reconcile(m_is_spent, other->m_is_spent);
}
// ------------------------ MONERO OUTPUT REQUEST ---------------------------