aboutsummaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/command_parser_executor.cpp39
-rw-r--r--src/daemon/command_server.cpp2
-rw-r--r--src/daemon/daemon.cpp9
-rw-r--r--src/daemon/rpc.h3
-rw-r--r--src/daemon/rpc_command_executor.cpp72
-rw-r--r--src/daemon/rpc_command_executor.h6
6 files changed, 107 insertions, 24 deletions
diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp
index 99a460c78..3a4081e39 100644
--- a/src/daemon/command_parser_executor.cpp
+++ b/src/daemon/command_parser_executor.cpp
@@ -153,6 +153,16 @@ bool t_command_parser_executor::print_blockchain_info(const std::vector<std::str
}
uint64_t start_index = 0;
uint64_t end_index = 0;
+ if (args[0][0] == '-')
+ {
+ int64_t nblocks;
+ if(!epee::string_tools::get_xtype_from_string(nblocks, args[0]))
+ {
+ std::cout << "wrong number of blocks" << std::endl;
+ return false;
+ }
+ return m_executor.print_blockchain_info(nblocks, (uint64_t)-nblocks);
+ }
if(!epee::string_tools::get_xtype_from_string(start_index, args[0]))
{
std::cout << "wrong starter block index parameter" << std::endl;
@@ -243,12 +253,15 @@ bool t_command_parser_executor::print_block(const std::vector<std::string>& args
bool t_command_parser_executor::print_transaction(const std::vector<std::string>& args)
{
+ bool include_metadata = false;
bool include_hex = false;
bool include_json = false;
// Assumes that optional flags come after mandatory argument <transaction_hash>
for (unsigned int i = 1; i < args.size(); ++i) {
- if (args[i] == "+hex")
+ if (args[i] == "+meta")
+ include_metadata = true;
+ else if (args[i] == "+hex")
include_hex = true;
else if (args[i] == "+json")
include_json = true;
@@ -260,7 +273,7 @@ bool t_command_parser_executor::print_transaction(const std::vector<std::string>
}
if (args.empty())
{
- std::cout << "expected: print_tx <transaction_hash> [+hex] [+json]" << std::endl;
+ std::cout << "expected: print_tx <transaction_hash> [+meta] [+hex] [+json]" << std::endl;
return true;
}
@@ -268,7 +281,7 @@ bool t_command_parser_executor::print_transaction(const std::vector<std::string>
crypto::hash tx_hash;
if (parse_hash256(str_hash, tx_hash))
{
- m_executor.print_transaction(tx_hash, include_hex, include_json);
+ m_executor.print_transaction(tx_hash, include_metadata, include_hex, include_json);
}
return true;
@@ -844,13 +857,27 @@ bool t_command_parser_executor::set_bootstrap_daemon(const std::vector<std::stri
bool t_command_parser_executor::flush_cache(const std::vector<std::string>& args)
{
+ bool bad_txs = false, bad_blocks = false;
+ std::string arg;
+
if (args.empty())
goto show_list;
- if (args[0] == "bad-txs")
- return m_executor.flush_cache(true);
+
+ for (size_t i = 0; i < args.size(); ++i)
+ {
+ arg = args[i];
+ if (arg == "bad-txs")
+ bad_txs = true;
+ else if (arg == "bad-blocks")
+ bad_blocks = true;
+ else
+ goto show_list;
+ }
+ return m_executor.flush_cache(bad_txs, bad_blocks);
show_list:
- std::cout << "Cache type needed: bad-txs" << std::endl;
+ std::cout << "Invalid cache type: " << arg << std::endl;
+ std::cout << "Cache types: bad-txs bad-blocks" << std::endl;
return true;
}
diff --git a/src/daemon/command_server.cpp b/src/daemon/command_server.cpp
index 8ec690631..7fae77c30 100644
--- a/src/daemon/command_server.cpp
+++ b/src/daemon/command_server.cpp
@@ -325,7 +325,7 @@ t_command_server::t_command_server(
m_command_lookup.set_handler(
"flush_cache"
, std::bind(&t_command_parser_executor::flush_cache, &m_parser, p::_1)
- , "flush_cache bad-txs"
+ , "flush_cache [bad-txs] [bad-blocks]"
, "Flush the specified cache(s)."
);
}
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index cb96b37b6..056f2f320 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -78,13 +78,14 @@ public:
const auto restricted = command_line::get_arg(vm, cryptonote::core_rpc_server::arg_restricted_rpc);
const auto main_rpc_port = command_line::get_arg(vm, cryptonote::core_rpc_server::arg_rpc_bind_port);
- rpcs.emplace_back(new t_rpc{vm, core, p2p, restricted, main_rpc_port, "core"});
+ const auto restricted_rpc_port_arg = cryptonote::core_rpc_server::arg_rpc_restricted_bind_port;
+ const bool has_restricted_rpc_port_arg = !command_line::is_arg_defaulted(vm, restricted_rpc_port_arg);
+ rpcs.emplace_back(new t_rpc{vm, core, p2p, restricted, main_rpc_port, "core", !has_restricted_rpc_port_arg});
- auto restricted_rpc_port_arg = cryptonote::core_rpc_server::arg_rpc_restricted_bind_port;
- if(!command_line::is_arg_defaulted(vm, restricted_rpc_port_arg))
+ if(has_restricted_rpc_port_arg)
{
auto restricted_rpc_port = command_line::get_arg(vm, restricted_rpc_port_arg);
- rpcs.emplace_back(new t_rpc{vm, core, p2p, true, restricted_rpc_port, "restricted"});
+ rpcs.emplace_back(new t_rpc{vm, core, p2p, true, restricted_rpc_port, "restricted", true});
}
}
};
diff --git a/src/daemon/rpc.h b/src/daemon/rpc.h
index 213593aa7..6f545a3b7 100644
--- a/src/daemon/rpc.h
+++ b/src/daemon/rpc.h
@@ -56,12 +56,13 @@ public:
, const bool restricted
, const std::string & port
, const std::string & description
+ , bool allow_rpc_payment
)
: m_server{core.get(), p2p.get()}, m_description{description}
{
MGINFO("Initializing " << m_description << " RPC server...");
- if (!m_server.init(vm, restricted, port))
+ if (!m_server.init(vm, restricted, port, allow_rpc_payment))
{
throw std::runtime_error("Failed to initialize " + m_description + " RPC server.");
}
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index ef9fed177..086808f8e 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -665,7 +665,7 @@ bool t_rpc_command_executor::print_connections() {
<< std::setw(30) << std::left << address
<< std::setw(8) << (get_address_type_name((epee::net_utils::address_type)info.address_type))
<< std::setw(6) << (info.ssl ? "yes" : "no")
- << std::setw(20) << epee::string_tools::pad_string(info.peer_id, 16, '0', true)
+ << std::setw(20) << info.peer_id
<< std::setw(20) << info.support_flags
<< std::setw(30) << std::to_string(info.recv_count) + "(" + std::to_string(info.recv_idle_time) + ")/" + std::to_string(info.send_count) + "(" + std::to_string(info.send_idle_time) + ")"
<< std::setw(25) << info.state
@@ -744,17 +744,46 @@ bool t_rpc_command_executor::print_net_stats()
return true;
}
-bool t_rpc_command_executor::print_blockchain_info(uint64_t start_block_index, uint64_t end_block_index) {
+bool t_rpc_command_executor::print_blockchain_info(int64_t start_block_index, uint64_t end_block_index) {
cryptonote::COMMAND_RPC_GET_BLOCK_HEADERS_RANGE::request req;
cryptonote::COMMAND_RPC_GET_BLOCK_HEADERS_RANGE::response res;
epee::json_rpc::error error_resp;
+ std::string fail_message = "Problem fetching info";
+
+ // negative: relative to the end
+ if (start_block_index < 0)
+ {
+ cryptonote::COMMAND_RPC_GET_INFO::request ireq;
+ cryptonote::COMMAND_RPC_GET_INFO::response ires;
+ if (m_is_rpc)
+ {
+ if (!m_rpc_client->rpc_request(ireq, ires, "/getinfo", fail_message.c_str()))
+ {
+ return true;
+ }
+ }
+ else
+ {
+ if (!m_rpc_server->on_get_info(ireq, ires) || ires.status != CORE_RPC_STATUS_OK)
+ {
+ tools::fail_msg_writer() << make_error(fail_message, ires.status);
+ return true;
+ }
+ }
+ if (start_block_index < 0 && (uint64_t)-start_block_index >= ires.height)
+ {
+ tools::fail_msg_writer() << "start offset is larger than blockchain height";
+ return true;
+ }
+ start_block_index = ires.height + start_block_index;
+ end_block_index = start_block_index + end_block_index - 1;
+ }
req.start_height = start_block_index;
req.end_height = end_block_index;
req.fill_pow_hash = false;
- std::string fail_message = "Unsuccessful";
-
+ fail_message = "Failed calling getblockheadersrange";
if (m_is_rpc)
{
if (!m_rpc_client->json_rpc_request(req, res, "getblockheadersrange", fail_message.c_str()))
@@ -940,6 +969,7 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height, bool include
}
bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
+ bool include_metadata,
bool include_hex,
bool include_json) {
cryptonote::COMMAND_RPC_GET_TRANSACTIONS::request req;
@@ -982,6 +1012,29 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front();
const std::string &pruned_as_hex = (1 == res.txs.size()) ? res.txs.front().pruned_as_hex : "";
const std::string &prunable_as_hex = (1 == res.txs.size()) ? res.txs.front().prunable_as_hex : "";
+ // Print metadata if requested
+ if (include_metadata)
+ {
+ if (!res.txs.front().in_pool)
+ {
+ tools::msg_writer() << "Block timestamp: " << res.txs.front().block_timestamp << " (" << tools::get_human_readable_timestamp(res.txs.front().block_timestamp) << ")";
+ }
+ cryptonote::blobdata blob;
+ if (epee::string_tools::parse_hexstr_to_binbuff(pruned_as_hex + prunable_as_hex, blob))
+ {
+ cryptonote::transaction tx;
+ if (cryptonote::parse_and_validate_tx_from_blob(blob, tx))
+ {
+ tools::msg_writer() << "Size: " << blob.size();
+ tools::msg_writer() << "Weight: " << cryptonote::get_transaction_weight(tx);
+ }
+ else
+ tools::fail_msg_writer() << "Error parsing transaction blob";
+ }
+ else
+ tools::fail_msg_writer() << "Error parsing transaction from hex";
+ }
+
// Print raw hex if requested
if (include_hex)
{
@@ -1852,9 +1905,9 @@ bool t_rpc_command_executor::print_coinbase_tx_sum(uint64_t height, uint64_t cou
tools::msg_writer() << "Sum of coinbase transactions between block heights ["
<< height << ", " << (height + count) << ") is "
- << cryptonote::print_money(res.emission_amount + res.fee_amount) << " "
- << "consisting of " << cryptonote::print_money(res.emission_amount)
- << " in emissions, and " << cryptonote::print_money(res.fee_amount) << " in fees";
+ << cryptonote::print_money(boost::multiprecision::uint128_t(res.wide_emission_amount) + boost::multiprecision::uint128_t(res.wide_fee_amount)) << " "
+ << "consisting of " << cryptonote::print_money(boost::multiprecision::uint128_t(res.wide_emission_amount))
+ << " in emissions, and " << cryptonote::print_money(boost::multiprecision::uint128_t(res.wide_fee_amount)) << " in fees";
return true;
}
@@ -2218,7 +2271,7 @@ bool t_rpc_command_executor::sync_info()
for (const auto &s: res.spans)
if (s.connection_id == p.info.connection_id)
nblocks += s.nblocks, size += s.size;
- tools::success_msg_writer() << address << " " << epee::string_tools::pad_string(p.info.peer_id, 16, '0', true) << " " <<
+ tools::success_msg_writer() << address << " " << p.info.peer_id << " " <<
epee::string_tools::pad_string(p.info.state, 16) << " " <<
epee::string_tools::pad_string(epee::string_tools::to_string_hex(p.info.pruning_seed), 8) << " " << p.info.height << " " <<
p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued";
@@ -2374,7 +2427,7 @@ bool t_rpc_command_executor::set_bootstrap_daemon(
return true;
}
-bool t_rpc_command_executor::flush_cache(bool bad_txs)
+bool t_rpc_command_executor::flush_cache(bool bad_txs, bool bad_blocks)
{
cryptonote::COMMAND_RPC_FLUSH_CACHE::request req;
cryptonote::COMMAND_RPC_FLUSH_CACHE::response res;
@@ -2382,6 +2435,7 @@ bool t_rpc_command_executor::flush_cache(bool bad_txs)
epee::json_rpc::error error_resp;
req.bad_txs = bad_txs;
+ req.bad_blocks = bad_blocks;
if (m_is_rpc)
{
diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h
index af55f0e22..66ada6f1f 100644
--- a/src/daemon/rpc_command_executor.h
+++ b/src/daemon/rpc_command_executor.h
@@ -85,7 +85,7 @@ public:
bool print_connections();
- bool print_blockchain_info(uint64_t start_block_index, uint64_t end_block_index);
+ bool print_blockchain_info(int64_t start_block_index, uint64_t end_block_index);
bool set_log_level(int8_t level);
@@ -97,7 +97,7 @@ public:
bool print_block_by_height(uint64_t height, bool include_hex);
- bool print_transaction(crypto::hash transaction_hash, bool include_hex, bool include_json);
+ bool print_transaction(crypto::hash transaction_hash, bool include_metadata, bool include_hex, bool include_json);
bool is_key_image_spent(const crypto::key_image &ki);
@@ -172,7 +172,7 @@ public:
bool rpc_payments();
- bool flush_cache(bool bad_txs);
+ bool flush_cache(bool bad_txs, bool invalid_blocks);
};
} // namespace daemonize
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:23:31 +0000