4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

monero-rpc-deprecated basic. get_info, save_bc, start, stop mining

Browse Source
This commit is contained in:
Oran Juice 2015-05-24 23:10:15 +05:30
parent 9eb15fffa5
commit 44c3ad69b4
No known key found for this signature in database
GPG Key ID: 71C5AF46CCB28124
23 changed files with 1558 additions and 1422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/daemon/daemon.cpp
View File

@ -34,7 +34,7 @@
#include "daemon/core.h"
#include "daemon/p2p.h"
#include "daemon/protocol.h"
#include "daemon/rpc.h"
// #include "daemon/rpc.h"
#include "daemon/command_server.h"
#include "misc_log_ex.h"
#include "version.h"
@ -57,7 +57,7 @@ private:
public:
t_core core;
t_p2p p2p;
t_rpc rpc;
// t_rpc rpc;
bool testnet_mode;
t_internals(
@ -66,7 +66,7 @@ public:
: core{vm}
, protocol{vm, core}
, p2p{vm, protocol}
, rpc{vm, core, p2p}
// , rpc{vm, core, p2p}
{
// Handle circular dependencies
protocol.set_p2p_endpoint(p2p.get());
@ -79,7 +79,7 @@ void t_daemon::init_options(boost::program_options::options_description & option
{
t_core::init_options(option_spec);
t_p2p::init_options(option_spec);
t_rpc::init_options(option_spec);
// t_rpc::init_options(option_spec);
}
t_daemon::t_daemon(
@ -122,14 +122,14 @@ bool t_daemon::run(bool interactive)
try
{
mp_internals->core.run();
mp_internals->rpc.run();
// mp_internals->rpc.run();
daemonize::t_command_server* rpc_commands;
// daemonize::t_command_server* rpc_commands;
if (interactive)
{
rpc_commands = new daemonize::t_command_server(0, 0, false, mp_internals->rpc.get_server());
rpc_commands->start_handling();
// rpc_commands = new daemonize::t_command_server(0, 0, false, mp_internals->rpc.get_server());
// rpc_commands->start_handling();
IPC::Daemon::init(mp_internals->core.get(), mp_internals->p2p.get(), mp_internals->testnet_mode);
}
@ -138,11 +138,11 @@ bool t_daemon::run(bool interactive)
if (interactive)
{
rpc_commands->stop_handling();
// rpc_commands->stop_handling();
IPC::Daemon::stop();
}
mp_internals->rpc.stop();
// mp_internals->rpc.stop();
LOG_PRINT("Node stopped.", LOG_LEVEL_0);
return true;
}
@ -165,7 +165,7 @@ void t_daemon::stop()
throw std::runtime_error{"Can't stop stopped daemon"};
}
mp_internals->p2p.stop();
mp_internals->rpc.stop();
// mp_internals->rpc.stop();
mp_internals.reset(nullptr); // Ensure resources are cleaned up before we return
}

42
src/ipc/daemon_ipc_handlers.cpp
View File

@ -320,5 +320,47 @@ namespace IPC
LOG_PRINT_L2("COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS: " << ENDL << s);
wap_proto_set_status(message, STATUS_OK);
}
void get_height(wap_proto_t *message) {
if (!check_core_busy()) {
wap_proto_set_status(message, STATUS_CORE_BUSY);
return;
}
wap_proto_set_height(message, core->get_current_blockchain_height());
wap_proto_set_status(message, STATUS_OK);
}
void save_bc(wap_proto_t *message) {
if (!check_core_busy()) {
wap_proto_set_status(message, STATUS_CORE_BUSY);
return;
}
if (!core->get_blockchain_storage().store_blockchain()) {
wap_proto_set_status(message, STATUS_ERROR_STORING_BLOCKCHAIN);
return;
}
wap_proto_set_status(message, STATUS_OK);
}
void get_info(wap_proto_t *message) {
if (!check_core_busy()) {
wap_proto_set_status(message, STATUS_CORE_BUSY);
return;
}
uint64_t height = core->get_current_blockchain_height();
wap_proto_set_height(message, height);
wap_proto_set_target_height(message, core->get_target_blockchain_height());
wap_proto_set_difficulty(message, core->get_blockchain_storage().get_difficulty_for_next_block());
wap_proto_set_tx_count(message, core->get_blockchain_storage().get_total_transactions() - height);
wap_proto_set_tx_pool_size(message, core->get_pool_transactions_count());
wap_proto_set_alt_blocks_count(message, core->get_blockchain_storage().get_alternative_blocks_count());
uint64_t outgoing_connections_count = p2p->get_outgoing_connections_count();
wap_proto_set_outgoing_connections_count(message, outgoing_connections_count);
uint64_t total_connections = p2p->get_connections_count();
wap_proto_set_incoming_connections_count(message, total_connections - outgoing_connections_count);
wap_proto_set_white_peerlist_size(message, p2p->get_peerlist_manager().get_white_peers_count());
wap_proto_set_grey_peerlist_size(message, p2p->get_peerlist_manager().get_gray_peers_count());
wap_proto_set_status(message, STATUS_OK);
}
}
}

4
src/ipc/include/daemon_ipc_handlers.h
View File

@ -65,6 +65,7 @@ namespace IPC
const uint64_t STATUS_TX_NOT_RELAYED = 8;
const uint64_t STATUS_RANDOM_OUTS_FAILED = 9;
const uint64_t STATUS_MINING_NOT_STOPPED = 10;
const uint64_t STATUS_ERROR_STORING_BLOCKCHAIN = 11;
namespace Daemon
{
void start_mining(wap_proto_t *message);
@ -73,6 +74,9 @@ namespace IPC
void send_raw_transaction(wap_proto_t *message);
void get_output_indexes(wap_proto_t *message);
void get_random_outs(wap_proto_t *message);
void get_height(wap_proto_t *message);
void save_bc(wap_proto_t *message);
void get_info(wap_proto_t *message);
void init(cryptonote::core &p_core,
nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > &p_p2p,
bool p_testnet);

52
src/ipc/include/wap_client.h
View File

@ -85,7 +85,7 @@ WAP_EXPORT int
// Request a set of blocks from the server.
// Returns >= 0 if successful, -1 if interrupted.
WAP_EXPORT int
wap_client_save (wap_client_t *self);
wap_client_save_bc (wap_client_t *self);
// Ask for tx output indexes.
// Returns >= 0 if successful, -1 if interrupted.
@ -97,6 +97,16 @@ WAP_EXPORT int
WAP_EXPORT int
wap_client_random_outs (wap_client_t *self, uint64_t outs_count, zframe_t **amounts_p);
// Ask for height.
// Returns >= 0 if successful, -1 if interrupted.
WAP_EXPORT int
wap_client_get_height (wap_client_t *self);
// Ask for height.
// Returns >= 0 if successful, -1 if interrupted.
WAP_EXPORT int
wap_client_get_info (wap_client_t *self);
// Send start command to server.
// Returns >= 0 if successful, -1 if interrupted.
WAP_EXPORT int
@ -139,6 +149,46 @@ WAP_EXPORT zframe_t *
WAP_EXPORT zframe_t *
wap_client_random_outputs (wap_client_t *self);
// Return last received height
WAP_EXPORT uint64_t
wap_client_height (wap_client_t *self);
// Return last received target_height
WAP_EXPORT uint64_t
wap_client_target_height (wap_client_t *self);
// Return last received difficulty
WAP_EXPORT uint64_t
wap_client_difficulty (wap_client_t *self);
// Return last received tx_count
WAP_EXPORT uint64_t
wap_client_tx_count (wap_client_t *self);
// Return last received tx_pool_size
WAP_EXPORT uint64_t
wap_client_tx_pool_size (wap_client_t *self);
// Return last received alt_blocks_count
WAP_EXPORT uint64_t
wap_client_alt_blocks_count (wap_client_t *self);
// Return last received outgoing_connections_count
WAP_EXPORT uint64_t
wap_client_outgoing_connections_count (wap_client_t *self);
// Return last received incoming_connections_count
WAP_EXPORT uint64_t
wap_client_incoming_connections_count (wap_client_t *self);
// Return last received white_peerlist_size
WAP_EXPORT uint64_t
wap_client_white_peerlist_size (wap_client_t *self);
// Return last received grey_peerlist_size
WAP_EXPORT uint64_t
wap_client_grey_peerlist_size (wap_client_t *self);
// Self test of this class
WAP_EXPORT void
wap_client_test (bool verbose);

410
src/ipc/include/wap_client_engine.inc
View File

@ -27,15 +27,17 @@ typedef enum {
expect_blocks_ok_state = 4,
expect_get_ok_state = 5,
expect_put_ok_state = 6,
expect_save_ok_state = 7,
expect_save_bc_ok_state = 7,
expect_start_ok_state = 8,
expect_stop_ok_state = 9,
expect_output_indexes_ok_state = 10,
expect_random_outs_ok_state = 11,
expect_close_ok_state = 12,
defaults_state = 13,
have_error_state = 14,
reexpect_open_ok_state = 15
expect_get_height_ok_state = 12,
expect_get_info_ok_state = 13,
expect_close_ok_state = 14,
defaults_state = 15,
have_error_state = 16,
reexpect_open_ok_state = 17
} state_t;
typedef enum {
@ -47,26 +49,30 @@ typedef enum {
blocks_event = 5,
get_event = 6,
put_event = 7,
save_event = 8,
save_bc_event = 8,
start_event = 9,
stop_event = 10,
output_indexes_event = 11,
random_outs_event = 12,
destructor_event = 13,
blocks_ok_event = 14,
get_ok_event = 15,
put_ok_event = 16,
save_ok_event = 17,
start_ok_event = 18,
stop_ok_event = 19,
output_indexes_ok_event = 20,
random_outs_ok_event = 21,
close_ok_event = 22,
ping_ok_event = 23,
error_event = 24,
exception_event = 25,
command_invalid_event = 26,
other_event = 27
get_height_event = 13,
get_info_event = 14,
destructor_event = 15,
blocks_ok_event = 16,
get_ok_event = 17,
put_ok_event = 18,
save_bc_ok_event = 19,
start_ok_event = 20,
stop_ok_event = 21,
output_indexes_ok_event = 22,
random_outs_ok_event = 23,
get_height_ok_event = 24,
get_info_ok_event = 25,
close_ok_event = 26,
ping_ok_event = 27,
error_event = 28,
exception_event = 29,
command_invalid_event = 30,
other_event = 31
} event_t;
// Names for state machine logging and error reporting
@ -79,11 +85,13 @@ s_state_name [] = {
"expect blocks ok",
"expect get ok",
"expect put ok",
"expect save ok",
"expect save bc ok",
"expect start ok",
"expect stop ok",
"expect output indexes ok",
"expect random outs ok",
"expect get height ok",
"expect get info ok",
"expect close ok",
"defaults",
"have error",
@ -100,20 +108,24 @@ s_event_name [] = {
"BLOCKS",
"GET",
"PUT",
"SAVE",
"SAVE_BC",
"START",
"STOP",
"OUTPUT_INDEXES",
"RANDOM_OUTS",
"GET_HEIGHT",
"GET_INFO",
"destructor",
"BLOCKS_OK",
"GET_OK",
"PUT_OK",
"SAVE_OK",
"SAVE_BC_OK",
"START_OK",
"STOP_OK",
"OUTPUT_INDEXES_OK",
"RANDOM_OUTS_OK",
"GET_HEIGHT_OK",
"GET_INFO_OK",
"CLOSE_OK",
"PING_OK",
"ERROR",
@ -198,8 +210,6 @@ static void
prepare_get_command (client_t *self);
static void
prepare_put_command (client_t *self);
static void
prepare_save_command (client_t *self);
static void
prepare_start_command (client_t *self);
static void
@ -215,7 +225,7 @@ static void
static void
signal_have_put_ok (client_t *self);
static void
signal_have_save_ok (client_t *self);
signal_have_save_bc_ok (client_t *self);
static void
signal_have_start_ok (client_t *self);
static void
@ -224,6 +234,10 @@ static void
signal_have_output_indexes_ok (client_t *self);
static void
signal_have_random_outs_ok (client_t *self);
static void
signal_have_get_height_ok (client_t *self);
static void
signal_have_get_info_ok (client_t *self);
static void
signal_failure (client_t *self);
static void
@ -443,17 +457,23 @@ s_protocol_event (s_client_t *self, wap_proto_t *message)
case WAP_PROTO_RANDOM_OUTS_OK:
return random_outs_ok_event;
break;
case WAP_PROTO_GET_HEIGHT:
return get_height_event;
break;
case WAP_PROTO_GET_HEIGHT_OK:
return get_height_ok_event;
break;
case WAP_PROTO_GET:
return get_event;
break;
case WAP_PROTO_GET_OK:
return get_ok_event;
break;
case WAP_PROTO_SAVE:
return save_event;
case WAP_PROTO_SAVE_BC:
return save_bc_event;
break;
case WAP_PROTO_SAVE_OK:
return save_ok_event;
case WAP_PROTO_SAVE_BC_OK:
return save_bc_ok_event;
break;
case WAP_PROTO_START:
return start_event;
@ -461,6 +481,12 @@ s_protocol_event (s_client_t *self, wap_proto_t *message)
case WAP_PROTO_START_OK:
return start_ok_event;
break;
case WAP_PROTO_GET_INFO:
return get_info_event;
break;
case WAP_PROTO_GET_INFO_OK:
return get_info_ok_event;
break;
case WAP_PROTO_STOP:
return stop_event;
break;
@ -681,22 +707,16 @@ s_client_execute (s_client_t *self, event_t event)
self->state = expect_put_ok_state;
}
else
if (self->event == save_event) {
if (self->event == save_bc_event) {
if (!self->exception) {
// prepare save command
// send SAVE_BC
if (wap_client_verbose)
zsys_debug ("wap_client: $ prepare save command");
prepare_save_command (&self->client);
}
if (!self->exception) {
// send SAVE
if (wap_client_verbose)
zsys_debug ("wap_client: $ send SAVE");
wap_proto_set_id (self->message, WAP_PROTO_SAVE);
zsys_debug ("wap_client: $ send SAVE_BC");
wap_proto_set_id (self->message, WAP_PROTO_SAVE_BC);
wap_proto_send (self->message, self->dealer);
}
if (!self->exception)
self->state = expect_save_ok_state;
self->state = expect_save_bc_ok_state;
}
else
if (self->event == start_event) {
@ -765,6 +785,30 @@ s_client_execute (s_client_t *self, event_t event)
self->state = expect_random_outs_ok_state;
}
else
if (self->event == get_height_event) {
if (!self->exception) {
// send GET_HEIGHT
if (wap_client_verbose)
zsys_debug ("wap_client: $ send GET_HEIGHT");
wap_proto_set_id (self->message, WAP_PROTO_GET_HEIGHT);
wap_proto_send (self->message, self->dealer);
}
if (!self->exception)
self->state = expect_get_height_ok_state;
}
else
if (self->event == get_info_event) {
if (!self->exception) {
// send GET_INFO
if (wap_client_verbose)
zsys_debug ("wap_client: $ send GET_INFO");
wap_proto_set_id (self->message, WAP_PROTO_GET_INFO);
wap_proto_send (self->message, self->dealer);
}
if (!self->exception)
self->state = expect_get_info_ok_state;
}
else
if (self->event == destructor_event) {
if (!self->exception) {
// send CLOSE
@ -961,13 +1005,13 @@ s_client_execute (s_client_t *self, event_t event)
}
break;
case expect_save_ok_state:
if (self->event == save_ok_event) {
case expect_save_bc_ok_state:
if (self->event == save_bc_ok_event) {
if (!self->exception) {
// signal have save ok
// signal have save bc ok
if (wap_client_verbose)
zsys_debug ("wap_client: $ signal have save ok");
signal_have_save_ok (&self->client);
zsys_debug ("wap_client: $ signal have save bc ok");
signal_have_save_bc_ok (&self->client);
}
if (!self->exception)
self->state = connected_state;
@ -1186,6 +1230,96 @@ s_client_execute (s_client_t *self, event_t event)
}
break;
case expect_get_height_ok_state:
if (self->event == get_height_ok_event) {
if (!self->exception) {
// signal have get height ok
if (wap_client_verbose)
zsys_debug ("wap_client: $ signal have get height ok");
signal_have_get_height_ok (&self->client);
}
if (!self->exception)
self->state = connected_state;
}
else
if (self->event == ping_ok_event) {
if (!self->exception) {
// client is connected
if (wap_client_verbose)
zsys_debug ("wap_client: $ client is connected");
client_is_connected (&self->client);
}
}
else
if (self->event == error_event) {
if (!self->exception) {
// check status code
if (wap_client_verbose)
zsys_debug ("wap_client: $ check status code");
check_status_code (&self->client);
}
if (!self->exception)
self->state = have_error_state;
}
else
if (self->event == exception_event) {
// No action - just logging
if (wap_client_verbose)
zsys_debug ("wap_client: $ exception");
}
else {
// Handle unexpected protocol events
// No action - just logging
if (wap_client_verbose)
zsys_debug ("wap_client: $ *");
}
break;
case expect_get_info_ok_state:
if (self->event == get_info_ok_event) {
if (!self->exception) {
// signal have get info ok
if (wap_client_verbose)
zsys_debug ("wap_client: $ signal have get info ok");
signal_have_get_info_ok (&self->client);
}
if (!self->exception)
self->state = connected_state;
}
else
if (self->event == ping_ok_event) {
if (!self->exception) {
// client is connected
if (wap_client_verbose)
zsys_debug ("wap_client: $ client is connected");
client_is_connected (&self->client);
}
}
else
if (self->event == error_event) {
if (!self->exception) {
// check status code
if (wap_client_verbose)
zsys_debug ("wap_client: $ check status code");
check_status_code (&self->client);
}
if (!self->exception)
self->state = have_error_state;
}
else
if (self->event == exception_event) {
// No action - just logging
if (wap_client_verbose)
zsys_debug ("wap_client: $ exception");
}
else {
// Handle unexpected protocol events
// No action - just logging
if (wap_client_verbose)
zsys_debug ("wap_client: $ *");
}
break;
case expect_close_ok_state:
if (self->event == close_ok_event) {
if (!self->exception) {
@ -1456,8 +1590,8 @@ s_client_handle_cmdpipe (zloop_t *loop, zsock_t *reader, void *argument)
s_client_execute (self, get_event);
}
else
if (streq (method, "SAVE")) {
s_client_execute (self, save_event);
if (streq (method, "SAVE BC")) {
s_client_execute (self, save_bc_event);
}
else
if (streq (method, "OUTPUT INDEXES")) {
@ -1472,6 +1606,14 @@ s_client_handle_cmdpipe (zloop_t *loop, zsock_t *reader, void *argument)
s_client_execute (self, random_outs_event);
}
else
if (streq (method, "GET HEIGHT")) {
s_client_execute (self, get_height_event);
}
else
if (streq (method, "GET INFO")) {
s_client_execute (self, get_info_event);
}
else
if (streq (method, "START")) {
zchunk_destroy (&self->args.address);
zsock_recv (self->cmdpipe, "p8", &self->args.address, &self->args.thread_count);
@ -1601,6 +1743,16 @@ struct _wap_client_t {
zchunk_t *tx_data; // Returned by actor reply
zframe_t *o_indexes; // Returned by actor reply
zframe_t *random_outputs; // Returned by actor reply
uint64_t height; // Returned by actor reply
uint64_t target_height; // Returned by actor reply
uint64_t difficulty; // Returned by actor reply
uint64_t tx_count; // Returned by actor reply
uint64_t tx_pool_size; // Returned by actor reply
uint64_t alt_blocks_count; // Returned by actor reply
uint64_t outgoing_connections_count; // Returned by actor reply
uint64_t incoming_connections_count; // Returned by actor reply
uint64_t white_peerlist_size; // Returned by actor reply
uint64_t grey_peerlist_size; // Returned by actor reply
};
@ -1745,8 +1897,8 @@ s_accept_reply (wap_client_t *self, ...)
zsock_recv (self->actor, "ip", &self->status, &self->tx_data);
}
else
if (streq (reply, "SAVE OK")) {
zsock_recv (self->actor, "i", &self->status);
if (streq (reply, "SAVE BC OK")) {
zsock_recv (self->actor, "8", &self->status);
}
else
if (streq (reply, "OUTPUT INDEXES OK")) {
@ -1759,6 +1911,14 @@ s_accept_reply (wap_client_t *self, ...)
zsock_recv (self->actor, "8p", &self->status, &self->random_outputs);
}
else
if (streq (reply, "GET HEIGHT OK")) {
zsock_recv (self->actor, "88", &self->status, &self->height);
}
else
if (streq (reply, "GET INFO OK")) {
zsock_recv (self->actor, "88888888888", &self->status, &self->height, &self->target_height, &self->difficulty, &self->tx_count, &self->tx_pool_size, &self->alt_blocks_count, &self->outgoing_connections_count, &self->incoming_connections_count, &self->white_peerlist_size, &self->grey_peerlist_size);
}
else
if (streq (reply, "START OK")) {
zsock_recv (self->actor, "8", &self->status);
}
@ -1873,12 +2033,12 @@ wap_client_get (wap_client_t *self, zchunk_t **tx_id_p)
// Returns >= 0 if successful, -1 if interrupted.
int
wap_client_save (wap_client_t *self)
wap_client_save_bc (wap_client_t *self)
{
assert (self);
zsock_send (self->actor, "s", "SAVE");
if (s_accept_reply (self, "SAVE OK", "FAILURE", NULL))
zsock_send (self->actor, "s", "SAVE BC");
if (s_accept_reply (self, "SAVE BC OK", "FAILURE", NULL))
return -1; // Interrupted or timed-out
return self->status;
}
@ -1918,6 +2078,38 @@ wap_client_random_outs (wap_client_t *self, uint64_t outs_count, zframe_t **amou
}
// ---------------------------------------------------------------------------
// Ask for height.
// Returns >= 0 if successful, -1 if interrupted.
int
wap_client_get_height (wap_client_t *self)
{
assert (self);
zsock_send (self->actor, "s", "GET HEIGHT");
if (s_accept_reply (self, "GET HEIGHT OK", "FAILURE", NULL))
return -1; // Interrupted or timed-out
return self->status;
}
// ---------------------------------------------------------------------------
// Ask for height.
// Returns >= 0 if successful, -1 if interrupted.
int
wap_client_get_info (wap_client_t *self)
{
assert (self);
zsock_send (self->actor, "s", "GET INFO");
if (s_accept_reply (self, "GET INFO OK", "FAILURE", NULL))
return -1; // Interrupted or timed-out
return self->status;
}
// ---------------------------------------------------------------------------
// Send start command to server.
// Returns >= 0 if successful, -1 if interrupted.
@ -2037,3 +2229,113 @@ wap_client_random_outputs (wap_client_t *self)
assert (self);
return self->random_outputs;
}
// ---------------------------------------------------------------------------
// Return last received height
uint64_t
wap_client_height (wap_client_t *self)
{
assert (self);
return self->height;
}
// ---------------------------------------------------------------------------
// Return last received target_height
uint64_t
wap_client_target_height (wap_client_t *self)
{
assert (self);
return self->target_height;
}
// ---------------------------------------------------------------------------
// Return last received difficulty
uint64_t
wap_client_difficulty (wap_client_t *self)
{
assert (self);
return self->difficulty;
}
// ---------------------------------------------------------------------------
// Return last received tx_count
uint64_t
wap_client_tx_count (wap_client_t *self)
{
assert (self);
return self->tx_count;
}
// ---------------------------------------------------------------------------
// Return last received tx_pool_size
uint64_t
wap_client_tx_pool_size (wap_client_t *self)
{
assert (self);
return self->tx_pool_size;
}
// ---------------------------------------------------------------------------
// Return last received alt_blocks_count
uint64_t
wap_client_alt_blocks_count (wap_client_t *self)
{
assert (self);
return self->alt_blocks_count;
}
// ---------------------------------------------------------------------------
// Return last received outgoing_connections_count
uint64_t
wap_client_outgoing_connections_count (wap_client_t *self)
{
assert (self);
return self->outgoing_connections_count;
}
// ---------------------------------------------------------------------------
// Return last received incoming_connections_count
uint64_t
wap_client_incoming_connections_count (wap_client_t *self)
{
assert (self);
return self->incoming_connections_count;
}
// ---------------------------------------------------------------------------
// Return last received white_peerlist_size
uint64_t
wap_client_white_peerlist_size (wap_client_t *self)
{
assert (self);
return self->white_peerlist_size;
}
// ---------------------------------------------------------------------------
// Return last received grey_peerlist_size
uint64_t
wap_client_grey_peerlist_size (wap_client_t *self)
{
assert (self);
return self->grey_peerlist_size;
}

118
src/ipc/include/wap_proto.h
View File

@ -63,6 +63,12 @@ PUT-OK, or ERROR.
status number 8 Status
random_outputs frame Outputs
GET_HEIGHT - Get height.
GET_HEIGHT_OK - Daemon returns height.
status number 8 Status
height number 8 Height
GET - Wallet requests transaction data from the daemon. Daemon replies
with GET-OK, or ERROR.
tx_id chunk Transaction ID
@ -70,9 +76,10 @@ with GET-OK, or ERROR.
GET_OK - Daemon replies with transaction data.
tx_data chunk Transaction data
SAVE - save_bc command. Details tbd.
SAVE_BC - save_bc command. Details tbd.
SAVE_OK - Daemon replies to a save_bc command.
SAVE_BC_OK - Daemon replies to a save_bc command.
status number 8 Status
START - Wallet asks daemon to start mining. Daemon replies with START-OK, or
ERROR.
@ -82,7 +89,22 @@ ERROR.
START_OK - Daemon replies to a start mining request.
status number 8
STOP - Wallet asks daemon to start mining. Daemon replies with START-OK, or
GET_INFO - getinfo IPC
GET_INFO_OK - This is a codec for a Bitcoin Wallet Access Protocol (RFC tbd)
status number 8 Status
height number 8 Height
target_height number 8 Target Height
difficulty number 8 Difficulty
tx_count number 8 TX Count
tx_pool_size number 8 TX Pool Size
alt_blocks_count number 8 Alt Blocks Count
outgoing_connections_count number 8 Outgoing Connections Count
incoming_connections_count number 8 Incoming Connections Count
white_peerlist_size number 8 White Peerlist Size
grey_peerlist_size number 8 Grey Peerlist Size
STOP - Wallet asks daemon to start mining. Daemon replies with STOP-OK, or
ERROR.
STOP_OK - Daemon replies to a stop mining request.
@ -123,19 +145,23 @@ Daemon will reply with CLOSE-OK or ERROR.
#define WAP_PROTO_OUTPUT_INDEXES_OK 8
#define WAP_PROTO_RANDOM_OUTS 9
#define WAP_PROTO_RANDOM_OUTS_OK 10
#define WAP_PROTO_GET 11
#define WAP_PROTO_GET_OK 12
#define WAP_PROTO_SAVE 13
#define WAP_PROTO_SAVE_OK 14
#define WAP_PROTO_START 15
#define WAP_PROTO_START_OK 16
#define WAP_PROTO_STOP 17
#define WAP_PROTO_STOP_OK 18
#define WAP_PROTO_CLOSE 19
#define WAP_PROTO_CLOSE_OK 20
#define WAP_PROTO_PING 21
#define WAP_PROTO_PING_OK 22
#define WAP_PROTO_ERROR 23
#define WAP_PROTO_GET_HEIGHT 11
#define WAP_PROTO_GET_HEIGHT_OK 12
#define WAP_PROTO_GET 13
#define WAP_PROTO_GET_OK 14
#define WAP_PROTO_SAVE_BC 15
#define WAP_PROTO_SAVE_BC_OK 16
#define WAP_PROTO_START 17
#define WAP_PROTO_START_OK 18
#define WAP_PROTO_GET_INFO 19
#define WAP_PROTO_GET_INFO_OK 20
#define WAP_PROTO_STOP 21
#define WAP_PROTO_STOP_OK 22
#define WAP_PROTO_CLOSE 23
#define WAP_PROTO_CLOSE_OK 24
#define WAP_PROTO_PING 25
#define WAP_PROTO_PING_OK 26
#define WAP_PROTO_ERROR 27
#include <czmq.h>
@ -285,6 +311,12 @@ zframe_t *
void
wap_proto_set_random_outputs (wap_proto_t *self, zframe_t **frame_p);
// Get/set the height field
uint64_t
wap_proto_height (wap_proto_t *self);
void
wap_proto_set_height (wap_proto_t *self, uint64_t height);
// Get a copy of the tx_data field
zchunk_t *
wap_proto_tx_data (wap_proto_t *self);
@ -311,6 +343,60 @@ uint64_t
void
wap_proto_set_thread_count (wap_proto_t *self, uint64_t thread_count);
// Get/set the target_height field
uint64_t
wap_proto_target_height (wap_proto_t *self);
void
wap_proto_set_target_height (wap_proto_t *self, uint64_t target_height);
// Get/set the difficulty field
uint64_t
wap_proto_difficulty (wap_proto_t *self);
void
wap_proto_set_difficulty (wap_proto_t *self, uint64_t difficulty);
// Get/set the tx_count field
uint64_t
wap_proto_tx_count (wap_proto_t *self);
void
wap_proto_set_tx_count (wap_proto_t *self, uint64_t tx_count);
// Get/set the tx_pool_size field
uint64_t
wap_proto_tx_pool_size (wap_proto_t *self);
void
wap_proto_set_tx_pool_size (wap_proto_t *self, uint64_t tx_pool_size);
// Get/set the alt_blocks_count field
uint64_t
wap_proto_alt_blocks_count (wap_proto_t *self);
void
wap_proto_set_alt_blocks_count (wap_proto_t *self, uint64_t alt_blocks_count);
// Get/set the outgoing_connections_count field
uint64_t
wap_proto_outgoing_connections_count (wap_proto_t *self);
void
wap_proto_set_outgoing_connections_count (wap_proto_t *self, uint64_t outgoing_connections_count);
// Get/set the incoming_connections_count field
uint64_t
wap_proto_incoming_connections_count (wap_proto_t *self);
void
wap_proto_set_incoming_connections_count (wap_proto_t *self, uint64_t incoming_connections_count);
// Get/set the white_peerlist_size field
uint64_t
wap_proto_white_peerlist_size (wap_proto_t *self);
void
wap_proto_set_white_peerlist_size (wap_proto_t *self, uint64_t white_peerlist_size);
// Get/set the grey_peerlist_size field
uint64_t
wap_proto_grey_peerlist_size (wap_proto_t *self);
void
wap_proto_set_grey_peerlist_size (wap_proto_t *self, uint64_t grey_peerlist_size);
// Get/set the reason field
const char *
wap_proto_reason (wap_proto_t *self);

84
src/ipc/include/wap_server_engine.inc
View File

@ -34,16 +34,18 @@ typedef enum {
blocks_event = 3,
put_event = 4,
get_event = 5,
save_event = 6,
save_bc_event = 6,
start_event = 7,
stop_event = 8,
output_indexes_event = 9,
random_outs_event = 10,
close_event = 11,
ping_event = 12,
expired_event = 13,
exception_event = 14,
settled_event = 15
get_height_event = 11,
get_info_event = 12,
close_event = 13,
ping_event = 14,
expired_event = 15,
exception_event = 16,
settled_event = 17
} event_t;
// Names for state machine logging and error reporting
@ -64,11 +66,13 @@ s_event_name [] = {
"BLOCKS",
"PUT",
"GET",
"SAVE",
"SAVE_BC",
"START",
"STOP",
"OUTPUT_INDEXES",
"RANDOM_OUTS",
"GET_HEIGHT",
"GET_INFO",
"CLOSE",
"PING",
"expired",
@ -144,6 +148,8 @@ static void
send_transaction (client_t *self);
static void
retrieve_transaction (client_t *self);
static void
save_bc (client_t *self);
static void
start_mining_process (client_t *self);
static void
@ -152,6 +158,10 @@ static void
output_indexes (client_t *self);
static void
random_outs (client_t *self);
static void
height (client_t *self);
static void
getinfo (client_t *self);
static void
deregister_wallet (client_t *self);
static void
@ -351,15 +361,21 @@ s_protocol_event (wap_proto_t *message)
case WAP_PROTO_RANDOM_OUTS:
return random_outs_event;
break;
case WAP_PROTO_GET_HEIGHT:
return get_height_event;
break;
case WAP_PROTO_GET:
return get_event;
break;
case WAP_PROTO_SAVE:
return save_event;
case WAP_PROTO_SAVE_BC:
return save_bc_event;
break;
case WAP_PROTO_START:
return start_event;
break;
case WAP_PROTO_GET_INFO:
return get_info_event;
break;
case WAP_PROTO_STOP:
return stop_event;
break;
@ -632,13 +648,19 @@ s_client_execute (s_client_t *self, event_t event)
}
}
else
if (self->event == save_event) {
if (self->event == save_bc_event) {
if (!self->exception) {
// send SAVE_OK
// save bc
if (self->server->verbose)
zsys_debug ("%s: $ send SAVE_OK",
zsys_debug ("%s: $ save bc", self->log_prefix);
save_bc (&self->client);
}
if (!self->exception) {
// send SAVE_BC_OK
if (self->server->verbose)
zsys_debug ("%s: $ send SAVE_BC_OK",
self->log_prefix);
wap_proto_set_id (self->server->message, WAP_PROTO_SAVE_OK);
wap_proto_set_id (self->server->message, WAP_PROTO_SAVE_BC_OK);
wap_proto_set_routing_id (self->server->message, self->routing_id);
wap_proto_send (self->server->message, self->server->router);
}
@ -716,6 +738,42 @@ s_client_execute (s_client_t *self, event_t event)
}
}
else
if (self->event == get_height_event) {
if (!self->exception) {
// height
if (self->server->verbose)
zsys_debug ("%s: $ height", self->log_prefix);
height (&self->client);
}
if (!self->exception) {
// send GET_HEIGHT_OK
if (self->server->verbose)
zsys_debug ("%s: $ send GET_HEIGHT_OK",
self->log_prefix);
wap_proto_set_id (self->server->message, WAP_PROTO_GET_HEIGHT_OK);
wap_proto_set_routing_id (self->server->message, self->routing_id);
wap_proto_send (self->server->message, self->server->router);
}
}
else
if (self->event == get_info_event) {
if (!self->exception) {
// getinfo
if (self->server->verbose)
zsys_debug ("%s: $ getinfo", self->log_prefix);
getinfo (&self->client);
}
if (!self->exception) {
// send GET_INFO_OK
if (self->server->verbose)
zsys_debug ("%s: $ send GET_INFO_OK",
self->log_prefix);
wap_proto_set_id (self->server->message, WAP_PROTO_GET_INFO_OK);
wap_proto_set_routing_id (self->server->message, self->routing_id);
wap_proto_send (self->server->message, self->server->router);
}
}
else
if (self->event == close_event) {
if (!self->exception) {
// send CLOSE_OK

47
src/ipc/wap_client/wap_client.c
View File

@ -229,25 +229,14 @@ signal_have_get_ok (client_t *self)
}
// ---------------------------------------------------------------------------
// prepare_save_command
//
static void
prepare_save_command (client_t *self)
{
}
// ---------------------------------------------------------------------------
// signal_have_save_ok
//
static void
signal_have_save_ok (client_t *self)
signal_have_save_bc_ok (client_t *self)
{
zsock_send (self->cmdpipe, "s8", "SAVE OK", 0);
zsock_send (self->cmdpipe, "s8", "SAVE BC OK", wap_proto_status(self->message));
}
@ -272,6 +261,17 @@ signal_have_stop_ok (client_t *self)
zsock_send (self->cmdpipe, "s8", "STOP OK", 0);
}
// ---------------------------------------------------------------------------
// signal_have_get_height_ok
//
static void
signal_have_get_height_ok (client_t *self)
{
zsock_send (self->cmdpipe, "si8", "GET HEIGHT OK", 0,
wap_proto_height (self->message));
}
// ---------------------------------------------------------------------------
// signal_have_output_indexes_ok
//
@ -375,3 +375,24 @@ signal_have_random_outs_ok (client_t *self)
wap_proto_status (self->message),
wap_proto_get_random_outputs (self->message));
}
// ---------------------------------------------------------------------------
// signal_have_get_info_ok
//
static void
signal_have_get_info_ok (client_t *self)
{
zsock_send (self->cmdpipe, "s88888888888", "GET INFO OK",
wap_proto_status (self->message),
wap_proto_height (self->message),
wap_proto_target_height (self->message),
wap_proto_difficulty (self->message),
wap_proto_tx_count (self->message),
wap_proto_tx_pool_size (self->message),
wap_proto_alt_blocks_count (self->message),
wap_proto_outgoing_connections_count (self->message),
wap_proto_incoming_connections_count (self->message),
wap_proto_white_peerlist_size (self->message),
wap_proto_grey_peerlist_size (self->message));
}

393
src/ipc/wap_proto.c
View File

@ -46,9 +46,19 @@ struct _wap_proto_t {
uint64_t outs_count; // Outs count
zframe_t *amounts; // Amounts
zframe_t *random_outputs; // Outputs
uint64_t height; // Height
zchunk_t *tx_data; // Transaction data
zchunk_t *address; // address
uint64_t thread_count; // thread_count
uint64_t target_height; // Target Height
uint64_t difficulty; // Difficulty
uint64_t tx_count; // TX Count
uint64_t tx_pool_size; // TX Pool Size
uint64_t alt_blocks_count; // Alt Blocks Count
uint64_t outgoing_connections_count; // Outgoing Connections Count
uint64_t incoming_connections_count; // Incoming Connections Count
uint64_t white_peerlist_size; // White Peerlist Size
uint64_t grey_peerlist_size; // Grey Peerlist Size
char reason [256]; // Printable explanation
};
@ -399,6 +409,14 @@ wap_proto_recv (wap_proto_t *self, zsock_t *input)
self->random_outputs = zframe_recv (input);
break;
case WAP_PROTO_GET_HEIGHT:
break;
case WAP_PROTO_GET_HEIGHT_OK:
GET_NUMBER8 (self->status);
GET_NUMBER8 (self->height);
break;
case WAP_PROTO_GET:
{
size_t chunk_size;
@ -427,10 +445,11 @@ wap_proto_recv (wap_proto_t *self, zsock_t *input)
}
break;
case WAP_PROTO_SAVE:
case WAP_PROTO_SAVE_BC:
break;
case WAP_PROTO_SAVE_OK:
case WAP_PROTO_SAVE_BC_OK:
GET_NUMBER8 (self->status);
break;
case WAP_PROTO_START:
@ -452,6 +471,23 @@ wap_proto_recv (wap_proto_t *self, zsock_t *input)
GET_NUMBER8 (self->status);
break;
case WAP_PROTO_GET_INFO:
break;
case WAP_PROTO_GET_INFO_OK:
GET_NUMBER8 (self->status);
GET_NUMBER8 (self->height);
GET_NUMBER8 (self->target_height);
GET_NUMBER8 (self->difficulty);
GET_NUMBER8 (self->tx_count);
GET_NUMBER8 (self->tx_pool_size);
GET_NUMBER8 (self->alt_blocks_count);
GET_NUMBER8 (self->outgoing_connections_count);
GET_NUMBER8 (self->incoming_connections_count);
GET_NUMBER8 (self->white_peerlist_size);
GET_NUMBER8 (self->grey_peerlist_size);
break;
case WAP_PROTO_STOP:
break;
@ -549,6 +585,10 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
case WAP_PROTO_RANDOM_OUTS_OK:
frame_size += 8; // status
break;
case WAP_PROTO_GET_HEIGHT_OK:
frame_size += 8; // status
frame_size += 8; // height
break;
case WAP_PROTO_GET:
frame_size += 4; // Size is 4 octets
if (self->tx_id)
@ -559,6 +599,9 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
if (self->tx_data)
frame_size += zchunk_size (self->tx_data);
break;
case WAP_PROTO_SAVE_BC_OK:
frame_size += 8; // status
break;
case WAP_PROTO_START:
frame_size += 4; // Size is 4 octets
if (self->address)
@ -568,6 +611,19 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
case WAP_PROTO_START_OK:
frame_size += 8; // status
break;
case WAP_PROTO_GET_INFO_OK:
frame_size += 8; // status
frame_size += 8; // height
frame_size += 8; // target_height
frame_size += 8; // difficulty
frame_size += 8; // tx_count
frame_size += 8; // tx_pool_size
frame_size += 8; // alt_blocks_count
frame_size += 8; // outgoing_connections_count
frame_size += 8; // incoming_connections_count
frame_size += 8; // white_peerlist_size
frame_size += 8; // grey_peerlist_size
break;
case WAP_PROTO_ERROR:
frame_size += 2; // status
frame_size += 1 + strlen (self->reason);
@ -654,6 +710,11 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
nbr_frames++;
break;
case WAP_PROTO_GET_HEIGHT_OK:
PUT_NUMBER8 (self->status);
PUT_NUMBER8 (self->height);
break;
case WAP_PROTO_GET:
if (self->tx_id) {
PUT_NUMBER4 (zchunk_size (self->tx_id));
@ -678,6 +739,10 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
PUT_NUMBER4 (0); // Empty chunk
break;
case WAP_PROTO_SAVE_BC_OK:
PUT_NUMBER8 (self->status);
break;
case WAP_PROTO_START:
if (self->address) {
PUT_NUMBER4 (zchunk_size (self->address));
@ -695,6 +760,20 @@ wap_proto_send (wap_proto_t *self, zsock_t *output)
PUT_NUMBER8 (self->status);
break;
case WAP_PROTO_GET_INFO_OK:
PUT_NUMBER8 (self->status);
PUT_NUMBER8 (self->height);
PUT_NUMBER8 (self->target_height);
PUT_NUMBER8 (self->difficulty);
PUT_NUMBER8 (self->tx_count);
PUT_NUMBER8 (self->tx_pool_size);
PUT_NUMBER8 (self->alt_blocks_count);
PUT_NUMBER8 (self->outgoing_connections_count);
PUT_NUMBER8 (self->incoming_connections_count);
PUT_NUMBER8 (self->white_peerlist_size);
PUT_NUMBER8 (self->grey_peerlist_size);
break;
case WAP_PROTO_ERROR:
PUT_NUMBER2 (self->status);
PUT_STRING (self->reason);
@ -833,6 +912,16 @@ wap_proto_print (wap_proto_t *self)
zsys_debug ("(NULL)");
break;
case WAP_PROTO_GET_HEIGHT:
zsys_debug ("WAP_PROTO_GET_HEIGHT:");
break;
case WAP_PROTO_GET_HEIGHT_OK:
zsys_debug ("WAP_PROTO_GET_HEIGHT_OK:");
zsys_debug (" status=%ld", (long) self->status);
zsys_debug (" height=%ld", (long) self->height);
break;
case WAP_PROTO_GET:
zsys_debug ("WAP_PROTO_GET:");
zsys_debug (" tx_id=[ ... ]");
@ -843,12 +932,13 @@ wap_proto_print (wap_proto_t *self)
zsys_debug (" tx_data=[ ... ]");
break;
case WAP_PROTO_SAVE:
zsys_debug ("WAP_PROTO_SAVE:");
case WAP_PROTO_SAVE_BC:
zsys_debug ("WAP_PROTO_SAVE_BC:");
break;
case WAP_PROTO_SAVE_OK:
zsys_debug ("WAP_PROTO_SAVE_OK:");
case WAP_PROTO_SAVE_BC_OK:
zsys_debug ("WAP_PROTO_SAVE_BC_OK:");
zsys_debug (" status=%ld", (long) self->status);
break;
case WAP_PROTO_START:
@ -862,6 +952,25 @@ wap_proto_print (wap_proto_t *self)
zsys_debug (" status=%ld", (long) self->status);
break;
case WAP_PROTO_GET_INFO:
zsys_debug ("WAP_PROTO_GET_INFO:");
break;
case WAP_PROTO_GET_INFO_OK:
zsys_debug ("WAP_PROTO_GET_INFO_OK:");
zsys_debug (" status=%ld", (long) self->status);
zsys_debug (" height=%ld", (long) self->height);
zsys_debug (" target_height=%ld", (long) self->target_height);
zsys_debug (" difficulty=%ld", (long) self->difficulty);
zsys_debug (" tx_count=%ld", (long) self->tx_count);
zsys_debug (" tx_pool_size=%ld", (long) self->tx_pool_size);
zsys_debug (" alt_blocks_count=%ld", (long) self->alt_blocks_count);
zsys_debug (" outgoing_connections_count=%ld", (long) self->outgoing_connections_count);
zsys_debug (" incoming_connections_count=%ld", (long) self->incoming_connections_count);
zsys_debug (" white_peerlist_size=%ld", (long) self->white_peerlist_size);
zsys_debug (" grey_peerlist_size=%ld", (long) self->grey_peerlist_size);
break;
case WAP_PROTO_STOP:
zsys_debug ("WAP_PROTO_STOP:");
break;
@ -969,17 +1078,23 @@ wap_proto_command (wap_proto_t *self)
case WAP_PROTO_RANDOM_OUTS_OK:
return ("RANDOM_OUTS_OK");
break;
case WAP_PROTO_GET_HEIGHT:
return ("GET_HEIGHT");
break;
case WAP_PROTO_GET_HEIGHT_OK:
return ("GET_HEIGHT_OK");
break;
case WAP_PROTO_GET:
return ("GET");
break;
case WAP_PROTO_GET_OK:
return ("GET_OK");
break;
case WAP_PROTO_SAVE:
return ("SAVE");
case WAP_PROTO_SAVE_BC:
return ("SAVE_BC");
break;
case WAP_PROTO_SAVE_OK:
return ("SAVE_OK");
case WAP_PROTO_SAVE_BC_OK:
return ("SAVE_BC_OK");
break;
case WAP_PROTO_START:
return ("START");
@ -987,6 +1102,12 @@ wap_proto_command (wap_proto_t *self)
case WAP_PROTO_START_OK:
return ("START_OK");
break;
case WAP_PROTO_GET_INFO:
return ("GET_INFO");
break;
case WAP_PROTO_GET_INFO_OK:
return ("GET_INFO_OK");
break;
case WAP_PROTO_STOP:
return ("STOP");
break;
@ -1339,6 +1460,24 @@ wap_proto_set_random_outputs (wap_proto_t *self, zframe_t **frame_p)
}
// --------------------------------------------------------------------------
// Get/set the height field
uint64_t
wap_proto_height (wap_proto_t *self)
{
assert (self);
return self->height;
}
void
wap_proto_set_height (wap_proto_t *self, uint64_t height)
{
assert (self);
self->height = height;
}
// --------------------------------------------------------------------------
// Get the tx_data field without transferring ownership
@ -1423,6 +1562,168 @@ wap_proto_set_thread_count (wap_proto_t *self, uint64_t thread_count)
}
// --------------------------------------------------------------------------
// Get/set the target_height field
uint64_t
wap_proto_target_height (wap_proto_t *self)
{
assert (self);
return self->target_height;
}
void
wap_proto_set_target_height (wap_proto_t *self, uint64_t target_height)
{
assert (self);
self->target_height = target_height;
}
// --------------------------------------------------------------------------
// Get/set the difficulty field
uint64_t
wap_proto_difficulty (wap_proto_t *self)
{
assert (self);
return self->difficulty;
}
void
wap_proto_set_difficulty (wap_proto_t *self, uint64_t difficulty)
{
assert (self);
self->difficulty = difficulty;
}
// --------------------------------------------------------------------------
// Get/set the tx_count field
uint64_t
wap_proto_tx_count (wap_proto_t *self)
{
assert (self);
return self->tx_count;
}
void
wap_proto_set_tx_count (wap_proto_t *self, uint64_t tx_count)
{
assert (self);
self->tx_count = tx_count;
}
// --------------------------------------------------------------------------
// Get/set the tx_pool_size field
uint64_t
wap_proto_tx_pool_size (wap_proto_t *self)
{
assert (self);
return self->tx_pool_size;
}
void
wap_proto_set_tx_pool_size (wap_proto_t *self, uint64_t tx_pool_size)
{
assert (self);
self->tx_pool_size = tx_pool_size;
}
// --------------------------------------------------------------------------
// Get/set the alt_blocks_count field
uint64_t
wap_proto_alt_blocks_count (wap_proto_t *self)
{
assert (self);
return self->alt_blocks_count;
}
void
wap_proto_set_alt_blocks_count (wap_proto_t *self, uint64_t alt_blocks_count)
{
assert (self);
self->alt_blocks_count = alt_blocks_count;
}
// --------------------------------------------------------------------------
// Get/set the outgoing_connections_count field
uint64_t
wap_proto_outgoing_connections_count (wap_proto_t *self)
{
assert (self);
return self->outgoing_connections_count;
}
void
wap_proto_set_outgoing_connections_count (wap_proto_t *self, uint64_t outgoing_connections_count)
{
assert (self);
self->outgoing_connections_count = outgoing_connections_count;
}
// --------------------------------------------------------------------------
// Get/set the incoming_connections_count field
uint64_t
wap_proto_incoming_connections_count (wap_proto_t *self)
{
assert (self);
return self->incoming_connections_count;
}
void
wap_proto_set_incoming_connections_count (wap_proto_t *self, uint64_t incoming_connections_count)
{
assert (self);
self->incoming_connections_count = incoming_connections_count;
}
// --------------------------------------------------------------------------
// Get/set the white_peerlist_size field
uint64_t
wap_proto_white_peerlist_size (wap_proto_t *self)
{
assert (self);
return self->white_peerlist_size;
}
void
wap_proto_set_white_peerlist_size (wap_proto_t *self, uint64_t white_peerlist_size)
{
assert (self);
self->white_peerlist_size = white_peerlist_size;
}
// --------------------------------------------------------------------------
// Get/set the grey_peerlist_size field
uint64_t
wap_proto_grey_peerlist_size (wap_proto_t *self)
{
assert (self);
return self->grey_peerlist_size;
}
void
wap_proto_set_grey_peerlist_size (wap_proto_t *self, uint64_t grey_peerlist_size)
{
assert (self);
self->grey_peerlist_size = grey_peerlist_size;
}
// --------------------------------------------------------------------------
// Get/set the reason field
@ -1634,6 +1935,30 @@ wap_proto_test (bool verbose)
assert (zframe_streq (wap_proto_random_outputs (self), "Captcha Diem"));
zframe_destroy (&random_outs_ok_random_outputs);
}
wap_proto_set_id (self, WAP_PROTO_GET_HEIGHT);
// Send twice
wap_proto_send (self, output);
wap_proto_send (self, output);
for (instance = 0; instance < 2; instance++) {
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
}
wap_proto_set_id (self, WAP_PROTO_GET_HEIGHT_OK);
wap_proto_set_status (self, 123);
wap_proto_set_height (self, 123);
// Send twice
wap_proto_send (self, output);
wap_proto_send (self, output);
for (instance = 0; instance < 2; instance++) {
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
assert (wap_proto_status (self) == 123);
assert (wap_proto_height (self) == 123);
}
wap_proto_set_id (self, WAP_PROTO_GET);
zchunk_t *get_tx_id = zchunk_new ("Captcha Diem", 12);
@ -1662,7 +1987,7 @@ wap_proto_test (bool verbose)
assert (memcmp (zchunk_data (wap_proto_tx_data (self)), "Captcha Diem", 12) == 0);
zchunk_destroy (&get_ok_tx_data);
}
wap_proto_set_id (self, WAP_PROTO_SAVE);
wap_proto_set_id (self, WAP_PROTO_SAVE_BC);
// Send twice
wap_proto_send (self, output);
@ -1672,8 +1997,9 @@ wap_proto_test (bool verbose)
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
}
wap_proto_set_id (self, WAP_PROTO_SAVE_OK);
wap_proto_set_id (self, WAP_PROTO_SAVE_BC_OK);
wap_proto_set_status (self, 123);
// Send twice
wap_proto_send (self, output);
wap_proto_send (self, output);
@ -1681,6 +2007,7 @@ wap_proto_test (bool verbose)
for (instance = 0; instance < 2; instance++) {
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
assert (wap_proto_status (self) == 123);
}
wap_proto_set_id (self, WAP_PROTO_START);
@ -1710,6 +2037,48 @@ wap_proto_test (bool verbose)
assert (wap_proto_routing_id (self));
assert (wap_proto_status (self) == 123);
}
wap_proto_set_id (self, WAP_PROTO_GET_INFO);
// Send twice
wap_proto_send (self, output);
wap_proto_send (self, output);
for (instance = 0; instance < 2; instance++) {
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
}
wap_proto_set_id (self, WAP_PROTO_GET_INFO_OK);
wap_proto_set_status (self, 123);
wap_proto_set_height (self, 123);
wap_proto_set_target_height (self, 123);
wap_proto_set_difficulty (self, 123);
wap_proto_set_tx_count (self, 123);
wap_proto_set_tx_pool_size (self, 123);
wap_proto_set_alt_blocks_count (self, 123);
wap_proto_set_outgoing_connections_count (self, 123);
wap_proto_set_incoming_connections_count (self, 123);
wap_proto_set_white_peerlist_size (self, 123);
wap_proto_set_grey_peerlist_size (self, 123);
// Send twice
wap_proto_send (self, output);
wap_proto_send (self, output);
for (instance = 0; instance < 2; instance++) {
wap_proto_recv (self, input);
assert (wap_proto_routing_id (self));
assert (wap_proto_status (self) == 123);
assert (wap_proto_height (self) == 123);
assert (wap_proto_target_height (self) == 123);
assert (wap_proto_difficulty (self) == 123);
assert (wap_proto_tx_count (self) == 123);
assert (wap_proto_tx_pool_size (self) == 123);
assert (wap_proto_alt_blocks_count (self) == 123);
assert (wap_proto_outgoing_connections_count (self) == 123);
assert (wap_proto_incoming_connections_count (self) == 123);
assert (wap_proto_white_peerlist_size (self) == 123);
assert (wap_proto_grey_peerlist_size (self) == 123);
}
wap_proto_set_id (self, WAP_PROTO_STOP);
// Send twice

30
src/ipc/wap_server/wap_server.c
View File

@ -270,3 +270,33 @@ random_outs (client_t *self)
{
IPC::Daemon::get_random_outs(self->message);
}
// ---------------------------------------------------------------------------
// height
//
static void
height (client_t *self)
{
IPC::Daemon::get_height(self->message);
}
// ---------------------------------------------------------------------------
// save_bc
//
static void
save_bc (client_t *self)
{
IPC::Daemon::save_bc(self->message);
}
// ---------------------------------------------------------------------------
// getinfo
//
static void
getinfo (client_t *self)
{
IPC::Daemon::get_info(self->message);
}

24
src/rpc/CMakeLists.txt
View File

@ -28,8 +28,7 @@
set(rpc_sources
core_rpc_server.cpp
json_rpc_http_server.cpp
daemon_json_rpc_handlers.cpp)
json_rpc_http_server.cpp)
set(rpc_headers)
@ -55,3 +54,24 @@ target_link_libraries(rpc
${EXTRA_LIBRARIES})
add_dependencies(rpc
version)
set(translator_rpc_sources
daemon_deprecated_rpc.cpp
json_rpc_http_server.cpp
json_rpc.cpp)
bitmonero_add_executable(rpc_translator
${translator_rpc_sources}
)
target_link_libraries(rpc_translator
LINK_PRIVATE
client_ipc
cryptonote_core
cryptonote_protocol
${EXTRA_LIBRARIES}
${NET_SKELETON_LIBRARY}
${ZMQ_LIB}
${CZMQ_LIB}
${CMAKE_THREAD_LIBS_INIT})
set_property(TARGET rpc_translator
PROPERTY
OUTPUT_NAME "monero-rpc-deprecated")

333
src/rpc/daemon_deprecated_rpc.cpp Normal file
View File

@ -0,0 +1,333 @@
/*!
* \file rpc_translator.cpp
* \brief Implementations of JSON RPC handlers (Daemon)
*/
// NOTE:
// While this uses net_skeleton (aka fossa) for JSON RPC handling, JSON parsing
// and string conversion are done with rapidjson because it is way easier and better
// suited.
// To add a new method, add the name and function pointer to `method_names` and `handlers`.
// The handler function should have the same signature as the rest of them here.
// It should use rapidjson to parse the request string and the internal objects kept in the
// anonymous namespace to generate the response. The response must eventually get
// stringified using rapidjson.
// Trivial and error responses may be returned with ns_create_rpc_reply and ns_create_rpc_error
// respectively.
#include "daemon_deprecated_rpc.h"
#include <stdexcept>
#define MAX_RESPONSE_SIZE 2000
/*!
* \namespace
* \brief Anonymous namespace to keep things in the scope of this file.
*/
namespace
{
int daemon_connection_error = -326701;
int parse_error = -32700;
int invalid_request = -32600;
int invalid_params = -32602;
int internal_error = -32603;
RPC::Json_rpc_http_server *server = NULL;
wap_client_t *ipc_client = NULL;
const char* STATUS_OK = "OK";
bool check_connection_to_daemon()
{
return ipc_client && wap_client_connected(ipc_client);
}
void connect_to_daemon() {
if (check_connection_to_daemon()) {
return;
}
ipc_client = wap_client_new();
wap_client_connect(ipc_client, "ipc://@/monero", 200, "wallet identity");
}
/*!
* \brief Constructs a response string given a result JSON object.
*
* It also adds boilerplate properties like id, method.
* \param req net_skeleton request object
* \param result_json rapidjson result object
* \param response_json Root rapidjson document that will eventually have the whole response
* \param response Response as a string gets written here.
*/
void construct_response_string(struct ns_rpc_request *req, rapidjson::Value &result_json,
rapidjson::Document &response_json, std::string &response)
{
response_json.SetObject();
response_json.AddMember("jsonrpc", "2.0" , response_json.GetAllocator());
rapidjson::Value string_value(rapidjson::kStringType);
// If ID was present in request use it else use "null".
if (req->id != NULL)
{
string_value.SetString(req->id[0].ptr, req->id[0].len);
}
else
{
string_value.SetString("null", 4);
}
response_json.AddMember("id", string_value, response_json.GetAllocator());
string_value.SetString(req->method[0].ptr, req->method[0].len);
response_json.AddMember("method", string_value, response_json.GetAllocator());
response_json.AddMember("result", result_json, response_json.GetAllocator());
rapidjson::StringBuffer buffer;
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
response_json.Accept(writer);
// Write string to `response`.
response = buffer.GetString();
}
/*!
* \brief Implementation of 'getheight' method.
* \param buf Buffer to fill in response.
* \param len Max length of response.
* \param req net_skeleton RPC request
* \return Actual response length.
*/
int getheight(char *buf, int len, struct ns_rpc_request *req)
{
connect_to_daemon();
int rc = wap_client_get_height(ipc_client);
if (rc < 0) {
return ns_rpc_create_error(buf, len, req, daemon_connection_error,
"Couldn't connect to daemon.", "{}");
}
uint64_t height = wap_client_height(ipc_client);
rapidjson::Document response_json;
rapidjson::Value result_json;
result_json.SetObject();
result_json.AddMember("height", height, response_json.GetAllocator());
result_json.AddMember("status", "OK", response_json.GetAllocator());
std::string response;
construct_response_string(req, result_json, response_json, response);
size_t copy_length = ((uint32_t)len > response.length()) ? response.length() + 1 : (uint32_t)len;
strncpy(buf, response.c_str(), copy_length);
return response.length();
}
/*!
* \brief Implementation of 'startmining' method.
* \param buf Buffer to fill in response.
* \param len Max length of response.
* \param req net_skeleton RPC request
* \return Actual response length.
*/
int startmining(char *buf, int len, struct ns_rpc_request *req)
{
connect_to_daemon();
if (req->params == NULL)
{
return ns_rpc_create_error(buf, len, req, invalid_params,
"Parameters missing.", "{}");
}
rapidjson::Document request_json;
char request_buf[1000];
strncpy(request_buf, req->params[0].ptr, req->params[0].len);
request_buf[req->params[0].len] = '\0';
if (request_json.Parse(request_buf).HasParseError())
{
return ns_rpc_create_error(buf, len, req, parse_error,
"Invalid JSON passed", "{}");
}
if (!request_json.HasMember("miner_address") || !request_json["miner_address"].IsString())
{
return ns_rpc_create_error(buf, len, req, invalid_params,
"Incorrect miner_address", "{}");
}
if (!request_json.HasMember("threads_count") || !request_json["threads_count"].IsUint64())
{
return ns_rpc_create_error(buf, len, req, invalid_params,
"Incorrect threads_count", "{}");
}
std::string miner_address = request_json["miner_address"].GetString();
uint64_t threads_count = request_json["threads_count"].GetUint();
zchunk_t *address_chunk = zchunk_new((void*)miner_address.c_str(), miner_address.length());
int rc = wap_client_start(ipc_client, &address_chunk, threads_count);
zchunk_destroy(&address_chunk);
if (rc < 0) {
return ns_rpc_create_error(buf, len, req, daemon_connection_error,
"Couldn't connect to daemon.", "{}");
}
uint64_t status = wap_client_status(ipc_client);
if (status == IPC::STATUS_WRONG_ADDRESS)
{
return ns_rpc_create_error(buf, len, req, invalid_params,
"Failed, wrong address", "{}");
}
if (status == IPC::STATUS_MINING_NOT_STARTED)
{
return ns_rpc_create_error(buf, len, req, invalid_request,
"Failed, mining not started", "{}");
}
return ns_rpc_create_reply(buf, len, req, "{s:s}", "status", STATUS_OK);
}
/*!
* \brief Implementation of 'stopmining' method.
* \param buf Buffer to fill in response.
* \param len Max length of response.
* \param req net_skeleton RPC request
* \return Actual response length.
*/
int stopmining(char *buf, int len, struct ns_rpc_request *req)
{
connect_to_daemon();
int rc = wap_client_stop(ipc_client);
if (rc < 0) {
return ns_rpc_create_error(buf, len, req, daemon_connection_error,
"Couldn't connect to daemon.", "{}");
}
if (wap_client_status(ipc_client) != IPC::STATUS_OK)
{
return ns_rpc_create_error(buf, len, req, invalid_request,
"Failed, mining not stopped", "{}");
}
return ns_rpc_create_reply(buf, len, req, "{s:s}", "status", STATUS_OK);
}
/*!
* \brief Implementation of 'getinfo' method.
* \param buf Buffer to fill in response.
* \param len Max length of response.
* \param req net_skeleton RPC request
* \return Actual response length.
*/
int getinfo(char *buf, int len, struct ns_rpc_request *req)
{
connect_to_daemon();
int rc = wap_client_get_info(ipc_client);
if (rc < 0) {
return ns_rpc_create_error(buf, len, req, daemon_connection_error,
"Couldn't connect to daemon.", "{}");
}
if (wap_client_status(ipc_client) != IPC::STATUS_OK)
{
return ns_rpc_create_error(buf, len, req, invalid_request,
"Failed to get info", "{}");
}
rapidjson::Document response_json;
rapidjson::Value result_json;
result_json.SetObject();
result_json.AddMember("height", wap_client_height(ipc_client), response_json.GetAllocator());
result_json.AddMember("target_height", wap_client_target_height(ipc_client),
response_json.GetAllocator());
result_json.AddMember("difficulty", wap_client_difficulty(ipc_client),
response_json.GetAllocator());
result_json.AddMember("tx_count", wap_client_tx_count(ipc_client),
response_json.GetAllocator());
result_json.AddMember("tx_pool_size", wap_client_tx_pool_size(ipc_client),
response_json.GetAllocator());
result_json.AddMember("alt_blocks_count", wap_client_alt_blocks_count(ipc_client),
response_json.GetAllocator());
result_json.AddMember("outgoing_connections_count", wap_client_outgoing_connections_count(ipc_client),
response_json.GetAllocator());
result_json.AddMember("incoming_connections_count", wap_client_incoming_connections_count(ipc_client),
response_json.GetAllocator());
result_json.AddMember("white_peerlist_size", wap_client_white_peerlist_size(ipc_client),
response_json.GetAllocator());
result_json.AddMember("grey_peerlist_size", wap_client_grey_peerlist_size(ipc_client),
response_json.GetAllocator());
std::string response;
construct_response_string(req, result_json, response_json, response);
size_t copy_length = ((uint32_t)len > response.length()) ? response.length() + 1 : (uint32_t)len;
strncpy(buf, response.c_str(), copy_length);
return response.length();
}
// Contains a list of method names.
const char *method_names[] = {
"getheight",
"startmining",
"stopmining",
"getinfo",
NULL
};
// Contains a list of function pointers. These must map 1-1 by index with `method_names`.
ns_rpc_handler_t handlers[] = {
getheight,
startmining,
stopmining,
getinfo,
NULL
};
/*!
* \brief Event handler that is invoked upon net_skeleton network events.
*
* Any change in behavior of RPC should happen from this point.
* \param nc net_skeleton connection
* \param ev Type of event
* \param ev_data Event data
*/
void ev_handler(struct ns_connection *nc, int ev, void *ev_data)
{
struct http_message *hm = (struct http_message *) ev_data;
char buf[MAX_RESPONSE_SIZE];
switch (ev) {
case NS_HTTP_REQUEST:
ns_rpc_dispatch(hm->body.p, hm->body.len, buf, sizeof(buf),
method_names, handlers);
ns_printf(nc, "HTTP/1.0 200 OK\r\nContent-Length: %d\r\n"
"Content-Type: application/json\r\n\r\n%s",
(int) strlen(buf), buf);
nc->flags |= NSF_FINISHED_SENDING_DATA;
break;
default:
break;
}
}
}
/*!
* \namespace RPC
* \brief RPC related utilities
*/
namespace RPC
{
/*!
* \namespace Daemon
* \brief RPC relevant to daemon
*/
namespace DaemonDeprecated
{
int start() {
server = new RPC::Json_rpc_http_server("127.0.0.1", "9997", "daemon_json_rpc", &ev_handler);
if (!server->start()) {
return FAILURE_HTTP_SERVER;
}
std::cout << "Started Daemon server at 127.0.0.1/daemon_json_rpc:9997\n";
ipc_client = wap_client_new();
wap_client_connect(ipc_client, "ipc://@/monero", 200, "wallet identity");
if (!check_connection_to_daemon()) {
return FAILURE_DAEMON_NOT_RUNNING;
}
return SUCCESS;
}
void stop() {
if (server) {
server->stop();
delete server;
}
std::cout << "HTTP done\n\n";
if (ipc_client) {
wap_client_destroy(&ipc_client);
}
std::cout << "IPC done\n\n";
}
}
}

48
src/rpc/daemon_deprecated_rpc.h Normal file
View File

@ -0,0 +1,48 @@
/*!
* \file daemon_json_rpc_handlers.h
* \brief Header for JSON RPC handlers (Daemon)
*/
#ifndef DAEMON_JSON_RPC_HANDLERS_H
#define DAEMON_JSON_RPC_HANDLERS_H
#include "net_skeleton/net_skeleton.h"
#include "json_rpc_http_server.h"
#include "common/command_line.h"
#include "net/http_server_impl_base.h"
#include "cryptonote_core/cryptonote_core.h"
#include "p2p/net_node.h"
#include "cryptonote_protocol/cryptonote_protocol_handler.h"
#include <string>
#include "rapidjson/document.h"
#include "rapidjson/writer.h"
#include "rapidjson/stringbuffer.h"
#include <cstring>
#include "cryptonote_core/cryptonote_basic.h"
#include "crypto/hash-ops.h"
#include "ipc/include/wallet.h"
#include "ipc/include/daemon_ipc_handlers.h"
#include <iostream>
/*!
* \namespace RPC
* \brief RPC related utilities
*/
namespace RPC
{
/*!
* \namespace Daemon
* \brief RPC relevant to daemon
*/
namespace DaemonDeprecated
{
const int SUCCESS = 0;
const int FAILURE_DAEMON_NOT_RUNNING = 1;
const int FAILURE_HTTP_SERVER = 2;
int start();
void stop();
}
}
#endif

1197
src/rpc/daemon_json_rpc_handlers.cpp
View File

File diff suppressed because it is too large Load Diff

75
src/rpc/daemon_json_rpc_handlers.h
View File

@ -1,75 +0,0 @@
/*!
* \file daemon_json_rpc_handlers.h
* \brief Header for JSON RPC handlers (Daemon)
*/
#ifndef DAEMON_JSON_RPC_HANDLERS_H
#define DAEMON_JSON_RPC_HANDLERS_H
#include "net_skeleton/net_skeleton.h"
#include "json_rpc_http_server.h"
#include "common/command_line.h"
#include "net/http_server_impl_base.h"
#include "cryptonote_core/cryptonote_core.h"
#include "p2p/net_node.h"
#include "cryptonote_protocol/cryptonote_protocol_handler.h"
#include <string>
#include "rapidjson/document.h"
#include "rapidjson/writer.h"
#include "rapidjson/stringbuffer.h"
#include <cstring>
#include "cryptonote_core/cryptonote_basic.h"
#include "crypto/hash-ops.h"
#include <iostream>
/*!
* \namespace RPC
* \brief RPC related utilities
*/
namespace RPC
{
/*!
* \namespace Daemon
* \brief RPC relevant to daemon
*/
namespace Daemon
{
/*!
* \brief initializes module (must call this before handling requests)
* \param p_core Pointer to cryptonote core object
* \param p_p2p Pointer to P2P object
* \param p_testnet True if testnet false otherwise
*/
void init(cryptonote::core *p_core,
nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<cryptonote::core> > *p_p2p,
bool p_testnet);
/*!
* \Inits certain options used in Daemon CLI.
* \param desc Instance of options description object
*/
void init_options(boost::program_options::options_description& desc);
/*!
* \brief Gets IP address and port number from variable map
* \param vm Variable map
* \param ip_address IP address
* \param port Port number
*/
void get_address_and_port(const boost::program_options::variables_map& vm,
std::string &ip_address, std::string &port);
/*!
* \brief Event handler that is invoked upon net_skeleton network events.
*
* Any change in behavior of RPC should happen from this point.
* \param nc net_skeleton connection
* \param ev Type of event
* \param ev_data Event data
*/
void ev_handler(struct ns_connection *nc, int ev, void *ev_data);
}
}
#endif

26
src/rpc/json_rpc.cpp Normal file
View File

@ -0,0 +1,26 @@
#include "daemon_deprecated_rpc.h"
#include <signal.h>
#include <iostream>
static bool execute = true;
void trap(int signal) {
RPC::DaemonDeprecated::stop();
execute = false;
}
int main() {
int res = RPC::DaemonDeprecated::start();
if (res == RPC::DaemonDeprecated::FAILURE_HTTP_SERVER) {
std::cerr << "Couldn't start HTTP server\n";
execute = false;
} else if (res == RPC::DaemonDeprecated::FAILURE_DAEMON_NOT_RUNNING) {
std::cerr << "Couldn't connect to daemon\n";
execute = false;
}
signal(SIGINT, &trap);
while (execute) {
}
std::cout << "out!\n";
return 0;
}

9
src/rpc/json_rpc_http_server.cpp
View File

@ -13,10 +13,6 @@
*/
namespace RPC
{
int Json_rpc_http_server::parse_error = -32700;
int Json_rpc_http_server::invalid_request = -32600;
int Json_rpc_http_server::invalid_params = -32602;
int Json_rpc_http_server::internal_error = -32603;
/**
* \brief Constructor
@ -25,10 +21,11 @@ namespace RPC
* \param ev_handler Event handler function pointer
*/
Json_rpc_http_server::Json_rpc_http_server(const std::string &ip, const std::string &port,
void (*ev_handler)(struct ns_connection *nc, int ev, void *ev_data))
const std::string &path, void (*ev_handler)(struct ns_connection *nc, int ev, void *ev_data))
{
m_ip = ip;
m_port = port;
m_path = path;
m_is_running = false;
m_ev_handler = ev_handler;
}
@ -53,7 +50,7 @@ namespace RPC
}
m_is_running = true;
ns_mgr_init(&mgr, NULL);
nc = ns_bind(&mgr, (m_ip + ":" + m_port).c_str(), m_ev_handler);
nc = ns_bind(&mgr, (m_ip + ":" + m_port + "/" + m_path).c_str(), m_ev_handler);
if (!nc)
{
return false;

3
src/rpc/json_rpc_http_server.h
View File

@ -33,6 +33,7 @@ namespace RPC
void poll();
std::string m_ip; /*!< IP address where its listening */
std::string m_port; /*!< Port where its listening */
std::string m_path; /*!< Path */
bool m_is_running; /*!< Whether the server is currently running */
void (*m_ev_handler)(struct ns_connection *nc, int ev, void *ev_data); /*!< Server event handler function pointer */
public:
@ -43,7 +44,7 @@ namespace RPC
* \param port Port number to bind
* \param ev_handler Event handler function pointer
*/
Json_rpc_http_server(const std::string &ip, const std::string &port,
Json_rpc_http_server(const std::string &ip, const std::string &port, const std::string &path,
void (*ev_handler)(struct ns_connection *nc, int ev, void *ev_data));
/**

32
src/simplewallet/simplewallet.cpp
View File

@ -755,7 +755,7 @@ bool simple_wallet::start_mining(const std::vector<std::string>& args)
if (!try_connect_to_daemon())
return true;
COMMAND_RPC_START_MINING::request req;
// COMMAND_RPC_START_MINING::request req;
// req.miner_address = m_wallet->get_account().get_public_address_str(m_wallet->testnet());
std::string miner_address = m_wallet->get_account().get_public_address_str(m_wallet->testnet());
uint64_t threads_count;
@ -822,14 +822,15 @@ bool simple_wallet::save_bc(const std::vector<std::string>& args)
if (!try_connect_to_daemon())
return true;
COMMAND_RPC_SAVE_BC::request req;
COMMAND_RPC_SAVE_BC::response res;
bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/save_bc", req, res, m_http_client);
std::string err = interpret_rpc_response(r, res.status);
if (err.empty())
// COMMAND_RPC_SAVE_BC::request req;
// COMMAND_RPC_SAVE_BC::response res;
// bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/save_bc", req, res, m_http_client);
// std::string err = interpret_rpc_response(r, res.status);
uint64_t status = m_wallet->save_bc();
if (status == IPC::STATUS_OK)
success_msg_writer() << "Blockchain saved";
else
fail_msg_writer() << "Blockchain can't be saved: " << err;
fail_msg_writer() << "Blockchain can't be saved: " << status;
return true;
}
//----------------------------------------------------------------------------------------------------
@ -1053,11 +1054,18 @@ bool simple_wallet::show_payments(const std::vector<std::string> &args)
//----------------------------------------------------------------------------------------------------
uint64_t simple_wallet::get_daemon_blockchain_height(std::string& err)
{
COMMAND_RPC_GET_HEIGHT::request req;
COMMAND_RPC_GET_HEIGHT::response res = boost::value_initialized<COMMAND_RPC_GET_HEIGHT::response>();
bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/getheight", req, res, m_http_client);
err = interpret_rpc_response(r, res.status);
return res.height;
// COMMAND_RPC_GET_HEIGHT::request req;
// COMMAND_RPC_GET_HEIGHT::response res = boost::value_initialized<COMMAND_RPC_GET_HEIGHT::response>();
// bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/getheight", req, res, m_http_client);
// err = interpret_rpc_response(r, res.status);
uint64_t height;
uint64_t status = m_wallet->get_height(height);
// res has to be true since we have checked before.
if (status != IPC::STATUS_OK) {
// TODO: map proper error messages to codes.
err = "Couldn't get blockchain height.";
}
return height;
}
//----------------------------------------------------------------------------------------------------
bool simple_wallet::show_blockchain_height(const std::vector<std::string>& args)

1
src/simplewallet/simplewallet.h
View File

@ -207,6 +207,5 @@ namespace cryptonote
std::unique_ptr<tools::wallet2> m_wallet;
epee::net_utils::http::http_simple_client m_http_client;
refresh_progress_reporter_t m_refresh_progress_reporter;
wap_client_t *client;
};
}

16
src/wallet/wallet2.cpp
View File

@ -1268,8 +1268,7 @@ void wallet2::stop_ipc_client() {
}
void wallet2::connect_to_daemon() {
if (ipc_client) {
// TODO: Instead, check if daemon is reachable.
if (check_connection()) {
return;
}
ipc_client = wap_client_new();
@ -1289,4 +1288,17 @@ uint64_t wallet2::stop_mining() {
THROW_WALLET_EXCEPTION_IF(rc < 0, error::no_connection_to_daemon, "stop_mining");
return wap_client_status(ipc_client);
}
uint64_t wallet2::get_height(uint64_t &height) {
int rc = wap_client_get_height(ipc_client);
THROW_WALLET_EXCEPTION_IF(rc < 0, error::no_connection_to_daemon, "get_height");
height = wap_client_height(ipc_client);
return wap_client_status(ipc_client);
}
uint64_t wallet2::save_bc() {
int rc = wap_client_save_bc(ipc_client);
THROW_WALLET_EXCEPTION_IF(rc < 0, error::no_connection_to_daemon, "save_bc");
return wap_client_status(ipc_client);
}
}

2
src/wallet/wallet2.h
View File

@ -268,6 +268,8 @@ namespace tools
uint64_t start_mining(const std::string &address, uint64_t thread_count);
uint64_t stop_mining();
uint64_t get_height(uint64_t &height);
uint64_t save_bc();
private:
/*!
* \brief Stores wallet information to wallet file.

12
src/wallet/wallet_json_rpc_handlers.cpp
View File

@ -39,7 +39,7 @@ namespace
void construct_response_string(struct ns_rpc_request *req, rapidjson::Value &result_json,
rapidjson::Document &response_json, std::string &response)
{
response_json.SetObject();
/*response_json.SetObject();
rapidjson::Value string_value(rapidjson::kStringType);
// If ID was present in request use it else use "null".
if (req->id != NULL)
@ -58,7 +58,7 @@ namespace
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
response_json.Accept(writer);
// Write string to `response`.
response = buffer.GetString();
response = buffer.GetString();*/
}
/*!
@ -70,7 +70,7 @@ namespace
*/
int getbalance(char *buf, int len, struct ns_rpc_request *req)
{
uint64_t balance, unlocked_balance;
/*uint64_t balance, unlocked_balance;
try
{
balance = wallet->balance();
@ -91,7 +91,7 @@ namespace
construct_response_string(req, result_json, response_json, response);
size_t copy_length = ((uint32_t)len > response.length()) ? response.length() + 1 : (uint32_t)len;
strncpy(buf, response.c_str(), copy_length);
return response.length();
return response.length();*/
}
/*!
@ -103,7 +103,7 @@ namespace
*/
int getaddress(char *buf, int len, struct ns_rpc_request *req)
{
std::string address;
/*std::string address;
try
{
address = wallet->get_account().get_public_address_str(wallet->testnet());
@ -124,7 +124,7 @@ namespace
construct_response_string(req, result_json, response_json, response);
size_t copy_length = ((uint32_t)len > response.length()) ? response.length() + 1 : (uint32_t)len;
strncpy(buf, response.c_str(), copy_length);
return response.length();
return response.length();*/
}
// Contains a list of method names.