From ed649dae3268b702289fde6d5e5a13cbfd4ad64e Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Tue, 21 May 2024 19:21:30 +0700
Subject: [PATCH] Start
https://projects.demlabs.net/issues/11755?issue_count=24&issue_position=1&next_issue_id=11684
---
modules/chain/dap_chain.c | 4 +--
modules/chain/dap_chain_cell.c | 2 +-
modules/chain/dap_chain_ch.c | 6 ++--
modules/chain/include/dap_chain.h | 6 +++-
modules/net/dap_chain_net.c | 4 +--
modules/net/dap_chain_net_anchor.c | 2 +-
modules/net/dap_chain_node_cli_cmd.c | 2 +-
modules/net/dap_chain_node_cli_cmd_tx.c | 6 ++--
modules/type/blocks/dap_chain_cs_blocks.c | 12 +++++--
.../type/blocks/tests/dap_chain_blocks_test.c | 35 +++++++++----------
modules/type/dag/dap_chain_cs_dag.c | 4 +--
modules/type/none/dap_chain_cs_none.c | 4 +--
12 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c
index da6d4bc13c..e6bef06537 100644
--- a/modules/chain/dap_chain.c
+++ b/modules/chain/dap_chain.c
@@ -192,7 +192,7 @@ dap_chain_atom_ptr_t dap_chain_get_atom_by_hash(dap_chain_t * a_chain, dap_chain
dap_chain_atom_ptr_t l_ret = NULL;
dap_chain_cell_t *l_cell, *l_iter_tmp;
HASH_ITER(hh, a_chain->cells, l_cell, l_iter_tmp) {
- dap_chain_atom_iter_t * l_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, 0);
+ dap_chain_atom_iter_t * l_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, 0, false);
l_ret = a_chain->callback_atom_find_by_hash(l_iter, a_atom_hash, a_atom_size);
a_chain->callback_atom_iter_delete(l_iter);
if (l_ret)
@@ -683,7 +683,7 @@ void dap_chain_add_callback_notify(dap_chain_t * a_chain, dap_chain_callback_not
bool dap_chain_get_atom_last_hash_num(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_atom_hash, uint64_t *a_atom_num)
{
dap_return_val_if_fail(a_atom_hash || a_atom_num, false);
- dap_chain_atom_iter_t *l_iter = a_chain->callback_atom_iter_create(a_chain, a_cell_id, NULL);
+ dap_chain_atom_iter_t *l_iter = a_chain->callback_atom_iter_create(a_chain, a_cell_id, NULL, false);
if (!l_iter)
return false;
a_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_LAST, NULL);
diff --git a/modules/chain/dap_chain_cell.c b/modules/chain/dap_chain_cell.c
index 73dfae7412..67b63aaf3d 100644
--- a/modules/chain/dap_chain_cell.c
+++ b/modules/chain/dap_chain_cell.c
@@ -352,7 +352,7 @@ ssize_t dap_chain_cell_file_append(dap_chain_cell_t *a_cell, const void *a_atom,
pthread_rwlock_unlock(&a_cell->storage_rwlock);
return -4;
}
- dap_chain_atom_iter_t *l_atom_iter = a_cell->chain->callback_atom_iter_create(a_cell->chain, a_cell->id, NULL);
+ dap_chain_atom_iter_t *l_atom_iter = a_cell->chain->callback_atom_iter_create(a_cell->chain, a_cell->id, NULL, false);
dap_chain_atom_ptr_t l_atom;
uint64_t l_atom_size = 0;
for (l_atom = a_cell->chain->callback_atom_iter_get(l_atom_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size);
diff --git a/modules/chain/dap_chain_ch.c b/modules/chain/dap_chain_ch.c
index 67752668cf..151bc63ce4 100644
--- a/modules/chain/dap_chain_ch.c
+++ b/modules/chain/dap_chain_ch.c
@@ -367,7 +367,7 @@ static bool s_sync_out_chains_proc_callback(void *a_arg)
dap_chain_t * l_chain = dap_chain_find_by_id(l_sync_request->request_hdr.net_id, l_sync_request->request_hdr.chain_id);
assert(l_chain);
- l_sync_request->chain.request_atom_iter = l_chain->callback_atom_iter_create(l_chain, l_sync_request->request_hdr.cell_id, NULL);
+ l_sync_request->chain.request_atom_iter = l_chain->callback_atom_iter_create(l_chain, l_sync_request->request_hdr.cell_id, NULL, false);
size_t l_first_size = 0;
dap_chain_atom_ptr_t l_atom = l_chain->callback_atom_iter_get(l_sync_request->chain.request_atom_iter, DAP_CHAIN_ITER_OP_FIRST, &l_first_size);
if (l_atom && l_first_size) {
@@ -900,7 +900,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
}
bool l_sync_from_begin = dap_hash_fast_is_blank(&l_request->hash_from);
dap_chain_atom_iter_t *l_iter = l_chain->callback_atom_iter_create(l_chain, l_chain_pkt->hdr.cell_id, l_sync_from_begin
- ? NULL : &l_request->hash_from);
+ ? NULL : &l_request->hash_from, false);
if (!l_iter) {
dap_stream_ch_write_error_unsafe(a_ch, l_chain_pkt->hdr.net_id.uint64,
l_chain_pkt->hdr.chain_id.uint64, l_chain_pkt->hdr.cell_id.uint64,
@@ -1249,7 +1249,7 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if(s_debug_more)
log_it(L_INFO, "Out: UPDATE_CHAINS_START pkt: net %s chain %s cell 0x%016"DAP_UINT64_FORMAT_X, l_chain->name,
l_chain->net_name, l_chain_pkt->hdr.cell_id.uint64);
- l_ch_chain->request_atom_iter = l_chain->callback_atom_iter_create(l_chain, l_chain_pkt->hdr.cell_id, NULL);
+ l_ch_chain->request_atom_iter = l_chain->callback_atom_iter_create(l_chain, l_chain_pkt->hdr.cell_id, NULL, false);
l_chain->callback_atom_iter_get(l_ch_chain->request_atom_iter, DAP_CHAIN_ITER_OP_FIRST, NULL);
l_ch_chain->request_hdr = l_chain_pkt->hdr;
dap_chain_ch_pkt_write_unsafe(a_ch, DAP_CHAIN_CH_PKT_TYPE_UPDATE_CHAINS_START,
diff --git a/modules/chain/include/dap_chain.h b/modules/chain/include/dap_chain.h
index 8dbfc53057..099a433d02 100644
--- a/modules/chain/include/dap_chain.h
+++ b/modules/chain/include/dap_chain.h
@@ -51,6 +51,10 @@ typedef struct dap_chain_atom_iter {
size_t cur_size;
dap_chain_hash_fast_t *cur_hash;
uint64_t cur_num;
+
+ bool show_forked_branches;
+ dap_list_t *forked_branches;
+ dap_list_t *current_forked_atom;
} dap_chain_atom_iter_t;
typedef struct dap_chain_datum_iter {
@@ -93,7 +97,7 @@ typedef dap_chain_atom_ptr_t (*dap_chain_callback_atom_form_treshold_t)(dap_chai
typedef dap_chain_atom_verify_res_t (*dap_chain_callback_atom_verify_t)(dap_chain_t *, dap_chain_atom_ptr_t , size_t, dap_hash_fast_t*);
typedef size_t (*dap_chain_callback_atom_get_hdr_size_t)(void);
-typedef dap_chain_atom_iter_t * (*dap_chain_callback_atom_iter_create_t)(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from);
+typedef dap_chain_atom_iter_t * (*dap_chain_callback_atom_iter_create_t)(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches);
typedef dap_chain_atom_ptr_t (*dap_chain_callback_atom_iter_get_t)(dap_chain_atom_iter_t *a_iter, dap_chain_iter_op_t a_operation, size_t *a_atom_size);
typedef dap_chain_atom_ptr_t (*dap_chain_callback_atom_iter_find_by_hash_t)(dap_chain_atom_iter_t *a_iter, dap_hash_fast_t *a_atom_hash, size_t *a_atom_size);
typedef dap_chain_atom_ptr_t (*dap_chain_callback_atom_iter_get_by_num_t)(dap_chain_atom_iter_t *a_iter, uint64_t a_atom_num);
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index b69a141c79..a2d37ba66e 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2386,7 +2386,7 @@ static void s_ch_in_pkt_callback(dap_stream_ch_t *a_ch, uint8_t a_type, const vo
l_net_pvt->sync_context.cur_cell
? l_net_pvt->sync_context.cur_cell->id
: c_dap_chain_cell_id_null,
- NULL);
+ NULL, false);
if (!l_iter) {
log_it(L_CRITICAL, g_error_memory_alloc);
dap_stream_ch_write_error_unsafe(a_ch, l_net->pub.id.uint64,
@@ -3059,7 +3059,7 @@ dap_list_t* dap_chain_datum_list(dap_chain_net_t *a_net, dap_chain_t *a_chain, d
{
dap_chain_cell_t *l_cell = l_chain_cur->cells;
size_t l_atom_size = 0;
- dap_chain_atom_iter_t *l_atom_iter = l_chain_cur->callback_atom_iter_create(l_chain_cur, l_cell->id, NULL);
+ dap_chain_atom_iter_t *l_atom_iter = l_chain_cur->callback_atom_iter_create(l_chain_cur, l_cell->id, NULL, false);
dap_chain_atom_ptr_t l_atom = l_chain_cur->callback_atom_iter_get(l_atom_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size);
while(l_atom && l_atom_size)
{
diff --git a/modules/net/dap_chain_net_anchor.c b/modules/net/dap_chain_net_anchor.c
index 7a3bc3c49f..4012dda4c1 100644
--- a/modules/net/dap_chain_net_anchor.c
+++ b/modules/net/dap_chain_net_anchor.c
@@ -185,7 +185,7 @@ dap_chain_datum_anchor_t * s_find_previous_anchor(dap_chain_datum_anchor_t * a_a
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_iter_t *l_atom_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, 0, false);
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){
size_t l_datums_count = 0;
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 66792ad9fc..ee18fd50ca 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -7816,7 +7816,7 @@ static int s_check_cmd(int a_arg_index, int a_argc, char **a_argv, void **a_str_
size_t l_atom_size = 0, l_datums_count = 0;
HASH_ITER(hh, l_chain->cells, l_cell, l_cell_tmp) {
- l_iter = l_cell->chain->callback_atom_iter_create(l_cell->chain, l_cell->id, NULL);
+ l_iter = l_cell->chain->callback_atom_iter_create(l_cell->chain, l_cell->id, NULL, false);
dap_chain_atom_ptr_t l_atom = l_cell->chain->callback_atom_find_by_hash(l_iter, &l_hash_tmp, &l_atom_size);
dap_chain_datum_t **l_datums = l_cell->chain->callback_atom_get_datums(l_atom, l_atom_size, &l_datums_count);
for (size_t i = 0; i < l_datums_count; i++) {
diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c
index 15e225603e..99fb3090a1 100644
--- a/modules/net/dap_chain_node_cli_cmd_tx.c
+++ b/modules/net/dap_chain_node_cli_cmd_tx.c
@@ -616,7 +616,7 @@ json_object *dap_db_history_tx_all(dap_chain_t *l_chain, dap_chain_net_t *l_net,
HASH_ITER(hh, l_chain->cells, l_cell, l_cell_tmp) {
if (a_limit && l_count_tx >= a_limit)
break;
- l_iter = l_chain->callback_atom_iter_create(l_chain, l_cell->id, NULL);
+ l_iter = l_chain->callback_atom_iter_create(l_chain, l_cell->id, NULL, false);
size_t l_atom_size = 0;
dap_chain_atom_ptr_t l_ptr = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size);
while (l_ptr && l_atom_size && (a_limit ? l_count_tx < a_limit : true)) {
@@ -684,7 +684,7 @@ static char* dap_db_chain_history_token_list(dap_chain_t * a_chain, const char *
size_t l_atom_size = 0;
dap_chain_cell_t *l_cell = a_chain->cells;
do {
- dap_chain_atom_iter_t *l_atom_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, NULL);
+ dap_chain_atom_iter_t *l_atom_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, NULL, false);
if(!a_chain->callback_atom_get_datums) {
log_it(L_DEBUG, "Not defined callback_atom_get_datums for chain \"%s\"", a_chain->name);
return NULL ;
@@ -774,7 +774,7 @@ static char* dap_db_history_filter(dap_chain_t * a_chain, dap_ledger_t *a_ledger
do {
// load transactions
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, NULL);
+ dap_chain_atom_iter_t *l_atom_iter = a_chain->callback_atom_iter_create(a_chain, l_cell->id, NULL, false);
size_t l_datum_num = 0, l_token_num = 0, l_emission_num = 0, l_tx_num = 0;
size_t l_datum_num_global = a_total_datums ? *a_total_datums : 0;
for (dap_chain_atom_ptr_t l_atom = a_chain->callback_atom_iter_get(l_atom_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size);
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index c96dc2a2c0..f8c1744596 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -101,7 +101,7 @@ static dap_chain_atom_verify_res_t s_callback_atom_verify(dap_chain_t * a_chain,
// Get block header size
static size_t s_callback_atom_get_static_hdr_size(void);
-static dap_chain_atom_iter_t *s_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from);
+static dap_chain_atom_iter_t *s_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches);
static dap_chain_atom_ptr_t s_callback_atom_iter_find_by_hash(dap_chain_atom_iter_t * a_atom_iter ,
dap_chain_hash_fast_t * a_atom_hash, size_t * a_atom_size);
static dap_chain_atom_ptr_t s_callback_atom_iter_get_by_num(dap_chain_atom_iter_t *a_atom_iter, uint64_t a_atom_num);
@@ -1855,13 +1855,14 @@ static dap_chain_datum_t** s_callback_atom_get_datums(dap_chain_atom_ptr_t a_ato
* @param a_chain
* @return
*/
-static dap_chain_atom_iter_t *s_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from)
+static dap_chain_atom_iter_t *s_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches)
{
dap_chain_atom_iter_t * l_atom_iter = DAP_NEW_Z(dap_chain_atom_iter_t);
if (!l_atom_iter) {
log_it(L_CRITICAL, "%s", g_error_memory_alloc);
return NULL;
}
+ l_atom_iter->show_forked_branches = a_show_forked_branches;
l_atom_iter->chain = a_chain;
l_atom_iter->cell_id = a_cell_id;
if (a_hash_from)
@@ -1905,7 +1906,12 @@ static dap_chain_atom_ptr_t s_callback_atom_iter_get(dap_chain_atom_iter_t *a_at
a_atom_iter->cur_size = l_item->block_size;
a_atom_iter->cur_hash = &l_item->block_hash;
a_atom_iter->cur_num = l_item->block_number;
- } else
+ if (a_atom_iter->show_forked_branches &&
+ l_item->forked_branches){
+ a_atom_iter->forked_branches
+ }
+
+ } else
*a_atom_iter = (dap_chain_atom_iter_t) { .chain = a_atom_iter->chain,
.cell_id = a_atom_iter->cell_id };
pthread_rwlock_unlock(&l_blocks_pvt->rwlock);
diff --git a/modules/type/blocks/tests/dap_chain_blocks_test.c b/modules/type/blocks/tests/dap_chain_blocks_test.c
index cf6d34cfc8..ba5c5cc206 100644
--- a/modules/type/blocks/tests/dap_chain_blocks_test.c
+++ b/modules/type/blocks/tests/dap_chain_blocks_test.c
@@ -61,7 +61,7 @@ void dap_chain_blocks_test()
}
- dap_test_msg("Add forked block from %s", dap_chain_hash_fast_to_str_static(&l_forked_block_hash));
+ // dap_test_msg("Add forked block from %s", dap_chain_hash_fast_to_str_static(&l_forked_block_hash));
l_block_size = 0;
l_block = dap_chain_block_new(&l_forked_block_hash, &l_block_size);
// dap_assert_PIF(l_block != NULL, "Creating of forked block:");
@@ -73,18 +73,18 @@ void dap_chain_blocks_test()
dap_chain_cell_id_t l_cell_id = {.uint64 = 1};
size_t l_atom_size_from_iter = 0;
- dap_chain_atom_iter_t *l_iter = l_chain->callback_atom_iter_create(l_chain, l_cell_id, NULL);
+ dap_chain_atom_iter_t *l_iter = l_chain->callback_atom_iter_create(l_chain, l_cell_id, NULL, false);
dap_list_t *l_branch_temp = NULL;
dap_chain_atom_ptr_t l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size_from_iter);
for (dap_list_t *l_branch_temp = l_first_branch_atoms_list; l_branch_temp && l_atom;
l_branch_temp = l_branch_temp->next, l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_NEXT, &l_atom_size_from_iter)){
- dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
- dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
+ // dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
+ // dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
- dap_test_msg("Add block to forked branch");
+ // dap_test_msg("Add block to forked branch");
l_block_size = 0;
l_block = dap_chain_block_new(&l_block_hash, &l_block_size);
// dap_assert_PIF(l_block != NULL, "Creating of forked block:");
@@ -97,12 +97,12 @@ void dap_chain_blocks_test()
l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size_from_iter);
for (dap_list_t *l_branch_temp = l_first_branch_atoms_list; l_branch_temp && l_atom;
l_branch_temp = l_branch_temp->next, l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_NEXT, &l_atom_size_from_iter)){
- dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
- dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
+ // dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
+ // dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
- dap_test_msg("Add block to forked branch");
+ // dap_test_msg("Add block to forked branch");
l_block_size = 0;
l_block = dap_chain_block_new(&l_block_hash, &l_block_size);
// dap_assert_PIF(l_block != NULL, "Creating of forked block:");
@@ -115,12 +115,12 @@ void dap_chain_blocks_test()
l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size_from_iter);
for (dap_list_t *l_branch_temp = l_second_branch_atoms_list; l_branch_temp && l_atom;
l_branch_temp = l_branch_temp->next, l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_NEXT, &l_atom_size_from_iter)){
- dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
- dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
+ // dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
+ // dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
- dap_test_msg("Add block to former main branch");
+ // dap_test_msg("Add block to former main branch");
l_block_size = 0;
l_block = dap_chain_block_new((dap_hash_fast_t*)dap_list_last(l_first_branch_atoms_list)->data, &l_block_size);
// dap_assert_PIF(l_block != NULL, "Creating of forked block:");
@@ -133,12 +133,12 @@ void dap_chain_blocks_test()
l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size_from_iter);
for (dap_list_t *l_branch_temp = l_second_branch_atoms_list; l_branch_temp && l_atom;
l_branch_temp = l_branch_temp->next, l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_NEXT, &l_atom_size_from_iter)){
- dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
- dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
+ // dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
+ // dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
- dap_test_msg("Add block to former main branch");
+ // dap_test_msg("Add block to former main branch");
l_block_size = 0;
l_block = dap_chain_block_new((dap_hash_fast_t*)dap_list_last(l_first_branch_atoms_list)->data, &l_block_size);
// dap_assert_PIF(l_block != NULL, "Creating of forked block:");
@@ -151,8 +151,8 @@ void dap_chain_blocks_test()
l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_FIRST, &l_atom_size_from_iter);
for (dap_list_t *l_branch_temp = l_first_branch_atoms_list; l_branch_temp && l_atom;
l_branch_temp = l_branch_temp->next, l_atom = l_chain->callback_atom_iter_get(l_iter, DAP_CHAIN_ITER_OP_NEXT, &l_atom_size_from_iter)){
- dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
- dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
+ // dap_test_msg("Check block %s and %s", dap_chain_hash_fast_to_str_static(l_iter->cur_hash),
+ // dap_chain_hash_fast_to_str_static((dap_hash_fast_t*)l_branch_temp->data));
dap_assert_PIF(dap_hash_fast_compare(l_iter->cur_hash, (dap_hash_fast_t*)l_branch_temp->data), "Check adding block into forked branch: ");
}
@@ -162,7 +162,4 @@ void dap_chain_blocks_test()
-
-
-
}
\ No newline at end of file
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index ced41b457b..b324de0264 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -100,7 +100,7 @@ static dap_chain_atom_ptr_t s_chain_callback_atom_add_from_treshold(dap_chain_t
static dap_chain_atom_verify_res_t s_chain_callback_atom_verify(dap_chain_t * a_chain, dap_chain_atom_ptr_t , size_t, dap_hash_fast_t *a_atom_hash); // Verify new event in dag
static size_t s_chain_callback_atom_get_static_hdr_size(void); // Get dag event header size
-static dap_chain_atom_iter_t* s_chain_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from);
+static dap_chain_atom_iter_t* s_chain_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches);
static dap_chain_atom_ptr_t s_chain_callback_atom_iter_find_by_hash(dap_chain_atom_iter_t * a_atom_iter ,
dap_chain_hash_fast_t * a_atom_hash, size_t * a_atom_size);
@@ -1077,7 +1077,7 @@ static dap_chain_atom_ptr_t* s_chain_callback_atom_iter_get_links( dap_chain_ato
* @param a_chain
* @return
*/
-static dap_chain_atom_iter_t *s_chain_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from)
+static dap_chain_atom_iter_t *s_chain_callback_atom_iter_create(dap_chain_t *a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches)
{
dap_chain_atom_iter_t * l_atom_iter = DAP_NEW_Z(dap_chain_atom_iter_t);
if (!l_atom_iter) {
diff --git a/modules/type/none/dap_chain_cs_none.c b/modules/type/none/dap_chain_cs_none.c
index 2b01fe8f50..45f1dee54d 100644
--- a/modules/type/none/dap_chain_cs_none.c
+++ b/modules/type/none/dap_chain_cs_none.c
@@ -66,7 +66,7 @@ static dap_chain_atom_verify_res_t s_nonconsensus_callback_atom_add(dap_chain_t
static dap_chain_atom_verify_res_t s_nonconsensus_callback_atom_verify(dap_chain_t * a_chain, dap_chain_atom_ptr_t, size_t, dap_hash_fast_t *a_atom_hash); // Verify new event in gdb
static size_t s_nonconsensus_callback_atom_get_static_hdr_size(void); // Get gdb event header size
-static dap_chain_atom_iter_t* s_nonconsensus_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from);
+static dap_chain_atom_iter_t* s_nonconsensus_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches);
// Delete iterator
static void s_nonconsensus_callback_atom_iter_delete(dap_chain_atom_iter_t * a_atom_iter); // Get the fisrt event from gdb
@@ -408,7 +408,7 @@ static size_t s_nonconsensus_callback_atom_get_static_hdr_size()
* @param a_chain dap_chain_t a_chain
* @return dap_chain_atom_iter_t*
*/
-static dap_chain_atom_iter_t* s_nonconsensus_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from)
+static dap_chain_atom_iter_t* s_nonconsensus_callback_atom_iter_create(dap_chain_t * a_chain, dap_chain_cell_id_t a_cell_id, dap_hash_fast_t *a_hash_from, bool a_show_forked_branches)
{
dap_chain_atom_iter_t * l_iter = DAP_NEW_Z(dap_chain_atom_iter_t);
if (!l_iter) {
--
GitLab