diff --git a/dap-sdk b/dap-sdk
index cfa30cd79b3326caa8c02a35a380f4821de6ec10..90f390fa4c304be9c5cb9675216642f22b97f5d0 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit cfa30cd79b3326caa8c02a35a380f4821de6ec10
+Subproject commit 90f390fa4c304be9c5cb9675216642f22b97f5d0
diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c
index 00410809fb86f219fc939b5bbdccd7f82bb3955b..a07f57c48829b31e2618e9bf2d96704ad0178b4b 100644
--- a/modules/chain/dap_chain.c
+++ b/modules/chain/dap_chain.c
@@ -716,7 +716,7 @@ ssize_t dap_chain_atom_save(dap_chain_cell_t *a_chain_cell, const uint8_t *a_ato
dap_chain_t *l_chain = a_chain_cell->chain;
if (a_new_atom_hash) { // Atom is new and need to be distributed for the net
- dap_cluster_t *l_net_cluster = dap_cluster_find(l_chain->net_id.uint64);
+ dap_cluster_t *l_net_cluster = dap_cluster_find(dap_cluster_guuid_compose(l_chain->net_id.uint64, 0));
if (l_net_cluster) {
size_t l_pkt_size = a_atom_size + sizeof(dap_chain_ch_pkt_t);
dap_chain_ch_pkt_t *l_pkt = dap_chain_ch_pkt_new(l_chain->net_id.uint64, l_chain->id.uint64,
diff --git a/modules/chain/dap_chain_ch.c b/modules/chain/dap_chain_ch.c
index dbd16f69e51d0859ac750259ccb27fcb3e03ad9b..b4c2c298390e87431a35d0c2015e393136fe8ec0 100644
--- a/modules/chain/dap_chain_ch.c
+++ b/modules/chain/dap_chain_ch.c
@@ -1076,7 +1076,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
log_it(L_WARNING, "Incorrect chain packet size");
break;
}
- dap_cluster_t *l_cluster = dap_cluster_find(l_chain_pkt->hdr.net_id.uint64);
+ dap_cluster_t *l_cluster = dap_cluster_find(dap_cluster_guuid_compose(l_chain_pkt->hdr.net_id.uint64, 0));
if (!l_cluster) {
log_it(L_WARNING, "Can't find cluster with ID 0x%" DAP_UINT64_FORMAT_X, l_chain_pkt->hdr.net_id.uint64);
break;
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index d766e003f97bdf0457b17a5ed363411dca9e84d2..cfc7ee62a708c200779d2d76b2a0069d14a9ca8c 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -479,7 +479,7 @@ static int s_callback_created(dap_chain_t *a_chain, dap_config_t *a_chain_net_cf
l_session->my_signing_addr = l_my_signing_addr;
char *l_sync_group = s_get_penalty_group(l_net->pub.id);
l_session->db_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(), NULL,
- dap_cluster_uuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_ESBOCS),
+ dap_cluster_guuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_ESBOCS),
l_sync_group, 72 * 3600, true,
DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_ROLE_AUTONOMIC);
DAP_DELETE(l_sync_group);
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 6e284dd6bec77a57efde3f6555bdc20a5123262f..378c735f68723998cfe3657f998e642ee52fb208 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2878,7 +2878,7 @@ int s_net_load(dap_chain_net_t *a_net)
l_gdb_groups_mask = dap_strdup_printf("%s.chain-%s.mempool", l_net->pub.gdb_groups_prefix, l_chain->name);
dap_global_db_cluster_t *l_cluster = dap_global_db_cluster_add(
dap_global_db_instance_get_default(),
- l_net->pub.name, dap_cluster_uuid_compose(l_net->pub.id.uint64, 0),
+ l_net->pub.name, dap_cluster_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, DAP_CHAIN_NET_MEMPOOL_TTL, true,
DAP_GDB_MEMBER_ROLE_USER,
DAP_CLUSTER_ROLE_EMBEDDED);
@@ -2894,7 +2894,7 @@ int s_net_load(dap_chain_net_t *a_net)
// Service orders cluster
l_gdb_groups_mask = dap_strdup_printf("%s.service.orders", l_net->pub.gdb_groups_prefix);
l_net_pvt->orders_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(),
- l_net->pub.name, dap_cluster_uuid_compose(l_net->pub.id.uint64, 0),
+ l_net->pub.name, dap_cluster_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, 0, true,
DAP_GDB_MEMBER_ROLE_GUEST,
DAP_CLUSTER_ROLE_EMBEDDED);
@@ -2909,7 +2909,7 @@ int s_net_load(dap_chain_net_t *a_net)
l_net->pub.gdb_nodes_aliases = dap_strdup_printf("%s.nodes.aliases",l_net->pub.gdb_groups_prefix);
l_gdb_groups_mask = dap_strdup_printf("%s.nodes*", l_net->pub.gdb_groups_prefix);
l_net_pvt->nodes_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(),
- l_net->pub.name, dap_cluster_uuid_compose(l_net->pub.id.uint64, 0),
+ l_net->pub.name, dap_cluster_guuid_compose(l_net->pub.id.uint64, 0),
l_gdb_groups_mask, 0, true,
DAP_GDB_MEMBER_ROLE_GUEST,
DAP_CLUSTER_ROLE_EMBEDDED);
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index 86b67da9a155d77e8320617ca0420633729c3cf8..72bc9984ebd5c5fd5c6143ba4f2c3235b36edbf7 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -323,7 +323,7 @@ static int s_chain_cs_dag_new(dap_chain_t * a_chain, dap_config_t * a_chain_cfg)
l_dag->gdb_group_events_round_new = dap_strdup_printf(l_dag->is_celled ? "dag-%s-%s-%016llx-round.new" : "dag-%s-%s-round.new",
l_net->pub.gdb_groups_prefix, a_chain->name, 0LLU);
dap_global_db_cluster_t *l_dag_cluster = dap_global_db_cluster_add(dap_global_db_instance_get_default(), NULL,
- dap_cluster_uuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_DAG),
+ dap_cluster_guuid_compose(l_net->pub.id.uint64, DAP_CHAIN_CLUSTER_ID_DAG),
l_dag->gdb_group_events_round_new, 900, true,
DAP_GDB_MEMBER_ROLE_NOBODY, DAP_CLUSTER_ROLE_AUTONOMIC);
dap_global_db_cluster_add_notify_callback(l_dag_cluster, s_round_changes_notify, l_dag);
diff --git a/modules/type/none/dap_chain_cs_none.c b/modules/type/none/dap_chain_cs_none.c
index d53fbe43518d38776b0c5eb6864b1a89329e3847..3cb904ce38c2c1acf13ad62f51d7b38e44715e3a 100644
--- a/modules/type/none/dap_chain_cs_none.c
+++ b/modules/type/none/dap_chain_cs_none.c
@@ -169,8 +169,8 @@ static int s_cs_callback_new(dap_chain_t *a_chain, dap_config_t UNUSED_ARG *a_ch
// Add group prefix that will be tracking all changes
dap_global_db_cluster_t *l_nonconsensus_cluster =
dap_global_db_cluster_add(dap_global_db_instance_get_default(),
- l_net->pub.name, l_net->pub.id.uint64,
- l_nochain_priv->group_datums, dap_cluster_uuid_compose(l_net->pub.id.uint64, 0),
+ l_net->pub.name, dap_cluster_guuid_compose(l_net->pub.id.uint64, 0),
+ l_nochain_priv->group_datums, 0,
true, DAP_GDB_MEMBER_ROLE_USER, DAP_CLUSTER_ROLE_EMBEDDED);
if (!l_nonconsensus_cluster) {
log_it(L_ERROR, "Can't create global DB cluster for synchronization");