From c4d2d8b47f16238575dd794752275fe066c2ba15 Mon Sep 17 00:00:00 2001
From: Aleksey Feoktistov <aleksey.feoktistov@demlabs.net>
Date: Sun, 27 Mar 2022 08:45:32 +0000
Subject: [PATCH] features-5238
---
CMakeLists.txt | 12 ++++++------
cellframe-sdk | 2 +-
sources/main.c | 6 ++++++
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5858705..4703c08e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 5)
SET( CPACK_PACKAGE_VERSION_MINOR 1)
-SET( CPACK_PACKAGE_VERSION_PATCH 10)
+SET( CPACK_PACKAGE_VERSION_PATCH 11)
if (CMAKE_TARGET_ARCH MATCHES arm)
SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}")
@@ -48,15 +48,15 @@ endif()
if (WIN32)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos 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-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(BSD)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos 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-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(DARWIN)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos 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-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(ANDROID)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos 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-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
elseif(LINUX)
- set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
+ 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")
endif()
add_subdirectory(cellframe-sdk)
diff --git a/cellframe-sdk b/cellframe-sdk
index 48c77891..5a0ba58e 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 48c778917accea702f76a61b3c1ff18159616750
+Subproject commit 5a0ba58ea6dbbfd11d6659150b1589184b62ec23
diff --git a/sources/main.c b/sources/main.c
index 5f2c3282..c494bd52 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -77,6 +77,7 @@
#include "dap_chain_cs_blocks.h"
#include "dap_chain_cs_block_poa.h"
#include "dap_chain_cs_block_pos.h"
+#include "dap_chain_cs_block_ton.h"
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_poa.h"
#include "dap_chain_cs_dag_pos.h"
@@ -341,6 +342,11 @@ int main( int argc, const char **argv )
return -64;
}
+ if (dap_chain_cs_block_ton_init() != 0) {
+ log_it(L_CRITICAL,"Can't init dap chain blocks consensus TON module");
+ return -69;
+ }
+
if(dap_chain_gdb_init() != 0) {
log_it(L_CRITICAL, "Can't init dap chain gdb module");
return -71;
--
GitLab