mirror of
https://github.com/jwinterm/wownero.git
synced 2026-11-20 10:03:57 +01:00
Stagenet
This commit is contained in:
+17
-11
@@ -90,12 +90,12 @@ namespace cryptonote
|
||||
bool core_rpc_server::init(
|
||||
const boost::program_options::variables_map& vm
|
||||
, const bool restricted
|
||||
, const bool testnet
|
||||
, const network_type nettype
|
||||
, const std::string& port
|
||||
)
|
||||
{
|
||||
m_restricted = restricted;
|
||||
m_testnet = testnet;
|
||||
m_nettype = nettype;
|
||||
m_net_server.set_threads_prefix("RPC");
|
||||
|
||||
auto rpc_config = cryptonote::rpc_args::process(vm);
|
||||
@@ -190,7 +190,9 @@ namespace cryptonote
|
||||
res.rpc_connections_count = get_connections_count();
|
||||
res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count();
|
||||
res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count();
|
||||
res.testnet = m_testnet;
|
||||
res.mainnet = m_nettype == MAINNET;
|
||||
res.testnet = m_nettype == TESTNET;
|
||||
res.stagenet = m_nettype == STAGENET;
|
||||
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
||||
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
||||
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
||||
@@ -823,7 +825,7 @@ namespace cryptonote
|
||||
PERF_TIMER(on_start_mining);
|
||||
CHECK_CORE_READY();
|
||||
cryptonote::address_parse_info info;
|
||||
if(!get_account_address_from_str(info, m_testnet, req.miner_address))
|
||||
if(!get_account_address_from_str(info, m_nettype, req.miner_address))
|
||||
{
|
||||
res.status = "Failed, wrong address";
|
||||
LOG_PRINT_L0(res.status);
|
||||
@@ -891,7 +893,7 @@ namespace cryptonote
|
||||
res.speed = lMiner.get_speed();
|
||||
res.threads_count = lMiner.get_threads_count();
|
||||
const account_public_address& lMiningAdr = lMiner.get_mining_address();
|
||||
res.address = get_account_address_as_str(m_testnet, false, lMiningAdr);
|
||||
res.address = get_account_address_as_str(m_nettype, false, lMiningAdr);
|
||||
}
|
||||
|
||||
res.status = CORE_RPC_STATUS_OK;
|
||||
@@ -1106,7 +1108,7 @@ namespace cryptonote
|
||||
|
||||
cryptonote::address_parse_info info;
|
||||
|
||||
if(!req.wallet_address.size() || !cryptonote::get_account_address_from_str(info, m_testnet, req.wallet_address))
|
||||
if(!req.wallet_address.size() || !cryptonote::get_account_address_from_str(info, m_nettype, req.wallet_address))
|
||||
{
|
||||
error_resp.code = CORE_RPC_ERROR_CODE_WRONG_WALLET_ADDRESS;
|
||||
error_resp.message = "Failed to parse wallet address";
|
||||
@@ -1568,7 +1570,9 @@ namespace cryptonote
|
||||
res.rpc_connections_count = get_connections_count();
|
||||
res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count();
|
||||
res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count();
|
||||
res.testnet = m_testnet;
|
||||
res.mainnet = m_nettype == MAINNET;
|
||||
res.testnet = m_nettype == TESTNET;
|
||||
res.stagenet = m_nettype == STAGENET;
|
||||
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
||||
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
||||
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
||||
@@ -2073,14 +2077,16 @@ namespace cryptonote
|
||||
}
|
||||
//------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
const command_line::arg_descriptor<std::string, false, true> core_rpc_server::arg_rpc_bind_port = {
|
||||
const command_line::arg_descriptor<std::string, false, true, 2> core_rpc_server::arg_rpc_bind_port = {
|
||||
"rpc-bind-port"
|
||||
, "Port for RPC server"
|
||||
, std::to_string(config::RPC_DEFAULT_PORT)
|
||||
, cryptonote::arg_testnet_on
|
||||
, [](bool testnet, bool defaulted, std::string val) {
|
||||
if (testnet && defaulted)
|
||||
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }}
|
||||
, [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
|
||||
if (testnet_stagenet[0] && defaulted)
|
||||
return std::to_string(config::testnet::RPC_DEFAULT_PORT);
|
||||
else if (testnet_stagenet[1] && defaulted)
|
||||
return std::to_string(config::stagenet::RPC_DEFAULT_PORT);
|
||||
return val;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace cryptonote
|
||||
{
|
||||
public:
|
||||
|
||||
static const command_line::arg_descriptor<std::string, false, true> arg_rpc_bind_port;
|
||||
static const command_line::arg_descriptor<std::string, false, true, 2> arg_rpc_bind_port;
|
||||
static const command_line::arg_descriptor<std::string> arg_rpc_restricted_bind_port;
|
||||
static const command_line::arg_descriptor<bool> arg_restricted_rpc;
|
||||
static const command_line::arg_descriptor<std::string> arg_bootstrap_daemon_address;
|
||||
@@ -70,10 +70,10 @@ namespace cryptonote
|
||||
bool init(
|
||||
const boost::program_options::variables_map& vm,
|
||||
const bool restricted,
|
||||
const bool testnet,
|
||||
const network_type nettype,
|
||||
const std::string& port
|
||||
);
|
||||
bool is_testnet() const { return m_testnet; }
|
||||
network_type nettype() const { return m_nettype; }
|
||||
|
||||
CHAIN_HTTP_TO_MAP2(connection_context); //forward http requests to uri map
|
||||
|
||||
@@ -235,7 +235,7 @@ private:
|
||||
bool m_should_use_bootstrap_daemon;
|
||||
std::chrono::system_clock::time_point m_bootstrap_height_check_time;
|
||||
bool m_was_bootstrap_ever_used;
|
||||
bool m_testnet;
|
||||
network_type m_nettype;
|
||||
bool m_restricted;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -948,7 +948,9 @@ namespace cryptonote
|
||||
uint64_t rpc_connections_count;
|
||||
uint64_t white_peerlist_size;
|
||||
uint64_t grey_peerlist_size;
|
||||
bool mainnet;
|
||||
bool testnet;
|
||||
bool stagenet;
|
||||
std::string top_block_hash;
|
||||
uint64_t cumulative_difficulty;
|
||||
uint64_t block_size_limit;
|
||||
@@ -975,7 +977,9 @@ namespace cryptonote
|
||||
KV_SERIALIZE(rpc_connections_count)
|
||||
KV_SERIALIZE(white_peerlist_size)
|
||||
KV_SERIALIZE(grey_peerlist_size)
|
||||
KV_SERIALIZE(mainnet)
|
||||
KV_SERIALIZE(testnet)
|
||||
KV_SERIALIZE(stagenet)
|
||||
KV_SERIALIZE(top_block_hash)
|
||||
KV_SERIALIZE(cumulative_difficulty)
|
||||
KV_SERIALIZE(block_size_limit)
|
||||
|
||||
@@ -413,7 +413,7 @@ namespace rpc
|
||||
void DaemonHandler::handle(const StartMining::Request& req, StartMining::Response& res)
|
||||
{
|
||||
cryptonote::address_parse_info info;
|
||||
if(!get_account_address_from_str(info, m_core.get_testnet(), req.miner_address))
|
||||
if(!get_account_address_from_str(info, m_core.get_nettype(), req.miner_address))
|
||||
{
|
||||
res.error_details = "Failed, wrong address";
|
||||
LOG_PRINT_L0(res.error_details);
|
||||
@@ -492,7 +492,9 @@ namespace rpc
|
||||
|
||||
res.info.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count();
|
||||
|
||||
res.info.testnet = m_core.get_testnet();
|
||||
res.info.mainnet = m_core.get_nettype() == MAINNET;
|
||||
res.info.testnet = m_core.get_nettype() == TESTNET;
|
||||
res.info.stagenet = m_core.get_nettype() == STAGENET;
|
||||
res.info.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.info.height - 1);
|
||||
res.info.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
||||
res.info.start_time = (uint64_t)m_core.get_start_time();
|
||||
@@ -525,7 +527,7 @@ namespace rpc
|
||||
res.speed = lMiner.get_speed();
|
||||
res.threads_count = lMiner.get_threads_count();
|
||||
const account_public_address& lMiningAdr = lMiner.get_mining_address();
|
||||
res.address = get_account_address_as_str(m_core.get_testnet(), false, lMiningAdr);
|
||||
res.address = get_account_address_as_str(m_core.get_nettype(), false, lMiningAdr);
|
||||
}
|
||||
|
||||
res.status = Message::STATUS_OK;
|
||||
|
||||
@@ -178,7 +178,9 @@ namespace rpc
|
||||
uint64_t incoming_connections_count;
|
||||
uint64_t white_peerlist_size;
|
||||
uint64_t grey_peerlist_size;
|
||||
bool mainnet;
|
||||
bool testnet;
|
||||
bool stagenet;
|
||||
crypto::hash top_block_hash;
|
||||
uint64_t cumulative_difficulty;
|
||||
uint64_t block_size_limit;
|
||||
|
||||
Reference in New Issue
Block a user