diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8261d8261863f738ff16aba01b979e4a631ea8a5..8ab05bbe8b7259a80225eb735bfb3a9be34a084d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
.deploy:
extends: .ci-polygon
- image: demlabs/amd64/debian-bullseye:cellframe-node
+ image: demlabs/amd64/debian-buster:linuxbuilder
stage: deploy
before_script: /opt/buildtools/prepare_environment.sh
@@ -38,20 +38,28 @@ macos-amd64:
script:
- ./prod_build/build.sh --target osx release
-linux-amd64-debian-bullseye-dbg:
+linux-amd64-debian-buster-dbg:
extends: .build
- image: demlabs/amd64/debian-bullseye:linuxbuilder
+ image: demlabs/amd64/debian-buster:linuxbuilder
before_script: /opt/buildtools/prepare_environment.sh amd64-linux
script:
- - ./prod_build/build.sh --target linux debug
+ - ./prod_build/build.sh --target linux debug -DBUILD_WITH_PYTHON_ENV=ON
- ./prod_build/pack.sh --target linux debug
-linux-amd64-debian-bullseye:
+linux-amd64-debian-buster-rwd:
extends: .build
- image: demlabs/amd64/debian-bullseye:linuxbuilder
+ image: demlabs/amd64/debian-buster:linuxbuilder
+ before_script: /opt/buildtools/prepare_environment.sh amd64-linux
+ script:
+ - ./prod_build/build.sh --target linux rwd -DBUILD_WITH_PYTHON_ENV=ON
+ - ./prod_build/pack.sh --target linux rwd
+
+linux-amd64-debian-buster:
+ extends: .build
+ image: demlabs/amd64/debian-buster:linuxbuilder
before_script: /opt/buildtools/prepare_environment.sh amd64-linux
script:
- - ./prod_build/build.sh --target linux release
+ - ./prod_build/build.sh --target linux release -DBUILD_WITH_PYTHON_ENV=ON
- ./prod_build/pack.sh --target linux release
linux-armhf-debian-bullseye:
@@ -75,13 +83,16 @@ linux-arm64-debian-bullseye:
deploy:
extends: .deploy
needs:
- - linux-amd64-debian-bullseye
- - linux-amd64-debian-bullseye-dbg
+ - linux-amd64-debian-buster
+ - linux-amd64-debian-buster-dbg
- linux-armhf-debian-bullseye
- linux-arm64-debian-bullseye
+ - linux-amd64-debian-buster-rwd
script:
- - /opt/buildtools/deploy_files.sh pub_cellframe linux/$CI_COMMIT_REF_NAME/ build_*/*.deb
+ - anybadge -l "node version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f node-version-badge.svg -c blue
+ - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ ./node-version-badge.svg || true
+ - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e834e0890ca3b162cd3c99a6c13d6f6bc8a0f57f..fa230135dcbf556a6afae09f7a9b34a61edf1f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.10)
project(cellframe-node C)
include(cellframe-sdk/cmake/ReadMKFile.cmake)
+include(FetchContent)
set(CMAKE_ENABLE_EXPORTS ON)
set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -15,6 +16,10 @@ SET( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
SET( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
SET( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+SET(DESTDIR "/opt/${PROJECT_NAME}")
+
#possible need be setted during crosscompily
#by default it uses dpkg --print-architecture
#we ok with it on native builds.
@@ -26,29 +31,22 @@ add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_
set(SUBMODULES_NO_BUILD ON)
include (cellframe-sdk/cmake/OS_Detection.cmake)
-
-#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)
-if(NOT WIN32)
+if (WIN32)
+ set(BUILD_WITH_GDB_DRIVER_MDBX OFF)
+else()
set(BUILD_WITH_GDB_DRIVER_MDBX ON)
endif()
+#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)
#set(BUILD_CRYPTO_TESTS ON)
-if(DARWIN)
- set(BUILD_PYTHON_FROM_SRC ON)
-else()
- set(BUILD_WITH_SYSTEM_PYTHON ON) #link with system python3. If OFF - will user prebuilds or src.
-endif()
-
-#set(BUILD_PYTHON_FROM_SRC ON) #build Python from sources; if OFF - will use a prebuilds.
-#set(BUILD_PYTHON_СUSTOM_LIBFFI ON) #use libffi from source archive.
-#set(BUILD_PYTHON_СUSTOM_ZLIB ON) #use zlib from source arcivie.
-#set(BUILD_PYTHON_СUSTOM_OPENSSL ON) #use openssl from source archive.
-#set(BUILD_PYTHON_SHARED OFF) #use python with shared lib (or link staticaly).
+set(BUILD_WITH_ZIP OFF)
if(LINUX)
-# set(SUPPORT_PYTHON_PLUGINS ON)
+set(BUILD_WITH_PYTHON_ENV ON)
+set(SUPPORT_PYTHON_PLUGINS ON)
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 OR DARWIN)
@@ -79,15 +77,13 @@ if(UNIX)
set(IMPORTSDIR ${BINDIR})
add_definitions("-DDAP_DARWIN_LIBRARY")
- else()
- SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
- SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
- SET(DESTDIR "/opt/${PROJECT_NAME}")
+
endif()
if(LINUX)
+ message("[*] Linux package setup")
SET( CPACK_GENERATOR "DEB")
SET( CPACK_SYSTEM_TYPE "${DEBIAN_OS_RELEASE_NAME}")
@@ -109,9 +105,13 @@ if(UNIX)
else()
set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CPACK_TARGET_ARCHITECTURE})
endif()
-
+
+ if ( CPACK_DEBIAN_PACKAGE_ARCHITECTURE MATCHES "arm")
+ SET( BUILD_WITH_PYTHON_ENV OFF )
+ endif()
+
if(NOT CPACK_SYSTEM_NAME)
- set(CPACK_SYSTEM_NAME ${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
+ set(CPACK_SYSTEM_NAME ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
endif()
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
@@ -122,7 +122,9 @@ if(UNIX)
if(CMAKE_BUILD_TYPE MATCHES Debug)
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-dbg" )
endif()
-
+ if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+ SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}-rwd" )
+ endif()
SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "CellFrame Node software https://cellframe.net" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "CellFrame Node" )
@@ -137,7 +139,7 @@ if(UNIX)
message("[*] Debian package setup pkgarch=${CPACK_DEBIAN_PACKAGE_ARCHITECTURE} version=${CPACK_PACKAGE_VERSION}")
SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
- "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;")
+ "${CMAKE_CURRENT_SOURCE_DIR}/os/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/os/debian/prerm;${CMAKE_CURRENT_SOURCE_DIR}/os/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/os/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/os/debian/config;")
elseif(BSD)
message("[*] BSD family system ${CMAKE_SYSTEM} ")
elseif(DARWIN)
@@ -216,219 +218,42 @@ if(UNIX AND NOT WIN32)
if (SUPPORT_PYTHON_PLUGINS)
message("[+] Build with python plugins support")
- add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDAP_SUPPORT_PYTHON_PLUGINS")
-
- set(PYTHON_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/python)
+ add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
- if (BUILD_WITH_SYSTEM_PYTHON)
- message("[!] Using system python")
- set(Python_ADDITIONAL_VERSION 3.9 3.8 3.7 3.6 3.5 3.4)
- find_package(PythonLibs REQUIRED)
-
- add_library( PYTHON_LIBRARY SHARED IMPORTED )
- set_target_properties( PYTHON_LIBRARY PROPERTIES IMPORTED_LOCATION ${PYTHON_LIBRARY})
-
- elseif (BUILD_PYTHON_FROM_SRC)
- message("[!] Building python from source")
- include(ExternalProject)
-
- set(LIBFFI_URL "https://pub.cellframe.net/3rdparty/python/libffi-3.3.tar.gz")
- set(LIBFFI_HASH "SHA256=72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056")
-
- set(ZLIB_URL "https://pub.cellframe.net/3rdparty/python/zlib-1.2.12.tar.gz")
- set(ZLIB_HASH "SHA256=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9")
-
- set(LIBSSL_URL "https://pub.cellframe.net/3rdparty/python/openssl-1.1.1o.tar.gz")
- set(LIBSSL_HASH "SHA256=9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f")
-
- if(LINUX)
- set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/Python-3.9.12.tgz")
- set(PYTHON_HASH "SHA256=70e08462ebf265012bd2be88a63d2149d880c73e53f1712b7bbbe93750560ae8")
- set(PYTHON_LIBNAME "python3.9")
- else()
- set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/Python-3.10.5.tgz")
- set(PYTHON_HASH "SHA256=18f57182a2de3b0be76dfc39fdcfd28156bb6dd23e5f08696f7492e9e3d0bf2d")
- set(PYTHON_LIBNAME "python3.10")
- endif()
-
- if(BUILD_PYTHON_СUSTOM_LIBFFI)
- message("[+] Building libffi from source")
-
- set(LIBFFI_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libffi)
- set(WRP_CFLAGS "-fPIC")
- set(WRP_CPPFLAGS "-fPIC")
-
- configure_file(cfg.python.wrapper.in ffi.cfg.wrapper.sh @ONLY)
-
- ExternalProject_Add(
- LIBFFI
- URL ${LIBFFI_URL}
- URL_HASH ${LIBFFI_HASH}
- PREFIX ${LIBFFI_PREFIX}
- INSTALL_DIR ${LIBFFI_PREFIX}
- BUILD_COMMAND ${MAKE}
- LOG_CONFIGURE ON
- LOG_BUILD ON
- LOG_OUTPUT_ON_FAILURE ON
- CONFIGURE_HANDLED_BY_BUILD ON
- CONFIGURE_COMMAND /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/ffi.cfg.wrapper.sh <SOURCE_DIR>/configure --disable-shared --prefix=${LIBFFI_PREFIX}
- )
-
-
- set(PYTHON_WRP_CFLAGS "${PYTHON_WRP_CFLAGS} -I${LIBFFI_PREFIX}/include")
- set(PYTHON_WRP_CPPFLAGS "${PYTHON_WRP_CPPFLAGS} -I${LIBFFI_PREFIX}/include")
-
-
- set(PYTHON_WRP_CFLAGS "${PYTHON_WRP_CFLAGS} ${LIBFFI_PREFIX}/lib/libffi.a")
- set(PYTHON_WRP_CPPFLAGS "${PYTHON_WRP_CPPFLAGS} ${LIBFFI_PREFIX}/lib/libffi.a")
- set(PYTHON_WRP_LDFLAGS "${PYTHON_WRP_LDFLAGS} ${LIBFFI_PREFIX}/lib/libffi.a")
- endif()
-
- if(BUILD_PYTHON_СUSTOM_ZLIB)
- message("[+] Building zlib from source")
-
- set(ZLIB_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/zlib)
- set(WRP_CFLAGS "-fPIC")
- set(WRP_CPPFLAGS "-fPIC")
-
- configure_file(cfg.python.wrapper.in zlib.cfg.wrapper.sh @ONLY)
-
- ExternalProject_Add(
- ZLIB
- URL ${ZLIB_URL}
- URL_HASH ${ZLIB_HASH}
- PREFIX ${ZLIB_PREFIX}
- INSTALL_DIR ${ZLIB_PREFIX}
- BUILD_COMMAND ${MAKE}
- LOG_CONFIGURE ON
- LOG_BUILD ON
- LOG_OUTPUT_ON_FAILURE ON
- CONFIGURE_HANDLED_BY_BUILD ON
- CONFIGURE_COMMAND /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/zlib.cfg.wrapper.sh <SOURCE_DIR>/configure --static --prefix=${ZLIB_PREFIX}
- )
-
- set(PYTHON_WRP_CFLAGS "${PYTHON_WRP_CFLAGS} -I${ZLIB_PREFIX}/include")
- set(PYTHON_WRP_CPPFLAGS "${PYTHON_WRP_CPPFLAGS} -I${ZLIB_PREFIX}/include")
- set(PYTHON_WRP_LDFLAGS "${PYTHON_WRP_LDFLAGS} -L${ZLIB_PREFIX}/lib/ ${ZLIB_PREFIX}/lib/libz.a")
-
- endif()
-
- if(BUILD_PYTHON_СUSTOM_OPENSSL)
-
- message("[+] Building openssl from source")
-
- set(LIBSSL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libssl)
-
- ExternalProject_Add(
- LIBSSL
- URL ${LIBSSL_URL}
- URL_HASH ${LIBSSL_HASH}
- PREFIX ${LIBSSL_PREFIX}
- INSTALL_DIR ${LIBSSL_PREFIX}
- BUILD_COMMAND ${MAKE}
- LOG_CONFIGURE ON
- LOG_BUILD ON
- LOG_OUTPUT_ON_FAILURE ON
- CONFIGURE_HANDLED_BY_BUILD ON
- CONFIGURE_COMMAND <SOURCE_DIR>/config --prefix=${LIBSSL_PREFIX}
- )
-
- set(WITH_OPENSSL "--with-openssl=${LIBSSL_PREFIX}")
-
- endif()
-
- if(CMAKE_BUILD_TYPE MATCHES Debug)
- #to fix pycore_byteswap.h not found error.
- set(PYTHON_WRP_CFLAGS "${PYTHON_WRP_CFLAGS} -I${PYTHON_PREFIX}/src/PYTHON/Include/internal/")
- set(PYTHON_WRP_CPPFLAGS "${PYTHON_WRP_CPPFLAGS} -I${PYTHON_PREFIX}/src/PYTHON/Include/internal/")
-
- if (BUILD_PYTHON_SHARED)
- message("[*] Building python as shared lib")
- set(PYTHON_LIBRARY ${CMAKE_BINARY_DIR}/python/lib/lib${PYTHON_LIBNAME}d.so)
- else()
- message("[*] Building python as static lib")
- set(PYTHON_LIBRARY ${CMAKE_BINARY_DIR}/python/lib/lib${PYTHON_LIBNAME}d.a)
- endif()
- set(PYTHON_INCLUDE_DIR ${PYTHON_PREFIX}/include/${PYTHON_LIBNAME}d)
- set(PYTHON_WITH_PYDEBUG "--with-pydebug")
- else()
- if (BUILD_PYTHON_SHARED)
- message("[*] Building python as shared lib")
- set(PYTHON_LIBRARY ${CMAKE_BINARY_DIR}/python/lib/lib${PYTHON_LIBNAME}.so)
- else()
- message("[*] Building python as static lib")
- set(PYTHON_LIBRARY ${CMAKE_BINARY_DIR}/python/lib/lib${PYTHON_LIBNAME}.a)
- endif()
- set(PYTHON_INCLUDE_DIR ${PYTHON_PREFIX}/include/${PYTHON_LIBNAME})
- endif()
-
- if(NOT BUILD_PYTHON_SHARED)
- set(PYTHON_SHARED "--disable-shared")
- else()
- set(PYTHON_SHARED "--enable-shared")
- endif()
-
- set(WRP_CFLAGS ${PYTHON_WRP_CFLAGS})
- set(WRP_CPPFLAGS ${PYTHON_WRP_CPPFLAGS})
- set(WRP_LDFLAGS ${PYTHON_WRP_LDFLAGS})
-
- configure_file(cfg.python.wrapper.in python.cfg.wrapper.sh @ONLY)
-
- ExternalProject_Add(
- PYTHON
- URL ${PYTHON_URL}
- URL_HASH ${PYTHON_HASH}
- PREFIX ${PYTHON_PREFIX}
- INSTALL_DIR ${PYTHON_PREFIX}
- BUILD_COMMAND ${MAKE}
- BUILD_BYPRODUCTS ${PYTHON_INCLUDE_DIR} ${PYTHON_LIBRARY}
- LOG_CONFIGURE ON
- LOG_BUILD ON
- LOG_OUTPUT_ON_FAILURE ON
- CONFIGURE_HANDLED_BY_BUILD ON
- CONFIGURE_COMMAND /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/python.cfg.wrapper.sh <SOURCE_DIR>/configure ${PYTHON_WITH_PYDEBUG} --with-ensurepip=install ${PYTHON_SHARED} ${WITH_OPENSSL} --prefix=${PYTHON_PREFIX}
+ if (BUILD_WITH_PYTHON_ENV)
+
+ message("[+] Build with python environment")
+ message(" Downloading static prebuild cpython3.7...")
+ #this python was build by compiling and installing static python distrip to /opt/cellframe-node/ and
+ # installing pip in it, then tared all back.
+ FetchContent_Declare(
+ CPython37Static
+ URL https://pub.cellframe.net/3rdparty/python/cpython.tar.xz
)
- if(NOT BUILD_PYTHON_SHARED)
- add_library( PYTHON_LIBRARY STATIC IMPORTED )
- else()
- add_library( PYTHON_LIBRARY SHARED IMPORTED )
- endif()
-
- set_target_properties( PYTHON_LIBRARY PROPERTIES IMPORTED_LOCATION ${PYTHON_LIBRARY})
-
- if(BUILD_PYTHON_СUSTOM_ZLIB)
- add_dependencies(PYTHON ZLIB)
- endif()
-
- if(BUILD_PYTHON_СUSTOM_OPENSSL)
- add_dependencies(PYTHON LIBSSL)
- endif()
+ FetchContent_MakeAvailable(CPython37Static)
- if(BUILD_PYTHON_СUSTOM_LIBFFI)
- add_dependencies(PYTHON LIBFFI)
- endif()
-
- if (BUILD_PYTHON_SHARED)
- set(CMAKE_SKIP_RPATH TRUE)
- set_target_properties(${NODE_TARGET} PROPERTIES LINK_FLAGS "-Wl,-rpath,\$ORIGIN/python/lib/")
- endif()
+ set(CMAKE_PREFIX_PATH ${cpython37static_SOURCE_DIR})
+
+ set(Python_ADDITIONAL_VERSIONS 3.7)
+ find_package(PythonLibs REQUIRED)
- add_dependencies(dap_core PYTHON)
+ add_definitions("-DDAP_BUILD_WITH_PYTHON_ENV")
+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} -lssl -lcrypto -lcrypt -lnsl -lz -lutil -lexpat )
+ else()
+ set(Python_ADDITIONAL_VERSION 3.9 3.8 3.7 3.6 3.5 3.4)
+ find_package(PythonLibs REQUIRED)
endif()
- get_target_property(PYTHON_LIBRARY_PATH PYTHON_LIBRARY IMPORTED_LOCATION)
-
message("[!] Python includes path: " ${PYTHON_INCLUDE_DIR})
message("[!] Python library path: " ${PYTHON_LIBRARY_PATH})
- include_directories(${PYTHON_INCLUDE_DIR})
- set(NODE_LIBRARIES ${NODE_LIBRARIES} dap_plugins_python PYTHON_LIBRARY -lutil)
-
+ include_directories(${PYTHON_INCLUDE_DIR} include/)
add_subdirectory(python-cellframe)
-
+
+ set(NODE_LIBRARIES ${NODE_LIBRARIES} dap_plugins_python ${PYTHON_LIBRARIES})
endif()
if(ANDROID )
@@ -436,8 +261,7 @@ if(UNIX AND NOT WIN32)
list(REMOVE_DUPLICATES ALL_LIBRARIES)
target_link_libraries(${NODE_TARGET} ${ALL_LIBRARIES})
else()
-
- target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )
+ target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )
target_link_libraries(${NODE_CLI_TARGET} ${NODE_CLI_LIBRARIES} pthread )
target_link_libraries(${NODE_TOOL_TARGET} ${NODE_TOOL_LIBRARIES} pthread )
endif()
@@ -452,33 +276,31 @@ endif()
if(DARWIN)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${SHAREDIR} FILES_MATCHING PATTERN "*" PATTERN "*")
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.darwin/ DESTINATION ${SHAREDIR} FILES_MATCHING PATTERN "*" PATTERN "*")
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR} )
INSTALL(TARGETS ${NODE_CLI_TARGET} DESTINATION ${BINDIR} )
INSTALL(TARGETS ${NODE_TOOL_TARGET} DESTINATION ${BINDIR} )
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ DESTINATION ${BINDIR} FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts.darwin/ DESTINATION ${BINDIR} FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
-
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ DESTINATION ${SHAREDIR} FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts.darwin/ DESTINATION ${SHAREDIR} FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
else()
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
if(LINUX)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.linux/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
- elseif(DARWIN)
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.darwin/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
elseif(BSD)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
endif()
-
+
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-
- if(UNIX AND NOT ANDROID)
- INSTALL(TARGETS ${NODE_CLI_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
- INSTALL(TARGETS ${NODE_TOOL_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-
- if (SUPPORT_PYTHON_PLUGINS AND NOT BUILD_WITH_SYSTEM_PYTHON) #install python environment if not system python in use
- INSTALL(DIRECTORY ${PYTHON_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin USE_SOURCE_PERMISSIONS)
+ INSTALL(TARGETS ${NODE_CLI_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+ INSTALL(TARGETS ${NODE_TOOL_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+
+ if(NOT ANDROID)
+ #install all python-specific files back to its original location
+ if (SUPPORT_PYTHON_PLUGINS AND BUILD_WITH_PYTHON_ENV)
+
+ INSTALL(FILES ${cpython37static_SOURCE_DIR}/bin/pip3 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/pip3 )
+ INSTALL(DIRECTORY ${cpython37static_SOURCE_DIR}/lib/python3.7 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ USE_SOURCE_PERMISSIONS)
endif()
endif()
diff --git a/cellframe-sdk b/cellframe-sdk
index 6bb7ffbf7b233181c093ae5a92887dd8be7f0424..c11ef834eb5d440d8f3f4d03c0823be8ac77986d 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 6bb7ffbf7b233181c093ae5a92887dd8be7f0424
+Subproject commit c11ef834eb5d440d8f3f4d03c0823be8ac77986d
diff --git a/debian b/debian
deleted file mode 120000
index 013cd0eeea68bdb27cd56ba520d09bbcde74ef5c..0000000000000000000000000000000000000000
--- a/debian
+++ /dev/null
@@ -1 +0,0 @@
-./prod_build/packaging/deb/
\ No newline at end of file
diff --git a/dist.darwin/etc/network/Backbone/chain-0.cfg b/dist.darwin/etc/network/Backbone/chain-0.cfg
deleted file mode 100755
index c620d2feb40c49503d5ef16b196d6b60f8e965de..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/Backbone/chain-0.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=0
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,ca,transaction]
-mempool_auto_types=[]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/scorpion/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=false
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0x6DD5EB423B94EECE44F6DA39D82D7BD2B4DD33744AC4DFB1D2E2971DAB40431A
-
-[dag-poa]
-auth_certs_prefix=scorpion.root
-auth_certs_number=5
-auth_certs_number_verify=3
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
-confirmations_timeout=60
-auto_confirmation=true
-auto_round_complete=true
-wait_sync_before_complete=120
diff --git a/dist.darwin/etc/network/Backbone/main.cfg b/dist.darwin/etc/network/Backbone/main.cfg
deleted file mode 100755
index 7584e7aa85c059d9d5be96acc2ff7f6ce7e894a3..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/Backbone/main.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-[chain]
-id=0x0000000000000002
-shard_id=0x0000000000000000
-name=main
-load_priority=2
-# Possible values [token, emission, transaction, ca]
-datum_types=[transaction]
-mempool_auto_types=[transaction]
-consensus=block_ton
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/scorpion/main/
-
-[blocks]
-is_celled=false
-
-is_static_genesis_event=true
-static_genesis_event=0xD3E07282FC1C4FC733AEE7898BA1017DF7659CA7B64047886FA12EDD82759C23
-
-[block-ton]
-stake_tokens=0
-stake_tokens_value=0
-# verifications_minimum=1
-
-ton_nodes_addrs=[DFAB::CDC2::A6BA::48FB,D05E::E083::A665::37A8,BC53::9462::EF3A::E47D]
-auth_certs_prefix=scorpion.master
-auth_certs_number=3
-consensus_debug=false
-validators_list_by_stake=false
-round_start_sync_timeout=10
-round_start_multiple_of=35
-allowed_clock_offset=10
-session_idle_min=10
-round_candidates_max=5
-next_candidate_delay=2
-round_attempts_max=5
-round_attempt_duration=20
-first_message_delay=2
-my_candidate_attempts_max=2
diff --git a/dist.darwin/etc/network/kelvpn-minkowski/chain-0.cfg b/dist.darwin/etc/network/kelvpn-minkowski/chain-0.cfg
deleted file mode 100755
index 7949727e3d85fa18c8e755785ebd96fed0749412..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/kelvpn-minkowski/chain-0.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=0
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,ca,transaction]
-mempool_auto_types=[emission,ca,transaction]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/kelvpn-minkowski/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=false
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0xD5FF5786E048ECF7B70C245D3E4EDE007F0495D108D0D29C4EC34B207E776F09
-
-[dag-poa]
-auth_certs_prefix=kelvpn-minkowski.root
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
-
-auth_certs_number=3
-auth_certs_number_verify=2
-confirmations_timeout=300
-auto_confirmation=true
-auto_round_complete=true
-wait_sync_before_complete=180
diff --git a/dist.darwin/etc/network/kelvpn-minkowski/support-chain.cfg b/dist.darwin/etc/network/kelvpn-minkowski/support-chain.cfg
deleted file mode 100755
index 5fe586fb285ef759ae7efd619053479ff42fe057..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/kelvpn-minkowski/support-chain.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-[chain]
-id=0x0000000000000001
-shard_id=0x0000000000000000
-name=support
-load_priority=1
-# Possible values [token, emission, transaction, ca]
-datum_types=[ca,transaction]
-# mempool_auto_types=[transaction]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/kelvpn-minkowski/support/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=false
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0x76C4EC7B555FD41694941F994C769442AB1BC3883A4B124ECBAB9D3296F09C59
-
-[dag-poa]
-auth_certs_prefix=kelvpn-minkowski.root
-auth_certs_number=3
-auth_certs_number_verify=2
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
-confirmations_timeout=300
-auto_confirmation=true
-auto_round_complete=true
-wait_sync_before_complete=180
diff --git a/dist.darwin/etc/network/mileena/chain-0.cfg b/dist.darwin/etc/network/mileena/chain-0.cfg
deleted file mode 100644
index 891b9ac4d9fb256621c35496f3b29b97d7370b1e..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/mileena/chain-0.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=0
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,ca,transaction]
-mempool_auto_types=[]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/mileena/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=false
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0xB168ACEA8542A1011D808013B9BE4924B0157B118944FE8785ED42943118BF2E
-
-[dag-poa]
-auth_certs_prefix=mileena
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
-auth_certs_number=5
-confirmations_timeout=60
-auto_confirmation=true
-auto_round_complete=true
-wait_sync_before_complete=120
-auth_certs_number_verify=3
diff --git a/dist.darwin/etc/network/subzero/chain-0.cfg b/dist.darwin/etc/network/subzero/chain-0.cfg
deleted file mode 100644
index 7a26761acea1de9dcc6e0b2f273d616fd5dc92f9..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/subzero/chain-0.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-[chain]
-id=0x0000000000000000
-shard_id=0x0000000000000000
-name=zerochain
-load_priority=1
-# Possible values [token, emission, transaction]
-datum_types=[token,emission,ca,transaction]
-mempool_auto_types=[emission,ca,transaction]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/subzero/zerochain/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=true
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0x17546F64F432EA2C5166C3710C1777F135FF8D70D7EE4D52157B9A05F8A580A1
-
-[dag-poa]
-auth_certs_prefix=subzero.cellframe.root
-auth_certs_number=5
-auth_certs_number_verify=1
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
diff --git a/dist.darwin/etc/network/subzero/support-chain.cfg b/dist.darwin/etc/network/subzero/support-chain.cfg
deleted file mode 100644
index 8147229a205a461eea2207255ae5767bf1619460..0000000000000000000000000000000000000000
--- a/dist.darwin/etc/network/subzero/support-chain.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-[chain]
-id=0x0000000000000001
-shard_id=0x0000000000000000
-name=support
-load_priority=1
-# Possible values [token, emission, transaction]
-datum_types=[ca,transaction]
-mempool_auto_types=[transaction]
-consensus=dag_poa
-
-[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/subzero/support/
-
-[dag]
-is_single_line=true
-is_celled=false
-is_add_directly=true
-datum_add_hashes_count=1
-
-is_static_genesis_event=true
-static_genesis_event=0x53587B7B6D1E1234005DC1053A5A3C8CA1FA496560A8BB91D4D99BBB83F0C1B2
-
-[dag-poa]
-auth_certs_prefix=subzero.cellframe.root
-auth_certs_number=5
-auth_certs_number_verify=1
-auth_certs_dir=/Applications/Cellframe.app/Contents/Resources/share/ca
diff --git a/dist.linux/share/cellframe-node.service b/dist.linux/share/cellframe-node.service
index b6f3539a3ea134b4d8267f1c11e920fc595af292..6d2953861482ce2c83931cdcb11a6c1c6e61d69e 100644
--- a/dist.linux/share/cellframe-node.service
+++ b/dist.linux/share/cellframe-node.service
@@ -1,14 +1,23 @@
[Unit]
Description=Cellframe Node
-After=network-online.target
+After=network.target
[Service]
+#Type=forking
+#OOMScoreAdjust=-1000
+#PIDFile=/opt/cellframe-node/var/run/cellframe-node.pid
WorkingDirectory=/opt/cellframe-node
ExecStart=/opt/cellframe-node/bin/cellframe-node &
+#ExecStop=/opt/cellframe-node/bin/cellframe-node --stop
ExecStop=/bin/kill -SIGTERM $MAINPID
Restart=always
#User=cellframe-node
#Group=cellframe-node
+User=root
+Group=root
+RestartSec=10
+LogNamespace=cellframe
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_IPC_LOCK CAP_KILL CAP_LEASE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RAWIO CAP_SYSLOG CAP_WAKE_ALARM CAP_SYS_RESOURCE CAP_DAC_READ_SEARCH
[Install]
WantedBy=multi-user.target
diff --git a/dist.linux/share/logrotate/cellframe-node b/dist.linux/share/logrotate/cellframe-node
index 651aa354e1130e8774daa728b8a7b4dd073350f4..134d4448aacffe5940a1aa82b123ab1624d8d304 100644
--- a/dist.linux/share/logrotate/cellframe-node
+++ b/dist.linux/share/logrotate/cellframe-node
@@ -1,9 +1,9 @@
"/opt/cellframe-node/var/log/*.log" {
copytruncate
- daily
- rotate 7
+ hourly
+ maxsize 10M
+ rotate 4
compress
- delaycompress
missingok
notifempty
}
diff --git a/dist.linux/share/logrotate/logrotate.timer b/dist.linux/share/logrotate/logrotate.timer
new file mode 100644
index 0000000000000000000000000000000000000000..115cf9cbdb88547e89d9fa1f0a31ef9ff4df1160
--- /dev/null
+++ b/dist.linux/share/logrotate/logrotate.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hourly rotation of log files
+Documentation=man:logrotate(8) man:logrotate.conf(5)
+
+[Timer]
+OnCalendar=hourly
+AccuracySec=1m
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/dist.linux/etc/network/Backbone/chain-0.cfg b/dist/etc/network/Backbone/chain-0.cfg
similarity index 90%
rename from dist.linux/etc/network/Backbone/chain-0.cfg
rename to dist/etc/network/Backbone/chain-0.cfg
index 15e592378d96d8bf1403c1a88ab114204e4343fc..4ea76e19afd2b7c0963427d1bb5ccdf5f6e04cbd 100755
--- a/dist.linux/etc/network/Backbone/chain-0.cfg
+++ b/dist/etc/network/Backbone/chain-0.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/scorpion/zerochain/
+storage_dir=../../../var/lib/network/scorpion/zerochain/
[dag]
is_single_line=true
diff --git a/dist.linux/etc/network/Backbone/main.cfg b/dist/etc/network/Backbone/main.cfg
similarity index 84%
rename from dist.linux/etc/network/Backbone/main.cfg
rename to dist/etc/network/Backbone/main.cfg
index 1cad79bf7a09ff95e614920ffc9f1db2ca80f45a..63bd69a84d365d4f5efe96de3b3a131dacb96a22 100755
--- a/dist.linux/etc/network/Backbone/main.cfg
+++ b/dist/etc/network/Backbone/main.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[transaction]
consensus=block_ton
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/scorpion/main/
+storage_dir=../../../var/lib/network/scorpion/main/
[blocks]
is_celled=false
@@ -22,7 +22,7 @@ stake_tokens=0
stake_tokens_value=0
# verifications_minimum=1
-ton_nodes_addrs=[DFAB::CDC2::A6BA::48FB,D05E::E083::A665::37A8,BC53::9462::EF3A::E47D]
+ton_nodes_addrs=[DFAB::CDC2::A6BA::48FB]
auth_certs_prefix=scorpion.master
auth_certs_number=3
consensus_debug=false
diff --git a/dist.linux/etc/network/kelvpn-minkowski/chain-0.cfg b/dist/etc/network/kelvpn-minkowski/chain-0.cfg
similarity index 90%
rename from dist.linux/etc/network/kelvpn-minkowski/chain-0.cfg
rename to dist/etc/network/kelvpn-minkowski/chain-0.cfg
index 2bb9878a5108523175eed17c62a234ca5175e7a8..924844f92ae5563acf9965a826789f2bb20b9e33 100755
--- a/dist.linux/etc/network/kelvpn-minkowski/chain-0.cfg
+++ b/dist/etc/network/kelvpn-minkowski/chain-0.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[emission,ca,transaction]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/kelvpn-minkowski/zerochain/
+storage_dir=../../../var/lib/network/kelvpn-minkowski/zerochain/
[dag]
is_single_line=true
diff --git a/dist.darwin/etc/network/mileena/main.cfg b/dist/etc/network/kelvpn-minkowski/main.cfg
old mode 100644
new mode 100755
similarity index 60%
rename from dist.darwin/etc/network/mileena/main.cfg
rename to dist/etc/network/kelvpn-minkowski/main.cfg
index 76681094ae32ef8f54f9052857ab007d8ac34a4c..74aa662a833a49f3df59f78ec3247f205ca7b3e9
--- a/dist.darwin/etc/network/mileena/main.cfg
+++ b/dist/etc/network/kelvpn-minkowski/main.cfg
@@ -2,28 +2,29 @@
id=0x0000000000000001
shard_id=0x0000000000000000
name=main
-load_priority=2
+load_priority=1
# Possible values [token, emission, transaction, ca]
datum_types=[transaction]
+default_datum_types=[transaction]
mempool_auto_types=[transaction]
consensus=block_ton
[files]
-storage_dir=/Applications/Cellframe.app/Contents/Resources/var/lib/network/mileena/main/
+storage_dir=../../../var/lib/network/kelvpn-minkowski/main/
[blocks]
is_celled=false
is_static_genesis_event=true
-static_genesis_event=0x7D77B753251CE8FE438C0ACA7BD1B7237FD07F35A751625D3665D4B7B5764181
+static_genesis_event=0x5C6C3BDD89F7317A1E3D01E6C440021D81C17F16431ECF3D2BFCA0BE50143728
[block-ton]
-ton_nodes_addrs=[0661::D8DA::7DD7::28C2,EBBE::EE39::8E03::B881,FBB5::EB29::C205::8A4A]
-auth_certs_prefix=mileena
-auth_certs_number=3
+ton_nodes_addrs=[1234::0000::0000::0000]
+auth_certs_prefix=minkowski.master
+auth_certs_number=2
stake_tokens=0
stake_tokens_value=0
-consensus_debug=false
+consensus_debug=true
validators_list_by_stake=false
round_start_sync_timeout=10
round_start_multiple_of=35
@@ -32,6 +33,6 @@ session_idle_min=10
round_candidates_max=5
next_candidate_delay=2
round_attempts_max=5
-round_attempt_duration=20
+round_attempt_duration=45
first_message_delay=2
my_candidate_attempts_max=2
diff --git a/dist.linux/etc/network/kelvpn-minkowski/support-chain.cfg b/dist/etc/network/kelvpn-minkowski/support-chain.cfg
similarity index 90%
rename from dist.linux/etc/network/kelvpn-minkowski/support-chain.cfg
rename to dist/etc/network/kelvpn-minkowski/support-chain.cfg
index 1ba3c3c6c3de8959268a989d48f1c99b06b2727e..edbaed8dd142b13f015a6d1bf1e0ce41c0cb30df 100755
--- a/dist.linux/etc/network/kelvpn-minkowski/support-chain.cfg
+++ b/dist/etc/network/kelvpn-minkowski/support-chain.cfg
@@ -9,7 +9,7 @@ datum_types=[ca,transaction]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/kelvpn-minkowski/support/
+storage_dir=../../../var/lib/network/kelvpn-minkowski/support/
[dag]
is_single_line=true
diff --git a/dist.linux/etc/network/mileena/chain-0.cfg b/dist/etc/network/mileena/chain-0.cfg
similarity index 62%
rename from dist.linux/etc/network/mileena/chain-0.cfg
rename to dist/etc/network/mileena/chain-0.cfg
index 627c2dc6ea10f0498ad09814dc8d498699385e6e..d79120e241fa161bd72d382d23987e7758c99796 100644
--- a/dist.linux/etc/network/mileena/chain-0.cfg
+++ b/dist/etc/network/mileena/chain-0.cfg
@@ -3,13 +3,13 @@ id=0x0000000000000000
shard_id=0x0000000000000000
name=zerochain
load_priority=0
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,ca,transaction]
-mempool_auto_types=[]
+# Possible values [token, emission, shard, transaction, ca]
+datum_types=[token,emission,shard,ca,transaction]
+mempool_auto_types=[emission,ca,transaction]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/mileena/zerochain/
+storage_dir=../../../var/lib/network/mileena/zerochain/
[dag]
is_single_line=true
@@ -22,10 +22,9 @@ static_genesis_event=0xB168ACEA8542A1011D808013B9BE4924B0157B118944FE8785ED42943
[dag-poa]
auth_certs_prefix=mileena
-auth_certs_dir=/opt/cellframe-node/share/ca
-auth_certs_number=5
+auth_certs_number=2
+auth_certs_number_verify=1
confirmations_timeout=60
auto_confirmation=true
auto_round_complete=true
wait_sync_before_complete=120
-auth_certs_number_verify=3
diff --git a/dist.linux/etc/network/mileena/main.cfg b/dist/etc/network/mileena/main.cfg
similarity index 78%
rename from dist.linux/etc/network/mileena/main.cfg
rename to dist/etc/network/mileena/main.cfg
index 1bd09dade90ce3069460828b6a51e37f31014c13..f1a28ad99db1d6cf2c675ae28edf926f45dedbad 100644
--- a/dist.linux/etc/network/mileena/main.cfg
+++ b/dist/etc/network/mileena/main.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[transaction]
consensus=block_ton
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/mileena/main/
+storage_dir=../../../var/lib/network/mileena/main/
[blocks]
is_celled=false
@@ -17,9 +17,9 @@ is_static_genesis_event=true
static_genesis_event=0x7D77B753251CE8FE438C0ACA7BD1B7237FD07F35A751625D3665D4B7B5764181
[block-ton]
-ton_nodes_addrs=[0661::D8DA::7DD7::28C2,EBBE::EE39::8E03::B881,FBB5::EB29::C205::8A4A]
-auth_certs_prefix=mileena
-auth_certs_number=3
+ton_nodes_addrs=[CCCC::1234::0000::0000,CCCC::1234::0000::0001]
+auth_certs_prefix=mileena.master
+auth_certs_number=2
stake_tokens=0
stake_tokens_value=0
diff --git a/dist.linux/etc/network/subzero/chain-0.cfg b/dist/etc/network/subzero/chain-0.cfg
similarity index 90%
rename from dist.linux/etc/network/subzero/chain-0.cfg
rename to dist/etc/network/subzero/chain-0.cfg
index 43eeb1d8bf6232e43ea437687282d6104e722121..d60d2341cb9710927defb98bd357095d2eade8bc 100644
--- a/dist.linux/etc/network/subzero/chain-0.cfg
+++ b/dist/etc/network/subzero/chain-0.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[emission,ca,transaction]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/subzero/zerochain/
+storage_dir=../../../var/lib/network/subzero/zerochain/
[dag]
is_single_line=true
diff --git a/dist.linux/etc/network/subzero/support-chain.cfg b/dist/etc/network/subzero/support-chain.cfg
similarity index 90%
rename from dist.linux/etc/network/subzero/support-chain.cfg
rename to dist/etc/network/subzero/support-chain.cfg
index 8d544c5fe417db3dda1545be8ef8419d70fcef95..e6708d4b35fe4e4fe3169b44458cf7442253f900 100644
--- a/dist.linux/etc/network/subzero/support-chain.cfg
+++ b/dist/etc/network/subzero/support-chain.cfg
@@ -9,7 +9,7 @@ mempool_auto_types=[transaction]
consensus=dag_poa
[files]
-storage_dir=/opt/cellframe-node/var/lib/network/subzero/support/
+storage_dir=../../../var/lib/network/subzero/support/
[dag]
is_single_line=true
diff --git a/dist/share/ca/kelvpn-minkowski.root.0.pub.dcert b/dist/share/ca/kelvpn-minkowski.root.0.pub.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..74c0f8d2cf1f045cb60b7d20abf32aa0af8cf038
Binary files /dev/null and b/dist/share/ca/kelvpn-minkowski.root.0.pub.dcert differ
diff --git a/dist/share/ca/kelvpn-minkowski.root.1.pub.dcert b/dist/share/ca/kelvpn-minkowski.root.1.pub.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..eb03a5259f6801d2656151ea3c811975b295223b
Binary files /dev/null and b/dist/share/ca/kelvpn-minkowski.root.1.pub.dcert differ
diff --git a/dist/share/ca/kelvpn-minkowski.root.2.pub.dcert b/dist/share/ca/kelvpn-minkowski.root.2.pub.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..c647db63f1a69143306dc280c4c3c59f18c1c138
Binary files /dev/null and b/dist/share/ca/kelvpn-minkowski.root.2.pub.dcert differ
diff --git a/dist/share/ca/mileena.master.0.dcert b/dist/share/ca/mileena.master.0.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..573003c682d1711dd4d2ba19a60cad3142185293
Binary files /dev/null and b/dist/share/ca/mileena.master.0.dcert differ
diff --git a/dist/share/ca/mileena.master.1.dcert b/dist/share/ca/mileena.master.1.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..f25f0ef2781f82b9c5b0e32ab5d06a485810360b
Binary files /dev/null and b/dist/share/ca/mileena.master.1.dcert differ
diff --git a/dist/share/ca/minkowski.master.0.dcert b/dist/share/ca/minkowski.master.0.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..2a984eef2f3f25655c4471bdf7e4af44af12309d
Binary files /dev/null and b/dist/share/ca/minkowski.master.0.dcert differ
diff --git a/dist/share/ca/minkowski.master.1.dcert b/dist/share/ca/minkowski.master.1.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..f8d1911a59295648e7d3de9db530638114fdfc55
Binary files /dev/null and b/dist/share/ca/minkowski.master.1.dcert differ
diff --git a/dist/share/ca/minkowski.master.2.dcert b/dist/share/ca/minkowski.master.2.dcert
new file mode 100755
index 0000000000000000000000000000000000000000..31763bc57a2665c511ccdb43b40b9cb4055b42a4
Binary files /dev/null and b/dist/share/ca/minkowski.master.2.dcert differ
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index 32c27b944a228b831fa21b3da7e4251724f5a098..028e0ae2f6844efd61a78a95d35323beb0498efe 100644
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -31,6 +31,13 @@ listen_port_tcp={SERVER_PORT}
# If not set - used listen_port_tcp for node table auto fill
#ext_port_tcp=8089
+[notify_server]
+# Listening path have priority above listening address
+#listen_path={PREFIX}/var/run/node_notify
+#listen_path_mode=600
+listen_address={NOTIFY_SRV_ADDR}
+listen_port={NOTIFY_SRV_PORT}
+
[stream]
# For now its IAES but thats depricated
#preferred_encryption=SALSA2012
@@ -65,8 +72,8 @@ pricelist=[]
# Mempool
[mempool]
-# Automaticaly should be true for master ad root node role
-# auto_proc=false
+# Automaticaly false, for enabling need role master or higher
+auto_proc=false
# Chain network settings
[chain_net]
@@ -76,6 +83,7 @@ pricelist=[]
# Uncomment to have more debug information in stream channel Chain
# False by default
#debug_more=true
+ban_list_sync_groups=[*.orders-test-stat]
# Number of hashes packed into the one update packet
# Increase it to reduce update latency
@@ -118,7 +126,8 @@ log_file={PREFIX}/var/log/cellframe-node.log
wallets_path={PREFIX}/var/lib/wallet
ca_folders=[{PREFIX}/var/lib/ca,{PREFIX}/share/ca]
dap_global_db_path={PREFIX}/var/lib/global_db
-dap_global_db_driver=sqlite3
+#global_db_driver=mdbx
+#global_db_drvmode_async=false
# Plugins
#[plugins]
diff --git a/dist/share/configs/network/Backbone.cfg.tpl b/dist/share/configs/network/Backbone.cfg.tpl
index a7b983993527d33ee3a6fabb84bbdd5c7e8ab16b..1e68cc4124a9ba897e6cdc9bb7b22bcc5c43d899 100755
--- a/dist/share/configs/network/Backbone.cfg.tpl
+++ b/dist/share/configs/network/Backbone.cfg.tpl
@@ -21,11 +21,11 @@ require_links=3
#acl_accept_ca_chains=all
-#[dag-poa]
-#events-sign-cert=mycert0
+[dag-poa]
+#events-sign-cert=scorpion.root.0
-#[block-ton]
-#blocks-sign-cert=mycert1
+[block-ton]
+#blocks-sign-cert=scorpion.root.0
#[block-poa]
-#blocks-sign-cert=mycert2
+#blocks-sign-cert=mycert
diff --git a/dist/share/configs/network/kelvpn-minkowski.cfg.tpl b/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
index 78071d5d76aa5444451daecac4f89d0fc0a7252a..3cce75dff05bc371d4e970c103367e397725a5aa 100755
--- a/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
+++ b/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
@@ -10,7 +10,9 @@ node-role={NODE_TYPE}
seed_nodes_aliases=[minkowski.kelvpn.root.0,minkowski.kelvpn.root.1,minkowski.kelvpn.root.2]
seed_nodes_hostnames=[0.root.minkowski.kelvpn.com,1.root.minkowski.kelvpn.com,2.root.minkowski.kelvpn.com]
seed_nodes_addrs=[AAAA::0000::0000::0000,AAAA::0000::0000::0001,AAAA::0000::0000::0002]
-seed_nodes_port=[8099,8099,8099]
+seed_nodes_port=[8090,8090,8090]
+
+private=false
#[auth]
#type=ca
@@ -20,7 +22,9 @@ seed_nodes_port=[8099,8099,8099]
#[dag-poa]
-#events-sign-cert=mycert0
+#events-sign-cert=kelvpn-minkowski.root.0
+
+#[block-ton]
+#blocks-sign-cert=minkowski.master.pvt.0
+
-#[block-poa]
-#blocks-sign-cert=mycert1
diff --git a/dist/share/configs/network/mileena.cfg.tpl b/dist/share/configs/network/mileena.cfg.tpl
index e84228393ef5417cb14b1079d77b77d31b2ff2bf..af1ec45f000428cfa807e1bc56f7a595630a894c 100644
--- a/dist/share/configs/network/mileena.cfg.tpl
+++ b/dist/share/configs/network/mileena.cfg.tpl
@@ -2,16 +2,19 @@
# General section
[general]
+gdb_sync_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002]
id=0x000000000000cccc
name=mileena
gdb_groups_prefix=mileena
# Possible values: light, full, archive, master, root
node-role={NODE_TYPE}
-seed_nodes_aliases=[0.root.mileena,1.root.mileena,2.root.mileena,3.root.mileena,4.root.mileena]
-seed_nodes_hostnames=[0.root.mileena.cellframe.net,1.root.mileena.cellframe.net,2.root.mileena.cellframe.net,3.root.mileena.cellframe.net,4.root.mileena.cellframe.net]
-seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002,CCCC::0000::0000::0003,CCCC::0000::0000::0004]
-seed_nodes_port=[8079,8079,8079,8079,8079]
-require_links=4
+seed_nodes_aliases=[0.root.mileena,1.root.mileena,2.root.mileena]
+seed_nodes_hostnames=[0.root.mileena.cellframe.net,1.root.mileena.cellframe.net,2.root.mileena.cellframe.net]
+seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002]
+seed_nodes_port=[8099,8099,8099]
+require_links=2
+
+private=false
#[auth]
#type=ca
@@ -21,10 +24,10 @@ require_links=4
#[dag-poa]
-#events-sign-cert=mycert0
+#events-sign-cert=mileena.0.root
#[block-ton]
-#blocks-sign-cert=mycert1
+#blocks-sign-cert=mileena.0.master
#[block-poa]
-#blocks-sign-cert=mycert2
\ No newline at end of file
+#blocks-sign-cert=mycert
diff --git a/dist/share/configs/network/subzero.cfg.tpl b/dist/share/configs/network/subzero.cfg.tpl
index 5c72f2b76996530122a31c872c569b643ac87b4e..6c29d44e132748af7641043ef2071277752c68c7 100755
--- a/dist/share/configs/network/subzero.cfg.tpl
+++ b/dist/share/configs/network/subzero.cfg.tpl
@@ -12,6 +12,8 @@ seed_nodes_hostnames=[0.root.subzero.cellframe.net,1.root.subzero.cellframe.net,
seed_nodes_addrs=[ACCA::0000::0000::0001,ACCA::0000::0000::0002,ACCA::0000::0000::0003,ACCA::0000::0000::0004,ACCA::0000::0000::0005]
seed_nodes_port=[8099,8099,8099,8099,8099]
+private=false
+
#[auth]
#type=ca
#acl_accept_ca_list=[]
diff --git a/os/debian/config b/os/debian/config
new file mode 100755
index 0000000000000000000000000000000000000000..47ad739daed123b6de28f9ce0b20f4425bb0a5fb
--- /dev/null
+++ b/os/debian/config
@@ -0,0 +1,71 @@
+#!/bin/bash -e
+. /usr/share/debconf/confmodule
+
+
+case "$1" in
+reconfigure|configure)
+
+ db_input critical cellframe-node/auto_online || true
+ db_go || true
+
+ db_input critical cellframe-node/debug_mode || true
+ db_go || true
+
+ db_input critical cellframe-node/server_enabled || true
+ db_go || true
+
+ db_input critical cellframe-node/server_addr || true
+ db_go || true
+
+ db_input critical cellframe-node/server_port || true
+ db_go || true
+
+ db_input critical cellframe-node/notify_srv_addr || true
+ db_go || true
+
+ db_input critical cellframe-node/notify_srv_port || true
+ db_go || true
+
+ db_input critical cellframe-node/subzero_enabled || true
+ db_go || true
+
+ db_get cellframe-node/subzero_enabled
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/subzero_node_type || true
+ db_go || true
+ fi
+
+ db_input critical cellframe-node/kelvpn_minkowski_enabled || true
+ db_go || true
+
+ db_get cellframe-node/kelvpn_minkowski_enabled
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/kelvpn_minkowski_node_type || true
+ db_go || true
+ fi
+
+ db_input critical cellframe-node/backbone_enabled || true
+ db_go || true
+
+ db_get cellframe-node/backbone_enabled
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/backbone_node_type || true
+ db_go || true
+ fi
+
+ db_input critical cellframe-node/enable_python_plugins || true
+ db_go || true
+
+ db_get cellframe-node/enable_python_plugins
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/python_plugins_path || true
+ db_go || true
+ fi
+;;
+*)
+ echo "config called with unknown argument \`$1'" >&2
+ exit 1
+;;
+esac
+
+
diff --git a/os/debian/postinst b/os/debian/postinst
new file mode 100755
index 0000000000000000000000000000000000000000..205c338db41291255bc7771b83efc8290adc72ab
--- /dev/null
+++ b/os/debian/postinst
@@ -0,0 +1,199 @@
+#!/bin/bash -e
+. /usr/share/debconf/confmodule
+
+DAP_CHAINS_NAME="cellframe"
+DAP_APP_NAME="$DAP_CHAINS_NAME-node"
+DAP_PREFIX="/opt/$DAP_APP_NAME"
+
+DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl"
+
+# Store write config to new if present smth
+DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
+
+# Check profile.d symlink
+
+[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] || ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh
+
+# Init node config
+if [ -e "$DAP_CFG" ]; then
+ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg.dpkg-new"
+else
+ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
+fi
+
+cat $DAP_CFG_TPL > $DAP_CFG || true
+
+sed -i "s/{PREFIX}/\/opt\/$DAP_APP_NAME/g" $DAP_CFG || true
+
+db_get cellframe-node/debug_mode || true
+sed -i "s/{DEBUG_MODE}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/auto_online || true
+sed -i "s/{AUTO_ONLINE}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/server_enabled || true
+sed -i "s/{SERVER_ENABLED}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/server_port || true
+sed -i "s/{SERVER_PORT}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/server_addr || true
+sed -i "s/{SERVER_ADDR}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/notify_srv_addr || true
+sed -i "s/{NOTIFY_SRV_ADDR}/$RET/g" $DAP_CFG || true
+
+db_get cellframe-node/notify_srv_port || true
+sed -i "s/{NOTIFY_SRV_PORT}/$RET/g" $DAP_CFG || true
+
+# Init subzero
+NET_NAME="subzero"
+
+db_get cellframe-node/subzero_enabled || true
+if [ "$RET" = "true" ]; then
+ DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
+ DAP_NET_CFG=""
+ if [ -e "$DAP_CFG_NET" ]; then
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
+ else
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ fi
+
+ cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
+ db_get cellframe-node/subzero_node_type || true
+ NODE_TYPE=$RET
+ sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
+ echo "[*] Enabled subzero"
+fi
+
+# Init mileena
+NET_NAME="mileena"
+
+db_get cellframe-node/mileena_enabled || true
+if [ "$RET" = "true" ]; then
+ DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
+ DAP_NET_CFG=""
+ if [ -e "$DAP_CFG_NET" ]; then
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
+ else
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ fi
+
+ cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
+ db_get cellframe-node/mileena_node_type || true
+ NODE_TYPE=$RET
+ sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
+ echo "[*] Enabled mileena"
+fi
+
+# Init Minkowski
+NET_NAME="kelvpn-minkowski"
+
+db_get cellframe-node/kelvpn_minkowski_enabled || true
+if [ "$RET" = "true" ]; then
+ DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
+ DAP_NET_CFG=""
+ if [ -e "$DAP_CFG_NET" ]; then
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
+ else
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ fi
+
+ cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
+ db_get cellframe-node/kelvpn_minkowski_node_type || true
+ NODE_TYPE=$RET
+ sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
+ echo "[*] Enabled subzero"
+fi
+
+# Init Backbone
+NET_NAME="Backbone"
+
+db_get cellframe-node/backbone_enabled || true
+if [ "$RET" = "true" ]; then
+ DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
+ DAP_NET_CFG=""
+ if [ -e "$DAP_CFG_NET" ]; then
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
+ else
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ fi
+
+ cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
+ db_get cellframe-node/backbone_node_type || true
+ NODE_TYPE=$RET
+ sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
+ echo "[*] Enabled Backbone"
+fi
+
+mkdir -p $DAP_PREFIX/var/log || true
+mkdir -p $DAP_PREFIX/var/plugins || true
+
+#Set up Python plugins
+db_get cellframe-node/enable_python_plugins || true
+if [ "$RET" = "true" ]; then
+ sed -i 's/#\[plugins\]/\[plugins\]/g' $DAP_CFG || true
+ sed -i 's/#py_load=.*/py_load=true/g' $DAP_CFG || true
+ db_get cellframe-node/python_plugins_path || true
+ sed -i "s|#py_path=.*|py_path=$RET|g" $DAP_CFG || true
+ echo "[*] Enabled Python plugins"
+fi
+
+cat /etc/passwd| grep cellframe-node || adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node || true
+
+echo "[*] Check /etc/systemd/system/$DAP_APP_NAME.service file..."
+if [ -e /etc/systemd/system/$DAP_APP_NAME.service ]; then
+ echo "[*] Restarting $DAP_APP_NAME to implement changes"
+ systemctl --system stop $DAP_APP_NAME >> /dev/null|| true
+ echo "[*] Stopped $DAP_APP_NAME"
+ systemctl daemon-reload || true
+ systemctl --system start $DAP_APP_NAME || true
+ echo "[*] Started $DAP_APP_NAME"
+else
+ echo "[!] Installing $DAP_APP_NAME as systemd service (haven't found /etc/systemd/system/$DAP_APP_NAME.service)"
+ ln -sf $DAP_PREFIX/share/$DAP_APP_NAME.service /etc/systemd/system/$DAP_APP_NAME.service || true
+ systemctl --system enable $DAP_PREFIX/share/$DAP_APP_NAME.service || true
+# systemctl --system start $DAP_APP_NAME
+ echo "[ ] Execute 'systemctl start $DAP_APP_NAME' to start $DAP_APP_NAME service"
+
+ #USERMAN=`users | awk '{print $1}'`
+
+ echo "[ ] Additional configuration"
+ adduser --system --no-create-home --group --home /opt/cellframe-node cellframe-node || true
+ #usermod -aG $DAP_CHAINS_NAME `users | awk '{print $1}'`
+ for username in $(cat /etc/passwd | grep "/home" | cut -d ':' -f1); do
+ usermod -aG cellframe-node $username || true
+ done
+ mkdir -p $DAP_PREFIX/var/{run,lib/wallet,lib/global_db,var/plugins} || true
+ #mkdir -p $DAP_PREFIX/var/{run,lib/ca,lib/wallet,lib/global_db,var/plugins} || true
+ touch $DAP_PREFIX/var/run/cellframe-node.pid || true
+ #chown -R $USERMAN:$USERMAN $DAP_PREFIX
+ for filename in $(find $DAP_PREFIX | grep -v bugreport); do
+ if [ -d $filename ]; then
+ chmod 0775 $filename 2>/dev/null || true
+ else
+ chmod 0664 $filename 2>/dev/null || true
+ fi
+ done
+ chmod 0666 $DAP_CFG
+ chmod 0666 $DAP_CFG_TPL
+ chmod 0774 $DAP_PREFIX/bin/* || true
+ chmod 0777 $DAP_PREFIX/bin/$DAP_APP_NAME-cli $DAP_PREFIX/bin/pip3* $DAP_PREFIX/bin/python3* || true
+
+ service cellframe-node start || true
+ systemctl restart cellframe-node || true
+
+fi
+
+echo "[ ] Enabling logrotate"
+chmod 644 $DAP_PREFIX/share/logrotate/$DAP_APP_NAME || true
+ln -sf $DAP_PREFIX/share/logrotate/logrotate.timer /etc/systemd/system/logrotate.timer || true
+ln -sf $DAP_PREFIX/share/logrotate/$DAP_APP_NAME /etc/logrotate.d/$DAP_APP_NAME || true
+chmod 644 /etc/logrotate.d/$DAP_APP_NAME || true
+systemctl reenable logrotate.timer || true
+
+echo "[!] Done"
\ No newline at end of file
diff --git a/os/debian/postrm b/os/debian/postrm
new file mode 100755
index 0000000000000000000000000000000000000000..d95f25eb2b386280e41b03cb6f465a4dc2d590dd
--- /dev/null
+++ b/os/debian/postrm
@@ -0,0 +1,11 @@
+#! /bin/bash -e
+if [ "$1" == "purge" ] && [ -e /usr/share/debconf/confmodule ] ; then
+. /usr/share/debconf/confmodule
+db_purge
+fi
+GROUP_RM="cellframe-node"
+
+systemctl stop cellframe-node || true
+systemctl disable cellframe-node || true
+
+#this file will be merged to dashboard postinst, be aware of this
diff --git a/os/debian/prerm b/os/debian/prerm
new file mode 100755
index 0000000000000000000000000000000000000000..b961ff4342a99fd228b18e4b50983163fc3ef8a7
--- /dev/null
+++ b/os/debian/prerm
@@ -0,0 +1,29 @@
+#!/bin/bash -e
+
+case "$1" in
+ remove|purge|abort-install|abort-upgrade)
+ echo "[*] Stopping cellframe-node.service"
+ systemctl stop cellframe-node || true
+ echo "[*] Disabling cellframe-node.service"
+ systemctl disable cellframe-node || true
+ ;;
+
+ disappear)
+ ;;
+
+ upgrade)
+ echo "[*] Stopping cellframe-node.service"
+ systemctl stop cellframe-node || true
+ ;;
+
+ failed-upgrade)
+ echo "[*] Stopping cellframe-node.service"
+ systemctl stop cellframe-node || true
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1;;
+esac
+
+exit 0
diff --git a/os/debian/rules b/os/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..8ebdadfdb53a9504434765cae4080c4283f54437
--- /dev/null
+++ b/os/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+override_dh_fixperms:
+ dh_fixperms -X/opt/cellframe-node
+ chmod 777 /opt/cellframe-node/bin/cellframe-node-cli
+override_dh_auto_install:
+ dh_auto_install -- prefix=/opt/cellframe-node
+%:
+# dh $@ --with=systemd
+ dh $@
diff --git a/os/debian/templates b/os/debian/templates
new file mode 100755
index 0000000000000000000000000000000000000000..53d7dd3a1369481e852da47c8e5224c8c63b23ce
--- /dev/null
+++ b/os/debian/templates
@@ -0,0 +1,133 @@
+Template: cellframe-node/auto_online
+Default: false
+Choices: true, false
+Type: select
+Description: Auto online
+ Bring up links automatically and go to ONLINE network state
+
+Template: cellframe-node/debug_mode
+Default: false
+Choices: true, false
+Type: select
+Description: Debug mode
+ Debug mode for logs
+
+Template: cellframe-node/server_enabled
+Default: false
+Choices: true, false
+Type: select
+Description: Accept connections
+ Accept connections
+
+Template: cellframe-node/server_port
+Default: 8079
+Type: string
+Description: Server port
+ Server port to listen on, recommended 8079
+
+Template: cellframe-node/server_addr
+Default: 0.0.0.0
+Type: string
+Description: Server address
+ Server address to listen on
+
+Template: cellframe-node/notify_srv_addr
+Default: 127.0.0.1
+Type: string
+Description: Notify server address
+ Notify server address to listen on
+
+Template: cellframe-node/notify_srv_port
+Default: 8080
+Type: string
+Description: Notify server port
+ Notify server port to listen on
+
+Template: cellframe-node/subzero_enabled
+Default: true
+Choices: true, false
+Type: select
+Description: SubZero: Enable network
+ Subzero Testnet: Enable network auto load on start
+
+Template: cellframe-node/subzero_node_type
+Type: select
+Default: full
+Choices: full, light, master, archive, root
+Description: SubZero: Node role
+ Select node role:.
+ Light - Synchronize only local wallets
+ full - Sync all its cell
+ master - Allow to store values in chains and take comission, sync all shards that will need to be synced
+ archive - Sync all the network
+ root - Special predefined root nodes, usually produces zerochain and acts like archive as well
+
+Template: cellframe-node/mileena_enabled
+Default: true
+Choices: true, false
+Type: select
+Description: Mileena: Enable network
+ Mileena Testnet: Enable network auto load on start
+
+Template: cellframe-node/mileena_node_type
+Type: select
+Default: full
+Choices: full, light, master, archive, root
+Description: Mileena: Node role
+ Select node role:.
+ Light - Synchronize only local wallets
+ full - Sync all its cell
+ master - Allow to store values in chains and take comission, sync all shards that will need to be synced
+ archive - Sync all the network
+ root - Special predefined root nodes, usually produces zerochain and acts like archive as well
+
+Template: cellframe-node/kelvpn_minkowski_enabled
+Default: true
+Choices: true, false
+Type: select
+Description: Kelvpn Minkowski: Enable network
+ Minkowski Testnet: Enable network auto load on start
+
+Template: cellframe-node/kelvpn_minkowski_node_type
+Type: select
+Default: full
+Choices: full, light, master, archive, root
+Description: Kelvpn Minkowski: Node role
+ Select node role:.
+ Light - Synchronize only local wallets
+ full - Sync all its cell
+ master - Allow to store values in chains and take comission, sync all shards that will need to be synced
+ archive - Sync all the network
+ root - Special predefined root nodes, usually produces zerochain and acts like archive as well
+
+Template: cellframe-node/backbone_enabled
+Default: true
+Choices: true, false
+Type: select
+Description: Backbone: Enable network
+ Backbone Mainnet: Enable network auto load on start
+
+Template: cellframe-node/backbone_node_type
+Type: select
+Default: full
+Choices: full, light, master, archive, root
+Description: Backbone: Node role
+ Select node role:.
+ Light - Synchronize only local wallets
+ full - Sync all its cell
+ master - Allow to store values in chains and take comission, sync all shards that will need to be synced
+ archive - Sync all the network
+ root - Special predefined root nodes, usually produces zerochain and acts like archive as well
+
+Template: cellframe-node/enable_python_plugins
+Default: false
+Choices: true, false
+Type: select
+Description: Python plugins: Enable Python plugins
+ Python plugins: Enable Python plugins
+
+Template: cellframe-node/python_plugins_path
+Default: /opt/cellframe-node/var/lib/plugins
+Type: string
+Description: Python plugins path
+ Path for Python plugins
\ No newline at end of file
diff --git a/prod_build b/prod_build
index f9dcfa089cff22e2368395e05558f26f5a085eb2..c27f5075f58e991958ab09195bf5f285a586a1ad 160000
--- a/prod_build
+++ b/prod_build
@@ -1 +1 @@
-Subproject commit f9dcfa089cff22e2368395e05558f26f5a085eb2
+Subproject commit c27f5075f58e991958ab09195bf5f285a586a1ad
diff --git a/python-cellframe b/python-cellframe
index 770ce1db392302fc38edb425079fd8b7cfe7a868..abc34a5f12d648061f04582d823c91dab70d4970 160000
--- a/python-cellframe
+++ b/python-cellframe
@@ -1 +1 @@
-Subproject commit 770ce1db392302fc38edb425079fd8b7cfe7a868
+Subproject commit abc34a5f12d648061f04582d823c91dab70d4970