From 743db9220aed63d3417a0268ace5a6b2b64f2d5a Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Wed, 6 May 2020 18:21:52 +0300
Subject: [PATCH] [*] Command interface for eXchange service developing
---
modules/net/dap_chain_node_cli_cmd.c | 3 +-
modules/net/srv/dap_chain_net_srv.c | 2 +-
.../xchange/dap_chain_net_srv_xchange.c | 124 ++++++++++++++----
.../include/dap_chain_net_srv_xchange.h | 9 +-
4 files changed, 110 insertions(+), 28 deletions(-)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index af5a32c9e2..975ab08284 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <stddef.h>
#include <stdint.h>
-#include <unistd.h>
#include <string.h>
#include <stdbool.h>
#include <errno.h>
@@ -3314,7 +3313,7 @@ int com_stats(int argc, char ** argv, void *arg_func, char **str_reply)
#if (defined DAP_OS_UNIX) || (defined __WIN32)
{
dap_cpu_monitor_init();
- usleep(500000);
+ dap_usleep(500000);
char *str_reply_prev = dap_strdup_printf("");
char *str_delimiter;
dap_cpu_stats_t s_cpu_stats = dap_cpu_get_stats();
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index 8d7b8217c9..52eb35d65b 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -450,7 +450,7 @@ static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_re
dap_chain_str_to_hash_fast (l_tx_cond_hash_str, &l_tx_cond_hash);
l_price = (uint64_t) atoll ( l_price_str );
l_price_unit.uint32 = (uint32_t) atol ( l_price_unit_str );
-
+ strncpy(l_price_token, l_price_token_str, DAP_CHAIN_TICKER_SIZE_MAX - 1);
char * l_order_new_hash_str = dap_chain_net_srv_order_create(
l_net,l_direction, l_srv_uid, l_node_addr,l_tx_cond_hash, l_price, l_price_unit,
l_price_token, l_expires,l_ext, l_region_str, l_continent_num);
diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c
index 4016ae2830..f59eba9a1e 100644
--- a/modules/service/xchange/dap_chain_net_srv_xchange.c
+++ b/modules/service/xchange/dap_chain_net_srv_xchange.c
@@ -44,16 +44,16 @@ static dap_chain_net_srv_xchange_t *s_srv_xchange;
int dap_chain_net_srv_xchange_init()
{
dap_chain_node_cli_cmd_item_create ("srv_xchange", s_cli_srv_xchange, NULL, "eXchange service commands",
- "srv_xchange price create -net <net name> -token_sell <token ticker> -token_buy <token ticker> -rate <value> -wallet <name>\n"
+ "srv_xchange price create -net_sell <net name> -token_sell <token ticker> -net_buy <net_name> -token_buy <token ticker> -rate <value> -wallet <name>\n"
"\tCreate a new price with rate value = token_sell : token_buy\n"
- "srv_xchange price remove -token_pair <concatenated token ticker>\n"
- "\tRemove price with specified concatenated ticker\n"
+ "srv_xchange price remove -net_sell <net name> -token_sell <token ticker> -net_buy <net_name> -token_buy <token ticker>\n"
+ "\tRemove price with specified tickers within specified net names\n"
"srv_xchange price list\n"
"\tList all active prices\n"
- "srv_xchange price update -token_pair <concatenated token ticker> {-rate <value> | -wallet <name>}\n"
- "\tUpdate price with specified concatenated ticker\n"
+ "srv_xchange price update -net_sell <net name> -token_sell <token ticker> -net_buy <net_name> -token_buy <token ticker> {-rate <value> | -wallet <name>}\n"
+ "\tUpdate price with specified tickers within specified net names\n"
"srv_xchange purchase <order hash> -net <net name>\n"
- "\tExchange tokens with specified order\n"
+ "\tExchange tokens with specified order within specified net name\n"
"srv_xchange enable\n"
"\tEnable eXchange service\n"
"srv_xchange disable\n"
@@ -92,31 +92,111 @@ static int s_cli_srv_xchange_price(int a_argc, char **a_argv, int a_arg_index, c
else if(dap_chain_node_cli_find_option_val(a_argv, a_arg_index, min(a_argc, a_arg_index + 1), "update", NULL)) {
l_cmd_num = CMD_UPDATE;
}
+ int l_arg_index = a_arg_index + 1;
+ const char *l_net_sell_str = NULL, *l_net_buy_str = NULL;
+ const char *l_token_sell_str = NULL, *l_token_buy_str = NULL;
+ dap_chain_net_t *l_net_sell = NULL, *l_net_buy = NULL;
+ char l_token_sell[DAP_CHAIN_TICKER_SIZE_MAX], l_token_buy[DAP_CHAIN_TICKER_SIZE_MAX];
+ char *l_strkey;
+ if (l_cmd_num == CMD_CREATE || l_cmd_num == CMD_REMOVE || l_cmd_num == CMD_UPDATE) {
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-net_sell", &l_net_sell_str);
+ if (!l_net_sell_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price %s' required parameter -net_sell",
+ l_cmd_num == CMD_CREATE ? "create" : (l_cmd_num == CMD_REMOVE ? "remove" : "update"));
+ return -2;
+ }
+ l_net_sell = dap_chain_net_by_name(l_net_sell_str);
+ if (!l_net_sell) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Network %s not found", l_net_sell_str);
+ return -3;
+ }
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-net_buy", &l_net_buy_str);
+ if (!l_net_buy_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price %s' required parameter -net_buy",
+ l_cmd_num == CMD_CREATE ? "create" : (l_cmd_num == CMD_REMOVE ? "remove" : "update"));
+ return -2;
+ }
+ l_net_buy = dap_chain_net_by_name(l_net_buy_str);
+ if (!l_net_sell) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Network %s not found", l_net_buy_str);
+ return -3;
+ }
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-token_sell", &l_token_sell_str);
+ if (!l_token_sell_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price %s' required parameter -token_sell",
+ l_cmd_num == CMD_CREATE ? "create" : (l_cmd_num == CMD_REMOVE ? "remove" : "update"));
+ return -5;
+ }
+ strncpy(l_token_sell, l_token_sell_str, DAP_CHAIN_TICKER_SIZE_MAX - 1);
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-token_buy", &l_token_buy_str);
+ if (!l_token_buy_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price %s' required parameter -token_buy",
+ l_cmd_num == CMD_CREATE ? "create" : (l_cmd_num == CMD_REMOVE ? "remove" : "update"));
+ return -5;
+ }
+ strncpy(l_token_buy, l_token_buy_str, DAP_CHAIN_TICKER_SIZE_MAX - 1);
+ l_strkey = DAP_NEW_SIZE(char, dap_strlen(l_token_sell) + dap_strlen(l_net_sell_str) + dap_strlen(l_token_buy) + dap_strlen(l_net_buy_str) + 1);
+ dap_stpcpy(l_strkey, l_token_sell);
+ strcat(l_strkey, l_net_sell_str);
+ strcat(l_strkey, l_token_buy);
+ strcat(l_strkey, l_net_buy_str);
+ }
switch (l_cmd_num) {
case CMD_CREATE: {
- dap_chain_net_srv_xchange_price_t *l_price = DAP_NEW_Z(dap_chain_net_srv_xchange_price_t);
- //TODO fill the price
- HASH_ADD_STR(s_srv_xchange->pricelist, token_pair, l_price);
+ dap_chain_net_srv_xchange_price_t *l_price = NULL;
+ HASH_FIND_STR(s_srv_xchange->pricelist, l_strkey, l_price);
+ if (l_price) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Price with provided pair of token ticker + net name already exist");
+ return -7;
+ }
+ const char *l_rate_str = NULL, *l_wallet_str = NULL;
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-rate", &l_rate_str);
+ if (!l_rate_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price create' required parameter -rate");
+ return -8;
+ }
+ long double l_rate = strtold(l_rate_str, NULL);
+ if (!l_rate) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Format -rate <long double>");
+ return -9;
+ }
+ dap_chain_node_cli_find_option_val(a_argv, l_arg_index, a_argc, "-wallet", &l_rate_str);
+ if (!l_rate_str) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price create' required parameter -wallet");
+ return -10;
+ }
+ const char *l_wallets_path = dap_chain_wallet_get_path(g_config);
+ dap_chain_wallet_t *l_wallet = dap_chain_wallet_open(l_wallet_str, l_wallets_path);
+ if (!l_wallet) {
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Specified wallet not found");
+ return -11;
+ }
+ l_price = DAP_NEW_Z(dap_chain_net_srv_xchange_price_t);
+ l_price->wallet = l_wallet;
+ dap_stpcpy(l_price->token_sell, l_token_sell);
+ l_price->net_sell = l_net_sell;
+ dap_stpcpy(l_price->token_buy, l_token_buy);
+ l_price->net_buy = l_net_buy;
+ l_price->key_ptr = l_strkey;
+ //TODO create the order
+ HASH_ADD_KEYPTR(hh, s_srv_xchange->pricelist, l_price->key_ptr, strlen(l_price->key_ptr), l_price);
} break;
case CMD_REMOVE:
case CMD_UPDATE: {
- const char *l_token_str = NULL;
- dap_chain_node_cli_find_option_val(a_argv, ++a_arg_index, a_argc, "-token_pair", &l_token_str);
- if (!l_token_str) {
- dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'price %s' required parameter -token_pair",
- l_cmd_num == CMD_REMOVE ? "remove" : "update");
- return -1;
- }
dap_chain_net_srv_xchange_price_t *l_price = NULL;
- HASH_FIND_STR(s_srv_xchange->pricelist, l_token_str, l_price);
+ HASH_FIND_STR(s_srv_xchange->pricelist, l_strkey, l_price);
if (l_price) {
if (l_cmd_num == CMD_REMOVE) {
HASH_DEL(s_srv_xchange->pricelist, l_price);
+ DAP_DELETE(l_price->key_ptr);
+ dap_chain_wallet_close(l_price->wallet);
+ dap_cain_net_srv_order_delete(l_price->order);
+ DAP_DELETE(l_price);
} else {
//TODO update price
}
} else {
- dap_chain_node_cli_set_reply_text(a_str_reply, "Token pair %s not found", l_token_str);
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Price with provided pair of token ticker + net name is not exist");
return -1;
}
} break;
@@ -131,8 +211,8 @@ static int s_cli_srv_xchange_price(int a_argc, char **a_argv, int a_arg_index, c
}
} break;
default: {
- dap_chain_node_cli_set_reply_text(a_str_reply, "Subcommand %s not recognized", a_argv[a_arg_index]);
- return -1;
+ dap_chain_node_cli_set_reply_text(a_str_reply, "Subcommand %s not recognized", a_argv[a_arg_index + 1]);
+ return -4;
}
}
return 0;
@@ -166,12 +246,12 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, void *a_arg_func, char *
dap_chain_node_cli_find_option_val(a_argv, ++arg_index, a_argc, "-net", &l_net_str);
if (!l_net_str) {
dap_chain_node_cli_set_reply_text(a_str_reply, "Command 'purchase' required parameter -net");
- return -1;
+ return -2;
}
dap_chain_net_t *l_net = dap_chain_net_by_name(l_net_str);
if (!l_net) {
dap_chain_node_cli_set_reply_text(a_str_reply, "Network %s not found", l_net_str);
- return -1;
+ return -3;
}
dap_chain_net_srv_order_t *l_order = dap_chain_net_srv_order_find_by_hash_str(l_net, a_argv[arg_index]);
if (l_order) {
diff --git a/modules/service/xchange/include/dap_chain_net_srv_xchange.h b/modules/service/xchange/include/dap_chain_net_srv_xchange.h
index a4b1733a3b..a9ea65c49b 100644
--- a/modules/service/xchange/include/dap_chain_net_srv_xchange.h
+++ b/modules/service/xchange/include/dap_chain_net_srv_xchange.h
@@ -31,10 +31,13 @@
typedef struct dap_chain_net_srv_xchange_price {
dap_chain_wallet_t *wallet;
- dap_chain_net_t *net;
- char token_pair[DAP_CHAIN_TICKER_SIZE_MAX * 2];
- double rate;
+ dap_chain_net_t *net_sell;
+ char token_sell[DAP_CHAIN_TICKER_SIZE_MAX];
+ dap_chain_net_t *net_buy;
+ char token_buy[DAP_CHAIN_TICKER_SIZE_MAX];
+ long double rate;
dap_chain_net_srv_order_t *order;
+ char *key_ptr;
UT_hash_handle hh;
} dap_chain_net_srv_xchange_price_t;
--
GitLab