diff --git a/modules/common/dap_chain_datum.c b/modules/common/dap_chain_datum.c
index 07855c803dca5e3feb5345b61a0c015ff83268f6..fa7959b1a7c1b2f3af5d23b90fdfafc13e15f96d 100644
--- a/modules/common/dap_chain_datum.c
+++ b/modules/common/dap_chain_datum.c
@@ -222,7 +222,7 @@ void dap_chain_datum_token_dump_tsd(dap_string_t *a_str_out, dap_chain_datum_tok
}
}
-void s_datum_token_dump_tsd_to_json(json_object * json_obj_out, dap_chain_datum_token_t *a_token, size_t a_token_size, const char *a_hash_out_type)
+void dap_datum_token_dump_tsd_to_json(json_object * json_obj_out, dap_chain_datum_token_t *a_token, size_t a_token_size, const char *a_hash_out_type)
{
dap_tsd_t *l_tsd = dap_chain_datum_token_tsd_get(a_token, a_token_size);
if (l_tsd == NULL) {
@@ -325,7 +325,7 @@ void s_datum_token_dump_tsd_to_json(json_object * json_obj_out, dap_chain_datum_
char *balance = NULL;
dap_chain_datum_token_tsd_delegate_from_stake_lock_t *l_tsd_section = _dap_tsd_get_object(l_tsd, dap_chain_datum_token_tsd_delegate_from_stake_lock_t);
balance = dap_chain_balance_to_coins(l_tsd_section->emission_rate);
- json_object_object_add(json_obj_out, "ticker_token_from", json_object_new_string(l_tsd_section->ticker_token_from));
+ json_object_object_add(json_obj_out, "ticker_token_from", json_object_new_string((char *)l_tsd_section->ticker_token_from));
json_object_object_add(json_obj_out, "emission_rate", json_object_new_string(balance));
DAP_DEL_Z(balance);
}continue;
@@ -370,7 +370,7 @@ void s_datum_token_dump_tsd_to_json(json_object * json_obj_out, dap_chain_datum_
continue;
default: {
char l_tsd_type_char[50] = {};
- dap_string_append_printf(l_tsd_type_char, "<0x%04hX>", l_tsd->type, l_tsd->size);
+ dap_snprintf(l_tsd_type_char, 50, "<0x%04hX>", l_tsd->type);
json_object_object_add(json_obj_out, "tsd_type", json_object_new_string(l_tsd_type_char));
json_object_object_add(json_obj_out, "tsd_size", json_object_new_int(l_tsd->size));
}
diff --git a/modules/common/include/dap_chain_datum.h b/modules/common/include/dap_chain_datum.h
index bb532c306854660e5c6a328acf18982f38e4fc66..1f24b9fa4c39850473b1e364d07677392c7390bf 100644
--- a/modules/common/include/dap_chain_datum.h
+++ b/modules/common/include/dap_chain_datum.h
@@ -154,6 +154,7 @@ DAP_STATIC_INLINE const char *dap_chain_datum_type_id_to_str(uint16_t a_type_id)
}
void dap_chain_datum_token_dump_tsd(dap_string_t *a_str_out, dap_chain_datum_token_t *a_token, size_t a_token_size, const char *a_hash_out_type);
+void dap_datum_token_dump_tsd_to_json(json_object * json_obj_out, dap_chain_datum_token_t *a_token, size_t a_token_size, const char *a_hash_out_type);
void dap_chain_datum_dump(dap_string_t *a_str_out, dap_chain_datum_t *a_datum, const char *a_hash_out_type, dap_chain_net_id_t a_net_id);
bool dap_chain_datum_dump_tx(dap_chain_datum_tx_t *a_datum,
const char *a_ticker,
diff --git a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
index 151f48d3f007fe32a26ac1b933eb956e8b7f1a4a..2c3218072d18db145332573482d1a060555e452b 100644
--- a/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
+++ b/modules/consensus/dag-poa/dap_chain_cs_dag_poa.c
@@ -692,6 +692,7 @@ static bool s_callback_sync_all_on_start(dap_global_db_instance_t *a_dbi, int a_
for (size_t i = 0; i < a_values_count; i++)
s_callback_event_round_sync((dap_chain_cs_dag_t *)a_arg, DAP_GLOBAL_DB_OPTYPE_ADD, a_group,
a_values[i].key, a_values[i].value, a_values[i].value_len);
+ return false;
}
/**
diff --git a/modules/net/dap_chain_ledger.c b/modules/net/dap_chain_ledger.c
index e74a42ad35e0c33ae6dfe7043bd85f4fdb74ceab..4dbb3a1a150363e0dca46c262fb28fc7af60db4d 100644
--- a/modules/net/dap_chain_ledger.c
+++ b/modules/net/dap_chain_ledger.c
@@ -2071,7 +2071,7 @@ json_object *dap_ledger_token_info(dap_ledger_t *a_ledger)
json_object_object_add(json_obj_datum, "Auth signs valid", json_object_new_int(l_token_item->auth_signs_valid));
json_object_object_add(json_obj_datum, "Auth signs total", json_object_new_int(l_token_item->auth_signs_total));
json_object_object_add(json_obj_datum, "TSD and Signs", json_object_new_string(""));
- s_datum_token_dump_tsd_to_json(json_obj_datum, l_token_item->datum_token, l_token_item->datum_token_size, "hex");
+ dap_datum_token_dump_tsd_to_json(json_obj_datum, l_token_item->datum_token, l_token_item->datum_token_size, "hex");
size_t l_certs_field_size = l_token_item->datum_token_size - sizeof(*l_token_item->datum_token) - l_token_item->datum_token->header_native_decl.tsd_total_size;
dap_chain_datum_token_certs_dump_to_json(json_obj_datum, l_token_item->datum_token->data_n_tsd + l_token_item->datum_token->header_native_decl.tsd_total_size,
l_certs_field_size, "hex");
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index 687321a91a56413c1b7e56ca3344d0df8310cb2a..26f741220acda1a17b7f71f40ebc3aa544582b68 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -833,8 +833,9 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger
dap_hash_fast(l_tx, dap_chain_datum_tx_get_size(l_tx), &l_tx_hash);
dap_chain_tx_hash_processed_ht_t *l_sht = NULL;
HASH_FIND(hh, a_tx_hash_processed, &l_tx_hash, sizeof(dap_chain_hash_fast_t), l_sht);
+ json_object * l_json_obj_datum = json_object_new_object();
if (l_sht != NULL ||
- !s_dap_chain_datum_tx_out_data(l_tx, a_ledger, l_str_out, a_hash_out_type, &l_tx_hash)) {
+ !s_dap_chain_datum_tx_out_data(l_tx, a_ledger, l_json_obj_datum, a_hash_out_type, &l_tx_hash)) {
l_datum_num--;
break;
}