From edc34047a258a179bb167ef638595daa9344dc27 Mon Sep 17 00:00:00 2001 From: woodser Date: Fri, 21 Aug 2020 11:12:34 -0400 Subject: [PATCH] rename unlock time to unlock height --- src/daemon/monero_daemon_model.cpp | 8 +++---- src/daemon/monero_daemon_model.h | 2 +- src/utils/monero_utils.cpp | 2 +- src/wallet/monero_wallet_core.cpp | 34 +++++++++++++++--------------- src/wallet/monero_wallet_model.cpp | 6 +++--- src/wallet/monero_wallet_model.h | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/daemon/monero_daemon_model.cpp b/src/daemon/monero_daemon_model.cpp index 3baf5e0..468fabd 100644 --- a/src/daemon/monero_daemon_model.cpp +++ b/src/daemon/monero_daemon_model.cpp @@ -249,7 +249,7 @@ namespace monero { if (m_fee != boost::none) monero_utils::addJsonMember("fee", m_fee.get(), allocator, root, value_num); if (m_ring_size != boost::none) monero_utils::addJsonMember("ringSize", m_ring_size.get(), allocator, root, value_num); if (m_num_confirmations != boost::none) monero_utils::addJsonMember("numConfirmations", m_num_confirmations.get(), allocator, root, value_num); - if (m_unlock_time != boost::none) monero_utils::addJsonMember("unlockTime", m_unlock_time.get(), allocator, root, value_num); + if (m_unlock_height != boost::none) monero_utils::addJsonMember("unlockHeight", m_unlock_height.get(), allocator, root, value_num); if (m_last_relayed_timestamp != boost::none) monero_utils::addJsonMember("lastRelayedTimestamp", m_last_relayed_timestamp.get(), allocator, root, value_num); if (m_received_timestamp != boost::none) monero_utils::addJsonMember("receivedTimestamp", m_received_timestamp.get(), allocator, root, value_num); if (m_size != boost::none) monero_utils::addJsonMember("size", m_size.get(), allocator, root, value_num); @@ -310,7 +310,7 @@ namespace monero { else if (key == std::string("isConfirmed")) tx->m_is_confirmed = it->second.get_value(); else if (key == std::string("inTxPool")) tx->m_in_tx_pool = it->second.get_value(); else if (key == std::string("numConfirmations")) tx->m_num_confirmations = it->second.get_value(); - else if (key == std::string("unlockTime")) tx->m_unlock_time = it->second.get_value(); + else if (key == std::string("unlockHeight")) tx->m_unlock_height = it->second.get_value(); else if (key == std::string("lastRelayedTimestamp")) tx->m_last_relayed_timestamp = it->second.get_value(); else if (key == std::string("receivedTimestamp")) tx->m_received_timestamp = it->second.get_value(); else if (key == std::string("isDoubleSpendSeen")) tx->m_is_double_spend_seen = it->second.get_value(); @@ -352,7 +352,7 @@ namespace monero { tgt->m_is_confirmed = src->m_is_confirmed; tgt->m_in_tx_pool = src->m_in_tx_pool; tgt->m_num_confirmations = src->m_num_confirmations; - tgt->m_unlock_time = src->m_unlock_time; + tgt->m_unlock_height = src->m_unlock_height; tgt->m_last_relayed_timestamp = src->m_last_relayed_timestamp; tgt->m_received_timestamp = src->m_received_timestamp; tgt->m_is_double_spend_seen = src->m_is_double_spend_seen; @@ -451,7 +451,7 @@ namespace monero { m_max_used_block_height = gen_utils::reconcile(m_max_used_block_height, other->m_max_used_block_height, "max_used_block_height"); m_max_used_block_hash = gen_utils::reconcile(m_max_used_block_hash, other->m_max_used_block_hash); //m_signatures = gen_utils::reconcile(m_signatures, other->m_signatures); // TODO - m_unlock_time = gen_utils::reconcile(m_unlock_time, other->m_unlock_time, "m_unlock_time"); + m_unlock_height = gen_utils::reconcile(m_unlock_height, other->m_unlock_height, "m_unlock_height"); m_num_confirmations = gen_utils::reconcile(m_num_confirmations, other->m_num_confirmations, "m_num_confirmations"); // merge inputs diff --git a/src/daemon/monero_daemon_model.h b/src/daemon/monero_daemon_model.h index 8c890cd..ffba465 100644 --- a/src/daemon/monero_daemon_model.h +++ b/src/daemon/monero_daemon_model.h @@ -179,7 +179,7 @@ namespace monero { boost::optional m_is_confirmed; boost::optional m_in_tx_pool; boost::optional m_num_confirmations; - boost::optional m_unlock_time; + boost::optional m_unlock_height; boost::optional m_last_relayed_timestamp; boost::optional m_received_timestamp; boost::optional m_is_double_spend_seen; diff --git a/src/utils/monero_utils.cpp b/src/utils/monero_utils.cpp index f31e21f..70b0a1a 100644 --- a/src/utils/monero_utils.cpp +++ b/src/utils/monero_utils.cpp @@ -264,7 +264,7 @@ std::shared_ptr monero_utils::cn_block_to_block(const cryptonote:: std::shared_ptr monero_utils::cn_tx_to_tx(const cryptonote::transaction& cn_tx, bool init_as_tx_wallet) { std::shared_ptr tx = init_as_tx_wallet ? std::make_shared() : std::make_shared(); tx->m_version = cn_tx.version; - tx->m_unlock_time = cn_tx.unlock_time; + tx->m_unlock_height = cn_tx.unlock_time; tx->m_hash = epee::string_tools::pod_to_hex(cn_tx.hash); tx->m_extra = cn_tx.extra; diff --git a/src/wallet/monero_wallet_core.cpp b/src/wallet/monero_wallet_core.cpp index 7f8b435..d0c7564 100644 --- a/src/wallet/monero_wallet_core.cpp +++ b/src/wallet/monero_wallet_core.cpp @@ -132,7 +132,7 @@ namespace monero { tx->m_payment_id = epee::string_tools::pod_to_hex(payment_id); if (tx->m_payment_id->substr(16).find_first_not_of('0') == std::string::npos) tx->m_payment_id = tx->m_payment_id->substr(0, 16); // TODO monero core: this should be part of core wallet if (tx->m_payment_id == monero_tx::DEFAULT_PAYMENT_ID) tx->m_payment_id = boost::none; // clear default payment id - tx->m_unlock_time = pd.m_unlock_time; + tx->m_unlock_height = pd.m_unlock_time; tx->m_is_locked = !m_w2.is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height); tx->m_fee = pd.m_fee; tx->m_note = m_w2.get_tx_note(pd.m_tx_hash); @@ -185,7 +185,7 @@ namespace monero { tx->m_payment_id = epee::string_tools::pod_to_hex(pd.m_payment_id); if (tx->m_payment_id->substr(16).find_first_not_of('0') == std::string::npos) tx->m_payment_id = tx->m_payment_id->substr(0, 16); // TODO monero core: this should be part of core wallet if (tx->m_payment_id == monero_tx::DEFAULT_PAYMENT_ID) tx->m_payment_id = boost::none; // clear default payment id - tx->m_unlock_time = pd.m_unlock_time; + tx->m_unlock_height = pd.m_unlock_time; tx->m_is_locked = !m_w2.is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height); tx->m_fee = pd.m_amount_in - pd.m_amount_out; tx->m_note = m_w2.get_tx_note(txid); @@ -248,7 +248,7 @@ namespace monero { tx->m_payment_id = epee::string_tools::pod_to_hex(payment_id); if (tx->m_payment_id->substr(16).find_first_not_of('0') == std::string::npos) tx->m_payment_id = tx->m_payment_id->substr(0, 16); // TODO monero core: this should be part of core wallet if (tx->m_payment_id == monero_tx::DEFAULT_PAYMENT_ID) tx->m_payment_id = boost::none; // clear default payment id - tx->m_unlock_time = pd.m_unlock_time; + tx->m_unlock_height = pd.m_unlock_time; tx->m_is_locked = true; tx->m_fee = pd.m_fee; tx->m_note = m_w2.get_tx_note(pd.m_tx_hash); @@ -290,7 +290,7 @@ namespace monero { tx->m_payment_id = epee::string_tools::pod_to_hex(pd.m_payment_id); if (tx->m_payment_id->substr(16).find_first_not_of('0') == std::string::npos) tx->m_payment_id = tx->m_payment_id->substr(0, 16); // TODO monero core: this should be part of core wallet if (tx->m_payment_id == monero_tx::DEFAULT_PAYMENT_ID) tx->m_payment_id = boost::none; // clear default payment id - tx->m_unlock_time = pd.m_tx.unlock_time; + tx->m_unlock_height = pd.m_tx.unlock_time; tx->m_is_locked = true; tx->m_fee = pd.m_amount_in - pd.m_amount_out; tx->m_note = m_w2.get_tx_note(txid); @@ -767,7 +767,7 @@ namespace monero { tx.reset(); } - void on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index, bool is_change, uint64_t unlock_time) override { + void on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index, bool is_change, uint64_t unlock_height) override { if (m_wallet.get_listeners().empty()) return; // create native library tx @@ -777,7 +777,7 @@ namespace monero { block->m_txs.push_back(tx); tx->m_block = block; tx->m_hash = epee::string_tools::pod_to_hex(txid); - tx->m_unlock_time = unlock_time; + tx->m_unlock_height = unlock_height; tx->m_is_locked = true; std::shared_ptr output = std::make_shared(); tx->m_outputs.push_back(output); @@ -1716,13 +1716,13 @@ namespace monero { // prepare parameters for wallet2's create_transactions_2() uint64_t mixin = m_w2->adjust_mixin(0); // get mixin for call to 'create_transactions_2' uint32_t priority = m_w2->adjust_priority(config.m_priority == boost::none ? 0 : config.m_priority.get()); - uint64_t unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); + uint64_t unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); uint32_t account_index = config.m_account_index.get(); std::set subaddress_indices; for (const uint32_t& subaddress_idx : config.m_subaddress_indices) subaddress_indices.insert(subaddress_idx); // prepare transactions - std::vector ptx_vector = m_w2->create_transactions_2(dsts, mixin, unlock_time, priority, extra, account_index, subaddress_indices); + std::vector ptx_vector = m_w2->create_transactions_2(dsts, mixin, unlock_height, priority, extra, account_index, subaddress_indices); if (ptx_vector.empty()) throw std::runtime_error("No transaction created"); // check if request cannot be fulfilled due to splitting @@ -1786,7 +1786,7 @@ namespace monero { if (!tx->m_is_failed.get() && tx->m_is_relayed.get()) tx->m_is_double_spend_seen = false; // TODO: test and handle if true tx->m_num_confirmations = 0; tx->m_ring_size = monero_utils::RING_SIZE; - tx->m_unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); + tx->m_unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); tx->m_is_locked = true; if (tx->m_is_relayed.get()) tx->m_last_relayed_timestamp = static_cast(time(NULL)); // std::set last relayed timestamp to current time iff relayed // TODO monero core: this should be encapsulated in wallet2 out_transfer->m_account_index = config.m_account_index; @@ -1907,13 +1907,13 @@ namespace monero { uint64_t below_amount = config.m_below_amount == boost::none ? 0 : config.m_below_amount.get(); uint64_t mixin = m_w2->adjust_mixin(0); uint32_t priority = m_w2->adjust_priority(config.m_priority == boost::none ? 0 : config.m_priority.get()); - uint64_t unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); + uint64_t unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); uint32_t account_index = config.m_account_index.get(); std::set subaddress_indices; for (const uint32_t& subaddress_idx : config.m_subaddress_indices) subaddress_indices.insert(subaddress_idx); // prepare transactions - std::vector ptx_vector = m_w2->create_transactions_all(below_amount, dsts[0].addr, dsts[0].is_subaddress, num_outputs, mixin, unlock_time, priority, extra, account_index, subaddress_indices); + std::vector ptx_vector = m_w2->create_transactions_all(below_amount, dsts[0].addr, dsts[0].is_subaddress, num_outputs, mixin, unlock_height, priority, extra, account_index, subaddress_indices); // config for fill_response() bool get_tx_keys = true; @@ -1974,7 +1974,7 @@ namespace monero { if (!tx->m_is_failed.get() && tx->m_is_relayed.get()) tx->m_is_double_spend_seen = false; // TODO: test and handle if true tx->m_num_confirmations = 0; tx->m_ring_size = monero_utils::RING_SIZE; - tx->m_unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); + tx->m_unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); if (tx->m_is_relayed.get()) tx->m_last_relayed_timestamp = static_cast(time(NULL)); // std::set last relayed timestamp to current time iff relayed // TODO monero core: this should be encapsulated in wallet2 out_transfer->m_account_index = config.m_account_index; if (config.m_subaddress_indices.size() == 1) out_transfer->m_subaddress_indices.push_back(config.m_subaddress_indices[0]); // subaddress index is known iff 1 requested // TODO: get all known subaddress indices here @@ -2029,8 +2029,8 @@ namespace monero { // create transaction uint64_t mixin = m_w2->adjust_mixin(0); uint32_t priority = m_w2->adjust_priority(config.m_priority == boost::none ? 0 : config.m_priority.get()); - uint64_t unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); - std::vector ptx_vector = m_w2->create_transactions_single(ki, dsts[0].addr, dsts[0].is_subaddress, 1, mixin, unlock_time, priority, extra); + uint64_t unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); + std::vector ptx_vector = m_w2->create_transactions_single(ki, dsts[0].addr, dsts[0].is_subaddress, 1, mixin, unlock_height, priority, extra); // validate created transaction if (ptx_vector.empty()) throw std::runtime_error("No outputs found"); @@ -2094,7 +2094,7 @@ namespace monero { if (!tx->m_is_failed.get() && tx->m_is_relayed.get()) tx->m_is_double_spend_seen = false; // TODO: test and handle if true tx->m_num_confirmations = 0; tx->m_ring_size = monero_utils::RING_SIZE; - tx->m_unlock_time = config.m_unlock_time == boost::none ? 0 : config.m_unlock_time.get(); + tx->m_unlock_height = config.m_unlock_height == boost::none ? 0 : config.m_unlock_height.get(); tx->m_is_locked = true; if (tx->m_is_relayed.get()) tx->m_last_relayed_timestamp = static_cast(time(NULL)); // std::set last relayed timestamp to current time iff relayed // TODO monero core: this should be encapsulated in wallet2 out_transfer->m_account_index = config.m_account_index; @@ -2184,7 +2184,7 @@ namespace monero { if (!tx->m_is_failed.get() && tx->m_is_relayed.get()) tx->m_is_double_spend_seen = false; // TODO: test and handle if true tx->m_num_confirmations = 0; tx->m_ring_size = monero_utils::RING_SIZE; - tx->m_unlock_time = 0; + tx->m_unlock_height = 0; if (tx->m_is_relayed.get()) tx->m_last_relayed_timestamp = static_cast(time(NULL)); // std::set last relayed timestamp to current time iff relayed // TODO monero core: this should be encapsulated in wallet2 out_transfer->m_destinations[0]->m_amount = *tx_amounts_iter; @@ -2389,7 +2389,7 @@ namespace monero { } tx->m_fee = tx->m_input_sum.get() - tx->m_output_sum.get(); - tx->m_unlock_time = cd.unlock_time; + tx->m_unlock_height = cd.unlock_time; tx->m_extra_hex = epee::to_hex::string({cd.extra.data(), cd.extra.size()}); txs.push_back(tx); } diff --git a/src/wallet/monero_wallet_model.cpp b/src/wallet/monero_wallet_model.cpp index 0ea82c5..c6b66cb 100644 --- a/src/wallet/monero_wallet_model.cpp +++ b/src/wallet/monero_wallet_model.cpp @@ -1116,7 +1116,7 @@ namespace monero { m_fee = config.m_fee; m_account_index = config.m_account_index; m_subaddress_indices = config.m_subaddress_indices; - m_unlock_time = config.m_unlock_time; + m_unlock_height = config.m_unlock_height; m_can_split = config.m_can_split; m_relay = config.m_relay; m_note = config.m_note; @@ -1140,7 +1140,7 @@ namespace monero { if (m_priority != boost::none) monero_utils::addJsonMember("priority", m_priority.get(), allocator, root, value_num); if (m_ring_size != boost::none) monero_utils::addJsonMember("ringSize", m_ring_size.get(), allocator, root, value_num); if (m_account_index != boost::none) monero_utils::addJsonMember("accountIndex", m_account_index.get(), allocator, root, value_num); - if (m_unlock_time != boost::none) monero_utils::addJsonMember("unlockTime", m_unlock_time.get(), allocator, root, value_num); + if (m_unlock_height != boost::none) monero_utils::addJsonMember("unlockHeight", m_unlock_height.get(), allocator, root, value_num); if (m_below_amount != boost::none) monero_utils::addJsonMember("belowAmount", m_below_amount.get(), allocator, root, value_num); // set std::string values @@ -1195,7 +1195,7 @@ namespace monero { else if (key == std::string("fee")) config->m_fee = it->second.get_value(); else if (key == std::string("accountIndex")) config->m_account_index = it->second.get_value(); else if (key == std::string("subaddressIndices")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) config->m_subaddress_indices.push_back(it2->second.get_value()); - else if (key == std::string("unlockTime")) config->m_unlock_time = it->second.get_value(); + else if (key == std::string("unlockHeight")) config->m_unlock_height = it->second.get_value(); else if (key == std::string("canSplit")) config->m_can_split = it->second.get_value(); else if (key == std::string("relay")) config->m_relay = it->second.get_value(); else if (key == std::string("note")) config->m_note = it->second.data(); diff --git a/src/wallet/monero_wallet_model.h b/src/wallet/monero_wallet_model.h index f8c43e8..433998e 100644 --- a/src/wallet/monero_wallet_model.h +++ b/src/wallet/monero_wallet_model.h @@ -350,7 +350,7 @@ namespace monero { boost::optional m_fee; boost::optional m_account_index; std::vector m_subaddress_indices; - boost::optional m_unlock_time; + boost::optional m_unlock_height; boost::optional m_can_split; boost::optional m_relay; boost::optional m_note;