Merge pull request #15 from kelvinblockchain/feature-2272

Feature 2272

libdap-chain @ 73c853c4

-Subproject commit 188bd144a0798ca96090bbed1676b84d714c465d
+Subproject commit 73c853c47c3524ff55519ed27c5f9f782c031494

libdap-chain-crypto @ 114abf9a

-Subproject commit 1b0e408cdd658bdd02f900b5d0b989c2c1b19623
+Subproject commit 114abf9aaf78a56d424b604c17bac57454ebc8c1

libdap-chain-cs-block @ dea947a8

+Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f

libdap-chain-cs-block-poa @ 25de9a1e

+Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3

libdap-chain-cs-block-pow @ 02a9f374

+Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e

libdap-chain-cs-dag-hashgraph @ d30d1f4a

+Subproject commit d30d1f4a3028ecef9578c253f421a9e0a967efeb

libdap-chain-cs-dag-poh @ bc964f0d

+Subproject commit bc964f0dcf0985aa9e56028d2275e246ee3a8ef4

libdap-chain-mempool @ 34fdd108

-Subproject commit fc98c944ebb8152abdbab243c07b8befe1ddbcb5
+Subproject commit 34fdd1084926156576678043a4180d3df7138c4c

libdap-chain-mine @ 1c2d1d7f

+Subproject commit 1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4

libdap-chain-net @ db815cb5

-Subproject commit 8b97046503228af0bd1b3746c511d01d594361d1
+Subproject commit db815cb587eab65ba13d0add4daf4b6625d8a900

libdap-chain-net-srv @ 0783ba71

-Subproject commit 467476c788636b404a37ae480f4f9da61f952a32
+Subproject commit 0783ba715d28b71d6c2c7fb8ea2df4ad0d5bb894

libdap-chain-net-srv-mining @ 7ce617eb

+Subproject commit 7ce617ebdc33f812c161a6c500e157da5ee0f1f1

libdap-chain-net-srv-mining-pool @ eff1668d

+Subproject commit eff1668d22c4747684781fe969cce4aac05937d7

libdap-chain-net-srv-vpn @ 657f42e1

-Subproject commit 10476728dbc21816ea314b4b089e1903132b80b3
+Subproject commit 657f42e138dba298deb06134586ca09aaba3b38d

libdap-stream @ 9729b334

-Subproject commit f6c1c2cd593ca61b6cc5140855d5dbd9bc61aed3
+Subproject commit 9729b3341b4a1d5cc90007be760d3c8931f2bf3d

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);