diff --git a/libdap-chain b/libdap-chain
index 188bd144a0798ca96090bbed1676b84d714c465d..73c853c47c3524ff55519ed27c5f9f782c031494 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 188bd144a0798ca96090bbed1676b84d714c465d
+Subproject commit 73c853c47c3524ff55519ed27c5f9f782c031494
diff --git a/libdap-chain-crypto b/libdap-chain-crypto
index 1b0e408cdd658bdd02f900b5d0b989c2c1b19623..114abf9aaf78a56d424b604c17bac57454ebc8c1 160000
--- a/libdap-chain-crypto
+++ b/libdap-chain-crypto
@@ -1 +1 @@
-Subproject commit 1b0e408cdd658bdd02f900b5d0b989c2c1b19623
+Subproject commit 114abf9aaf78a56d424b604c17bac57454ebc8c1
diff --git a/libdap-chain-cs-block b/libdap-chain-cs-block
new file mode 160000
index 0000000000000000000000000000000000000000..dea947a8aa69945f61f87d43df0ad2b096357e1f
--- /dev/null
+++ b/libdap-chain-cs-block
@@ -0,0 +1 @@
+Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f
diff --git a/libdap-chain-cs-block-poa b/libdap-chain-cs-block-poa
new file mode 160000
index 0000000000000000000000000000000000000000..25de9a1e9e8d2fbda45690dc38983534dee780b3
--- /dev/null
+++ b/libdap-chain-cs-block-poa
@@ -0,0 +1 @@
+Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3
diff --git a/libdap-chain-cs-block-pow b/libdap-chain-cs-block-pow
new file mode 160000
index 0000000000000000000000000000000000000000..02a9f374344ffc8fa1f47082c26db9efaa591e7e
--- /dev/null
+++ b/libdap-chain-cs-block-pow
@@ -0,0 +1 @@
+Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e
diff --git a/libdap-chain-cs-dag-hashgraph b/libdap-chain-cs-dag-hashgraph
new file mode 160000
index 0000000000000000000000000000000000000000..d30d1f4a3028ecef9578c253f421a9e0a967efeb
--- /dev/null
+++ b/libdap-chain-cs-dag-hashgraph
@@ -0,0 +1 @@
+Subproject commit d30d1f4a3028ecef9578c253f421a9e0a967efeb
diff --git a/libdap-chain-cs-dag-poh b/libdap-chain-cs-dag-poh
new file mode 160000
index 0000000000000000000000000000000000000000..bc964f0dcf0985aa9e56028d2275e246ee3a8ef4
--- /dev/null
+++ b/libdap-chain-cs-dag-poh
@@ -0,0 +1 @@
+Subproject commit bc964f0dcf0985aa9e56028d2275e246ee3a8ef4
diff --git a/libdap-chain-mempool b/libdap-chain-mempool
index fc98c944ebb8152abdbab243c07b8befe1ddbcb5..34fdd1084926156576678043a4180d3df7138c4c 160000
--- a/libdap-chain-mempool
+++ b/libdap-chain-mempool
@@ -1 +1 @@
-Subproject commit fc98c944ebb8152abdbab243c07b8befe1ddbcb5
+Subproject commit 34fdd1084926156576678043a4180d3df7138c4c
diff --git a/libdap-chain-mine b/libdap-chain-mine
new file mode 160000
index 0000000000000000000000000000000000000000..1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4
--- /dev/null
+++ b/libdap-chain-mine
@@ -0,0 +1 @@
+Subproject commit 1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4
diff --git a/libdap-chain-net b/libdap-chain-net
index 8b97046503228af0bd1b3746c511d01d594361d1..db815cb587eab65ba13d0add4daf4b6625d8a900 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit 8b97046503228af0bd1b3746c511d01d594361d1
+Subproject commit db815cb587eab65ba13d0add4daf4b6625d8a900
diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
index 467476c788636b404a37ae480f4f9da61f952a32..0783ba715d28b71d6c2c7fb8ea2df4ad0d5bb894 160000
--- a/libdap-chain-net-srv
+++ b/libdap-chain-net-srv
@@ -1 +1 @@
-Subproject commit 467476c788636b404a37ae480f4f9da61f952a32
+Subproject commit 0783ba715d28b71d6c2c7fb8ea2df4ad0d5bb894
diff --git a/libdap-chain-net-srv-mining b/libdap-chain-net-srv-mining
new file mode 160000
index 0000000000000000000000000000000000000000..7ce617ebdc33f812c161a6c500e157da5ee0f1f1
--- /dev/null
+++ b/libdap-chain-net-srv-mining
@@ -0,0 +1 @@
+Subproject commit 7ce617ebdc33f812c161a6c500e157da5ee0f1f1
diff --git a/libdap-chain-net-srv-mining-pool b/libdap-chain-net-srv-mining-pool
new file mode 160000
index 0000000000000000000000000000000000000000..eff1668d22c4747684781fe969cce4aac05937d7
--- /dev/null
+++ b/libdap-chain-net-srv-mining-pool
@@ -0,0 +1 @@
+Subproject commit eff1668d22c4747684781fe969cce4aac05937d7
diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn
index 10476728dbc21816ea314b4b089e1903132b80b3..657f42e138dba298deb06134586ca09aaba3b38d 160000
--- a/libdap-chain-net-srv-vpn
+++ b/libdap-chain-net-srv-vpn
@@ -1 +1 @@
-Subproject commit 10476728dbc21816ea314b4b089e1903132b80b3
+Subproject commit 657f42e138dba298deb06134586ca09aaba3b38d
diff --git a/libdap-stream b/libdap-stream
index f6c1c2cd593ca61b6cc5140855d5dbd9bc61aed3..9729b3341b4a1d5cc90007be760d3c8931f2bf3d 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit f6c1c2cd593ca61b6cc5140855d5dbd9bc61aed3
+Subproject commit 9729b3341b4a1d5cc90007be760d3c8931f2bf3d
diff --git a/sources/main.c b/sources/main.c
index cbc6b8ecdb30a7ab8be493c2d6d1f6871c63a13d..144b1e79ed85956597699f967fb66adbd8583de2 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -143,26 +143,33 @@ int main(int argc, const char * argv[])
return -57;
}
+ if(dap_chain_global_db_init(g_config)) {
+ log_it(L_CRITICAL, "Can't init global db module");
+ return -58;
+ }
+
+ if(dap_datum_mempool_init()) {
+ log_it(L_CRITICAL, "Can't init mempool module");
+ return -59;
+ }
if( dap_chain_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain modules");
- return -58;
+ return -60;
}
if( dap_chain_wallet_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain wallet module");
- return -59;
+ return -61;
}
-
if( dap_chain_cs_dag_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus module");
return -6;
}
-
if( dap_chain_cs_dag_poa_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus PoA module");
return -6;
@@ -197,8 +204,7 @@ int main(int argc, const char * argv[])
log_it(L_CRITICAL,"Can't init dap chain network service datum pool module");
return -6;
}
-
- if( dap_chain_net_srv_vpn_init() !=0){
+ if( dap_chain_net_srv_vpn_init(g_config) !=0){
log_it(L_CRITICAL,"Can't init dap chain network service vpn module");
return -6;
}
@@ -223,11 +229,6 @@ int main(int argc, const char * argv[])
return -9;
}
- if(dap_chain_global_db_init(g_config)) {
- log_it(L_CRITICAL, "Can't init global db module");
- return -10;
- }
-
if(dap_chain_node_cli_init(g_config)) {
log_it(L_CRITICAL, "Can't init server for console");
return -11;
@@ -287,7 +288,6 @@ int main(int argc, const char * argv[])
dap_stream_add_proc_http(DAP_HTTP(l_server), STREAM_URL);
dap_stream_ctl_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
- dap_datum_mempool_init();
const char *str_start_mempool = dap_config_get_item_str(g_config, "mempool", "accept");
if(str_start_mempool && !strcmp(str_start_mempool, "true")) {
dap_chain_mempool_add_proc(DAP_HTTP(l_server), MEMPOOL_URL);