Merge branch 'features-5238-r5.1' into 'release-5.1'

features-5238

See merge request !398

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)

cellframe-sdk @ 5a0ba58e

-Subproject commit 48c778917accea702f76a61b3c1ff18159616750
+Subproject commit 5a0ba58ea6dbbfd11d6659150b1589184b62ec23

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;