From 88672cf7a8cfbcf49187bb68985437d4148f612e Mon Sep 17 00:00:00 2001
From: "roman.padenkov" <roman.padenkov@demlabs.net>
Date: Tue, 28 May 2024 09:24:13 +0000
Subject: [PATCH] Feature 11409 d
---
CMakeLists.txt | 8 +++++---
cellframe-sdk | 2 +-
dap-sdk | 2 +-
python-cellframe | 2 +-
sources/main.c | 16 ++++++++++++++++
version.mk | 2 +-
6 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c86d67ef..32f60e823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,11 +52,11 @@ option(ADD_UPDATER OFF)
#endif()
if(LINUX)
- set(BUILD_WITH_PYTHON_ENV ON)
- set(SUPPORT_PYTHON_PLUGINS ON)
+ set(BUILD_WITH_PYTHON_ENV OFF)
+ set(SUPPORT_PYTHON_PLUGINS OFF)
endif()
-set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-esbocs cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-esbocs cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange srv-bridge srv-voting")
if(LINUX OR DARWIN)
set(CELLFRAME_MODULES "${CELLFRAME_MODULES} srv-vpn")
@@ -398,6 +398,8 @@ else()
INSTALL(FILES ${cpython310static_SOURCE_DIR}/bin/python3.10 DESTINATION ${CMAKE_INSTALL_PREFIX}/python/bin/ )
+ INSTALL(DIRECTORY ${cpython310static_SOURCE_DIR}/lib/python3.10 DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/ USE_SOURCE_PERMISSIONS)
+
#install python-modules
INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycfhelpers DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/python3.10/site-packages USE_SOURCE_PERMISSIONS)
INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycftools DESTINATION ${CMAKE_INSTALL_PREFIX}/python/lib/python3.10/site-packages USE_SOURCE_PERMISSIONS)
diff --git a/cellframe-sdk b/cellframe-sdk
index 0640a4c94..99987fac3 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 0640a4c94426bced5278496625139be30335e43d
+Subproject commit 99987fac36ff89e687e15f5048936dfecee4b98e
diff --git a/dap-sdk b/dap-sdk
index 952c219fe..72796e25f 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 952c219fe0a702543bdf24728bc43aca288ee047
+Subproject commit 72796e25f1a7e792200c24e109b50d94ee7f5fd5
diff --git a/python-cellframe b/python-cellframe
index e93b26424..44d65ce75 160000
--- a/python-cellframe
+++ b/python-cellframe
@@ -1 +1 @@
-Subproject commit e93b2642437d61e6b3874a20d9ed0efe1e5e8bdb
+Subproject commit 44d65ce75f56304779ac2fcaae33a224a2ad5631
diff --git a/sources/main.c b/sources/main.c
index 34c108e6e..4fc697b9c 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -109,6 +109,8 @@
#include "dap_stream_ctl.h"
#include "dap_chain_net_srv_order.h"
#include "dap_chain_net_srv_xchange.h"
+#include "dap_chain_net_srv_voting.h"
+#include "dap_chain_net_srv_bridge.h"
#include "dap_chain_net_srv_stake_pos_delegate.h"
#include "dap_chain_net_srv_stake_lock.h"
@@ -350,6 +352,14 @@ int main( int argc, const char **argv )
log_it(L_ERROR, "Can't provide exchange capability");
}
+ if (dap_chain_net_srv_voting_init()) {
+ log_it(L_ERROR, "Can't provide voting capability");
+ }
+
+ if (dap_chain_net_srv_bridge_init()) {
+ log_it(L_ERROR, "Can't provide bridge capability");
+ }
+
if (dap_chain_net_srv_stake_lock_init()) {
log_it(L_ERROR, "Can't start stake lock service");
}
@@ -365,6 +375,10 @@ int main( int argc, const char **argv )
}
#ifndef _WIN32
+ if( dap_chain_net_srv_vpn_pre_init() ){
+ log_it(L_ERROR, "Can't pre-init vpn service");
+ }
+
if (sig_unix_handler_init(dap_config_get_item_str_default(g_config,
"resources",
"pid_path",
@@ -514,6 +528,8 @@ int main( int argc, const char **argv )
dap_chain_net_srv_xchange_deinit();
dap_chain_net_srv_stake_pos_delegate_deinit();
dap_chain_net_srv_stake_lock_deinit();
+ dap_chain_net_srv_bridge_deinit();
+ dap_chain_net_srv_voting_deinit();
dap_chain_net_deinit();
dap_global_db_deinit();
dap_chain_deinit();
diff --git a/version.mk b/version.mk
index 7e49db772..e0cfa213c 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
VERSION_MAJOR=5
VERSION_MINOR=3
-VERSION_PATCH=120
+VERSION_PATCH=121
--
GitLab