diff --git a/cellframe-sdk b/cellframe-sdk index c992e7135a0a0eba4549f9d616a7e0b7564fe182..ea206985ffd6523c00847972641ff714255390aa 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit c992e7135a0a0eba4549f9d616a7e0b7564fe182 +Subproject commit ea206985ffd6523c00847972641ff714255390aa diff --git a/python-cellframe b/python-cellframe index 17a0569e1c1d73cc7c9a75d152eb38d4c3a93586..4556354b985bef5083d949c2dae50a7c4bd1f3d5 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 17a0569e1c1d73cc7c9a75d152eb38d4c3a93586 +Subproject commit 4556354b985bef5083d949c2dae50a7c4bd1f3d5 diff --git a/sources/main.c b/sources/main.c index ef98e7abfa0bb2140112a6aeda5297a1d27a95d0..3b8fd8f78abab6db39d21d37faac44132f5dff97 100755 --- a/sources/main.c +++ b/sources/main.c @@ -322,11 +322,26 @@ int main( int argc, const char **argv ) dap_chain_ledger_verificator_add(DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_PAY, dap_chain_net_srv_pay_verificator); dap_chain_ledger_verificator_add(DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_STAKE, dap_chain_net_srv_stake_verificator); + // Chain Network init + + dap_stream_ch_chain_init( ); + dap_stream_ch_chain_net_init( ); + + dap_stream_ch_chain_net_srv_init(); + + if (!dap_chain_net_srv_xchange_init()) { + log_it(L_ERROR, "Can't provide exchange capability"); + } + if (!dap_chain_net_srv_stake_init()) { + log_it(L_ERROR, "Can't start delegated stake service"); + } +/// if (dap_config_get_item_bool_default(g_config,"vpn","enabled",false)) +/// dap_stream_ch_vpn_deinit(); + if( dap_chain_net_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network module"); return -65; } - if( dap_chain_net_srv_init(g_config) !=0){ log_it(L_CRITICAL,"Can't init dap chain network service module"); return -66; @@ -342,6 +357,7 @@ int main( int argc, const char **argv ) return -68; } + #ifndef _WIN32 // vpn server if(dap_config_get_item_bool_default(g_config, "srv_vpn", "enabled", false)) { @@ -451,21 +467,7 @@ int main( int argc, const char **argv ) } } - // Chain Network init - - dap_stream_ch_chain_init( ); - dap_stream_ch_chain_net_init( ); - dap_stream_ch_chain_net_srv_init(); - - if (!dap_chain_net_srv_xchange_init()) { - log_it(L_ERROR, "Can't provide exchange capability"); - } - if (!dap_chain_net_srv_stake_init()) { - log_it(L_ERROR, "Can't start delegated stake service"); - } -/// if (dap_config_get_item_bool_default(g_config,"vpn","enabled",false)) -/// dap_stream_ch_vpn_deinit(); //dap_chain_net_load_all();