aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authorstoffu <stoffu@protonmail.ch>2018-01-15 12:05:16 +0900
committerstoffu <stoffu@protonmail.ch>2018-01-28 11:04:52 +0900
commit30c44bce0627260134d3606a9a6d0b453aad763d (patch)
tree39880d433f73a72b3250274abee0baf8ffe20159 /src/wallet/wallet2.cpp
parentsimplewallet: bug fix for backlog estimate (diff)
downloadmonero-30c44bce0627260134d3606a9a6d0b453aad763d.tar.xz
wallet: automatically use low priority if safe (no backlog & recent blocks not full)
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet2.cpp91
1 files changed, 91 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 589259ec8..7dc8a1e47 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -612,6 +612,7 @@ wallet2::wallet2(bool testnet, bool restricted):
m_confirm_backlog(true),
m_confirm_backlog_threshold(0),
m_confirm_export_overwrite(true),
+ m_auto_low_priority(true),
m_is_initialized(false),
m_restricted(restricted),
is_old_file_format(false),
@@ -2447,6 +2448,9 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable
value2.SetInt(m_confirm_export_overwrite ? 1 :0);
json.AddMember("confirm_export_overwrite", value2, json.GetAllocator());
+ value2.SetInt(m_auto_low_priority ? 1 : 0);
+ json.AddMember("auto_low_priority", value2, json.GetAllocator());
+
value2.SetInt(m_testnet ? 1 :0);
json.AddMember("testnet", value2, json.GetAllocator());
@@ -2529,6 +2533,7 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
m_confirm_backlog = true;
m_confirm_backlog_threshold = 0;
m_confirm_export_overwrite = true;
+ m_auto_low_priority = true;
}
else if(json.IsObject())
{
@@ -2630,6 +2635,8 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
m_confirm_backlog_threshold = field_confirm_backlog_threshold;
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, confirm_export_overwrite, int, Int, false, true);
m_confirm_export_overwrite = field_confirm_export_overwrite;
+ GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, m_auto_low_priority, int, Int, false, true);
+ m_auto_low_priority = field_m_auto_low_priority;
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, testnet, int, Int, false, m_testnet);
// Wallet is being opened with testnet flag, but is saved as a mainnet wallet
THROW_WALLET_EXCEPTION_IF(m_testnet && !field_testnet, error::wallet_internal_error, "Mainnet wallet can not be opened as testnet wallet");
@@ -5033,6 +5040,90 @@ uint64_t wallet2::adjust_mixin(uint64_t mixin) const
return mixin;
}
//----------------------------------------------------------------------------------------------------
+uint32_t wallet2::adjust_priority(uint32_t priority)
+{
+ if (priority == 0 && get_default_priority() != 1 && auto_low_priority())
+ {
+ try
+ {
+ // check if there's a backlog in the tx pool
+ const double fee_level = get_fee_multiplier(1) * get_per_kb_fee() * (12/(double)13) / (double)1024;
+ const std::vector<std::pair<uint64_t, uint64_t>> blocks = estimate_backlog({std::make_pair(fee_level, fee_level)});
+ if (blocks.size() != 1)
+ {
+ MERROR("Bad estimated backlog array size");
+ return priority;
+ }
+ else if (blocks[0].first > 0)
+ {
+ MINFO("We don't use the low priority because there's a backlog in the tx pool.");
+ return priority;
+ }
+
+ // get the current full reward zone
+ epee::json_rpc::request<cryptonote::COMMAND_RPC_GET_INFO::request> getinfo_req = AUTO_VAL_INIT(getinfo_req);
+ epee::json_rpc::response<cryptonote::COMMAND_RPC_GET_INFO::response, std::string> getinfo_res = AUTO_VAL_INIT(getinfo_res);
+ m_daemon_rpc_mutex.lock();
+ getinfo_req.jsonrpc = "2.0";
+ getinfo_req.id = epee::serialization::storage_entry(0);
+ getinfo_req.method = "get_info";
+ bool r = net_utils::invoke_http_json("/json_rpc", getinfo_req, getinfo_res, m_http_client);
+ m_daemon_rpc_mutex.unlock();
+ THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_info");
+ THROW_WALLET_EXCEPTION_IF(getinfo_res.result.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "get_info");
+ THROW_WALLET_EXCEPTION_IF(getinfo_res.result.status != CORE_RPC_STATUS_OK, error::get_tx_pool_error);
+ const uint64_t full_reward_zone = getinfo_res.result.block_size_limit / 2;
+
+ // get the last N block headers and sum the block sizes
+ const size_t N = 10;
+ if (m_blockchain.size() < N)
+ {
+ MERROR("The blockchain is too short");
+ return priority;
+ }
+ epee::json_rpc::request<cryptonote::COMMAND_RPC_GET_BLOCK_HEADERS_RANGE::request> getbh_req = AUTO_VAL_INIT(getbh_req);
+ epee::json_rpc::response<cryptonote::COMMAND_RPC_GET_BLOCK_HEADERS_RANGE::response, std::string> getbh_res = AUTO_VAL_INIT(getbh_res);
+ m_daemon_rpc_mutex.lock();
+ getbh_req.jsonrpc = "2.0";
+ getbh_req.id = epee::serialization::storage_entry(0);
+ getbh_req.method = "getblockheadersrange";
+ getbh_req.params.start_height = m_blockchain.size() - N;
+ getbh_req.params.end_height = m_blockchain.size() - 1;
+ r = net_utils::invoke_http_json("/json_rpc", getbh_req, getbh_res, m_http_client, rpc_timeout);
+ m_daemon_rpc_mutex.unlock();
+ THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "getblockheadersrange");
+ THROW_WALLET_EXCEPTION_IF(getbh_res.result.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "getblockheadersrange");
+ THROW_WALLET_EXCEPTION_IF(getbh_res.result.status != CORE_RPC_STATUS_OK, error::get_blocks_error, getbh_res.result.status);
+ if (getbh_res.result.headers.size() != N)
+ {
+ MERROR("Bad blockheaders size");
+ return priority;
+ }
+ size_t block_size_sum = 0;
+ for (const cryptonote::block_header_response &i : getbh_res.result.headers)
+ {
+ block_size_sum += i.block_size;
+ }
+
+ // estimate how 'full' the last N blocks are
+ const size_t P = 100 * block_size_sum / (N * full_reward_zone);
+ MINFO((boost::format("The last %d blocks fill roughly %d%% of the full reward zone.") % N % P).str());
+ if (P > 80)
+ {
+ MINFO("We don't use the low priority because recent blocks are quite full.");
+ return priority;
+ }
+ MINFO("We'll use the low priority because probably it's safe to do so.");
+ return 1;
+ }
+ catch (const std::exception &e)
+ {
+ MERROR(e.what());
+ }
+ }
+ return priority;
+}
+//----------------------------------------------------------------------------------------------------
// separated the call(s) to wallet2::transfer into their own function
//
// this function will make multiple calls to wallet2::transfer if multiple