diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c index 17692b65ed02fbbbdf9b2c4510dd9adcd522f458..6fb414757554acd550311d2be3a54245c9bc4ef5 100644 --- a/modules/net/srv/dap_chain_net_srv.c +++ b/modules/net/srv/dap_chain_net_srv.c @@ -407,7 +407,7 @@ static int s_cli_net_srv( int argc, char **argv, char **a_str_reply) size_t l_orders_size = 0; for (size_t i = 0; i< l_orders_num; i++){ dap_chain_net_srv_order_t *l_order =(dap_chain_net_srv_order_t *) (((byte_t*) l_orders) + l_orders_size); - dap_chain_net_srv_order_dump_to_string(l_order, l_string_ret, l_hash_out_type); + dap_chain_net_srv_order_dump_to_string(l_order, l_string_ret, l_hash_out_type, l_net->pub.native_ticker); l_orders_size += dap_chain_net_srv_order_get_size(l_order); dap_string_append(l_string_ret,"\n"); } @@ -423,7 +423,7 @@ static int s_cli_net_srv( int argc, char **argv, char **a_str_reply) if ( l_order_hash_str ){ dap_chain_net_srv_order_t * l_order = dap_chain_net_srv_order_find_by_hash_str( l_net, l_order_hash_hex_str ); if (l_order) { - dap_chain_net_srv_order_dump_to_string(l_order,l_string_ret, l_hash_out_type); + dap_chain_net_srv_order_dump_to_string(l_order,l_string_ret, l_hash_out_type, l_net->pub.native_ticker); l_ret = 0; }else{ l_ret = -7 ; @@ -447,7 +447,7 @@ static int s_cli_net_srv( int argc, char **argv, char **a_str_reply) size_t l_orders_size = 0; for(size_t i = 0; i < l_orders_num; i++) { dap_chain_net_srv_order_t *l_order =(dap_chain_net_srv_order_t *) (((byte_t*) l_orders) + l_orders_size); - dap_chain_net_srv_order_dump_to_string(l_order, l_string_ret, l_hash_out_type); + dap_chain_net_srv_order_dump_to_string(l_order, l_string_ret, l_hash_out_type, l_net->pub.native_ticker); l_orders_size += dap_chain_net_srv_order_get_size(l_order); dap_string_append(l_string_ret, "\n"); } diff --git a/modules/net/srv/dap_chain_net_srv_order.c b/modules/net/srv/dap_chain_net_srv_order.c index 30a8335e8c0a7557fd3d754da97bfe2d23b1d9b9..c53d35d127e1adacce2d2ac51ed8ac39bad74bd2 100644 --- a/modules/net/srv/dap_chain_net_srv_order.c +++ b/modules/net/srv/dap_chain_net_srv_order.c @@ -524,7 +524,7 @@ int dap_chain_net_srv_order_delete_by_hash_str_sync(dap_chain_net_t * a_net, con * @param a_orders * @param a_str_out */ -void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,dap_string_t * a_str_out, const char *a_hash_out_type) +void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,dap_string_t * a_str_out, const char *a_hash_out_type, const char *a_native_ticker) { if (a_order && a_str_out ){ dap_chain_hash_fast_t l_hash; @@ -541,7 +541,9 @@ void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,d case SERV_DIR_SELL: dap_string_append_printf(a_str_out, " direction: SERV_DIR_SELL\n" ); break; case SERV_DIR_BUY: dap_string_append_printf(a_str_out, " direction: SERV_DIR_BUY\n" ); break; } - + char buf_time[50]; + dap_time_to_str_rfc822(buf_time, 50, a_order->ts_created); + dap_string_append_printf(a_str_out, " created: %s\n", buf_time); dap_string_append_printf(a_str_out, " srv_uid: 0x%016"DAP_UINT64_FORMAT_X"\n", a_order->srv_uid.uint64 ); char *l_balance_coins = dap_chain_balance_to_coins(a_order->price); char *l_balance = dap_chain_balance_print(a_order->price); @@ -550,8 +552,7 @@ void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,d DAP_DELETE(l_balance); if( a_order->price_unit.uint32 ) dap_string_append_printf(a_str_out, " price_unit: %s\n", dap_chain_net_srv_price_unit_uid_to_str(a_order->price_unit) ); - if (*a_order->price_ticker) - dap_string_append_printf(a_str_out, " price_token: %s\n", a_order->price_ticker); + dap_string_append_printf(a_str_out, " price_token: %s\n", (*a_order->price_ticker) ? a_order->price_ticker: a_native_ticker); if ( a_order->node_addr.uint64) dap_string_append_printf(a_str_out, " node_addr: "NODE_ADDR_FP_STR"\n", NODE_ADDR_FP_ARGS_S(a_order->node_addr) ); diff --git a/modules/net/srv/include/dap_chain_net_srv_order.h b/modules/net/srv/include/dap_chain_net_srv_order.h index e2c7e4122561f4a849ae34cc8353a654f2985b8a..24f26df936320eba9fb69029f1a48fbd16ed3b4f 100644 --- a/modules/net/srv/include/dap_chain_net_srv_order.h +++ b/modules/net/srv/include/dap_chain_net_srv_order.h @@ -158,7 +158,7 @@ dap_chain_net_srv_order_t *dap_chain_net_srv_order_compose( ); char *dap_chain_net_srv_order_save(dap_chain_net_t *a_net, dap_chain_net_srv_order_t *a_order); -void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,dap_string_t * a_str_out, const char *a_hash_out_type); +void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,dap_string_t * a_str_out, const char *a_hash_out_type, const char *a_native_ticker); void dap_chain_net_srv_order_add_notify_callback(dap_chain_net_t *a_net, dap_store_obj_callback_notify_t a_callback, void *a_cb_arg); /** * @brief dap_chain_net_srv_order_get_gdb_group_mempool