From 9215afb462efa32859e9e847d4150e3b7b73c210 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 5 Sep 2022 12:25:04 +0200 Subject: [PATCH] wallet rpc: obsolete scan pos RPC has been removed --- src/currency_core/blockchain_storage.cpp | 40 ------------------------ src/currency_core/blockchain_storage.h | 1 - src/rpc/core_rpc_server.cpp | 7 ----- src/rpc/core_rpc_server.h | 2 -- src/rpc/core_rpc_server_commands_defs.h | 33 ------------------- src/wallet/core_default_rpc_proxy.cpp | 5 --- src/wallet/core_default_rpc_proxy.h | 1 - src/wallet/core_fast_rpc_proxy.h | 5 --- src/wallet/core_rpc_proxy.h | 1 - 9 files changed, 95 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 9879a6e1..ae488699 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -6328,46 +6328,6 @@ bool blockchain_storage::build_kernel(uint64_t amount, return true; } //------------------------------------------------------------------ -bool blockchain_storage::scan_pos(const COMMAND_RPC_SCAN_POS::request& sp, COMMAND_RPC_SCAN_POS::response& rsp) const -{ - uint64_t timstamp_start = 0; - wide_difficulty_type basic_diff = 0; - CRITICAL_REGION_BEGIN(m_read_lock); - timstamp_start = m_db_blocks.back()->bl.timestamp; - basic_diff = get_next_diff_conditional(true); - CRITICAL_REGION_END(); - - stake_modifier_type sm = AUTO_VAL_INIT(sm); - bool r = build_stake_modifier(sm); - CHECK_AND_ASSERT_MES(r, false, "failed to build_stake_modifier"); - - for (size_t i = 0; i != sp.pos_entries.size(); i++) - { - stake_kernel sk = AUTO_VAL_INIT(sk); - build_kernel(sp.pos_entries[i].amount, sp.pos_entries[i].keyimage, sk, sm, 0); - - for (uint64_t ts = timstamp_start; ts < timstamp_start + POS_SCAN_WINDOW; ts++) - { - sk.block_timestamp = ts; - crypto::hash kernel_hash = crypto::cn_fast_hash(&sk, sizeof(sk)); - wide_difficulty_type this_coin_diff = basic_diff / sp.pos_entries[i].amount; - if (!check_hash(kernel_hash, this_coin_diff)) - continue; - else - { - //found kernel - LOG_PRINT_GREEN("Found kernel: amount=" << print_money(sp.pos_entries[i].amount) << ", key_image" << sp.pos_entries[i].keyimage, LOG_LEVEL_0); - rsp.index = i; - rsp.block_timestamp = ts; - rsp.status = API_RETURN_CODE_OK; - return true; - } - } - } - rsp.status = API_RETURN_CODE_NOT_FOUND; - return false; -} -//------------------------------------------------------------------ void blockchain_storage::set_core_runtime_config(const core_runtime_config& pc) const { m_core_runtime_config = pc; diff --git a/src/currency_core/blockchain_storage.h b/src/currency_core/blockchain_storage.h index 8f29723a..39d4ba15 100644 --- a/src/currency_core/blockchain_storage.h +++ b/src/currency_core/blockchain_storage.h @@ -344,7 +344,6 @@ namespace currency uint64_t timestamp)const; bool build_stake_modifier(stake_modifier_type& sm, const alt_chain_type& alt_chain = alt_chain_type(), uint64_t split_height = 0, crypto::hash *p_last_block_hash = nullptr) const; - bool scan_pos(const COMMAND_RPC_SCAN_POS::request& sp, COMMAND_RPC_SCAN_POS::response& rsp)const; bool validate_pos_coinbase_outs_unlock_time(const transaction& miner_tx, uint64_t staked_amount, uint64_t source_max_unlock_time)const; bool validate_pos_block(const block& b, const crypto::hash& id, bool for_altchain)const; bool validate_pos_block(const block& b, wide_difficulty_type basic_diff, const crypto::hash& id, bool for_altchain)const; diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 5a2208a7..1a099a0d 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -431,13 +431,6 @@ namespace currency return true; } //------------------------------------------------------------------------------------------------------------------------------ - bool core_rpc_server::on_scan_pos(const COMMAND_RPC_SCAN_POS::request& req, COMMAND_RPC_SCAN_POS::response& res, connection_context& cntx) - { - CHECK_CORE_READY(); - m_core.get_blockchain_storage().scan_pos(req, res); - return true; - } - //------------------------------------------------------------------------------------------------------------------------------ bool core_rpc_server::on_check_keyimages(const COMMAND_RPC_CHECK_KEYIMAGES::request& req, COMMAND_RPC_CHECK_KEYIMAGES::response& res, connection_context& cntx) { m_core.get_blockchain_storage().check_keyimages(req.images, res.images_stat); diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 590b1151..4c2eb123 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -53,7 +53,6 @@ namespace currency bool on_set_maintainers_info(const COMMAND_RPC_SET_MAINTAINERS_INFO::request& req, COMMAND_RPC_SET_MAINTAINERS_INFO::response& res, connection_context& cntx); bool on_get_tx_pool(const COMMAND_RPC_GET_TX_POOL::request& req, COMMAND_RPC_GET_TX_POOL::response& res, connection_context& cntx); bool on_check_keyimages(const COMMAND_RPC_CHECK_KEYIMAGES::request& req, COMMAND_RPC_CHECK_KEYIMAGES::response& res, connection_context& cntx); - bool on_scan_pos(const COMMAND_RPC_SCAN_POS::request& req, COMMAND_RPC_SCAN_POS::response& res, connection_context& cntx); bool on_rpc_get_blocks_details(const COMMAND_RPC_GET_BLOCKS_DETAILS::request& req, COMMAND_RPC_GET_BLOCKS_DETAILS::response& res, connection_context& cntx); bool on_force_relaey_raw_txs(const COMMAND_RPC_FORCE_RELAY_RAW_TXS::request& req, COMMAND_RPC_FORCE_RELAY_RAW_TXS::response& res, connection_context& cntx); bool on_get_offers_ex(const COMMAND_RPC_GET_OFFERS_EX::request& req, COMMAND_RPC_GET_OFFERS_EX::response& res, epee::json_rpc::error& error_resp, connection_context& cntx); @@ -121,7 +120,6 @@ namespace currency MAP_URI_AUTO_BIN2("/set_maintainers_info.bin", on_set_maintainers_info, COMMAND_RPC_SET_MAINTAINERS_INFO) MAP_URI_AUTO_BIN2("/get_tx_pool.bin", on_get_tx_pool, COMMAND_RPC_GET_TX_POOL) MAP_URI_AUTO_BIN2("/check_keyimages.bin", on_check_keyimages, COMMAND_RPC_CHECK_KEYIMAGES) - MAP_URI_AUTO_BIN2("/scan_pos.bin", on_scan_pos, COMMAND_RPC_SCAN_POS) MAP_URI_AUTO_BIN2("/get_pos_details.bin", on_get_pos_mining_details, COMMAND_RPC_GET_POS_MINING_DETAILS) // JSON RPCs BEGIN_JSON_RPC_MAP("/json_rpc") diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 2cbb3af2..12874e9f 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -1118,39 +1118,6 @@ namespace currency }; }; - struct COMMAND_RPC_SCAN_POS - { - struct request - { - std::vector pos_entries; - - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(pos_entries) - END_KV_SERIALIZE_MAP() - }; - - struct response - { - std::string status; - uint64_t index; - uint64_t block_timestamp; - uint64_t height; - uint64_t starter_timestamp; - crypto::hash last_block_hash; - bool is_pos_allowed; - - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(status) - KV_SERIALIZE(index) - KV_SERIALIZE(block_timestamp) - KV_SERIALIZE(height) - KV_SERIALIZE(is_pos_allowed) - KV_SERIALIZE(starter_timestamp) - KV_SERIALIZE_VAL_POD_AS_BLOB(last_block_hash); - END_KV_SERIALIZE_MAP() - }; - }; - struct COMMAND_RPC_GET_POS_MINING_DETAILS { struct request diff --git a/src/wallet/core_default_rpc_proxy.cpp b/src/wallet/core_default_rpc_proxy.cpp index 9de9f344..7e4a4ed6 100644 --- a/src/wallet/core_default_rpc_proxy.cpp +++ b/src/wallet/core_default_rpc_proxy.cpp @@ -97,11 +97,6 @@ namespace tools return invoke_http_bin_remote_command2_update_is_disconnect("/check_keyimages.bin", req, rsp); } //------------------------------------------------------------------------------------------------------------------------------ - bool default_http_core_proxy::call_COMMAND_RPC_SCAN_POS(const currency::COMMAND_RPC_SCAN_POS::request& req, currency::COMMAND_RPC_SCAN_POS::response& rsp) - { - return invoke_http_bin_remote_command2_update_is_disconnect("/scan_pos.bin", req, rsp); - } - //------------------------------------------------------------------------------------------------------------------------------ bool default_http_core_proxy::call_COMMAND_RPC_GET_POS_MINING_DETAILS(const currency::COMMAND_RPC_GET_POS_MINING_DETAILS::request& req, currency::COMMAND_RPC_GET_POS_MINING_DETAILS::response& rsp) { return invoke_http_bin_remote_command2_update_is_disconnect("/get_pos_details.bin", req, rsp); diff --git a/src/wallet/core_default_rpc_proxy.h b/src/wallet/core_default_rpc_proxy.h index 77d3a4f3..89234151 100644 --- a/src/wallet/core_default_rpc_proxy.h +++ b/src/wallet/core_default_rpc_proxy.h @@ -44,7 +44,6 @@ namespace tools bool call_COMMAND_RPC_GET_ALIAS_REWARD(const currency::COMMAND_RPC_GET_ALIAS_REWARD::request& req, currency::COMMAND_RPC_GET_ALIAS_REWARD::response& rsp) override; bool call_COMMAND_RPC_GET_TRANSACTIONS(const currency::COMMAND_RPC_GET_TRANSACTIONS::request& req, currency::COMMAND_RPC_GET_TRANSACTIONS::response& rsp) override; bool call_COMMAND_RPC_COMMAND_RPC_CHECK_KEYIMAGES(const currency::COMMAND_RPC_CHECK_KEYIMAGES::request& req, currency::COMMAND_RPC_CHECK_KEYIMAGES::response& rsp) override; - bool call_COMMAND_RPC_SCAN_POS(const currency::COMMAND_RPC_SCAN_POS::request& req, currency::COMMAND_RPC_SCAN_POS::response& rsp) override; bool call_COMMAND_RPC_GETBLOCKTEMPLATE(const currency::COMMAND_RPC_GETBLOCKTEMPLATE::request& req, currency::COMMAND_RPC_GETBLOCKTEMPLATE::response& rsp) override; bool call_COMMAND_RPC_SUBMITBLOCK(const currency::COMMAND_RPC_SUBMITBLOCK::request& req, currency::COMMAND_RPC_SUBMITBLOCK::response& rsp) override; bool call_COMMAND_RPC_SUBMITBLOCK2(const currency::COMMAND_RPC_SUBMITBLOCK2::request& req, currency::COMMAND_RPC_SUBMITBLOCK2::response& rsp) override; diff --git a/src/wallet/core_fast_rpc_proxy.h b/src/wallet/core_fast_rpc_proxy.h index 60035292..7e3478c9 100644 --- a/src/wallet/core_fast_rpc_proxy.h +++ b/src/wallet/core_fast_rpc_proxy.h @@ -98,11 +98,6 @@ namespace tools return m_rpc.on_check_keyimages(req, rsp, m_cntxt_stub); } //------------------------------------------------------------------------------------------------------------------------------ - bool call_COMMAND_RPC_SCAN_POS(const currency::COMMAND_RPC_SCAN_POS::request& req, currency::COMMAND_RPC_SCAN_POS::response& rsp) override - { - return m_rpc.on_scan_pos(req, rsp, m_cntxt_stub); - } - //------------------------------------------------------------------------------------------------------------------------------ bool call_COMMAND_RPC_GETBLOCKTEMPLATE(const currency::COMMAND_RPC_GETBLOCKTEMPLATE::request& req, currency::COMMAND_RPC_GETBLOCKTEMPLATE::response& rsp) override { return m_rpc.on_getblocktemplate(req, rsp, m_err_stub, m_cntxt_stub); diff --git a/src/wallet/core_rpc_proxy.h b/src/wallet/core_rpc_proxy.h index b8d2e303..7154ff55 100644 --- a/src/wallet/core_rpc_proxy.h +++ b/src/wallet/core_rpc_proxy.h @@ -43,7 +43,6 @@ namespace tools virtual bool call_COMMAND_RPC_GET_ALIAS_REWARD(const currency::COMMAND_RPC_GET_ALIAS_REWARD::request& req, currency::COMMAND_RPC_GET_ALIAS_REWARD::response& rsp){ return false; } virtual bool call_COMMAND_RPC_GET_TRANSACTIONS(const currency::COMMAND_RPC_GET_TRANSACTIONS::request& req, currency::COMMAND_RPC_GET_TRANSACTIONS::response& rsp){ return false; } virtual bool call_COMMAND_RPC_COMMAND_RPC_CHECK_KEYIMAGES(const currency::COMMAND_RPC_CHECK_KEYIMAGES::request& req, currency::COMMAND_RPC_CHECK_KEYIMAGES::response& rsp){ return false; } - virtual bool call_COMMAND_RPC_SCAN_POS(const currency::COMMAND_RPC_SCAN_POS::request& req, currency::COMMAND_RPC_SCAN_POS::response& rsp){ return false; } virtual bool call_COMMAND_RPC_GETBLOCKTEMPLATE(const currency::COMMAND_RPC_GETBLOCKTEMPLATE::request& req, currency::COMMAND_RPC_GETBLOCKTEMPLATE::response& rsp){ return false; } virtual bool call_COMMAND_RPC_SUBMITBLOCK(const currency::COMMAND_RPC_SUBMITBLOCK::request& req, currency::COMMAND_RPC_SUBMITBLOCK::response& rsp){ return false; } virtual bool call_COMMAND_RPC_SUBMITBLOCK2(const currency::COMMAND_RPC_SUBMITBLOCK2::request& req, currency::COMMAND_RPC_SUBMITBLOCK2::response& rsp) { return false; }