diff --git a/dap-sdk b/dap-sdk index f11590342d80e1de304de380e6ad082b1d898046..e7aba2f7157652c411183e9b2fcf37991724028b 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit f11590342d80e1de304de380e6ad082b1d898046 +Subproject commit e7aba2f7157652c411183e9b2fcf37991724028b diff --git a/modules/common/dap_chain_datum.c b/modules/common/dap_chain_datum.c index 1dbb358441dd3dc4ba98c5ece3568677b21329fa..341f52c739b33fab85bbff206568e33d3635d0b8 100644 --- a/modules/common/dap_chain_datum.c +++ b/modules/common/dap_chain_datum.c @@ -134,7 +134,7 @@ void dap_chain_datum_token_dump_tsd(dap_string_t *a_str_out, dap_chain_datum_tok } case DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TOTAL_PKEYS_ADD: if(l_tsd->size >= sizeof(dap_pkey_t)) { - char *l_hash_str; + const char *l_hash_str; dap_pkey_t *l_pkey = (dap_pkey_t*)l_tsd->data; dap_hash_fast_t l_hf = { }; if (!dap_pkey_get_hash(l_pkey, &l_hf)) { @@ -152,7 +152,7 @@ void dap_chain_datum_token_dump_tsd(dap_string_t *a_str_out, dap_chain_datum_tok case DAP_CHAIN_DATUM_TOKEN_TSD_TYPE_TOTAL_PKEYS_REMOVE: if(l_tsd->size == sizeof(dap_chain_hash_fast_t) ){ - char *l_hash_str = (!dap_strcmp(a_hash_out_type,"hex")|| !dap_strcmp(a_hash_out_type, "content_hash")) + const char *l_hash_str = (!dap_strcmp(a_hash_out_type,"hex")|| !dap_strcmp(a_hash_out_type, "content_hash")) ? dap_chain_hash_fast_to_str_static((dap_chain_hash_fast_t*) l_tsd->data) : dap_enc_base58_encode_hash_to_str_static((dap_chain_hash_fast_t*) l_tsd->data); dap_string_append_printf(a_str_out,"total_pkeys_remove: %s\n", l_hash_str); @@ -400,7 +400,7 @@ bool dap_chain_datum_dump_tx(dap_chain_datum_tx_t *a_datum, if (l_in_item && dap_hash_fast_is_blank(&l_in_item->header.tx_prev_hash)) l_is_first = true; char l_tmp_buf[DAP_TIME_STR_SIZE]; - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(a_tx_hash) : dap_chain_hash_fast_to_str_static(a_tx_hash); dap_time_to_str_rfc822(l_tmp_buf, DAP_TIME_STR_SIZE, a_datum->header.ts_created); @@ -677,7 +677,7 @@ bool dap_chain_datum_dump_tx(dap_chain_datum_tx_t *a_datum, } break; case TX_ITEM_TYPE_VOTE:{ dap_chain_tx_vote_t *l_vote_item = (dap_chain_tx_vote_t *)item; - char *l_hash_str = dap_chain_hash_fast_to_str_static(&l_vote_item->voting_hash); + const char *l_hash_str = dap_chain_hash_fast_to_str_static(&l_vote_item->voting_hash); dap_string_append_printf(a_str_out, "\t VOTE: \n" "\t Voting hash: %s\n" "\t Vote answer idx: %"DAP_UINT64_FORMAT_U"\n", l_hash_str, l_vote_item->answer_idx); @@ -715,7 +715,7 @@ void dap_chain_datum_dump(dap_string_t *a_str_out, dap_chain_datum_t *a_datum, c } dap_hash_fast_t l_datum_hash; dap_hash_fast(a_datum->data, a_datum->header.data_size, &l_datum_hash); - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_datum_hash) : dap_chain_hash_fast_to_str_static(&l_datum_hash); switch (a_datum->header.type_id) { diff --git a/modules/common/dap_chain_datum_anchor.c b/modules/common/dap_chain_datum_anchor.c index a6110889698dd5828769a9797221dddd2d475805..58cdc378b7257a7476c41a29d617a1df3a635b9d 100644 --- a/modules/common/dap_chain_datum_anchor.c +++ b/modules/common/dap_chain_datum_anchor.c @@ -83,7 +83,7 @@ void dap_chain_datum_anchor_certs_dump(dap_string_t * a_str_out, byte_t * a_sign dap_string_append_printf(a_str_out, "<CORRUPTED - can't calc hash>\n"); continue; } - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? 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(a_str_out, "%d) %s, %s, %u bytes\n", i, l_hash_str, diff --git a/modules/common/dap_chain_datum_decree.c b/modules/common/dap_chain_datum_decree.c index 38758a133ae949afc47c62ef1859caf438ae719f..6920023a493e992d1188653a5ccb0a2d7affe229 100644 --- a/modules/common/dap_chain_datum_decree.c +++ b/modules/common/dap_chain_datum_decree.c @@ -245,7 +245,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree } dap_hash_fast_t *l_stake_tx = /*{ }; _dap_tsd_get_scalar(l_tsd, &l_stake_tx);*/ _dap_tsd_get_object(l_tsd, dap_hash_fast_t); - char *l_stake_tx_hash = dap_strcmp(a_hash_out_type, "hex") + const char *l_stake_tx_hash = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(l_stake_tx) : dap_chain_hash_fast_to_str_static(l_stake_tx); dap_string_append_printf(a_str_out, "\tStake tx: %s\n", l_stake_tx_hash); @@ -269,7 +269,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree _dap_tsd_get_scalar(l_tsd, &l_stake_addr_signing);*/ _dap_tsd_get_object(l_tsd, dap_chain_addr_t); dap_string_append_printf(a_str_out, "\tSigning addr: %s\n", dap_chain_addr_to_str(l_stake_addr_signing)); dap_chain_hash_fast_t l_pkey_signing = l_stake_addr_signing->data.hash_fast; - char *l_pkey_signing_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_pkey_signing_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_pkey_signing) : dap_chain_hash_fast_to_str_static(&l_pkey_signing); dap_string_append_printf(a_str_out, "\tSigning pkey fingerprint: %s\n", l_pkey_signing_str); @@ -341,7 +341,7 @@ void dap_chain_datum_decree_certs_dump(dap_string_t * a_str_out, byte_t * a_sign continue; } - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? 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(a_str_out, "%d) %s, %s, %u bytes\n", i, l_hash_str, diff --git a/modules/common/dap_chain_datum_token.c b/modules/common/dap_chain_datum_token.c index 8d1c75fc617429cffe57ae481bf78ad6378b54a7..bd1f2d3f8504e3ae369b4748bbc7fcae6040452e 100644 --- a/modules/common/dap_chain_datum_token.c +++ b/modules/common/dap_chain_datum_token.c @@ -282,7 +282,7 @@ void dap_chain_datum_token_certs_dump(dap_string_t * a_str_out, byte_t * a_data_ continue; } - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_pkey_hash) : dap_chain_hash_fast_to_str_static(&l_pkey_hash); diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c index 5233bd3581116838137e90c01a1f0da09c0b94ae..e449a19996cfb2e3cd1d0b760c5194de7de859cb 100644 --- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c +++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c @@ -267,7 +267,7 @@ static int s_callback_new(dap_chain_t *a_chain, dap_config_t *a_chain_cfg) l_validator->node_addr = l_signer_node_addr; l_validator->weight = uint256_1; l_esbocs_pvt->poa_validators = dap_list_append(l_esbocs_pvt->poa_validators, l_validator); - char *l_signer_addr = dap_chain_hash_fast_to_str_static(&l_signing_addr.data.hash_fast); + const char *l_signer_addr = dap_chain_hash_fast_to_str_static(&l_signing_addr.data.hash_fast); log_it(L_MSG, "add validator addr "NODE_ADDR_FP_STR", signing addr %s", NODE_ADDR_FP_ARGS_S(l_signer_node_addr), l_signer_addr); if (!l_esbocs_pvt->poa_mode) { // auth certs in PoA mode will be first PoS validators keys @@ -877,7 +877,7 @@ static void s_session_update_penalty(dap_chain_esbocs_session_t *a_session) } if (l_item->miss_count < DAP_CHAIN_ESBOCS_PENALTY_KICK) { if (PVT(a_session->esbocs)->debug) { - char *l_addr_str = dap_chain_hash_fast_to_str_static(&l_signing_addr->data.hash_fast); + const char *l_addr_str = dap_chain_hash_fast_to_str_static(&l_signing_addr->data.hash_fast); log_it(L_DEBUG, "Increment miss count %d for addr %s. Miss count for kick is %d", l_item->miss_count, l_addr_str, DAP_CHAIN_ESBOCS_PENALTY_KICK); } @@ -1036,7 +1036,7 @@ static uint64_t s_session_calc_current_round_id(dap_chain_esbocs_session_t *a_se } } if (l_id_candidate == 0) { - char *l_signing_addr_str = dap_chain_hash_fast_to_str_static(&l_validator->signing_addr.data.hash_fast); + const char *l_signing_addr_str = dap_chain_hash_fast_to_str_static(&l_validator->signing_addr.data.hash_fast); log_it(L_ERROR, "Can't find sync message of synced validator %s", l_signing_addr_str); continue; } @@ -1164,7 +1164,7 @@ static void s_session_state_change(dap_chain_esbocs_session_t *a_session, enum s dap_hash_fast_t l_directive_hash; dap_hash_fast(l_directive, l_directive->size, &l_directive_hash); if (PVT(a_session->esbocs)->debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_directive_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_directive_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu. Put on the vote my directive:%s", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, a_session->cur_round.attempt_num, l_candidate_hash_str); @@ -1205,7 +1205,7 @@ static void s_session_state_change(dap_chain_esbocs_session_t *a_session, enum s ); dap_chain_esbocs_validator_t *l_validator = l_list ? l_list->data : NULL; if (!l_validator || !l_validator->is_chosen) { - char *l_addr = dap_chain_hash_fast_to_str_static(&a_session->cur_round.attempt_submit_validator.data.hash_fast); + const char *l_addr = dap_chain_hash_fast_to_str_static(&a_session->cur_round.attempt_submit_validator.data.hash_fast); log_it(L_MSG, "Error: can't find current attmempt submit validator %s in signers list", l_addr); } l_validator->is_chosen = false; @@ -1332,7 +1332,7 @@ static void s_session_proc_state(dap_chain_esbocs_session_t *a_session) } if (dap_list_length(l_store->candidate_signs) >= PVT(a_session->esbocs)->min_validators_count) { if(l_cs_debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&a_session->cur_round.attempt_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&a_session->cur_round.attempt_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu" " Candidate %s collected sings of minimum number of validators, so to sent PRE_COMMIT", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, @@ -1418,7 +1418,7 @@ static void s_session_candidate_submit(dap_chain_esbocs_session_t *a_session) if (l_candidate_size) { dap_hash_fast(l_candidate, l_candidate_size, &l_candidate_hash); if (PVT(a_session->esbocs)->debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu. Submit my candidate %s", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, a_session->cur_round.attempt_num, l_candidate_hash_str); @@ -1462,7 +1462,7 @@ static void s_session_candidate_verify(dap_chain_esbocs_session_t *a_session, da s_message_send(a_session, DAP_CHAIN_ESBOCS_MSG_TYPE_APPROVE, a_candidate_hash, NULL, 0, a_session->cur_round.validators_list); if (PVT(a_session->esbocs)->debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu Sent APPROVE candidate %s", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, a_session->cur_round.attempt_num, l_candidate_hash_str); @@ -1472,7 +1472,7 @@ static void s_session_candidate_verify(dap_chain_esbocs_session_t *a_session, da s_message_send(a_session, DAP_CHAIN_ESBOCS_MSG_TYPE_REJECT, a_candidate_hash, NULL, 0, a_session->cur_round.validators_list); if (PVT(a_session->esbocs)->debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu Sent REJECT candidate %s", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, a_session->cur_round.attempt_num, l_candidate_hash_str); @@ -1492,7 +1492,7 @@ static void s_session_candidate_precommit(dap_chain_esbocs_session_t *a_session, byte_t *l_message_data = a_message->msg_n_sign; dap_chain_hash_fast_t *l_candidate_hash = &a_message->hdr.candidate_hash; dap_chain_esbocs_store_t *l_store; - char *l_candidate_hash_str = NULL; + const char *l_candidate_hash_str = NULL; HASH_FIND(hh, a_session->cur_round.store_items, l_candidate_hash, sizeof(dap_chain_hash_fast_t), l_store); if (!l_store) { l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); @@ -1552,7 +1552,7 @@ static bool s_session_candidate_to_chain(dap_chain_esbocs_session_t *a_session, } bool res = false; dap_chain_atom_verify_res_t l_res = a_session->chain->callback_atom_add(a_session->chain, a_candidate, a_candidate_size); - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(a_candidate_hash); switch (l_res) { case ATOM_ACCEPT: // block save to chain @@ -1594,25 +1594,25 @@ static void s_session_round_finish(dap_chain_esbocs_session_t *a_session, dap_ch } if (l_store->reject_count >= l_cs_level) { - char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); + const char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); debug_if(l_cs_debug, L_WARNING, "Trying to finish rejected candidate %s", l_finish_candidate_hash_str); return; } if (l_store->approve_count < l_cs_level) { - char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); + const char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); debug_if(l_cs_debug, L_WARNING, "Trying to finish not properly approved candidate %s", l_finish_candidate_hash_str); return; } if (dap_list_length(l_store->candidate_signs) < l_cs_level) { - char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); + const char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); debug_if(l_cs_debug, L_WARNING, "Trying to finish not properly signed candidate %s", l_finish_candidate_hash_str); return; } if (l_store->precommit_count < l_cs_level) { - char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); + const char *l_finish_candidate_hash_str = dap_chain_hash_fast_to_str_static(&l_store->candidate_hash); debug_if(l_cs_debug, L_WARNING, "Trying to finish not properly precommited candidate %s", l_finish_candidate_hash_str); return; } @@ -1751,7 +1751,7 @@ static void s_session_directive_process(dap_chain_esbocs_session_t *a_session, d } if (PVT(a_session->esbocs)->debug) { - char *l_directive_hash_str = dap_chain_hash_fast_to_str_static(a_directive_hash); + const char *l_directive_hash_str = dap_chain_hash_fast_to_str_static(a_directive_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu Send VOTE %s directive %s", a_session->chain->net_name, a_session->chain->name, a_session->cur_round.id, a_session->cur_round.attempt_num, l_vote_for ? "FOR" : "AGAINST", @@ -2152,7 +2152,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain } if (l_cs_debug) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu." " Receive SUBMIT candidate %s, size %zu", l_session->chain->net_name, l_session->chain->name, l_session->cur_round.id, @@ -2162,7 +2162,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain dap_chain_esbocs_store_t *l_store; HASH_FIND(hh, l_session->cur_round.store_items, l_candidate_hash, sizeof(dap_chain_hash_fast_t), l_store); if (l_store) { - char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); + const char *l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); log_it(L_WARNING, "Duplicate candidate: %s", l_candidate_hash_str); break; } @@ -2190,7 +2190,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain case DAP_CHAIN_ESBOCS_MSG_TYPE_APPROVE: case DAP_CHAIN_ESBOCS_MSG_TYPE_REJECT: { dap_chain_esbocs_store_t *l_store; - char *l_candidate_hash_str = NULL; + const char *l_candidate_hash_str = NULL; bool l_approve = l_message->hdr.type == DAP_CHAIN_ESBOCS_MSG_TYPE_APPROVE; HASH_FIND(hh, l_session->cur_round.store_items, l_candidate_hash, sizeof(dap_chain_hash_fast_t), l_store); if (!l_store) { @@ -2257,7 +2257,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain } dap_chain_esbocs_store_t *l_store; - char *l_candidate_hash_str = NULL; + const char *l_candidate_hash_str = NULL; HASH_FIND(hh, l_session->cur_round.store_items, l_candidate_hash, sizeof(dap_chain_hash_fast_t), l_store); if (!l_store) { l_candidate_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); @@ -2325,7 +2325,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain break; } if (l_cs_debug) { - char *l_dirtective_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); + const char *l_dirtective_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu." " Receive DIRECTIVE hash %s, size %zu", l_session->chain->net_name, l_session->chain->name, l_session->cur_round.id, @@ -2356,7 +2356,7 @@ static void s_session_packet_in(dap_chain_esbocs_session_t *a_session, dap_chain break; } if (l_cs_debug) { - char *l_directive_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); + const char *l_directive_hash_str = dap_chain_hash_fast_to_str_static(l_candidate_hash); log_it(L_MSG, "net:%s, chain:%s, round:%"DAP_UINT64_FORMAT_U", attempt:%hhu." " Receive VOTE %s directive %s", l_session->chain->net_name, l_session->chain->name, l_session->cur_round.id, diff --git a/modules/json_rpc/common/dap_json_rpc_chain_datum_decree.c b/modules/json_rpc/common/dap_json_rpc_chain_datum_decree.c index 572d2606365a9dd04e3a70ea90c903a146005722..95d2cedcc88c33ec686dcacca946a23101dd593e 100644 --- a/modules/json_rpc/common/dap_json_rpc_chain_datum_decree.c +++ b/modules/json_rpc/common/dap_json_rpc_chain_datum_decree.c @@ -399,7 +399,7 @@ json_object *dap_chain_datum_decree_to_json(dap_chain_datum_decree_t *a_decree){ _dap_tsd_get_scalar(l_tsd, &l_stake_addr_signing); // dap_string_append_printf(a_str_out, "\tSigning addr: %s\n", l_stake_addr_signing_str); dap_chain_hash_fast_t l_pkey_signing = l_stake_addr_signing.data.hash_fast; - char *l_pkey_signing_str = dap_chain_hash_fast_to_str_static(&l_pkey_signing); + const char *l_pkey_signing_str = dap_chain_hash_fast_to_str_static(&l_pkey_signing); json_object *l_jobj_stake_addr_signing = dap_chain_addr_to_json(&l_stake_addr_signing); json_object *l_jobj_pkey_signing = json_object_new_string(l_pkey_signing_str); json_object_object_add(l_jobj_tsd, "addr", l_jobj_stake_addr_signing); diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c index 41639e23b430d3845416bda33ecaee24f13d7d29..73d98c1ba859dbab66dacf4185996b407c66b2f8 100644 --- a/modules/mempool/dap_chain_mempool.c +++ b/modules/mempool/dap_chain_mempool.c @@ -95,7 +95,7 @@ char *dap_chain_mempool_datum_add(const dap_chain_datum_t *a_datum, dap_chain_t dap_chain_hash_fast_t l_key_hash; dap_hash_fast(a_datum->data, a_datum->header.data_size, &l_key_hash); - char *l_key_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_key_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_key_hash) : dap_chain_hash_fast_to_str_static(&l_key_hash); @@ -1484,8 +1484,8 @@ void dap_chain_mempool_filter(dap_chain_t *a_chain, int *a_removed){ char * l_gdb_group = dap_chain_net_get_gdb_group_mempool_new(a_chain); size_t l_objs_size = 0; dap_time_t l_cut_off_time = dap_time_now() - 3 * 24 * 3600; // 3 days - char l_cut_off_time_str[80] = {'\0'}; - dap_time_to_str_rfc822(l_cut_off_time_str, 80, l_cut_off_time); + char l_cut_off_time_str[DAP_TIME_STR_SIZE] = {'\0'}; + dap_time_to_str_rfc822(l_cut_off_time_str, DAP_TIME_STR_SIZE, l_cut_off_time); dap_global_db_obj_t * l_objs = dap_global_db_get_all_sync(l_gdb_group, &l_objs_size); for (size_t i = 0; i < l_objs_size; i++) { dap_chain_datum_t *l_datum = (dap_chain_datum_t*)l_objs[i].value; diff --git a/modules/net/dap_chain_ledger.c b/modules/net/dap_chain_ledger.c index b8424b1e8664e9bd17ee14520775fd82c2c4dcbc..04352f0746f1cf3de61e8f0130ccb6b460db4342 100644 --- a/modules/net/dap_chain_ledger.c +++ b/modules/net/dap_chain_ledger.c @@ -819,7 +819,7 @@ static void s_tx_header_print(json_object *a_json_out, dap_chain_datum_tx_t *a_t char l_time_str[DAP_TIME_STR_SIZE] = "unknown"; if (a_tx->header.ts_created) dap_time_to_str_rfc822(l_time_str, DAP_TIME_STR_SIZE, a_tx->header.ts_created); - char *l_tx_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_tx_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(a_tx_hash) : dap_chain_hash_fast_to_str_static(a_tx_hash); json_object_object_add(a_json_out, "TX hash ", json_object_new_string(l_tx_hash_str)); diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c index 85db305dd0e41e8054156dc24b0227813922b3a8..19d8a1755e4c5665e122a17db3e41b82caaabe6b 100644 --- a/modules/net/dap_chain_node_cli_cmd.c +++ b/modules/net/dap_chain_node_cli_cmd.c @@ -2568,8 +2568,8 @@ int com_token_decl_sign(int a_argc, char **a_argv, void **a_str_reply) l_datum_size = dap_chain_datum_size(l_datum); dap_chain_hash_fast_t l_key_hash = { }; dap_hash_fast(l_datum->data, l_token_size, &l_key_hash); - char *l_key_str = dap_chain_hash_fast_to_str_static(&l_key_hash); - char *l_key_str_base58 = dap_enc_base58_encode_hash_to_str_static(&l_key_hash); + const char *l_key_str = dap_chain_hash_fast_to_str_static(&l_key_hash); + const char *l_key_str_base58 = dap_enc_base58_encode_hash_to_str_static(&l_key_hash); const char *l_key_out_str = dap_strcmp(l_hash_out_type, "hex") ? l_key_str_base58 : l_key_str; // Add datum to mempool with datum_token hash as a key @@ -2711,8 +2711,8 @@ void s_com_mempool_list_print_for_chain(dap_chain_net_t * a_net, dap_chain_t * a dap_hash_fast_t l_datum_hash_from_key = {0}; dap_hash_fast(l_datum->data, l_datum->header.data_size, &l_datum_real_hash); dap_chain_hash_fast_from_str(l_objs[i].key, &l_datum_hash_from_key); - char buff_time[50]; - dap_time_to_str_rfc822(buff_time, 50, l_datum->header.ts_create); + char buff_time[DAP_TIME_STR_SIZE]; + dap_time_to_str_rfc822(buff_time, DAP_TIME_STR_SIZE, l_datum->header.ts_create); json_object *l_jobj_type = json_object_new_string(l_datum_type); json_object *l_jobj_hash = json_object_new_string(l_objs[i].key); json_object *l_jobj_ts_created = json_object_new_object(); @@ -4534,7 +4534,7 @@ int com_token_decl(int a_argc, char ** a_argv, void **a_str_reply) // Calc datum's hash dap_chain_hash_fast_t l_key_hash; dap_hash_fast(l_datum->data, l_datum->header.data_size, &l_key_hash); - char * l_key_str = !dap_strcmp(l_hash_out_type, "hex") ? + const char *l_key_str = !dap_strcmp(l_hash_out_type, "hex") ? dap_chain_hash_fast_to_str_static(&l_key_hash) : dap_enc_base58_encode_hash_to_str_static(&l_key_hash); @@ -4737,8 +4737,8 @@ int com_token_update(int a_argc, char ** a_argv, void **a_str_reply) // Calc datum's hash dap_chain_hash_fast_t l_key_hash; dap_hash_fast(l_datum->data, l_datum->header.data_size, &l_key_hash); - char * l_key_str = dap_chain_hash_fast_to_str_static(&l_key_hash); - char * l_key_str_out = dap_strcmp(l_hash_out_type, "hex") ? + const char *l_key_str = dap_chain_hash_fast_to_str_static(&l_key_hash); + const char *l_key_str_out = dap_strcmp(l_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_key_hash) : l_key_str; // Add datum to mempool with datum_token hash as a key diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c index db41574ba2cde3307cca679dd221c8c3f671d60b..b9f388f49c6d3d512e131d7e12d419da547b9124 100644 --- a/modules/net/dap_chain_node_cli_cmd_tx.c +++ b/modules/net/dap_chain_node_cli_cmd_tx.c @@ -172,13 +172,13 @@ json_object * dap_db_tx_history_to_json(dap_chain_hash_fast_t* a_tx_hash, } if (l_atom_hash) { - char *l_atom_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_atom_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(l_atom_hash) : dap_chain_hash_fast_to_str_static(l_atom_hash); json_object_object_add(json_obj_datum, "atom_hash", json_object_new_string(l_atom_hash_str)); } - char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(a_tx_hash) : dap_chain_hash_fast_to_str_static(a_tx_hash); json_object_object_add(json_obj_datum, "hash", json_object_new_string(l_hash_str)); @@ -228,7 +228,7 @@ json_object * dap_db_history_tx(dap_chain_hash_fast_t* a_tx_hash, if (l_tx) { return dap_db_tx_history_to_json(a_tx_hash, &l_atom_hash,l_tx, a_chain, a_hash_out_type, l_net, l_ret_code, &accepted_tx, false); } else { - char *l_tx_hash_str = dap_strcmp(a_hash_out_type, "hex") + const char *l_tx_hash_str = dap_strcmp(a_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(a_tx_hash) : dap_chain_hash_fast_to_str_static(a_tx_hash); dap_json_rpc_error_add(-1, "TX hash %s not founds in chains", l_tx_hash_str); @@ -803,9 +803,9 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger dap_chain_datum_t *l_datum = l_datums[l_datum_n]; if(!l_datum) continue; - char l_time_str[70]; + char l_time_str[DAP_TIME_STR_SIZE]; // get time of create datum - if(dap_time_to_str_rfc822(l_time_str, 71, l_datum->header.ts_create) < 1) + if(dap_time_to_str_rfc822(l_time_str, DAP_TIME_STR_SIZE, l_datum->header.ts_create) < 1) l_time_str[0] = '\0'; switch (l_datum->header.type_id) { // token diff --git a/modules/net/srv/dap_chain_net_srv_order.c b/modules/net/srv/dap_chain_net_srv_order.c index 1141d2584c23b119c141e775ba7d05ba45adc991..c1a954203a269d81271f21cb03367cdf621207ea 100644 --- a/modules/net/srv/dap_chain_net_srv_order.c +++ b/modules/net/srv/dap_chain_net_srv_order.c @@ -350,7 +350,7 @@ char *dap_chain_net_srv_order_save(dap_chain_net_t *a_net, dap_chain_net_srv_ord dap_chain_hash_fast_t l_order_hash; size_t l_order_size = dap_chain_net_srv_order_get_size(a_order); dap_hash_fast(a_order, l_order_size, &l_order_hash); - char *l_order_hash_str = dap_chain_hash_fast_to_str_static(&l_order_hash); + const char *l_order_hash_str = dap_chain_hash_fast_to_str_static(&l_order_hash); char *l_gdb_group_str = a_common ? dap_chain_net_srv_order_get_common_group(a_net) : dap_chain_net_srv_order_get_gdb_group(a_net); if (!l_gdb_group_str) @@ -541,7 +541,7 @@ void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,d if (a_order && a_str_out ){ dap_chain_hash_fast_t l_hash; dap_hash_fast(a_order, dap_chain_net_srv_order_get_size(a_order), &l_hash); - char *l_hash_str = dap_strcmp(a_hash_out_type,"hex") + const char *l_hash_str = dap_strcmp(a_hash_out_type,"hex") ? dap_enc_base58_encode_hash_to_str_static(&l_hash) : dap_chain_hash_fast_to_str_static(&l_hash); @@ -553,8 +553,8 @@ 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); + char buf_time[DAP_TIME_STR_SIZE]; + dap_time_to_str_rfc822(buf_time, DAP_TIME_STR_SIZE, 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 ); @@ -589,7 +589,7 @@ void dap_chain_net_srv_order_dump_to_string(dap_chain_net_srv_order_t *a_order,d dap_sign_t *l_sign = (dap_sign_t*)((byte_t*)a_order->ext_n_sign + a_order->ext_size); dap_hash_fast_t l_sign_pkey = {0}; dap_sign_get_pkey_hash(l_sign, &l_sign_pkey); - char *l_sign_pkey_hash_str = dap_hash_fast_to_str_static(&l_sign_pkey); + const char *l_sign_pkey_hash_str = dap_hash_fast_to_str_static(&l_sign_pkey); dap_string_append_printf(a_str_out, " pkey: %s\n", l_sign_pkey_hash_str); DAP_DELETE(l_ext_out); } diff --git a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c index 6287d6a0582666f8df5782ea0fe42162a54813ee..00a8f1eec0cf188133bda08c6b1c2097089ff901 100644 --- a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c +++ b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c @@ -87,7 +87,7 @@ int dap_chain_net_srv_stake_pos_delegate_init() "-cert <priv_cert_name> [-node_addr <for_validator_node>]}}" " -net <net_name> -w <wallet_name> -fee <value>\n" "\tDelegate public key in specified certificate or order with specified net name. Pay with specified value of m-tokens of native net token.\n" - "srv_stake invalidate -net <net_name> {-tx <transaction_hash> | -cert <delegated_cert> | -cert_pkey_hash <pkey_hash>}" + "srv_stake invalidate -net <net_name> {-tx <transaction_hash> | -cert <delegated_cert> | -siging_pkey_hash <pkey_hash> -signing_pkey_type <pkey_type>}" " {-w <wallet_name> -fee <value> | -poa_cert <cert_name>}\n" "\tInvalidate requested delegated stake transaction by hash or cert name or cert pkey hash within net name and" " return m-tokens to specified wallet (if any)\n" @@ -1931,7 +1931,7 @@ static int s_cli_srv_stake_invalidate(int a_argc, char **a_argv, int a_arg_index l_tx_hash = l_stake->tx_hash; } - char *l_tx_hash_str_tmp = l_tx_hash_str ? l_tx_hash_str : dap_hash_fast_to_str_static(&l_tx_hash); + const char *l_tx_hash_str_tmp = l_tx_hash_str ? l_tx_hash_str : dap_hash_fast_to_str_static(&l_tx_hash); dap_chain_datum_tx_t *l_tx = dap_ledger_tx_find_by_hash(l_net->pub.ledger, &l_tx_hash); if (!l_tx) { dap_cli_server_cmd_set_reply_text(a_str_reply, "Transaction %s not found", l_tx_hash_str_tmp); diff --git a/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c b/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c index 8fb7670106aa0d22cee24df42f54ae58a818a904..695fb53faab302c846a7b4e92dfdd4daaed08ae1 100644 --- a/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c +++ b/modules/service/vpn/dap_chain_net_srv_vpn_cmd.c @@ -46,7 +46,7 @@ int com_vpn_statistics(int a_argc, char ** a_argv, void **a_str_reply) l_conn++; // time start/length uint32_t l_time_len_sec = time(NULL) - l_session->time_created; - char l_buf[70] = { '\0' }; + char l_buf[DAP_TIME_STR_SIZE] = { '\0' }; if(dap_time_to_str_rfc822(l_buf, sizeof(l_buf), l_session->time_created) > 0) dap_string_append_printf(l_str, " start at %s (length %02u:%02u:%02u)\n", l_buf, l_time_len_sec / 3600, (l_time_len_sec % 3600) / 60, l_time_len_sec % 60); diff --git a/modules/service/xchange/dap_chain_net_srv_xchange.c b/modules/service/xchange/dap_chain_net_srv_xchange.c index dcdafae8ffeaaf1663cfff95d36609b4c6951294..9e0d51900c4f54bb0245156e825ad593dc424bc5 100644 --- a/modules/service/xchange/dap_chain_net_srv_xchange.c +++ b/modules/service/xchange/dap_chain_net_srv_xchange.c @@ -1420,7 +1420,7 @@ static int s_cli_srv_xchange_order(int a_argc, char **a_argv, int a_arg_index, v case XCHANGE_REMOVE_ERROR_CAN_NOT_INVALIDATE_TX: { dap_chain_datum_tx_t *l_cond_tx = dap_ledger_tx_find_by_hash(l_net->pub.ledger, &l_tx_hash); dap_chain_net_srv_xchange_price_t *l_price = s_xchange_price_from_order(l_net, l_cond_tx, &l_fee, false); - char *l_final_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_price->tx_hash); + const char *l_final_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_price->tx_hash); dap_cli_server_cmd_set_reply_text(a_str_reply, "Can't create invalidate transaction from: %s\n", l_final_tx_hash_str); DAP_DELETE(l_price); } break; @@ -1689,7 +1689,7 @@ static bool s_string_append_tx_cond_info( dap_string_t * a_reply_str, dap_hash_fast_t l_tx_hash = {0}; dap_hash_fast(a_tx, l_tx_size, &l_tx_hash); - char *l_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_tx_hash); + const char *l_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_tx_hash); // Get input token ticker const char * l_tx_input_ticker = dap_ledger_tx_get_token_ticker_by_hash( @@ -2025,7 +2025,7 @@ static int s_cli_srv_xchange(int a_argc, char **a_argv, void **a_str_reply) dap_hash_fast_t l_tx_hash = {}; dap_hash_fast(l_tx, dap_chain_datum_tx_get_size(l_tx), &l_tx_hash); - char *l_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_tx_hash); + const char *l_tx_hash_str = dap_chain_hash_fast_to_str_static(&l_tx_hash); uint64_t l_percent_completed = dap_chain_net_srv_xchange_get_order_completion_rate(l_net, l_tx_hash); diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c index cac044c804aa681a8edac5d41f7c5713bca52ab4..bea6eb54acebeada39b6989cf1f4ef9d1fbb97cc 100644 --- a/modules/type/blocks/dap_chain_cs_blocks.c +++ b/modules/type/blocks/dap_chain_cs_blocks.c @@ -662,8 +662,8 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply) dap_string_append_printf(l_str_tmp, "\t\t\tversion: 0x%04X\n", l_block->hdr.version); dap_string_append_printf(l_str_tmp, "\t\t\tcell_id: 0x%016"DAP_UINT64_FORMAT_X"\n", l_block->hdr.cell_id.uint64); dap_string_append_printf(l_str_tmp, "\t\t\tchain_id: 0x%016"DAP_UINT64_FORMAT_X"\n", l_block->hdr.chain_id.uint64); - char buf[50]; - dap_time_to_str_rfc822(buf, 50, l_block->hdr.ts_created); + char buf[DAP_TIME_STR_SIZE]; + dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_block->hdr.ts_created); dap_string_append_printf(l_str_tmp, "\t\t\tts_created: %s\n", buf); // Dump Metadata @@ -714,7 +714,7 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply) const char * l_datum_type_str="UNKNOWN"; DAP_DATUM_TYPE_STR(l_datum->header.type_id, l_datum_type_str); dap_string_append_printf(l_str_tmp,"\t\t\t\ttype_id:=%s\n", l_datum_type_str); - dap_time_to_str_rfc822(buf, 50, l_datum->header.ts_create); + dap_time_to_str_rfc822(buf, DAP_TIME_STR_SIZE, l_datum->header.ts_create); dap_string_append_printf(l_str_tmp,"\t\t\t\tts_create=%s\n", buf); dap_string_append_printf(l_str_tmp,"\t\t\t\tdata_size=%u\n", l_datum->header.data_size); dap_chain_datum_dump(l_str_tmp, l_datum, "hex", l_net->pub.id); @@ -901,8 +901,8 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply) continue; } } - char l_buf[50]; - dap_time_to_str_rfc822(l_buf, 50, l_ts); + char l_buf[DAP_TIME_STR_SIZE]; + dap_time_to_str_rfc822(l_buf, DAP_TIME_STR_SIZE, l_ts); dap_string_append_printf(l_str_tmp, "\t%s: ts_create=%s\n", l_block_cache->block_hash_str, l_buf); l_block_count++; if (l_to_hash_str && dap_hash_fast_compare(&l_to_hash, &l_block_cache->block_hash)) diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c index b96a079e1fb1a84ce927556e34169561cae7949d..8470fe80416d660e0b2118a6e117fe98ace92cc4 100644 --- a/modules/type/dag/dap_chain_cs_dag.c +++ b/modules/type/dag/dap_chain_cs_dag.c @@ -1644,7 +1644,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) } if ( l_event ){ dap_string_t * l_str_tmp = dap_string_new(NULL); - char buf[50]; + char buf[DAP_TIME_STR_SIZE]; dap_string_append_printf(l_str_tmp,"\nEvent %s:\n", l_event_hash_str); @@ -1653,7 +1653,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) dap_string_append_printf(l_str_tmp, "\tRound info:\n\t\tsigns reject: %d\n", l_round_item->round_info.reject_count); - dap_time_to_str_rfc822(buf, 50, l_round_item->round_info.ts_update); + dap_time_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); } @@ -1664,7 +1664,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) 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); - dap_time_to_str_rfc822(buf, 50, l_event->header.ts_created); + 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 ); // Hash links @@ -1685,7 +1685,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) 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); - dap_time_to_str_rfc822(buf, 50, l_datum->header.ts_create); + 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); @@ -1701,7 +1701,7 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) } dap_chain_hash_fast_t l_pkey_hash; dap_sign_get_pkey_hash(l_sign, &l_pkey_hash); - char *l_hash_str = dap_strcmp(l_hash_out_type, "hex") + const char *l_hash_str = dap_strcmp(l_hash_out_type, "hex") ? dap_enc_base58_encode_hash_to_str_static(&l_pkey_hash) : dap_chain_hash_fast_to_str_static(&l_pkey_hash); @@ -1797,8 +1797,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) i_tmp++; } else { i_tmp++; - char buf[50]; - dap_time_to_str_rfc822(buf, 50, l_event_item->event->header.ts_created); + 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%s: ts_create=%s\n", dap_chain_hash_fast_to_str_static(&l_event_item->hash), buf); @@ -1835,8 +1835,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) continue; } i_tmp++; - char buf[50]; - dap_time_to_str_rfc822(buf, 50, l_event_item->event->header.ts_created); + 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%s: ts_create=%s\n", dap_chain_hash_fast_to_str_static( &l_event_item->hash), buf); @@ -1886,8 +1886,8 @@ static int s_cli_dag(int argc, char ** argv, void **a_str_reply) if ( l_event_size_new ) { dap_chain_hash_fast_t l_event_new_hash; dap_chain_cs_dag_event_calc_hash(l_event, l_event_size_new, &l_event_new_hash); - char * l_event_new_hash_hex_str = dap_chain_hash_fast_to_str_static(&l_event_new_hash); - char * l_event_new_hash_base58_str = NULL; + const char *l_event_new_hash_hex_str = dap_chain_hash_fast_to_str_static(&l_event_new_hash); + const char *l_event_new_hash_base58_str = NULL; if (dap_strcmp(l_hash_out_type, "hex")) l_event_new_hash_base58_str = dap_enc_base58_encode_hash_to_str_static(&l_event_new_hash); diff --git a/modules/type/dag/dap_chain_cs_dag_event.c b/modules/type/dag/dap_chain_cs_dag_event.c index 0e081e629d9a6ea4d279e3329ffc24d00bf00397..c08185192ccac440d147a2c4723813b900eea1d7 100644 --- a/modules/type/dag/dap_chain_cs_dag_event.c +++ b/modules/type/dag/dap_chain_cs_dag_event.c @@ -221,7 +221,7 @@ size_t dap_chain_cs_dag_event_round_sign_add(dap_chain_cs_dag_event_round_item_t * @param a_group * @return */ -bool dap_chain_cs_dag_event_gdb_set(dap_chain_cs_dag_t *a_dag, char *a_event_hash_str, dap_chain_cs_dag_event_t *a_event, +bool dap_chain_cs_dag_event_gdb_set(dap_chain_cs_dag_t *a_dag, const char *a_event_hash_str, dap_chain_cs_dag_event_t *a_event, size_t a_event_size, dap_chain_cs_dag_event_round_item_t *a_round_item) { size_t l_signs_size = (size_t)(a_round_item->data_size-a_round_item->event_size); diff --git a/modules/type/dag/include/dap_chain_cs_dag_event.h b/modules/type/dag/include/dap_chain_cs_dag_event.h index cef68bfeee9e31e4839ff6fb15715d38eea48b26..bbe4f5b064044e7bc25f1b59e601f50fbaebab05 100644 --- a/modules/type/dag/include/dap_chain_cs_dag_event.h +++ b/modules/type/dag/include/dap_chain_cs_dag_event.h @@ -149,7 +149,7 @@ static inline size_t dap_chain_cs_dag_event_round_item_get_size(dap_chain_cs_dag void dap_chain_cs_dag_event_broadcast(dap_chain_cs_dag_t *a_dag, dap_store_obj_t *a_obj, dap_global_db_instance_t *a_dbi); -bool dap_chain_cs_dag_event_gdb_set(dap_chain_cs_dag_t *a_dag, char *a_event_hash_str, dap_chain_cs_dag_event_t *a_event, +bool dap_chain_cs_dag_event_gdb_set(dap_chain_cs_dag_t *a_dag, const char *a_event_hash_str, dap_chain_cs_dag_event_t *a_event, size_t a_event_size, dap_chain_cs_dag_event_round_item_t *a_round_item); dap_chain_cs_dag_event_t *dap_chain_cs_dag_event_gdb_get(const char *a_event_hash_str, size_t *a_event_size,