diff --git a/CMakeLists.txt b/CMakeLists.txt index e7556da5725323168b914481cf1771db47d86ef4..124af755763970f463752cb4a527ccfeb8885ecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11) # Predefine project SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 3) -SET( CPACK_PACKAGE_VERSION_MINOR 4) -SET( CPACK_PACKAGE_VERSION_PATCH 6) +SET( CPACK_PACKAGE_VERSION_MINOR 5) +SET( CPACK_PACKAGE_VERSION_PATCH 0) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") @@ -16,9 +16,9 @@ set(SUBMODULES_NO_BUILD ON) set(SUPPORT_PYTHON_PLUGINS ON) if (NOT WIN32) - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-vpn srv-xchange") + set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-xchange srv-stake srv-vpn") else() - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-xchange") + set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-xchange srv-stake") endif() include (cellframe-sdk/cmake/OS_Detection.cmake) diff --git a/cellframe-sdk b/cellframe-sdk index 44448a4a2e0f37d33980f40305be5992ea9b0d7e..0ae564864f1ba25c5501f05d1f290be16f55b7f0 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 44448a4a2e0f37d33980f40305be5992ea9b0d7e +Subproject commit 0ae564864f1ba25c5501f05d1f290be16f55b7f0 diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl index b883c596fa599158c3e2e0b04217aea43803d711..aa929f7b533f1209fba1ca0673d770c6e70b3f6c 100755 --- a/dist/share/configs/cellframe-node.cfg.tpl +++ b/dist/share/configs/cellframe-node.cfg.tpl @@ -22,6 +22,9 @@ bugreport_url_enabled=false enabled=false bootstrap_balancer=true +[srv] +order_signed_only=false + [srv_dns] enabled=false pricelist=[] diff --git a/python-cellframe b/python-cellframe index cfaa3c0afa73ecd3a140673d5e9a2125f9f7ba6a..7844eb44dc4dd714aac10d2730db327a714e4f33 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit cfaa3c0afa73ecd3a140673d5e9a2125f9f7ba6a +Subproject commit 7844eb44dc4dd714aac10d2730db327a714e4f33 diff --git a/sources/main.c b/sources/main.c index 4b26985e0d1a712509d642f88c7a749a52f5e543..d3c3e58862e0ca00c3154e9b3d0c90b3c701313f 100755 --- a/sources/main.c +++ b/sources/main.c @@ -102,6 +102,7 @@ #include "dap_stream_ch_chain_net.h" #include "dap_stream_ch_chain_net_srv.h" #include "dap_chain_net_srv_xchange.h" +#include "dap_chain_net_srv_stake.h" #include "dap_common.h" #include "dap_client_remote.h" @@ -299,6 +300,7 @@ int main( int argc, const char **argv ) dap_chain_ledger_verificator_add(DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_XCHANGE, dap_chain_net_srv_xchange_verificator); 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); if( dap_chain_net_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network module"); @@ -463,7 +465,9 @@ int main( int argc, const char **argv ) 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(); @@ -514,6 +518,8 @@ int main( int argc, const char **argv ) if (bServerEnabled) dap_server_deinit(); dap_enc_ks_deinit(); dap_chain_node_mempool_deinit(); + dap_chain_net_srv_xchange_deinit(); + dap_chain_net_srv_stake_deinit(); dap_config_close( g_config ); dap_common_deinit();