From 76857041e3592b2d3a040a3001e23ed74b439e3a Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Sat, 6 Aug 2022 13:49:35 +0700
Subject: [PATCH] Porting changes from the wizard to work with new libraries
and changed libraries.
---
CMakeLists.txt | 28 ++++++++++++++++++++--------
modules/CMakeLists.txt | 11 ++++++++---
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9856b1fb28..e10449de20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,13 +10,19 @@ set(DAPSDK_MODULES "")
if(NOT DEFINED CELLFRAME_MODULES)
include (cmake/OS_Detection.cmake)
+ #if(LINUX)
+ # set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
+ #elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
+ # set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ #else()
+ # set(CELLFRAME_MODULES "core chains network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ #endif()
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake-pos-delegate srv-stake-lock srv-xchange")
+
if(LINUX)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
- elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
- else()
- set(CELLFRAME_MODULES "core chains network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ set(CELLFRAME_MODULES "${CELLFRAME_MODULES} modules-dynamic srv-vpn")
endif()
+
endif()
message("Cellframe modules: ${CELLFRAME_MODULES}")
@@ -231,9 +237,15 @@ if (CELLFRAME_MODULES MATCHES "srv-xchange")
endif()
# Enable service of delegated stake
-if (CELLFRAME_MODULES MATCHES "srv-stake")
- message("[+] Module 'srv-stake'")
- set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake)
+if (CELLFRAME_MODULES MATCHES "srv-stake-pos-delegate")
+ message("[+] Module 'srv-stake-pos-delegate'")
+ set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake_pos_delegate)
+endif()
+
+# Enable service of stake token
+if (CELLFRAME_MODULES MATCHES "srv-stake-lock")
+ message("[+] Module 'srv-stake-lock'")
+ set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake_lock)
endif()
# Enable service for dynamic modules
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 72ceb6de6d..6cb243e903 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -108,9 +108,14 @@ if (CELLFRAME_MODULES MATCHES "srv-xchange")
add_subdirectory(service/xchange)
endif()
-# Service of delegated stake
-if (CELLFRAME_MODULES MATCHES "srv-stake")
- add_subdirectory(service/stake)
+# Service for token staking
+if (CELLFRAME_MODULES MATCHES "srv-stake-lock")
+ add_subdirectory(service/stake_lock)
+endif()
+
+# Service for PoS stake delegation
+if (CELLFRAME_MODULES MATCHES "srv-stake-pos-delegate")
+ add_subdirectory(service/stake_pos_delegate)
endif()
# Support for dynamic modules
--
GitLab