diff --git a/.gitmodules b/.gitmodules
index cca3a9babfe52073c570293dbb8cecb20195691d..22f3b2ec02e333e7f63ece13d6365893bf412000 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,136 +1,11 @@
-[submodule "libdap"]
- path = libdap
- url = https://gitlab.demlabs.net/cellframe/libdap.git
- branch = master
-[submodule "libdap-server"]
- path = libdap-server
- url = https://gitlab.demlabs.net/cellframe/libdap-server.git
- branch = master
-[submodule "libdap-chain"]
- path = libdap-chain
- url = https://gitlab.demlabs.net/cellframe/libdap-chain.git
- branch = master
-[submodule "libdap-stream"]
- path = libdap-stream
- url = https://gitlab.demlabs.net/cellframe/libdap-stream.git
- branch = master
-[submodule "libdap-stream-ch-vpn"]
- path = libdap-stream-ch-vpn
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-vpn.git
- branch = master
-[submodule "libdap-server-core"]
- path = libdap-server-core
- url = https://gitlab.demlabs.net/cellframe/libdap-server-core.git
- branch = master
-[submodule "libdap-stream-ch-chain"]
- path = libdap-stream-ch-chain
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chain.git
- branch = master
-[submodule "libdap-chain-net"]
- path = libdap-chain-net
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net.git
- branch = master
-[submodule "libdap-chain-net-srv"]
- path = libdap-chain-net-srv
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv.git
- branch = master
-[submodule "libdap-stream-ch-chain-net"]
- path = libdap-stream-ch-chain-net
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chain-net.git
- branch = master
-[submodule "libdap-stream-ch-chain-net-srv"]
- path = libdap-stream-ch-chain-net-srv
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chain-net-srv.git
- branch = master
-[submodule "libdap-chain-net-srv-vpn"]
- path = libdap-chain-net-srv-vpn
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-vpn.git
- branch = master
-[submodule "libdap-chain-wallet"]
- path = libdap-chain-wallet
- url = https://gitlab.demlabs.net/cellframe//libdap-chain-wallet.git
- branch = master
-[submodule "libdap-chain-crypto"]
- path = libdap-chain-crypto
- url = https://gitlab.demlabs.net/cellframe//libdap-chain-crypto.git
- branch = master
-[submodule "libdap-chain-net-srv-app"]
- path = libdap-chain-net-srv-app
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-app.git
- branch = master
-[submodule "libdap-chain-net-srv-app-db"]
- path = libdap-chain-net-srv-app-db
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-app-db.git
- branch = master
-[submodule "libdap-stream-ch"]
- path = libdap-stream-ch
- url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch.git
- branch = master
-[submodule "libdap-chain-net-srv-datum"]
- path = libdap-chain-net-srv-datum
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-datum.git
- branch = master
-[submodule "libdap-chain-net-srv-datum-pool"]
- path = libdap-chain-net-srv-datum-pool
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-datum-pool.git
- branch = master
-[submodule "libdap-server-udp"]
- path = libdap-server-udp
- url = https://gitlab.demlabs.net/cellframe/libdap-server-udp.git
- branch = master
-[submodule "libdap-client"]
- path = libdap-client
- url = https://gitlab.demlabs.net/cellframe/libdap-client.git
- branch = master
-[submodule "libdap-chain-global-db"]
- path = libdap-chain-global-db
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-global-db.git
- branch = master
-[submodule "libdap-chain-mempool"]
- path = libdap-chain-mempool
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-mempool.git
- branch = master
-[submodule "libdap-chain-cs-dag"]
- path = libdap-chain-cs-dag
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-dag.git
- branch = master
-[submodule "libdap-chain-cs-dag-poa"]
- path = libdap-chain-cs-dag-poa
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-dag-poa
- branch = master
-[submodule "libdap-chain-cs-dag-pos"]
- path = libdap-chain-cs-dag-pos
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-dag-pos.git
- branch = master
-[submodule "libdap-chain-gdb"]
- path = libdap-chain-gdb
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-gdb.git
- branch = master
-[submodule "libdap-crypto"]
- path = libdap-crypto
- url = https://gitlab.demlabs.net/cellframe/libdap-crypto
- branch = master
[submodule "test/libdap-test"]
path = test/libdap-test
url = https://gitlab.demlabs.net/cellframe/libdap-test.git
branch = master
-[submodule "libdap-chain-cs-block"]
- path = libdap-chain-cs-block
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-block.git
- branch = master
-[submodule "libdap-chain-cs-block-poa"]
- path = libdap-chain-cs-block-poa
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-block-poa.git
- branch = master
-[submodule "libdap-chain-cs-block-pow"]
- path = libdap-chain-cs-block-pow
- url = https://gitlab.demlabs.net/cellframe/libdap-chain-cs-block-pow.git
- branch = master
-[submodule "libdap-chain-common"]
- path = libdap-chain-common
- url = https://gitlab.demlabs.net/cellframe//libdap-chain-common.git
- branch = master
-[submodule "libdap-app-cli"]
- path = libdap-app-cli
- url = https://gitlab.demlabs.net/cellframe/libdap-app-cli.git
- branch = master
+[submodule "python-cellframe"]
+ path = python-cellframe
+ url = https://gitlab.demlabs.net/cellframe/python-cellframe.git
+[submodule "cellframe-sdk"]
+ path = cellframe-sdk
+ url = https://gitlab.demlabs.net/cellframe/cellframe-sdk.git
+ branch = master
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb3797cbe0bfd505b692768ed4c742c7dfb22c19..9d330cefe1d978fd3664900de5dad36f0d6b9dc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,234 +1,139 @@
project(dapcash-node C)
cmake_minimum_required(VERSION 3.1)
-
-set(NODE_TARGET "${PROJECT_NAME}" )
-set(NODE_CLI_TARGET "${PROJECT_NAME}-cli" )
-set(NODE_TOOL_TARGET "${PROJECT_NAME}-tool")
-
-include(cmake/OS_Detection.cmake)
-
-
-if(WIN32)
- message(STATUS "Building for Windows")
-endif()
-
-
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11)
-set(SUBMODULES_NO_BUILD ON)
+
+# Predefine project
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
-SET( CPACK_PACKAGE_VERSION_MAJOR 1)
-SET( CPACK_PACKAGE_VERSION_MINOR 2)
+SET( CPACK_PACKAGE_VERSION_MAJOR 2)
+SET( CPACK_PACKAGE_VERSION_MINOR 0)
SET( CPACK_PACKAGE_VERSION_PATCH 0)
+# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
-add_definitions ("-DDAP_SERVER -DDAP_LOG_MT")
-
-if (LINUX)
- SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
- SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
- SET(DESTDIR "/opt/${PROJECT_NAME}")
-
- SET( CPACK_GENERATOR "DEB")
-
- SET( CPACK_SYSTEM_TYPE "Debian")
- SET( CPACK_SYSTEM_VERSION "${DEBIAN_OS_VERSION}")
- SET( CPACK_SYSTEM_ARCH "${OS_ARCH}")
- SET( CPACK_SYSTEM_CODENAME "${DEBIAN_OS_NAME}")
-
- SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_CODENAME}-${CPACK_SYSTEM_ARCH}")
- SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
- SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
- SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" )
- SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "DapCash Node" )
- SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
- SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc, procps")
- SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
- SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;")
-endif()
-
-add_subdirectory(libdap)
-add_subdirectory(libdap-crypto)
-add_subdirectory(libdap-server-core)
-add_subdirectory(libdap-server-udp)
-add_subdirectory(libdap-server)
+set(SUBMODULES_NO_BUILD ON)
+set(SUPPORT_PYTHON_PLUGINS ON)
+if (NOT(WIN32))
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-vpn")
+else()
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum")
+endif()
-add_subdirectory(libdap-chain-crypto)
-add_subdirectory(libdap-chain-common)
-add_subdirectory(libdap-chain)
-add_subdirectory(libdap-chain-wallet)
-add_subdirectory(libdap-chain-cs-dag)
-add_subdirectory(libdap-chain-cs-dag-poa)
-add_subdirectory(libdap-chain-cs-dag-pos)
-add_subdirectory(libdap-chain-net)
-add_subdirectory(libdap-chain-net-srv)
+include (cellframe-sdk/cmake/OS_Detection.cmake)
+add_subdirectory(cellframe-sdk)
-add_subdirectory(libdap-app-cli)
+if(UNIX)
+ if(LINUX)
+ message("[*] Linux package setup")
+ SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+ SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+ SET(DESTDIR "/opt/${PROJECT_NAME}")
+
+ SET( CPACK_GENERATOR "DEB")
+
+ SET( CPACK_SYSTEM_TYPE "Debian")
+ SET( CPACK_SYSTEM_VERSION "${DEBIAN_OS_VERSION}")
+ SET( CPACK_SYSTEM_ARCH "${OS_ARCH}")
+ SET( CPACK_SYSTEM_CODENAME "${DEBIAN_OS_NAME}")
+ SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_CODENAME}-${CPACK_SYSTEM_ARCH}")
+ SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
+ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
+ SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" )
+ SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "DapCash Node" )
+ SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
+ SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc")
+ SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+ SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+ "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;")
-if(NOT (WIN32))
- add_subdirectory(libdap-chain-net-srv-vpn)
+ else()
+ message("[!] Unix but not linux")
+ endif()
+else()
+ message("[ ] Not UNIX")
endif()
-add_subdirectory(libdap-chain-mempool)
-add_subdirectory(libdap-stream)
-add_subdirectory(libdap-stream-ch)
-add_subdirectory(libdap-client)
+set(NODE_TARGET "${PROJECT_NAME}" )
+set(NODE_CLI_TARGET "${PROJECT_NAME}-cli" )
+set(NODE_TOOL_TARGET "${PROJECT_NAME}-tool")
+
-add_subdirectory(libdap-stream-ch-chain)
-#add_subdirectory(libdap-stream-ch-chat)
-add_subdirectory(libdap-stream-ch-chain-net)
-add_subdirectory(libdap-stream-ch-chain-net-srv)
-add_subdirectory(libdap-chain-global-db)
-if(BUILD_DAPCASH_NODE_TESTS)
+if(BUILD_CELLFRAME_NODE_TESTS)
enable_testing()
add_subdirectory(test)
endif()
set( NODE_SOURCES
- sources/main.c
- sources/sig_unix_handler.c
-)
+ sources/main.c
+ sources/sig_unix_handler.c
+ )
set( NODE_CLI_SOURCES
- sources/main_node_cli.c
-)
+ sources/main_node_cli.c
+ )
set( NODE_TOOL_SOURCES
- sources/main_node_tool.c
-)
+ sources/main_node_tool.c
+ )
if(UNIX)
- if(ANDROID)
- add_library(${PROJECT_NAME} SHARED
- ${NODE_SOURCES}
- ${NODE_CLI_SOURCES}
- ${NODE_TOOL_SOURCES}
- sources/cellframe_node.h
- )
- else()
- add_executable(${PROJECT_NAME} ${NODE_SOURCES})
- add_executable(${NODE_CLI_TARGET} ${NODE_CLI_SOURCES})
- add_executable(${NODE_TOOL_TARGET} ${NODE_TOOL_SOURCES})
- endif()
+ if(ANDROID)
+ add_library(${PROJECT_NAME} SHARED
+ ${NODE_SOURCES}
+ ${NODE_CLI_SOURCES}
+ ${NODE_TOOL_SOURCES}
+ sources/cellframe_node.h
+ )
+ else()
+ add_executable(${PROJECT_NAME} ${NODE_SOURCES})
+ add_executable(${NODE_CLI_TARGET} ${NODE_CLI_SOURCES})
+ add_executable(${NODE_TOOL_TARGET} ${NODE_TOOL_SOURCES})
+ endif()
endif()
if(WIN32)
- add_executable(${PROJECT_NAME} "sources/main.c" "sources/exh_win32.c" "sources/sig_win32_handler.c")
- add_executable(${NODE_CLI_TARGET} "sources/main_node_cli.c" )
- add_executable(${NODE_TOOL_TARGET} "sources/main_node_tool.c" )
-
- target_link_libraries(${NODE_CLI_TARGET} dap_chain_net dap_app_cli nghttp2 ssl cares ssh2 crypto z pthread
- KERNEL32
- USER32
- SHELL32
- WINMM
- GDI32
- ADVAPI32
- Ole32
- Version
- Imm32
- OleAut32
- ws2_32
- ntdll
- psapi
- Shlwapi
- Bcrypt
- Crypt32
- Secur32
- userenv
- )
- set_property(TARGET ${NODE_CLI_TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
- target_link_libraries(${NODE_TOOL_TARGET} dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
- dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
- dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
- dap_chain_net dap_chain_net_srv dap_app_cli
- dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_cuttdb nghttp2 ssl cares ssh2 crypto z pthread
-
- KERNEL32
- USER32
- SHELL32
- WINMM
- GDI32
- ADVAPI32
- Ole32
- Version
- Imm32
- OleAut32
- ws2_32
- ntdll
- psapi
- Shlwapi
- Bcrypt
- Crypt32
- Secur32
- userenv
- )
- set_property(TARGET ${NODE_TOOL_TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
-
- target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
- dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
- dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
- dap_chain_net dap_chain_net_srv
- dap_chain_wallet dap_chain_global_db dap_chain_mempool json-c sqlite3 nghttp2 ssl cares z ssh2 crypto m
- KERNEL32
- USER32
- SHELL32
- WINMM
- GDI32
- ADVAPI32
- Ole32
- Version
- Imm32
- OleAut32
- ws2_32
- ntdll
- psapi
- Shlwapi
- Bcrypt
- Crypt32
- Secur32
- userenv
- )
+ add_executable(${PROJECT_NAME} "sources/main.c" "sources/exh_win32.c" "sources/sig_win32_handler.c")
+ add_executable(${NODE_CLI_TARGET} "sources/main_node_cli.c" )
+ add_executable(${NODE_TOOL_TARGET} "sources/main_node_tool.c" )
+
+ target_link_libraries(${NODE_CLI_TARGET} dap_chain_net dap_app_cli z pthread
+ KERNEL32 USER32 SHELL32 WINMM GDI32 ADVAPI32 Ole32 Version Imm32
+ OleAut32 ws2_32 ntdll psapi Shlwapi Bcrypt Crypt32 Secur32 userenv )
+ set_property(TARGET ${NODE_CLI_TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
+ target_link_libraries(${NODE_TOOL_TARGET} cellframe-sdk )
+ set_property(TARGET ${NODE_TOOL_TARGET} APPEND_STRING PROPERTY LINK_FLAGS "-mconsole")
+
+ target_link_libraries(${PROJECT_NAME} cellframe-sdk json-c )
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "-mwindows")
-#dap_chain_net_srv_vpn dap_server_http_db_auth
+ #dap_chain_net_srv_vpn dap_server_http_db_auth
endif()
#add_executable(${PROJECT_NAME}-cli "sources/main_node_cli.c" "sources/main_node_cli_shell.c" "sources/main_node_cli_net.c" )
#add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" )
-if(UNIX)
+if(UNIX AND NOT WIN32)
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "-D_GNU_SOURCE")
+ set(NODE_LIBRARIES cellframe-sdk )
+
+ set(NODE_CLI_LIBRARIES m dap_chain_net dap_cuttdb dap_app_cli)
- set(NODE_LIBRARIES
- dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
- dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
- dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
- dap_chain_net dap_chain_net_srv
- dap_chain_net_srv_vpn
- dap_chain_wallet dap_chain_global_db dap_chain_mempool m magic
- dap_cuttdb)
-
- set(NODE_CLI_LIBRARIES
- m dap_chain_net dap_app_cli curl dap_cuttdb)
-
- set(NODE_TOOL_LIBRARIES
- dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
- dap_enc_server dap_stream dap_chain_net_srv_vpn dap_stream_ch_chain dap_stream_ch_chain_net
- dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
- dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
- dap_chain_net dap_chain_net_srv
- dap_chain_net_srv_vpn
- dap_chain_wallet dap_chain_global_db dap_chain_mempool m magic
- dap_core
- )
+ set(NODE_TOOL_LIBRARIES cellframe-sdk )
+
+ if (SUPPORT_PYTHON_PLUGINS)
+ add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDAP_SUPPORT_PYTHON_PLUGINS")
+ message("[+] Build with support python plugins")
+ set(Python_ADDITIONAL_VERSION 3.7 3.6 3.5 3.4)
+ find_package(PythonLibs REQUIRED)
+ include_directories(${PYTHON_INCLUDE_DIR} include/)
+
+ add_subdirectory(python-cellframe)
+ set(NODE_LIBRARIES ${NODE_LIBRARIES} ${PYTHON_LIBRARIES} dap_plugins_python)
+ endif()
if(ANDROID )
set(ALL_LIBRARIES ${NODE_LIBRARIES} ${NODE_CLI_LIBRARIES} ${NODE_TOOL_LIBRARIES} log)
@@ -238,7 +143,7 @@ if(UNIX)
target_link_libraries(${NODE_TARGET} ${ALL_LIBRARIES})
else()
- target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread dap_cuttdb )
+ 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()
@@ -246,7 +151,7 @@ endif()
target_include_directories(${PROJECT_NAME} INTERFACE .)
-if(UNIX AND NOT ANDROID)
+if(NOT ANDROID)
target_include_directories(${NODE_CLI_TARGET} INTERFACE .)
target_include_directories(${NODE_TOOL_TARGET} INTERFACE .)
endif()
@@ -259,5 +164,5 @@ if(UNIX AND NOT ANDROID)
INSTALL(TARGETS ${NODE_TOOL_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
endif()
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin FILES_MATCHING PATTERN "*" PATTERN "*" PERMISSIONS OWNER_EXECUTE;OWNER_READ;OWNER_WRITE;WORLD_READ;GROUP_READ )
INCLUDE(CPack)
diff --git a/cellframe-sdk b/cellframe-sdk
new file mode 160000
index 0000000000000000000000000000000000000000..ec656f249f0864aecc0a02bac141872c5ca4caf1
--- /dev/null
+++ b/cellframe-sdk
@@ -0,0 +1 @@
+Subproject commit ec656f249f0864aecc0a02bac141872c5ca4caf1
diff --git a/libdap b/libdap
deleted file mode 160000
index 9d2f6f58336f4555a0cc68d11a46b64fddc574e2..0000000000000000000000000000000000000000
--- a/libdap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d2f6f58336f4555a0cc68d11a46b64fddc574e2
diff --git a/libdap-app-cli b/libdap-app-cli
deleted file mode 160000
index 8c21d84db9762ba3a5c0699599d9f98823bc280b..0000000000000000000000000000000000000000
--- a/libdap-app-cli
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8c21d84db9762ba3a5c0699599d9f98823bc280b
diff --git a/libdap-chain b/libdap-chain
deleted file mode 160000
index aa95a9117e7491c6543e30dd8482738277c63141..0000000000000000000000000000000000000000
--- a/libdap-chain
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa95a9117e7491c6543e30dd8482738277c63141
diff --git a/libdap-chain-common b/libdap-chain-common
deleted file mode 160000
index 69a3f979f9d9a16e286eff099121476275020a3e..0000000000000000000000000000000000000000
--- a/libdap-chain-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 69a3f979f9d9a16e286eff099121476275020a3e
diff --git a/libdap-chain-crypto b/libdap-chain-crypto
deleted file mode 160000
index 8adfc9ceb403d4cf708717165c24cbd1c6a6d830..0000000000000000000000000000000000000000
--- a/libdap-chain-crypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8adfc9ceb403d4cf708717165c24cbd1c6a6d830
diff --git a/libdap-chain-cs-block b/libdap-chain-cs-block
deleted file mode 160000
index dea947a8aa69945f61f87d43df0ad2b096357e1f..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-block
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f
diff --git a/libdap-chain-cs-block-poa b/libdap-chain-cs-block-poa
deleted file mode 160000
index 25de9a1e9e8d2fbda45690dc38983534dee780b3..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-block-poa
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3
diff --git a/libdap-chain-cs-block-pow b/libdap-chain-cs-block-pow
deleted file mode 160000
index 02a9f374344ffc8fa1f47082c26db9efaa591e7e..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-block-pow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e
diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag
deleted file mode 160000
index bbd281914143a492607a73000c47ff676d513860..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-dag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bbd281914143a492607a73000c47ff676d513860
diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa
deleted file mode 160000
index f4e8e5cd96a532e9912232bbec58e6a9f92f3fb3..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-dag-poa
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f4e8e5cd96a532e9912232bbec58e6a9f92f3fb3
diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos
deleted file mode 160000
index fe298185a36681ad534244ac27869cf022276e44..0000000000000000000000000000000000000000
--- a/libdap-chain-cs-dag-pos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe298185a36681ad534244ac27869cf022276e44
diff --git a/libdap-chain-global-db b/libdap-chain-global-db
deleted file mode 160000
index b7223d98a7a262c2a7a56039e10c5fccd5fc79cb..0000000000000000000000000000000000000000
--- a/libdap-chain-global-db
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7223d98a7a262c2a7a56039e10c5fccd5fc79cb
diff --git a/libdap-chain-mempool b/libdap-chain-mempool
deleted file mode 160000
index 817aa1a49043df3b41184a7f2f9a4ad5f835791a..0000000000000000000000000000000000000000
--- a/libdap-chain-mempool
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 817aa1a49043df3b41184a7f2f9a4ad5f835791a
diff --git a/libdap-chain-net b/libdap-chain-net
deleted file mode 160000
index e3b3bc97d80a3483ddb2e0b28e1ee7ddb60c1c92..0000000000000000000000000000000000000000
--- a/libdap-chain-net
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e3b3bc97d80a3483ddb2e0b28e1ee7ddb60c1c92
diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
deleted file mode 160000
index efddc6a76a3682a04d7f7d9c4b153de5a602bea0..0000000000000000000000000000000000000000
--- a/libdap-chain-net-srv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit efddc6a76a3682a04d7f7d9c4b153de5a602bea0
diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn
deleted file mode 160000
index f56b13629ca54895fba908c328191c1a653c61c6..0000000000000000000000000000000000000000
--- a/libdap-chain-net-srv-vpn
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f56b13629ca54895fba908c328191c1a653c61c6
diff --git a/libdap-chain-wallet b/libdap-chain-wallet
deleted file mode 160000
index 03c5b590d7548b73ad739a1718adc20cfceee1d9..0000000000000000000000000000000000000000
--- a/libdap-chain-wallet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03c5b590d7548b73ad739a1718adc20cfceee1d9
diff --git a/libdap-client b/libdap-client
deleted file mode 160000
index e94eba925ca2b80ece1cf15d90e104deb9232314..0000000000000000000000000000000000000000
--- a/libdap-client
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e94eba925ca2b80ece1cf15d90e104deb9232314
diff --git a/libdap-crypto b/libdap-crypto
deleted file mode 160000
index 7e063687c6d7abbac54720694c23e401456b95f8..0000000000000000000000000000000000000000
--- a/libdap-crypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e063687c6d7abbac54720694c23e401456b95f8
diff --git a/libdap-server b/libdap-server
deleted file mode 160000
index 7c90843f4c208233807b8bfb56ccc4e22b4f1bab..0000000000000000000000000000000000000000
--- a/libdap-server
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7c90843f4c208233807b8bfb56ccc4e22b4f1bab
diff --git a/libdap-server-core b/libdap-server-core
deleted file mode 160000
index 8ad74aa799e3f408efcd991143db27f079bc6075..0000000000000000000000000000000000000000
--- a/libdap-server-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ad74aa799e3f408efcd991143db27f079bc6075
diff --git a/libdap-server-udp b/libdap-server-udp
deleted file mode 160000
index 86b9a6f0bf5d7bb2993600a16bb40ae86c229a22..0000000000000000000000000000000000000000
--- a/libdap-server-udp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 86b9a6f0bf5d7bb2993600a16bb40ae86c229a22
diff --git a/libdap-stream b/libdap-stream
deleted file mode 160000
index a4dda122735ad7ff8523d1f53b5e22696fe93d32..0000000000000000000000000000000000000000
--- a/libdap-stream
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4dda122735ad7ff8523d1f53b5e22696fe93d32
diff --git a/libdap-stream-ch b/libdap-stream-ch
deleted file mode 160000
index d911a60b20ec760d4938615dd8cc01d5c2955196..0000000000000000000000000000000000000000
--- a/libdap-stream-ch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d911a60b20ec760d4938615dd8cc01d5c2955196
diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain
deleted file mode 160000
index 1ffe062f0ae6ba10fe330b025a0a2b899cd03017..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-chain
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1ffe062f0ae6ba10fe330b025a0a2b899cd03017
diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net
deleted file mode 160000
index ffa9839387f4c58dc65efa75ee1b5fde15273a2e..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-chain-net
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ffa9839387f4c58dc65efa75ee1b5fde15273a2e
diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv
deleted file mode 160000
index 37715497f476cab7717e88f851f2872e64291cbd..0000000000000000000000000000000000000000
--- a/libdap-stream-ch-chain-net-srv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 37715497f476cab7717e88f851f2872e64291cbd
diff --git a/python-cellframe b/python-cellframe
new file mode 160000
index 0000000000000000000000000000000000000000..ce2cc96fe1b6405dada650bb0a992d58ee305a5e
--- /dev/null
+++ b/python-cellframe
@@ -0,0 +1 @@
+Subproject commit ce2cc96fe1b6405dada650bb0a992d58ee305a5e