diff --git a/modules/chain/dap_chain_ledger.c b/modules/chain/dap_chain_ledger.c
index 49c18c9e0e984a90aa76b4d9b9887f027109e009..8a18bfe2c288c4f40ba9e995345e20825b1bba9a 100644
--- a/modules/chain/dap_chain_ledger.c
+++ b/modules/chain/dap_chain_ledger.c
@@ -2985,7 +2985,7 @@ bool s_tx_match_sign(dap_chain_datum_token_emission_t *a_datum_emission, dap_cha
*/
// Checking a new transaction before adding to the cache
int dap_chain_ledger_tx_cache_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, dap_hash_fast_t *a_tx_hash,
- bool a_from_threshold, dap_list_t **a_list_bound_items, dap_list_t **a_list_tx_out)
+ bool a_from_threshold, dap_list_t **a_list_bound_items, dap_list_t **a_list_tx_out, char **a_main_ticker)
{
if (!PVT(a_ledger)->load_mode && !a_from_threshold) {
dap_chain_ledger_tx_item_t *l_ledger_item;
@@ -3445,8 +3445,9 @@ int dap_chain_ledger_tx_cache_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t
}
} else {
l_value_cur = DAP_NEW_Z(dap_chain_ledger_tokenizer_t);
- if(l_token)
- strcpy(l_value_cur->token_ticker, l_token);
+ dap_stpcpy(l_value_cur->token_ticker, l_token);
+ if (!l_main_ticker)
+ l_main_ticker = l_value_cur->token_ticker;
HASH_ADD_STR(l_values_from_cur_tx, token_ticker, l_value_cur);
}
@@ -3605,6 +3606,9 @@ int dap_chain_ledger_tx_cache_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t
DAP_DEL_Z(l_expected_fee);
}
+ if (a_main_ticker && !l_err_num)
+ *a_main_ticker = dap_strdup(l_main_ticker);
+
HASH_ITER(hh, l_values_from_prev_tx, l_value_cur, l_tmp) {
HASH_DEL(l_values_from_prev_tx, l_value_cur);
DAP_DELETE(l_value_cur);
@@ -3638,14 +3642,12 @@ int dap_chain_ledger_tx_add_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *
{
if(!a_tx)
return -2;
- dap_list_t *l_list_bound_items = NULL;
- dap_list_t *l_list_tx_out = NULL;
dap_hash_fast_t l_tx_hash;
dap_hash_fast(a_tx, dap_chain_datum_tx_get_size(a_tx), &l_tx_hash);
int l_ret_check;
if( (l_ret_check = dap_chain_ledger_tx_cache_check(a_ledger, a_tx, &l_tx_hash, false,
- &l_list_bound_items, &l_list_tx_out)) < 0) {
+ NULL, NULL, NULL)) < 0) {
debug_if(s_debug_more, L_DEBUG, "dap_chain_ledger_tx_add_check() tx not passed the check: code %d ", l_ret_check);
return l_ret_check;
}
@@ -3739,6 +3741,7 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
dap_list_t *l_list_bound_items = NULL;
dap_list_t *l_list_tx_out = NULL;
dap_chain_ledger_tx_item_t *l_item_tmp = NULL;
+ char *l_main_token_ticker = NULL;
if (!l_ledger_pvt->tps_timer) {
#ifndef DAP_TPS_TEST
@@ -3759,7 +3762,8 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
int l_ret_check;
l_item_tmp = NULL;
if( (l_ret_check = dap_chain_ledger_tx_cache_check(a_ledger, a_tx, a_tx_hash, a_from_threshold,
- &l_list_bound_items, &l_list_tx_out)) < 0) {
+ &l_list_bound_items, &l_list_tx_out,
+ &l_main_token_ticker)) < 0) {
if (l_ret_check == DAP_CHAIN_CS_VERIFY_CODE_TX_NO_PREVIOUS ||
l_ret_check == DAP_CHAIN_CS_VERIFY_CODE_TX_NO_EMISSION) {
if (!l_from_threshold) {
@@ -3801,8 +3805,7 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
size_t l_cache_size = sizeof(dap_store_obj_t) * (l_outs_used + 1);
dap_store_obj_t *l_cache_used_outs = DAP_NEW_Z_SIZE(dap_store_obj_t, l_cache_size);
char *l_gdb_group = dap_chain_ledger_get_gdb_group(a_ledger, DAP_CHAIN_LEDGER_TXS_STR);
- char *l_main_token_ticker = NULL, *l_cur_token_ticker = NULL;
- bool l_ticker_in_heap = false;
+ char *l_cur_token_ticker = NULL;
// Update balance: deducts
for (int i = 1; l_list_tmp; i++) {
@@ -3813,9 +3816,7 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
// It's the emission behind
// Find token ticker for emission
dap_chain_tx_in_ems_t * l_in_ems = (dap_chain_tx_in_ems_t *) dap_chain_datum_tx_item_get(a_tx, NULL, TX_ITEM_TYPE_IN_EMS, NULL);
- if (l_in_ems)
- l_main_token_ticker = l_in_ems->header.ticker;
- else {
+ if (!l_in_ems) {
log_it(L_ERROR, "No token item with blank prev tx hash");
break;
}
@@ -3824,7 +3825,7 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
pthread_rwlock_rdlock(&l_ledger_pvt->tokens_rwlock);
HASH_FIND_STR(l_ledger_pvt->tokens, l_main_token_ticker, l_token_item);
pthread_rwlock_unlock(&l_ledger_pvt->tokens_rwlock);
- if (!l_token_item){
+ if (!l_token_item) {
log_it(L_ERROR, "No token item found for token %s", l_main_token_ticker);
break;
}
@@ -3855,8 +3856,6 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
}
dap_chain_ledger_tx_item_t *l_prev_item_out = bound_item->item_out;
l_cur_token_ticker = l_prev_item_out->cache_data.token_ticker;
- if (!l_main_token_ticker)
- l_main_token_ticker = l_cur_token_ticker;
int l_tx_prev_out_used_idx = 0;
if (l_type == TX_ITEM_TYPE_IN) {
dap_chain_tx_in_t *l_tx_in = bound_item->in.tx_cur_in;
@@ -3911,8 +3910,6 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
/// Mark 'out' item in cache because it used
l_tx_prev_out_used_idx = l_tx_in_cond->header.tx_out_prev_idx;
dap_chain_tx_out_cond_t *l_cond = bound_item->out.tx_prev_out_cond_256;
- if (l_cond->header.subtype == DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_XCHANGE)
- l_main_token_ticker = l_prev_item_out->cache_data.token_ticker;
if (l_cond->header.subtype == DAP_CHAIN_TX_OUT_COND_SUBTYPE_FEE)
l_cur_token_ticker = (char *)PVT(a_ledger)->net_native_ticker;
// Update service items if any
@@ -3946,10 +3943,6 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
// delete previous transactions from cache because all out is used
if(l_prev_item_out->cache_data.n_outs_used == l_prev_item_out->cache_data.n_outs) {
- if (l_main_token_ticker == l_prev_item_out->cache_data.token_ticker) {
- l_main_token_ticker = dap_strdup(l_prev_item_out->cache_data.token_ticker);
- l_ticker_in_heap = true;
- }
dap_chain_hash_fast_t l_tx_prev_hash_to_del = bound_item->tx_prev_hash;
// remove from memory ledger
int res = dap_chain_ledger_tx_remove(a_ledger, &l_tx_prev_hash_to_del, a_tx->header.ts_created);
@@ -4074,13 +4067,8 @@ static inline int s_tx_add(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, d
if(l_tist_tmp)
dap_list_free(l_tist_tmp);
- if (l_main_token_ticker) {
- dap_stpcpy(l_tx_item->cache_data.token_ticker, l_main_token_ticker);
- if (l_ticker_in_heap)
- DAP_DELETE(l_main_token_ticker);
- }
- else
- debug_if(s_debug_more, L_ERROR, "No token ticker in previous txs");
+ dap_stpcpy(l_tx_item->cache_data.token_ticker, l_main_token_ticker);
+
l_tx_item->cache_data.multichannel = l_multichannel;
if(a_safe_call) pthread_rwlock_wrlock(&l_ledger_pvt->ledger_rwlock);
l_tx_item->ts_added = dap_nanotime_now();
@@ -4121,6 +4109,7 @@ FIN:
dap_list_free_full(l_list_bound_items, NULL);
if (l_list_tx_out)
dap_list_free(l_list_tx_out);
+ DAP_DEL_Z(l_main_token_ticker);
for (size_t i = 1; i <= l_outs_used; i++) {
DAP_DELETE(l_cache_used_outs[i].key);
DAP_DELETE(l_cache_used_outs[i].value);
diff --git a/modules/chain/include/dap_chain_ledger.h b/modules/chain/include/dap_chain_ledger.h
index 8d635165f7f796050fb3bc28fc5de368dbedcfd4..72e6e5cb85b7cb3873b08e70438c30fb49384cec 100644
--- a/modules/chain/include/dap_chain_ledger.h
+++ b/modules/chain/include/dap_chain_ledger.h
@@ -171,7 +171,7 @@ void dap_chain_ledger_addr_get_token_ticker_all(dap_ledger_t *a_ledger, dap_chai
// Checking a new transaction before adding to the cache
int dap_chain_ledger_tx_cache_check(dap_ledger_t *a_ledger, dap_chain_datum_tx_t *a_tx, dap_hash_fast_t *a_tx_hash,
- bool a_from_threshold, dap_list_t **a_list_bound_items, dap_list_t **a_list_tx_out);
+ bool a_from_threshold, dap_list_t **a_list_bound_items, dap_list_t **a_list_tx_out, char **a_main_ticker);
/**
* Delete transaction from the cache