diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index a0f31fdb383784bce3e325ee8b2f0c31ab770ee6..ab659d337739a8be2e142fd3e4023b59d0fc4a0d 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -186,6 +186,7 @@ typedef struct dap_chain_net_pvt{
struct block_reward *rewards;
dap_chain_net_decree_t *decree;
decree_table_t *decrees;
+ anchor_table_t *anchors;
} dap_chain_net_pvt_t;
typedef struct dap_chain_net_item{
@@ -3158,7 +3159,7 @@ int dap_chain_datum_add(dap_chain_t *a_chain, dap_chain_datum_t *a_datum, size_t
log_it(L_WARNING, "Corrupted anchor, datum size %zd is not equal to size of anchor %zd", l_datum_data_size, l_anchor_size);
return -102;
}
- return dap_chain_net_anchor_load(l_anchor, a_chain);
+ return dap_chain_net_anchor_load(l_anchor, a_chain, a_datum_hash);
}
case DAP_CHAIN_DATUM_TOKEN_DECL:
return dap_ledger_token_load(l_ledger, a_datum->data, a_datum->header.data_size);
@@ -3205,32 +3206,22 @@ int dap_chain_datum_remove(dap_chain_t *a_chain, dap_chain_datum_t *a_datum, siz
dap_ledger_t *l_ledger = dap_chain_net_by_id(a_chain->net_id)->pub.ledger;
switch (a_datum->header.type_id) {
case DAP_CHAIN_DATUM_DECREE: {
- /*dap_chain_datum_decree_t *l_decree = (dap_chain_datum_decree_t *)a_datum->data;
- size_t l_decree_size = dap_chain_datum_decree_get_size(l_decree);
- if (l_decree_size != l_datum_data_size) {
- log_it(L_WARNING, "Corrupted decree, datum size %zd is not equal to size of decree %zd", l_datum_data_size, l_decree_size);
- return -102;
- }*/
- return 0; //dap_chain_net_decree_load(l_decree, a_chain, a_datum_hash);
+ return 0;
}
case DAP_CHAIN_DATUM_ANCHOR: {
dap_chain_datum_anchor_t *l_anchor = (dap_chain_datum_anchor_t *)a_datum->data;
-
-
-
size_t l_anchor_size = dap_chain_datum_anchor_get_size(l_anchor);
if (l_anchor_size != l_datum_data_size) {
log_it(L_WARNING, "Corrupted anchor, datum size %zd is not equal to size of anchor %zd", l_datum_data_size, l_anchor_size);
return -102;
}
- return dap_chain_net_anchor_unload(l_anchor, a_chain);
+ return dap_chain_net_anchor_unload(l_anchor, a_chain, a_datum_hash);
}
case DAP_CHAIN_DATUM_TOKEN_DECL:
- return 0;//dap_ledger_token_load(l_ledger, a_datum->data, a_datum->header.data_size);
+ return 0;
case DAP_CHAIN_DATUM_TOKEN_EMISSION:
- return 0;//dap_ledger_token_emission_load(l_ledger, a_datum->data, a_datum->header.data_size, a_datum_hash);
-
+ return 0;
case DAP_CHAIN_DATUM_TX: {
dap_chain_datum_tx_t *l_tx = (dap_chain_datum_tx_t *)a_datum->data;
size_t l_tx_size = dap_chain_datum_tx_get_size(l_tx);
@@ -3318,4 +3309,8 @@ void dap_chain_net_set_net_decree(dap_chain_net_t *a_net, dap_chain_net_decree_t
decree_table_t **dap_chain_net_get_decrees(dap_chain_net_t *a_net) {
return a_net ? &(PVT(a_net)->decrees) : NULL;
+}
+
+anchor_table_t **dap_chain_net_get_anchors(dap_chain_net_t *a_net) {
+ return a_net ? &(PVT(a_net)->anchors) : NULL;
}
\ No newline at end of file
diff --git a/modules/net/dap_chain_net_anchor.c b/modules/net/dap_chain_net_anchor.c
index 2fab9b011989ffbf390aae33f44aa85aee285014..dde964b2d4481c500b626c1d207c35fb8059f107 100644
--- a/modules/net/dap_chain_net_anchor.c
+++ b/modules/net/dap_chain_net_anchor.c
@@ -40,6 +40,12 @@
#define LOG_TAG "chain_net_anchor"
+typedef struct anchor_table{
+ dap_hash_fast_t anchor_hash;
+ dap_chain_datum_anchor_t *anchor;
+ UT_hash_handle hh;
+} anchor_table_t;
+
// private function prototypes
static bool s_verify_pubkeys(dap_sign_t *a_sign, dap_sign_t **a_decree_signs, size_t a_num_of_decree_sign);
static inline dap_sign_t *s_concate_all_signs_in_array(dap_sign_t *a_in_signs, size_t a_signs_size, size_t *a_sings_count, size_t *a_signs_arr_size);
@@ -134,7 +140,7 @@ int dap_chain_net_anchor_verify(dap_chain_net_t *a_net, dap_chain_datum_anchor_t
return s_anchor_verify(a_net, a_anchor, a_data_size, false);
}
-int dap_chain_net_anchor_load(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain)
+int dap_chain_net_anchor_load(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain, dap_hash_fast_t *a_anchor_hash)
{
int ret_val = 0;
@@ -165,90 +171,106 @@ int dap_chain_net_anchor_load(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *
return -109;
}
- if ((ret_val = dap_chain_net_decree_apply(&l_hash, NULL, a_chain)) != 0)
+ if ((ret_val = dap_chain_net_decree_apply(&l_hash, NULL, a_chain)) != 0){
log_it(L_WARNING, "Decree applying failed");
+ return ret_val;
+ }
+
+
+ anchor_table_t **l_anchors = dap_chain_net_get_anchors(l_net);
+ anchor_table_t *l_new_anchor = DAP_NEW_Z(anchor_table_t);
+ l_new_anchor->anchor_hash = *a_anchor_hash;
+ l_new_anchor->anchor = a_anchor;
+ HASH_ADD(hh, *l_anchors, anchor_hash, sizeof(l_new_anchor->anchor_hash), l_new_anchor);
return ret_val;
}
-dap_chain_datum_anchor_t * s_find_previous_anchor(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain)
+dap_chain_datum_anchor_t * s_find_previous_anchor(dap_hash_fast_t *a_old_anchor_hash, dap_chain_net_t *a_net)
{
- if (!a_anchor || !a_chain){
+ if (!a_old_anchor_hash || !a_net){
log_it(L_ERROR,"Params are NULL");
return NULL;
}
- dap_chain_net_t *l_net = dap_chain_net_by_id(a_chain->net_id);
+
+ dap_chain_net_t *l_net = a_net;
dap_chain_datum_anchor_t * l_ret_anchor = NULL;
+ dap_chain_datum_anchor_t *l_old_anchor = NULL;
+
+ anchor_table_t **l_anchors_ptr = dap_chain_net_get_anchors(l_net);
+ anchor_table_t *l_anchor = NULL;
+ HASH_FIND(hh, *l_anchors_ptr, a_old_anchor_hash, sizeof(*a_old_anchor_hash), l_anchor);
+ if (!l_old_anchor){
+ log_it(L_WARNING,"Can not find anchor");
+ return NULL;
+ }
+
+ l_old_anchor = l_anchor->anchor;
dap_hash_fast_t l_old_decrere_hash = {};
- if (dap_chain_datum_anchor_get_hash_from_data(a_anchor, &l_old_decrere_hash) != 0)
+ if (dap_chain_datum_anchor_get_hash_from_data(l_old_anchor, &l_old_decrere_hash) != 0)
return NULL;
dap_chain_datum_decree_t *l_old_decree = dap_chain_net_decree_get_by_hash(l_net, &l_old_decrere_hash, NULL);
uint16_t l_old_decree_type = l_old_decree->header.type;
uint16_t l_old_decree_subtype = l_old_decree->header.sub_type;
- dap_chain_cell_t *l_cell = a_chain->cells;
- size_t l_atom_size = 0;
- dap_chain_atom_iter_t *l_atom_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, 0);
- dap_chain_atom_ptr_t l_atom = a_chain->callback_atom_iter_get(l_atom_iter, DAP_CHAIN_ITER_OP_LAST, &l_atom_size);
- while(l_atom && l_atom_size){
+ anchor_table_t *l_anchors = HASH_LAST(*l_anchors_ptr);
+ for(; l_anchors; l_anchors = l_anchors->hh.prev){
size_t l_datums_count = 0;
- dap_chain_datum_t **l_datums = a_chain->callback_atom_get_datums(l_atom, l_atom_size, &l_datums_count);
- dap_chain_datum_t *l_datum, *l_datum2;
- for(size_t l_datum_n = 0; l_datum_n < l_datums_count; l_datum_n++) {
- if ( ! (l_datum = l_datums[l_datum_n]) )
- continue;
-
- if (l_datum->header.type_id != DAP_CHAIN_DATUM_ANCHOR || a_anchor == (dap_chain_datum_anchor_t *)l_datum->data)
- continue;
- dap_chain_datum_anchor_t *l_curr_anchor = (dap_chain_datum_anchor_t *)l_datum->data;
- dap_hash_fast_t l_hash = {};
- if (dap_chain_datum_anchor_get_hash_from_data(l_curr_anchor, &l_hash) != 0)
- continue;
+ dap_chain_datum_anchor_t *l_curr_anchor = l_anchors->anchor;
+ dap_hash_fast_t l_hash = {};
+ if (dap_chain_datum_anchor_get_hash_from_data(l_curr_anchor, &l_hash) != 0)
+ continue;
+
+ bool l_is_applied = false;
+ dap_chain_datum_decree_t *l_decree = dap_chain_net_decree_get_by_hash(l_net, &l_hash, &l_is_applied);
+ if (!l_decree)
+ continue;
+
+ if (l_decree->header.type == l_old_decree_type && l_old_decree_type == DAP_CHAIN_DATUM_DECREE_TYPE_COMMON &&
+ l_old_decree_subtype == DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_INVALIDATE &&
+ l_decree->header.sub_type == DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_APPROVE){
- bool l_is_applied = false;
- dap_chain_datum_decree_t *l_decree = dap_chain_net_decree_get_by_hash(l_net, &l_hash, &l_is_applied);
- if (!l_decree)
+ dap_chain_addr_t l_addr_old, l_addr_new = {};
+ if (dap_chain_datum_decree_get_stake_signing_addr(l_old_decree, &l_addr_old)){
continue;
+ }
- if (l_decree->header.type == l_old_decree_type && l_old_decree_type == DAP_CHAIN_DATUM_DECREE_TYPE_COMMON &&
- l_old_decree_subtype == DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_INVALIDATE &&
- l_decree->header.sub_type == DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_APPROVE){
-
- dap_chain_addr_t l_addr_old, l_addr_new = {};
- if (dap_chain_datum_decree_get_stake_signing_addr(l_old_decree, &l_addr_old)){
- continue;
- }
-
- if (dap_chain_datum_decree_get_stake_signing_addr(l_decree, &l_addr_new)){
- continue;
- }
+ if (dap_chain_datum_decree_get_stake_signing_addr(l_decree, &l_addr_new)){
+ continue;
+ }
- if(dap_chain_addr_compare(&l_addr_old, &l_addr_new)){
- l_ret_anchor = l_curr_anchor;
- dap_chain_net_decree_reset_applied(l_net, &l_hash);
- break;
- }
- } else if (l_decree->header.type == l_old_decree_type && l_decree->header.sub_type == l_old_decree_subtype){
- // check addr if l_decree type is stake approve
+ if(dap_chain_addr_compare(&l_addr_old, &l_addr_new)){
l_ret_anchor = l_curr_anchor;
dap_chain_net_decree_reset_applied(l_net, &l_hash);
- break;
+ break;
}
+ } else if (l_decree->header.type == l_old_decree_type && l_decree->header.sub_type == l_old_decree_subtype){
+ // check addr if l_decree type is stake approve
+ l_ret_anchor = l_curr_anchor;
+ dap_chain_net_decree_reset_applied(l_net, &l_hash);
+ break;
}
- DAP_DEL_Z(l_datums);
if (l_ret_anchor)
break;
- // go to previous atom
- l_atom = a_chain->callback_atom_iter_get(l_atom_iter, DAP_CHAIN_ITER_OP_PREV, &l_atom_size);
}
- a_chain->callback_atom_iter_delete(l_atom_iter);
return l_ret_anchor;
}
-int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain)
+void s_delete_anchor(dap_chain_net_t *a_net, dap_hash_fast_t *a_anchor_hash)
+{
+ anchor_table_t **l_anchors_ptr = dap_chain_net_get_anchors(a_net);
+ anchor_table_t *l_anchor = NULL;
+ HASH_FIND(hh, *l_anchors_ptr, a_anchor_hash, sizeof(*a_anchor_hash), l_anchor);
+ if(l_anchor){
+ HASH_DEL(*l_anchors_ptr, l_anchor);
+ DAP_DEL_Z(l_anchor);
+ }
+}
+
+int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain, dap_hash_fast_t *a_anchor_hash)
{
int ret_val = 0;
@@ -287,7 +309,8 @@ int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t
{
case DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_FEE:{
dap_chain_net_decree_reset_applied(l_net, &l_hash);
- dap_chain_datum_anchor_t * l_new_anchor = s_find_previous_anchor(a_anchor, a_chain);
+ dap_chain_datum_anchor_t * l_new_anchor = s_find_previous_anchor(a_anchor_hash, l_net);
+ s_delete_anchor(l_net, a_anchor_hash);
if (l_new_anchor){// if previous anchor is founded apply it
dap_chain_hash_fast_t l_hash = {0};
if ((ret_val = dap_chain_datum_anchor_get_hash_from_data(l_new_anchor, &l_hash)) != 0){
@@ -317,12 +340,14 @@ int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t
}
dap_chain_net_srv_stake_key_invalidate(&l_signing_addr);
dap_chain_net_decree_reset_applied(l_net, &l_hash);
+ s_delete_anchor(l_net, a_anchor_hash);
}
break;
case DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_INVALIDATE:{
// Find previous anchor with this stake approve and apply it
dap_chain_net_decree_reset_applied(l_net, &l_hash);
dap_chain_datum_anchor_t * l_new_anchor = s_find_previous_anchor(a_anchor, a_chain);
+ s_delete_anchor(l_net, a_anchor_hash);
if (l_new_anchor){// if previous anchor is founded apply it
dap_chain_hash_fast_t l_hash = {0};
if ((ret_val = dap_chain_datum_anchor_get_hash_from_data(l_new_anchor, &l_hash)) != 0){
@@ -339,6 +364,7 @@ int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t
case DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_MIN_VALUE:{
dap_chain_net_decree_reset_applied(l_net, &l_hash);
dap_chain_datum_anchor_t * l_new_anchor = s_find_previous_anchor(a_anchor, a_chain);
+ s_delete_anchor(l_net, a_anchor_hash);
if (l_new_anchor){// if previous anchor is founded apply it
dap_chain_hash_fast_t l_hash = {0};
if ((ret_val = dap_chain_datum_anchor_get_hash_from_data(l_new_anchor, &l_hash)) != 0){
@@ -358,6 +384,7 @@ int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t
case DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_STAKE_MIN_VALIDATORS_COUNT:{
dap_chain_net_decree_reset_applied(l_net, &l_hash);
dap_chain_datum_anchor_t * l_new_anchor = s_find_previous_anchor(a_anchor, a_chain);
+ s_delete_anchor(l_net, a_anchor_hash);
if (l_new_anchor){// if previous anchor is founded apply it
dap_chain_hash_fast_t l_hash = {0};
if ((ret_val = dap_chain_datum_anchor_get_hash_from_data(l_new_anchor, &l_hash)) != 0){
@@ -378,6 +405,7 @@ int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t
// find previous anchor with rewarrd and apply it
dap_chain_net_decree_reset_applied(l_net, &l_hash);
dap_chain_net_remove_last_reward(dap_chain_net_by_id(a_chain->net_id));
+ s_delete_anchor(l_net, a_anchor_hash);
}
break;
case DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_OWNERS:
diff --git a/modules/net/dap_chain_net_decree.c b/modules/net/dap_chain_net_decree.c
index 9433256eb788451facee26a448f68c9b9409c27d..46d6c126472ff3e5c110872b348a772d2e4116d5 100644
--- a/modules/net/dap_chain_net_decree.c
+++ b/modules/net/dap_chain_net_decree.c
@@ -245,7 +245,6 @@ int dap_chain_net_decree_apply(dap_hash_fast_t *a_decree_hash, dap_chain_datum_d
decree_table_t **l_decrees = dap_chain_net_get_decrees(l_net), *l_new_decree;
HASH_FIND(hh, *l_decrees, a_decree_hash, sizeof(dap_hash_fast_t), l_new_decree);
-
if (!l_new_decree) {
l_new_decree = DAP_NEW_Z(decree_table_t);
if (!l_new_decree) {
diff --git a/modules/net/include/dap_chain_net.h b/modules/net/include/dap_chain_net.h
index 6e9f139a5223f361a849eda5c49a5c7c1f25c485..6e62d461f70fb3948bcfad59038a16bd2368dedb 100644
--- a/modules/net/include/dap_chain_net.h
+++ b/modules/net/include/dap_chain_net.h
@@ -44,6 +44,7 @@ typedef struct dap_chain_node_client dap_chain_node_client_t;
typedef struct dap_ledger dap_ledger_t;
typedef struct dap_chain_net_decree dap_chain_net_decree_t;
typedef struct decree_table decree_table_t;
+typedef struct anchor_table anchor_table_t;
typedef enum dap_chain_net_state {
NET_STATE_OFFLINE = 0,
NET_STATE_LINKS_PREPARE,
@@ -233,4 +234,5 @@ enum dap_chain_net_json_rpc_error_list{
};
dap_chain_net_decree_t *dap_chain_net_get_net_decree(dap_chain_net_t *a_net);
void dap_chain_net_set_net_decree(dap_chain_net_t *a_net, dap_chain_net_decree_t *a_decree);
-decree_table_t **dap_chain_net_get_decrees(dap_chain_net_t *a_net);
\ No newline at end of file
+decree_table_t **dap_chain_net_get_decrees(dap_chain_net_t *a_net);
+anchor_table_t **dap_chain_net_get_anchors(dap_chain_net_t *a_net);
\ No newline at end of file
diff --git a/modules/net/include/dap_chain_net_anchor.h b/modules/net/include/dap_chain_net_anchor.h
index 1a44cab2a1f10439cd03d4c91b355c78d3380355..7275e2c2b3ca0e4143c30f692de3f471b72a9dc4 100644
--- a/modules/net/include/dap_chain_net_anchor.h
+++ b/modules/net/include/dap_chain_net_anchor.h
@@ -24,6 +24,8 @@
#include "dap_chain_datum_anchor.h"
#include "dap_chain_net.h"
+int dap_chain_net_anchor_init(dap_chain_net_t *a_net);
+
int dap_chain_net_anchor_verify(dap_chain_net_t *a_net, dap_chain_datum_anchor_t * a_anchor, size_t a_data_size);
-int dap_chain_net_anchor_load(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain);
-int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain);
\ No newline at end of file
+int dap_chain_net_anchor_load(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain, dap_hash_fast_t *a_anchor_hash);
+int dap_chain_net_anchor_unload(dap_chain_datum_anchor_t * a_anchor, dap_chain_t *a_chain, dap_hash_fast_t *a_anchor_hash);
\ No newline at end of file
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 01a2468ff55625627c71735f8a5129ec0dd21d83..99ea171cf964f816ebdd3b85202419e11271e7f1 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -62,10 +62,12 @@ typedef struct dap_chain_cs_blocks_pvt
size_t forked_br_cnt;
dap_chain_block_forked_branch_t **forked_branches; // list of lists with atoms in side branches
+ pthread_rwlock_t forked_branches_rwlock;
// Chunks treshold
dap_chain_block_chunks_t * chunks;
dap_chain_block_datum_index_t *datum_index; // To find datum in blocks
+ pthread_rwlock_t datums_rwlock;
dap_chain_hash_fast_t genesis_block_hash;
dap_chain_hash_fast_t static_genesis_block_hash;
@@ -78,12 +80,24 @@ typedef struct dap_chain_cs_blocks_pvt
dap_timerfd_t *fill_timer;
uint64_t fill_timeout;
- pthread_rwlock_t rwlock, datums_rwlock;
+ pthread_rwlock_t rwlock;
struct cs_blocks_hal_item *hal;
} dap_chain_cs_blocks_pvt_t;
#define PVT(a) ((dap_chain_cs_blocks_pvt_t *)(a)->_pvt )
+#define print_rdlock(blocks) log_it(L_DEBUG, "Try to rdlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());\
+ pthread_rwlock_rdlock(& PVT(blocks)->rwlock);\
+ log_it(L_DEBUG, "Locked rdlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());
+
+#define print_wrlock(blocks) log_it(L_DEBUG, "Try to wrlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());\
+ pthread_rwlock_wrlock(& PVT(blocks)->rwlock);\
+ log_it(L_DEBUG, "Locked wrlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());
+
+#define print_unlock(blocks) log_it(L_DEBUG, "Try to unlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());\
+ pthread_rwlock_unlock(& PVT(blocks)->rwlock);\
+ log_it(L_DEBUG, "Unlocked rwqlock, %s, %d, thread_id=%u", __FUNCTION__, __LINE__, dap_gettid());
+
static int s_cli_parse_cmd_hash(char ** a_argv, int a_arg_index, int a_argc, void **a_str_reply,const char * a_param, dap_chain_hash_fast_t * a_datum_hash);
static void s_cli_meta_hash_print( json_object* json_obj_a, const char * a_meta_title, dap_chain_block_meta_t * a_meta);
static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply);
@@ -155,7 +169,7 @@ int dap_chain_cs_blocks_init()
{
dap_chain_cs_type_add("blocks", s_chain_cs_blocks_new);
s_seed_mode = dap_config_get_item_bool_default(g_config,"general","seed_mode",false);
- s_debug_more = true; //dap_config_get_item_bool_default(g_config, "blocks", "debug_more", false);
+ s_debug_more = dap_config_get_item_bool_default(g_config, "blocks", "debug_more", false);
dap_cli_server_cmd_add ("block", s_cli_blocks, "Create and explore blockchains",
"New block create, fill and complete commands:\n"
"block -net <net_name> -chain <chain_name> new\n"
@@ -286,6 +300,7 @@ static int s_chain_cs_blocks_new(dap_chain_t *a_chain, dap_config_t *a_chain_con
l_cs_blocks->_pvt = l_cs_blocks_pvt;
pthread_rwlock_init(&l_cs_blocks_pvt->rwlock,NULL);
pthread_rwlock_init(&l_cs_blocks_pvt->datums_rwlock, NULL);
+ pthread_rwlock_init(&l_cs_blocks_pvt->forked_branches_rwlock, NULL);
const char * l_genesis_blocks_hash_str = dap_config_get_item_str_default(a_chain_config,"blocks","genesis_block",NULL);
if ( l_genesis_blocks_hash_str ){
@@ -527,8 +542,7 @@ static void s_print_autocollect_table(dap_chain_net_t *a_net, json_object* json_
static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply)
{
json_object **json_arr_reply = (json_object **)a_str_reply;
- //char ** a_str_reply = (char **) reply;
- const char *l_hash_out_type = NULL;
+ //char ** a_str_reply = (char **) reply;
enum {
SUBCMD_UNDEFINED =0,
SUBCMD_NEW_FLUSH,
@@ -1339,6 +1353,7 @@ static void s_callback_delete(dap_chain_t * a_chain)
pthread_rwlock_unlock(&PVT(l_blocks)->rwlock);
pthread_rwlock_destroy(&PVT(l_blocks)->rwlock);
pthread_rwlock_destroy(&PVT(l_blocks)->datums_rwlock);
+ pthread_rwlock_destroy(&PVT(l_blocks)->forked_branches_rwlock);
dap_chain_block_chunks_delete(PVT(l_blocks)->chunks);
DAP_DEL_Z(l_blocks->_inheritor);
DAP_DEL_Z(l_blocks->_pvt);
@@ -1348,6 +1363,19 @@ static void s_callback_delete(dap_chain_t * a_chain)
static void s_callback_cs_blocks_purge(dap_chain_t *a_chain)
{
dap_chain_cs_blocks_t *l_blocks = DAP_CHAIN_CS_BLOCKS(a_chain);
+
+ pthread_rwlock_wrlock(&PVT(l_blocks)->forked_branches_rwlock);
+ for (size_t i = 0; i < PVT(l_blocks)->forked_br_cnt; i++){
+ dap_chain_block_forked_branch_atoms_table_t *l_atom_tmp, *l_atom;
+ HASH_ITER(hh, PVT(l_blocks)->forked_branches[i]->forked_branch_atoms, l_atom, l_atom_tmp) {
+ HASH_DEL(PVT(l_blocks)->forked_branches[i]->forked_branch_atoms, l_atom);
+ l_atom = NULL;
+ }
+ DAP_DEL_Z(PVT(l_blocks)->forked_branches[i]);
+ }
+ DAP_DEL_Z(PVT(l_blocks)->forked_branches);
+ pthread_rwlock_unlock(&PVT(l_blocks)->forked_branches_rwlock);
+
pthread_rwlock_wrlock(&PVT(l_blocks)->rwlock);
dap_chain_block_cache_t *l_block = NULL, *l_block_tmp = NULL;
HASH_ITER(hh, PVT(l_blocks)->blocks, l_block, l_block_tmp) {
@@ -1467,73 +1495,6 @@ static void s_add_atom_to_blocks(dap_chain_cs_blocks_t *a_blocks, dap_chain_bloc
}
-/**
- * @brief s_bft_consensus_setup
- * @param a_blocks
- */
-static void s_bft_consensus_setup(dap_chain_cs_blocks_t * a_blocks)
-{
- bool l_was_chunks_changed = false;
- // Compare all chunks with chain's tail
- for (dap_chain_block_chunk_t *l_chunk = PVT(a_blocks)->chunks->chunks_last ; l_chunk; l_chunk=l_chunk->prev ){
- size_t l_chunk_length = HASH_COUNT(l_chunk->block_cache_hash);
- dap_chain_block_cache_t * l_block_cache_chunk_top_prev = dap_chain_block_cache_get_by_hash(a_blocks,&l_chunk->block_cache_top->prev_hash);
- dap_chain_block_cache_t * l_block_cache= l_block_cache_chunk_top_prev;
- if ( l_block_cache ){ // we found prev block in main chain
- size_t l_tail_length = 0;
- // Now lets calc tail length
- for( ;l_block_cache; l_block_cache=l_block_cache->prev){
- l_tail_length++;
- if(l_tail_length>l_chunk_length)
- break;
- }
- if(l_tail_length<l_chunk_length ){ // This generals consensus is bigger than the current one
- // Cutoff current chank from the list
- if( l_chunk->next)
- l_chunk->next->prev = l_chunk->prev;
- if( l_chunk->prev)
- l_chunk->prev->next = l_chunk->next;
-
- // Pass through all the tail and move it to chunks
- for(l_block_cache= l_block_cache_chunk_top_prev ;l_block_cache; l_block_cache=l_block_cache->prev){
- pthread_rwlock_wrlock(& PVT(a_blocks)->rwlock);
- if(l_block_cache->prev)
- l_block_cache->prev->next = l_block_cache->next;
- if(l_block_cache->next)
- l_block_cache->next->prev = l_block_cache->prev;
- HASH_DEL(PVT(a_blocks)->blocks,l_block_cache);
- --PVT(a_blocks)->blocks_count;
- pthread_rwlock_unlock(& PVT(a_blocks)->rwlock);
- dap_chain_block_chunks_add(PVT(a_blocks)->chunks,l_block_cache);
- }
- // Pass through all the chunk and add it to main chain
- for(l_block_cache= l_chunk->block_cache_top ;l_block_cache; l_block_cache=l_block_cache->prev){
- int l_check_res = 0;
- if (a_blocks->callback_block_verify)
- l_check_res = a_blocks->callback_block_verify(a_blocks, l_block_cache->block, l_block_cache->block_size);
- if (!l_check_res) {
- log_it(L_WARNING,"Can't move block %s from chunk to main chain - data inside wasn't verified: code %d",
- l_block_cache->block_hash_str, l_check_res);
- dap_chain_block_chunks_add(PVT(a_blocks)->chunks,l_block_cache);
- }
- // TODO Rework blocks rwlock usage for this code
- HASH_ADD(hh, PVT(a_blocks)->blocks, block_hash, sizeof(l_block_cache->block_hash), l_block_cache);
- ++PVT(a_blocks)->blocks_count;
- s_add_atom_datums(a_blocks, l_block_cache);
- }
- dap_chain_block_chunk_delete(l_chunk );
- l_was_chunks_changed = true;
- }
- }
-
- }
- if(l_was_chunks_changed){
- dap_chain_block_chunks_sort( PVT(a_blocks)->chunks);
- log_it(L_INFO,"Recursive BFT stage additional check...");
- s_bft_consensus_setup(a_blocks);
- }
-}
-
static void s_select_longest_branch(dap_chain_cs_blocks_t * a_blocks, dap_chain_block_cache_t * a_bcache, uint64_t a_main_branch_length, dap_chain_cell_t *a_cell)
{
dap_chain_cs_blocks_t * l_blocks = a_blocks;
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index 8a57dc0d503e561669ce0531fc6ba69290f350fc..d392889bb785d87e44c5b7c3f71066fad1856daa 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -150,11 +150,7 @@ int dap_chain_cs_dag_init()
s_debug_more = dap_config_get_item_bool_default(g_config, "dag", "debug_more", false);
s_threshold_enabled = dap_config_get_item_bool_default(g_config, "dag", "threshold_enabled",false);
debug_if(s_debug_more, L_DEBUG, "Thresholding %s", s_threshold_enabled ? "enabled" : "disabled");
- dap_cli_server_cmd_add ("dag", s_cli_dag, "DAG commands",
- "dag event create -net <net_name> -chain <chain_name> -datum <datum_hash> [-H {hex | base58(default)}]\n"
- "\tCreate event from datum mempool element\n\n"
- "dag event cancel -net <net_name> -chain <chain_name> -event <event_hash>\n"
- "\tRemove event from forming new round and put back its datum to mempool\n\n"
+ dap_cli_server_cmd_add ("dag", s_cli_dag, "DAG commands",
"dag event sign -net <net_name> -chain <chain_name> -event <event_hash>\n"
"\tAdd sign to event <event hash> in round.new. Hash doesn't include other signs so event hash\n"
"\tdoesn't changes after sign add to event. \n\n"
@@ -1329,9 +1325,8 @@ static dap_chain_datum_t *s_chain_callback_datum_iter_get_next(dap_chain_datum_i
*/
static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
{
+ json_object **json_arr_reply = (json_object **)a_str_reply;
enum {
- SUBCMD_EVENT_CREATE,
- SUBCMD_EVENT_CANCEL,
SUBCMD_EVENT_LIST,
SUBCMD_EVENT_DUMP,
SUBCMD_EVENT_SIGN,
@@ -1364,31 +1359,30 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if(!l_hash_out_type)
l_hash_out_type = "hex";
if(dap_strcmp(l_hash_out_type,"hex") && dap_strcmp(l_hash_out_type,"base58")) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "invalid parameter -H, valid values: -H <hex | base58>");
- return -1;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR,"invalid parameter -H, valid values: -H <hex | base58>");
+ return -DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR;
}
- dap_chain_node_cli_cmd_values_parse_net_chain(&arg_index, argc, argv, a_str_reply, &l_chain, &l_net,
- CHAIN_TYPE_INVALID);
+ if(dap_chain_node_cli_cmd_values_parse_net_chain_for_json(&arg_index, argc, argv, &l_chain, &l_net,CHAIN_TYPE_TX) < 0)
+ return -DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR;
+
if ((l_net == NULL) || (l_chain == NULL)){
return -1;
- } else if (a_str_reply && *a_str_reply) {
- DAP_DELETE(*a_str_reply);
- *a_str_reply = NULL;
- }
+ }
l_dag = DAP_CHAIN_CS_DAG(l_chain);
const char *l_chain_type = dap_chain_get_cs_type(l_chain);
if (!strstr(l_chain_type, "dag_")){
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Type of chain %s is not dag. This chain with type %s is not supported by this command",
- l_chain->name, l_chain_type);
- return -42;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_CHAIN_TYPE_ERR,"Type of chain %s is not dag. This chain with type %s is not supported by this command",
+ l_chain->name, l_chain_type);
+ return -DAP_CHAIN_NODE_CLI_COM_DAG_CHAIN_TYPE_ERR;
}
int ret = 0;
if ( l_round_cmd_str ) {
+ json_object * json_obj_round = json_object_new_object();
+ char l_buf[150] = {};
if ( strcmp(l_round_cmd_str,"complete") == 0 ){
const char * l_cmd_mode_str = NULL;
dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-mode", &l_cmd_mode_str);
@@ -1400,9 +1394,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
size_t l_objs_size=0;
dap_global_db_obj_t * l_objs = dap_global_db_get_all_sync(l_dag->gdb_group_events_round_new,&l_objs_size);
-
- dap_string_t *l_str_ret_tmp= l_objs_size>0 ? dap_string_new("Completing round:\n") : dap_string_new("Completing round: no data");
-
+ dap_string_t *l_str_ret_tmp= l_objs_size>0 ? json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round")):
+ json_object_object_add(json_obj_round,"round status", json_object_new_string("Completing round: no data"));
// list for verifed and added events
dap_list_t *l_list_to_del = NULL;
@@ -1416,25 +1409,26 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
size_t l_event_size = l_round_item->event_size;
dap_hash_fast(l_event, l_event_size, &l_event_hash);
int l_ret_event_verify;
- if ( ( l_ret_event_verify = l_dag->callback_cs_verify (l_dag,l_event,l_event_size) ) !=0 ){// if consensus accept the event
- dap_string_append_printf( l_str_ret_tmp,
- "Error! Event %s is not passing consensus verification, ret code %d\n",
+ if ( ( l_ret_event_verify = l_dag->callback_cs_verify (l_dag,l_event,l_event_size) ) !=0 ){// if consensus accept the event
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_EVENT_ERR,"Error! Event %s is not passing consensus verification, ret code %d\n",
l_objs[i].key, l_ret_event_verify );
- ret = -30;
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_EVENT_ERR;
break;
}else {
- dap_string_append_printf( l_str_ret_tmp, "Event %s verification passed\n", l_objs[i].key);
+ snprintf(l_buf, 150, "Event %s verification passed", l_objs[i].key);
+ json_object_object_add(json_obj_round,"verification status", json_object_new_string(l_buf));
// If not verify only mode we add
if ( ! l_verify_only ){
- if (s_chain_callback_atom_add(l_chain, l_event, l_event_size, &l_event_hash) != ATOM_ACCEPT) { // Add new atom in chain
- dap_string_append_printf(l_str_ret_tmp, "Event %s not added in chain\n", l_objs[i].key);
+ if (s_chain_callback_atom_add(l_chain, l_event, l_event_size, &l_event_hash)!= ATOM_ACCEPT) { // Add new atom in chain
+ snprintf(l_buf, 150, "Event %s not added in chain\n", l_objs[i].key);
+ json_object_object_add(json_obj_round,"status add", json_object_new_string(l_buf));
} else {
// add event to delete
l_list_to_del = dap_list_prepend(l_list_to_del, (void *)l_objs[i].key);
- dap_string_append_printf(l_str_ret_tmp, "Event %s added in chain successfully\n",
+ snprintf(l_buf, 150, "Event %s added in chain successfully\n",
l_objs[i].key);
+ json_object_object_add(json_obj_round,"status add", json_object_new_string(l_buf));
}
-
}
}
}
@@ -1453,7 +1447,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
// Cleaning up
dap_global_db_objs_delete(l_objs, l_objs_size);
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_ret_tmp->str);
+ json_object_array_add(*json_arr_reply, json_obj_round);
dap_string_free(l_str_ret_tmp, true);
// Spread new mempool changes and dag events in network - going to SYNC_ALL
@@ -1469,20 +1463,20 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
l_datum_in_hash = dap_enc_base58_to_hex_str_from_str(l_datum_hash_str);
}
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "The -datum option was not specified, so "
- "no datum is known to look for in rounds.\n");
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR,"The -datum option was not specified, so "
+ "no datum is known to look for in rounds.\n");
return 0;
}
dap_hash_fast_t l_datum_hash = {0};
dap_chain_hash_fast_from_str(l_datum_in_hash, &l_datum_hash);
if (dap_hash_fast_is_blank(&l_datum_hash)) {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "The -datum parameter is not a valid hash.\n");
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR,"The -datum parameter is not a valid hash.\n");
return 0;
}
size_t l_objs_size = 0;
dap_global_db_obj_t * l_objs = dap_global_db_get_all_sync(l_dag->gdb_group_events_round_new, &l_objs_size);
size_t l_search_events = 0;
- dap_string_t *l_events_str = dap_string_new("Events: \n");
+ json_object_object_add(json_obj_round,"Events", json_object_new_string("empty"));
for (size_t i = 0; i < l_objs_size;i++) {
if (!strcmp(DAG_ROUND_CURRENT_KEY, l_objs[i].key))
continue;
@@ -1494,46 +1488,24 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
dap_hash_fast(l_event, l_event_size, &ll_event_hash);
char *ll_event_hash_str = dap_hash_fast_to_str_new(&ll_event_hash);
l_search_events++;
- dap_string_append_printf(l_events_str,
- "\t%zu) hash:%s cell_id:%zu\n", l_search_events, ll_event_hash_str,
- l_event->header.cell_id.uint64);
+ json_object_object_add(json_obj_round,"events count", json_object_new_uint64(l_search_events));
+ json_object_object_add(json_obj_round,"event hash", json_object_new_string(ll_event_hash_str));
+ json_object_object_add(json_obj_round,"cell_id", json_object_new_uint64(l_event->header.cell_id.uint64));
DAP_DELETE(ll_event_hash_str);
}
}
dap_global_db_objs_delete(l_objs, l_objs_size);
DAP_DELETE(l_datum_in_hash);
- if (l_search_events > 0) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Datum with hash %s found in %zu events:\n%s\n", l_datum_hash_str,
- l_search_events, l_events_str->str);
- } else {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Datum hash %s not found in round event.\n", l_datum_hash_str);
- }
- dap_string_free(l_events_str, true);
+ if (!l_search_events) {
+ snprintf(l_buf, 150, "Datum hash %s not found in round event.\n", l_datum_hash_str);
+ json_object_object_add(json_obj_round,"find result", json_object_new_string(l_buf));
+ }
return 0;
}
- }else if ( l_event_cmd_str ) {
+ }else if ( l_event_cmd_str ) {
char *l_datum_hash_hex_str = NULL;
char *l_datum_hash_base58_str = NULL;
- if ( strcmp( l_event_cmd_str, "create" ) == 0 ) {
- dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-datum", &l_datum_hash_str);
-
- // datum hash may be in hex or base58 format
- if(l_datum_hash_str) {
- if(!dap_strncmp(l_datum_hash_str, "0x", 2) || !dap_strncmp(l_datum_hash_str, "0X", 2)) {
- l_datum_hash_hex_str = dap_strdup(l_datum_hash_str);
- l_datum_hash_base58_str = dap_enc_base58_from_hex_str_to_str(l_datum_hash_str);
- }
- else {
- l_datum_hash_hex_str = dap_enc_base58_to_hex_str_from_str(l_datum_hash_str);
- l_datum_hash_base58_str = dap_strdup(l_datum_hash_str);
- }
- }
- l_event_subcmd = SUBCMD_EVENT_CREATE;
- } else if ( strcmp( l_event_cmd_str, "cancel" ) == 0 ) {
- dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-event", &l_event_hash_str);
- l_event_subcmd = SUBCMD_EVENT_CANCEL;
- } else if ( strcmp( l_event_cmd_str, "list" ) == 0 ) {
+ if ( strcmp( l_event_cmd_str, "list" ) == 0 ) {
l_event_subcmd = SUBCMD_EVENT_LIST;
dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-from", &l_from_events_str);
} else if ( strcmp( l_event_cmd_str,"dump") == 0 ) {
@@ -1566,95 +1538,11 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if (l_event_hash_hex_str)
dap_chain_hash_fast_from_str(l_event_hash_hex_str, &l_event_hash);
- switch (l_event_subcmd) {
-
- case SUBCMD_EVENT_CREATE: {
- char * l_gdb_group_mempool = dap_chain_net_get_gdb_group_mempool_new(l_chain);
- size_t l_datum_size = 0;
- dap_chain_datum_t *l_datum = (dap_chain_datum_t*)
- dap_global_db_get_sync(l_gdb_group_mempool, l_datum_hash_hex_str, &l_datum_size, NULL, NULL);
- if (s_callback_add_datums(l_chain, &l_datum, 1)) {
- char *l_datums_datum_hash_str;
- dap_get_data_hash_str_static(l_datum->data, l_datum->header.data_size, l_datums_datum_hash_str);
- if (!dap_global_db_del_sync(l_gdb_group_mempool, l_datum_hash_str)) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Converted datum %s from mempool to event in the new forming round ",
- l_datum_hash_str);
- ret = 0;
- } else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Warning! Can't delete datum %s from mempool after conversion to event in the new forming round ",
- l_datum_hash_str);
- ret = 1;
- }
- } else {
- if (!dap_strcmp(l_hash_out_type, "hex")) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Warning! Can't convert datum %s from mempool to event in the new forming round ", l_datum_hash_hex_str);
- } else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Warning! Can't convert datum %s from mempool to event in the new forming round ", l_datum_hash_base58_str);
-
- ret = -12;
- }
- }
- DAP_DELETE(l_gdb_group_mempool);
- // dap_chain_net_sync_all(l_net);
- } break; /* SUBCMD_EVENT_CREATE */
-
- case SUBCMD_EVENT_CANCEL: {
- char *l_gdb_group_events = DAP_CHAIN_CS_DAG(l_chain)->gdb_group_events_round_new;
- if (dap_global_db_del_sync(l_gdb_group_events, l_event_hash_hex_str) == 0) {
- if(!dap_strcmp(l_hash_out_type, "hex")) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Successfuly removed event %s from the new forming round ",
- l_event_hash_hex_str);
- } else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Successfuly removed event %s from the new forming round ",
- l_event_hash_base58_str);
- }
- ret = 0;
- } else {
- dap_chain_cs_dag_event_item_t * l_event_item = NULL;
- pthread_mutex_lock(&PVT(l_dag)->events_mutex);
- HASH_FIND(hh,PVT(l_dag)->events,&l_event_hash,sizeof(l_event_hash),l_event_item);
- pthread_mutex_unlock(&PVT(l_dag)->events_mutex);
- if (l_event_item) {
- pthread_mutex_lock(&PVT(l_dag)->events_mutex);
- HASH_DELETE(hh, PVT(l_dag)->events, l_event_item);
- pthread_mutex_unlock(&PVT(l_dag)->events_mutex);
- if(!dap_strcmp(l_hash_out_type, "hex")) {
- log_it(L_WARNING, "Dropped event %s from chains! Hope you know what are you doing!",
- l_event_hash_hex_str);
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Dropped event 0x%s from chains! Hope you know what are you doing! ",
- l_event_hash_hex_str);
- } else {
- log_it(L_WARNING, "Dropped event %s from chains! Hope you know what are you doing!",
- l_event_hash_base58_str);
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Dropped event 0x%s from chains! Hope you know what are you doing! ",
- l_event_hash_base58_str);
- }
- dap_chain_save_all(l_chain);
- } else {
- if(!dap_strcmp(l_hash_out_type, "hex")) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't remove event 0x%s ",
- l_event_hash_hex_str);
- } else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't remove event 0x%s ",
- l_event_hash_base58_str);
- }
- ret = -1;
- }
- }
- // dap_chain_net_sync_gdb(l_net);
- } break; /* SUBCMD_EVENT_CANCEL */
+ switch (l_event_subcmd) {
case SUBCMD_EVENT_DUMP: {
+ json_object * json_obj_event = json_object_new_object();
+ char l_buf[150] = {};
dap_chain_cs_dag_event_round_item_t *l_round_item = NULL;
dap_chain_cs_dag_event_t *l_event = NULL;
size_t l_event_size = 0;
@@ -1675,9 +1563,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if ( l_event_item )
l_event = l_event_item->event;
else {
- ret = -23;
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't find event %s in events_last table\n", l_event_hash_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR,"Can't find event %s in events_last table\n", l_event_hash_str);
break;
}
} else if (!l_from_events_str || strcmp(l_from_events_str,"events") == 0) {
@@ -1689,9 +1576,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
l_event = l_event_item->event;
l_event_size = l_event_item->event_size;
} else {
- ret = -24;
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't find event %s in events table\n", l_event_hash_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR,"Can't find event %s in events table\n", l_event_hash_str);
break;
}
} else if (l_from_events_str && strcmp(l_from_events_str,"threshold") == 0) {
@@ -1702,50 +1588,49 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if (l_event_item)
l_event = l_event_item->event;
else {
- ret = -23;
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't find event %s in threshold table\n", l_event_hash_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR,"Can't find event %s in threshold table\n", l_event_hash_str);
break;
}
} else {
- ret = -22;
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Wrong events_from option \"%s\", need one of variant: events, round.new, events_lasts, threshold", l_from_events_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR,
+ "Wrong events_from option \"%s\", need one of variant: events, round.new, events_lasts, threshold", l_from_events_str);
break;
}
- if ( l_event ){
- dap_string_t * l_str_tmp = dap_string_new(NULL);
- char buf[DAP_TIME_STR_SIZE];
-
- dap_string_append_printf(l_str_tmp, "\nEvent %s:\n", l_event_hash_str);
+ if ( l_event ){
+ json_object_object_add(json_obj_event,"Event hash", json_object_new_string(l_event_hash_str));
// Round info
if ((l_from_events_str && strcmp(l_from_events_str,"round.new") == 0) && l_round_item) {
- dap_string_append_printf(l_str_tmp,
- "\tRound info:\n\t\tsigns reject: %d\n",
- l_round_item->round_info.reject_count);
+ char buf[DAP_TIME_STR_SIZE];
+ json_object_object_add(json_obj_event,"Round info", json_object_new_string(" "));
+ json_object_object_add(json_obj_event,"tsigns reject", json_object_new_uint64(l_round_item->round_info.reject_count));
+ json_object_object_add(json_obj_event,"ts_update", json_object_new_string(buf));
dap_nanotime_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_round_item->round_info.ts_update);
- dap_string_append_printf(l_str_tmp, "\t\tdatum_hash: %s\n\t\tts_update: %s\n",
- dap_chain_hash_fast_to_str_static(&l_round_item->round_info.datum_hash), buf);
+ json_object_object_add(json_obj_event,"datum_hash", json_object_new_string(dap_chain_hash_fast_to_str_static(&l_round_item->round_info.datum_hash)));
+ json_object_object_add(json_obj_event,"ts_update", json_object_new_string(buf));
}
- // Header
- dap_string_append_printf(l_str_tmp,"\t\tHeader:\n");
- dap_string_append_printf(l_str_tmp,"\t\t\tversion: %hu\n",l_event->header.version);
- dap_string_append_printf(l_str_tmp,"\t\t\tround ID: %"DAP_UINT64_FORMAT_U"\n",l_event->header.round_id);
- dap_string_append_printf(l_str_tmp,"\t\t\tcell_id: 0x%016"DAP_UINT64_FORMAT_x"\n",l_event->header.cell_id.uint64);
- dap_string_append_printf(l_str_tmp,"\t\t\tchain_id: 0x%016"DAP_UINT64_FORMAT_X"\n",l_event->header.chain_id.uint64);
+ // Header
+ json_object_object_add(json_obj_event,"Header", json_object_new_string("empty"));
+ sprintf(l_buf,"%hu",l_event->header.version);
+ json_object_object_add(json_obj_event,"version", json_object_new_string(l_buf));
+ json_object_object_add(json_obj_event,"round ID", json_object_new_uint64(l_event->header.round_id));
+ sprintf(l_buf,"0x%016"DAP_UINT64_FORMAT_x"",l_event->header.cell_id.uint64);
+ json_object_object_add(json_obj_event,"cell_id", json_object_new_string(l_buf));
+ sprintf(l_buf,"0x%016"DAP_UINT64_FORMAT_x"",l_event->header.chain_id.uint64);
+ json_object_object_add(json_obj_event,"chain_id", json_object_new_string(l_buf));
dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_event->header.ts_created);
- dap_string_append_printf(l_str_tmp,"\t\t\tts_created: %s\n", buf );
+ json_object_object_add(json_obj_event,"ts_created", json_object_new_string(l_buf));
// Hash links
- dap_string_append_printf(l_str_tmp,"\t\t\thashes:\tcount: %u\n",l_event->header.hash_count);
+ json_object_object_add(json_obj_event,"hashes count", json_object_new_uint64(l_event->header.hash_count));
for (uint16_t i=0; i < l_event->header.hash_count; i++){
dap_chain_hash_fast_t * l_hash = (dap_chain_hash_fast_t *) (l_event->hashes_n_datum_n_signs +
i*sizeof (dap_chain_hash_fast_t));
- dap_string_append_printf(l_str_tmp,"\t\t\t\thash: %s\n",
- dap_chain_hash_fast_to_str_static(l_hash));
+ json_object_object_add(json_obj_event,"hash", json_object_new_string(dap_chain_hash_fast_to_str_static(l_hash)));
}
size_t l_offset = l_event->header.hash_count*sizeof (dap_chain_hash_fast_t);
dap_chain_datum_t * l_datum = (dap_chain_datum_t*) (l_event->hashes_n_datum_n_signs + l_offset);
@@ -1754,21 +1639,23 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
// Nested datum
const char *l_datum_type = NULL;
DAP_DATUM_TYPE_STR(l_datum->header.type_id, l_datum_type)
- dap_string_append_printf(l_str_tmp,"\t\tdatum:\tdatum_size: %zu\n",l_datum_size);
- dap_string_append_printf(l_str_tmp,"\t\t\tversion:=0x%02hhX\n", l_datum->header.version_id);
- dap_string_append_printf(l_str_tmp,"\t\t\ttype_id:=%s\n", l_datum_type);
+ json_object_object_add(json_obj_event,"Datum", json_object_new_string("empty"));
+ json_object_object_add(json_obj_event,"datum_size", json_object_new_uint64(l_datum_size));
+ sprintf(l_buf,"0x%02hhX",l_datum->header.version_id);
+ json_object_object_add(json_obj_event,"version", json_object_new_string(l_buf));
+ json_object_object_add(json_obj_event,"type_id", json_object_new_string(l_datum_type));
dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_datum->header.ts_create);
- dap_string_append_printf(l_str_tmp,"\t\t\tts_create=%s\n", buf);
- dap_string_append_printf(l_str_tmp,"\t\t\tdata_size=%u\n", l_datum->header.data_size);
-
+ json_object_object_add(json_obj_event,"ts_create", json_object_new_string(buf));
+ json_object_object_add(json_obj_event,"data_size", json_object_new_uint64(l_datum->header.data_size));
+
// Signatures
- dap_string_append_printf(l_str_tmp,"\t\t\t\tsigns:\tcount: %u\n",l_event->header.signs_count);
+ json_object_object_add(json_obj_event,"signs count", json_object_new_uint64(l_event->header.signs_count));
l_offset += l_datum_size;
while (l_offset + sizeof (l_event->header) < l_event_size ){
dap_sign_t * l_sign =(dap_sign_t *) (l_event->hashes_n_datum_n_signs +l_offset);
size_t l_sign_size = dap_sign_get_size(l_sign);
if (l_sign_size == 0 ){
- dap_string_append_printf(l_str_tmp,"\t\t\t\tERROR: wrong sign size 0, stop parsing headers\n");
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR," wrong sign size 0, stop parsing headers");
break;
}
dap_chain_hash_fast_t l_pkey_hash;
@@ -1777,19 +1664,17 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
? dap_enc_base58_encode_hash_to_str_static(&l_pkey_hash)
: dap_chain_hash_fast_to_str_static(&l_pkey_hash);
- dap_string_append_printf(l_str_tmp,"\t\t\t\t\t\ttype: %s\tpkey_hash: %s"
- "\n", dap_sign_type_to_str( l_sign->header.type ),
- l_hash_str );
+ json_object_object_add(json_obj_event,"type", json_object_new_string(dap_sign_type_to_str( l_sign->header.type )));
+ json_object_object_add(json_obj_event,"pkey_hash", json_object_new_string(l_hash_str));
+
l_offset += l_sign_size;
}
- dap_chain_datum_dump(l_str_tmp, l_datum, l_hash_out_type, l_net->pub.id);
+ dap_chain_datum_dump_json(json_obj_event, l_datum, l_hash_out_type, l_net->pub.id);
+ json_object_array_add(*json_arr_reply, json_obj_event);
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_tmp->str);
- dap_string_free(l_str_tmp, true);
ret=0;
}else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't find event 0x%s in the new forming round ",
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR,"Can't find event 0x%s in the new forming round ",
l_event_hash_str);
ret=-10;
}
@@ -1797,69 +1682,73 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
} break;
case SUBCMD_EVENT_LIST: {
+ json_object * json_obj_event_list = json_object_new_object();
+ json_object * json_arr_obj_event = json_object_new_array();
const char *l_limit_str = NULL, *l_offset_str = NULL;
dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-limit", &l_limit_str);
- dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-offset", &l_offset_str);
+ dap_cli_server_cmd_find_option_val(argv, arg_index, argc, "-offset", &l_offset_str);
+ char *ptr;
+ size_t l_limit = l_limit_str ? strtoull(l_limit_str, &ptr, 10) : 1000;
+ size_t l_offset = l_offset_str ? strtoull(l_offset_str, &ptr, 10) : 0;
+ if (l_offset)
+ json_object_object_add(json_obj_event_list,"offset", json_object_new_uint64(l_offset));
+ if (l_limit)
+ json_object_object_add(json_obj_event_list,"limit", json_object_new_uint64(l_limit));
+
if (l_from_events_str && strcmp(l_from_events_str,"round.new") == 0) {
char * l_gdb_group_events = DAP_CHAIN_CS_DAG(l_chain)->gdb_group_events_round_new;
- dap_string_t * l_str_tmp = dap_string_new("");
if ( l_gdb_group_events ){
dap_global_db_obj_t * l_objs;
size_t l_objs_count = 0;
- l_objs = dap_global_db_get_all_sync(l_gdb_group_events,&l_objs_count);
- char *ptr;
- size_t l_limit = l_limit_str ? strtoull(l_limit_str, &ptr, 10) : 1000;
- size_t l_offset = l_offset_str ? strtoull(l_offset_str, &ptr, 10) : 0;
+ l_objs = dap_global_db_get_all_sync(l_gdb_group_events,&l_objs_count);
size_t l_arr_start = 0;
if (l_offset) {
- l_arr_start = l_offset;
- dap_string_append_printf(l_str_tmp, "offset: %lu\n", l_arr_start);
+ l_arr_start = l_offset;
}
size_t l_arr_end = l_objs_count;
if (l_limit) {
- dap_string_append_printf(l_str_tmp, "limit: %lu\n", l_limit);
l_arr_end = l_arr_start + l_limit;
if (l_arr_end > l_objs_count)
l_arr_end = l_objs_count;
}
- dap_string_append_printf(l_str_tmp,"%s.%s: Found %zu records :\n",l_net->pub.name,l_chain->name,l_objs_count);
+ json_object_object_add(json_obj_event_list,"net name", json_object_new_string(l_net->pub.name));
+ json_object_object_add(json_obj_event_list,"chain", json_object_new_string(l_chain->name));
+ json_object_object_add(json_obj_event_list,"obj count", json_object_new_uint64(l_objs_count));
for (size_t i = l_arr_start; i < l_arr_end; i++) {
+ json_object * json_obj_event_i = json_object_new_object();
if (!strcmp(DAG_ROUND_CURRENT_KEY, l_objs[i].key)) {
- dap_string_append_printf(l_str_tmp, "\t%s: %" DAP_UINT64_FORMAT_U "\n",
- l_objs[i].key, *(uint64_t *)l_objs[i].value);
+ json_object_object_add(json_obj_event_i, l_objs[i].key, json_object_new_uint64(*(uint64_t *)l_objs[i].value));
+ json_object_array_add(json_arr_obj_event, json_obj_event_i);
continue;
}
dap_chain_cs_dag_event_t * l_event = (dap_chain_cs_dag_event_t *)
((dap_chain_cs_dag_event_round_item_t *)l_objs[i].value)->event_n_signs;
char buf[DAP_TIME_STR_SIZE];
dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_event->header.ts_created);
- dap_string_append_printf(l_str_tmp, "\t%zu\t - %s: ts_create=%s\n", i - 1, l_objs[i].key, buf);
-
+ json_object_object_add(json_obj_event_i, "#", json_object_new_string(dap_itoa(i-1)));
+ json_object_object_add(json_obj_event_i, "obj key", json_object_new_string(l_objs[i].key));
+ json_object_object_add(json_obj_event_i, "ts_create", json_object_new_string(buf));
+ json_object_array_add(json_arr_obj_event, json_obj_event_i);
}
+ json_object_object_add(json_obj_event_list, "OBJ", json_arr_obj_event);
if (l_objs && l_objs_count )
dap_global_db_objs_delete(l_objs, l_objs_count);
ret = 0;
} else {
- dap_string_append_printf(l_str_tmp, "%s.%s: Error! No GlobalDB group!\n", l_net->pub.name, l_chain->name);
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_GLOBALDB_ERR, "%s.%s: Error! No GlobalDB group!\n", l_net->pub.name, l_chain->name);
ret = -2;
}
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_tmp->str);
- dap_string_free(l_str_tmp, true);
+ json_object_array_add(*json_arr_reply, json_obj_event_list);
} else if (!l_from_events_str || (strcmp(l_from_events_str,"events") == 0)) {
- dap_string_t * l_str_tmp = dap_string_new(NULL);
- pthread_mutex_lock(&PVT(l_dag)->events_mutex);
- size_t l_limit = l_limit_str ? strtoul(l_limit_str, NULL, 10) : 1000;
- size_t l_offset = l_offset_str ? strtoul(l_offset_str, NULL, 10) : 0;
+ pthread_mutex_lock(&PVT(l_dag)->events_mutex);
size_t l_arr_start = 0;
if (l_offset > 0) {
- l_arr_start = l_offset;
- dap_string_append_printf(l_str_tmp, "offset: %lu\n", l_arr_start);
+ l_arr_start = l_offset;
}
size_t l_arr_end = HASH_COUNT(PVT(l_dag)->events);
if (l_limit) {
- dap_string_append_printf(l_str_tmp, "limit: %lu\n", l_limit);
l_arr_end = l_arr_start + l_limit;
if (l_arr_end > HASH_COUNT(PVT(l_dag)->events))
l_arr_end = HASH_COUNT(PVT(l_dag)->events);
@@ -1870,83 +1759,89 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if (i_tmp < l_arr_start || i_tmp >= l_arr_end) {
i_tmp++;
} else {
+ json_object * json_obj_event_i = json_object_new_object();
i_tmp++;
char buf[DAP_TIME_STR_SIZE];
dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_event_item->event->header.ts_created);
- dap_string_append_printf(l_str_tmp, "\t%zu\t- %s: ts_create=%s\n", i_tmp,
- dap_chain_hash_fast_to_str_static(&l_event_item->hash),
- buf);
+ json_object_object_add(json_obj_event_i, "#", json_object_new_string(dap_itoa(i_tmp)));
+ json_object_object_add(json_obj_event_i, "hash", json_object_new_string(dap_chain_hash_fast_to_str_static(&l_event_item->hash)));
+ json_object_object_add(json_obj_event_i, "ts_create", json_object_new_string(buf));
+ json_object_array_add(json_arr_obj_event, json_obj_event_i);
}
}
+ json_object_object_add(json_obj_event_list, "EVENTS", json_arr_obj_event);
size_t l_events_count = HASH_COUNT(PVT(l_dag)->events);
pthread_mutex_unlock(&PVT(l_dag)->events_mutex);
- dap_string_append_printf(l_str_tmp,"%s.%s have total %zu events :\n",
- l_net->pub.name, l_chain->name, l_events_count);
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_tmp->str);
- dap_string_free(l_str_tmp, true);
- }else if (l_from_events_str && (strcmp(l_from_events_str,"threshold") == 0) ){
- dap_string_t * l_str_tmp = dap_string_new(NULL);
+
+ json_object_object_add(json_obj_event_list,"net name", json_object_new_string(l_net->pub.name));
+ json_object_object_add(json_obj_event_list,"chain", json_object_new_string(l_chain->name));
+ json_object_object_add(json_obj_event_list,"total events", json_object_new_uint64(l_events_count));
+
+ json_object_array_add(*json_arr_reply, json_obj_event_list);
+ }else if (l_from_events_str && (strcmp(l_from_events_str,"threshold") == 0) ){
pthread_mutex_lock(&PVT(l_dag)->events_mutex);
dap_chain_cs_dag_event_item_t * l_event_item = NULL,*l_event_item_tmp = NULL;
- size_t l_limit = l_limit_str ? strtoul(l_limit_str, NULL, 10) : 0;
- size_t l_offset = l_offset_str ? strtoul(l_offset_str, NULL, 10) : 0;
size_t l_arr_start = 0;
if (l_offset) {
l_arr_start = l_offset;
- dap_string_append_printf(l_str_tmp, "offset: %lu\n", l_arr_start);
}
size_t l_arr_end = HASH_COUNT(PVT(l_dag)->events_treshold);
if (l_limit) {
- dap_string_append_printf(l_str_tmp, "limit: %lu\n", l_limit);
l_arr_end = l_arr_start + l_limit;
if (l_arr_end > HASH_COUNT(PVT(l_dag)->events_treshold))
l_arr_end = HASH_COUNT(PVT(l_dag)->events_treshold);
}
size_t i_tmp = 0;
- dap_string_append_printf(l_str_tmp,"\nDAG threshold events:\n");
HASH_ITER(hh,PVT(l_dag)->events_treshold,l_event_item, l_event_item_tmp ) {
if (i_tmp < l_arr_start || i_tmp > l_arr_end) {
i_tmp++;
continue;
}
i_tmp++;
+ json_object * json_obj_event_i = json_object_new_object();
char buf[DAP_TIME_STR_SIZE];
dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_event_item->event->header.ts_created);
- dap_string_append_printf(l_str_tmp, "\t%zu\t- %s: ts_create=%s\n", i_tmp,
- dap_chain_hash_fast_to_str_static( &l_event_item->hash),
- buf);
+ json_object_object_add(json_obj_event_i, "#", json_object_new_string(dap_itoa(i_tmp)));
+ json_object_object_add(json_obj_event_i, "hash", json_object_new_string(dap_chain_hash_fast_to_str_static(&l_event_item->hash)));
+ json_object_object_add(json_obj_event_i, "ts_create", json_object_new_string(buf));
+ json_object_array_add(json_arr_obj_event, json_obj_event_i);
}
+ json_object_object_add(json_obj_event_list, "TRESHOLD", json_arr_obj_event);
size_t l_events_count = HASH_COUNT(PVT(l_dag)->events_treshold);
pthread_mutex_unlock(&PVT(l_dag)->events_mutex);
- dap_string_append_printf(l_str_tmp,"%s.%s have total %zu events in threshold :\n",
- l_net->pub.name, l_chain->name, l_events_count);
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_tmp->str);
- dap_string_free(l_str_tmp, true);
+ json_object_object_add(json_obj_event_list,"net name", json_object_new_string(l_net->pub.name));
+ json_object_object_add(json_obj_event_list,"chain", json_object_new_string(l_chain->name));
+ json_object_object_add(json_obj_event_list,"total events", json_object_new_uint64(l_events_count));
+
+ json_object_array_add(*json_arr_reply, json_obj_event_list);
}else {
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Undefined events source for listing ");
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_UNDEF_ERR, "Undefined events source for listing ");
ret=-14;
}
} break;
case SUBCMD_EVENT_COUNT: {
- dap_string_t *l_ret_str = dap_string_new(NULL);
- dap_string_append_printf(l_ret_str, "%s.%s:\n", l_net->pub.name, l_chain->name);
+ json_object * json_obj_event_count = json_object_new_object();
+ json_object_object_add(json_obj_event_count,"net name", json_object_new_string(l_net->pub.name));
+ json_object_object_add(json_obj_event_count,"chain", json_object_new_string(l_chain->name));
const char * l_gdb_group_events = DAP_CHAIN_CS_DAG(l_chain)->gdb_group_events_round_new;
if (l_gdb_group_events) {
size_t l_objs_count = 0;
dap_global_db_obj_t *l_objs = dap_global_db_get_all_sync(l_gdb_group_events,&l_objs_count);
- dap_string_append_printf(l_ret_str,"%zu in round.new\n", l_objs_count);
+ json_object_object_add(json_obj_event_count,"event count in round new", json_object_new_string(l_objs_count));
}
size_t l_event_count = HASH_COUNT(PVT(l_dag)->events);
size_t l_event_treshold_count = HASH_COUNT(PVT(l_dag)->events_treshold);
- dap_string_append_printf(l_ret_str, "%zu atom(s) in events\n%zu atom(s) in threshold", l_event_count, l_event_treshold_count);
- dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_ret_str->str);
- dap_string_free(l_ret_str, true);
+ json_object_object_add(json_obj_event_count,"atom in events", json_object_new_uint64(l_event_count));
+ json_object_object_add(json_obj_event_count,"atom in threshold", json_object_new_uint64(l_event_treshold_count));
+ json_object_array_add(*json_arr_reply, json_obj_event_count);
} break;
case SUBCMD_EVENT_SIGN: { // Sign event command
+ json_object * json_obj_event_count = json_object_new_object();
+ json_object * json_arr_obj_event = json_object_new_array();
char * l_gdb_group_events = l_dag->gdb_group_events_round_new;
size_t l_round_item_size = 0;
dap_chain_cs_dag_event_round_item_t *l_round_item =
@@ -1968,42 +1863,44 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
if (dap_chain_cs_dag_event_gdb_set(l_dag, l_event_new_hash_hex_str, l_event,
l_event_size_new, l_round_item)) {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Added new sign with cert \"%s\", event %s placed back in round.new\n",
- l_cert_str, l_event_new_hash_base58_str ?
- l_event_new_hash_base58_str : l_event_new_hash_hex_str);
+ json_object * json_obj_sign = json_object_new_object();
+
+ json_object_object_add(json_obj_sign,"cert", json_object_new_string(l_cert_str));
+ json_object_object_add(json_obj_sign,"event", l_event_new_hash_base58_str ?
+ json_object_new_string(l_event_new_hash_base58_str) :
+ json_object_new_string(l_event_new_hash_hex_str));
+ json_object_array_add(json_arr_obj_event, json_obj_sign);
+
+ json_object_object_add(json_obj_event_count,"Added new sign with cert, event placed back in round.new", json_arr_obj_event);
+ json_object_array_add(*json_arr_reply, json_obj_event_count);
+
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "GDB Error: Can't place event %s with new sign back in round.new\n",
- l_event_new_hash_base58_str ? l_event_new_hash_base58_str : l_event_new_hash_hex_str);
- ret = -31;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR,"GDB Error: Can't place event %s with new sign back in round.new\n",
+ l_event_new_hash_base58_str ? l_event_new_hash_base58_str : l_event_new_hash_hex_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR;
}
DAP_DELETE(l_event);
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't sign event %s in round.new\n",
- l_event_hash_str);
- ret=-1;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR,"Can't sign event %s in round.new\n",
+ l_event_hash_str);
+ ret=-DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR;
}
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "No valid certificate provided for event %s signing\n",
- l_event_hash_str);
- ret = -50;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_CERT_ERR,"No valid certificate provided for event %s signing\n",
+ l_event_hash_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_CERT_ERR;
}
DAP_DELETE(l_round_item);
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Can't find event %s in round.new - only place where could be signed the new event\n",
- l_event_hash_str);
- ret = -30;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_FIND_EVENT_ERR,"Can't find event %s in round.new - only place where could be signed the new event\n",
+ l_event_hash_str);
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_FIND_EVENT_ERR;
}
} break;
case SUBCMD_UNDEFINED: {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Undefined event subcommand \"%s\" ",
- l_event_cmd_str);
- ret=-11;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_UNKNOWN,"Undefined event subcommand \"%s\" ",
+ l_event_cmd_str);
+ ret=-DAP_CHAIN_NODE_CLI_COM_DAG_UNKNOWN;
}
}
DAP_DEL_Z(l_datum_hash_hex_str);
@@ -2011,9 +1908,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply)
DAP_DEL_Z(l_event_hash_hex_str);
DAP_DEL_Z(l_event_hash_base58_str);
} else {
- dap_cli_server_cmd_set_reply_text(a_str_reply,
- "Undefined subcommand");
- ret = -13;
+ dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_DAG_UNDEF_SUB_ERR,"Undefined subcommand");
+ ret = -DAP_CHAIN_NODE_CLI_COM_DAG_UNDEF_SUB_ERR;
}
return ret;
}
diff --git a/modules/type/dag/include/dap_chain_cs_dag.h b/modules/type/dag/include/dap_chain_cs_dag.h
index 68d154e2d79705146d0d902f275b4f292c77e92a..0043a3afbe2f1c151a2c3e558275ff9f0687403b 100644
--- a/modules/type/dag/include/dap_chain_cs_dag.h
+++ b/modules/type/dag/include/dap_chain_cs_dag.h
@@ -74,6 +74,25 @@ typedef struct dap_chain_cs_dag
void * _inheritor;
} dap_chain_cs_dag_t;
+typedef enum s_com_dag_err{
+ DAP_CHAIN_NODE_CLI_COM_DAG_OK = 0,
+ DAP_CHAIN_NODE_CLI_COM_DAG_PARAM_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_CHAIN_TYPE_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_DATUM_DEL_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_EVENT_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_SIGN_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_FIND_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_GLOBALDB_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_UNDEF_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_CERT_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_FIND_EVENT_ERR,
+ DAP_CHAIN_NODE_CLI_COM_DAG_UNDEF_SUB_ERR,
+
+ /* add custom codes here */
+
+ DAP_CHAIN_NODE_CLI_COM_DAG_UNKNOWN /* MAX */
+} s_com_dag_err_t;
+
#define DAP_CHAIN_CS_DAG(a) ( (dap_chain_cs_dag_t *) (a)->_inheritor)
int dap_chain_cs_dag_init();