From d7b2fa794877ac4a79702ea5949f214bd0277f54 Mon Sep 17 00:00:00 2001
From: Dmitry Gerasimov <dmitriy.gerasimov@demlabs.net>
Date: Fri, 13 May 2022 12:52:03 +0700
Subject: [PATCH] [*] Cleared up some things
---
CMakeLists.txt | 99 +++----
CellFrame/wrapping_dap_mempool.c | 258 ------------------
modules/cellframe-sdk/app-cli/CMakeLists.txt | 4 +-
modules/cellframe-sdk/chain/CMakeLists.txt | 4 +-
modules/cellframe-sdk/common/CMakeLists.txt | 4 +-
.../consensus/dag_poa/CMakeLists.txt | 4 +-
modules/cellframe-sdk/gdb/CMakeLists.txt | 4 +-
.../cellframe-sdk/global-db/CMakeLists.txt | 4 +-
modules/cellframe-sdk/mempool/CMakeLists.txt | 4 +-
modules/cellframe-sdk/net/CMakeLists.txt | 4 +-
modules/cellframe-sdk/net/srv/CMakeLists.txt | 4 +-
.../services/datum/CMakeLists.txt | 4 +-
.../cellframe-sdk/type/blocks/CMakeLists.txt | 4 +-
modules/cellframe-sdk/type/dag/CMakeLists.txt | 4 +-
modules/cellframe-sdk/wallet/CMakeLists.txt | 4 +-
modules/dap-sdk/core/CMakeLists.txt | 4 +-
modules/dap-sdk/core/test/CMakeLists.txt | 4 +-
modules/dap-sdk/crypto/CMakeLists.txt | 4 +-
modules/dap-sdk/crypto/test/CMakeLists.txt | 4 +-
modules/dap-sdk/net/client/CMakeLists.txt | 4 +-
modules/dap-sdk/net/core/CMakeLists.txt | 4 +-
modules/dap-sdk/net/server/enc/CMakeLists.txt | 4 +-
.../dap-sdk/net/server/http/CMakeLists.txt | 4 +-
.../net/server/json_rpc/CMakeLists.txt | 4 +-
.../dap-sdk/net/stream/stream/CMakeLists.txt | 4 +-
modules/plugins/CMakeLists.txt | 4 +-
26 files changed, 100 insertions(+), 353 deletions(-)
delete mode 100644 CellFrame/wrapping_dap_mempool.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d50c703d..5ce7ce23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,61 @@ set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-set(Python_ADDITIONAL_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
-include_directories(${PYTHON_INCLUDE_DIR} include/)
+#set(Python_ADDITIONAL_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
+#include_directories(${PYTHON_INCLUDE_DIR} include/)
file(GLOB PYTHON_CELLFRAME_SRCS CellFrame/*.c)
file(GLOB PYTHON_CELLFRAME_HEADERS include/*.h)
set(SUBMODULES_NO_BUILD ON)
+if (SUPPORT_PYTHON_PLUGINS)
+ file (GLOB APP_CONTEXT_HEADER
+ modules/plugins/include/dap_plugins_python_app_context.h)
+
+ add_definitions("-fpic")
+ add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
+ add_library(${PROJECT_NAME} STATIC ${PYTHON_CELLFRAME_SRCS} ${APP_CONTEXT_HEADER} ${PYTHON_CELLFRAME_HEADERS})
+ target_include_directories(${PROJECT_NAME} INTERFACE include/)
+
+else()
+
+ SET( CPACK_GENERATOR "DEB")
+ SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+ SET( CPACK_PACKAGE_VERSION_MAJOR 0)
+ SET( CPACK_PACKAGE_VERSION_MINOR 9)
+ SET( CPACK_PACKAGE_VERSION_PATCH 15)
+
+ add_definitions("-DDAP_VERSION_MAJOR=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
+ add_definitions("-DDAP_VERSION_MINOR=\"${CPACK_PACKAGE_VERSION_MINOR}\"")
+ add_definitions("-DDAP_VERSION_PATCH=\"${CPACK_PACKAGE_VERSION_PATCH}\"")
+ add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}\"")
+ set(SUBMODULES_NO_BUILD ON)
+
+
+ #if (SKBUILD)
+ message(STATUS "Make python extension")
+ #find_package(PythonExtensions REQUIRED)
+ add_library(CellFrame MODULE ${PYTHON_CELLFRAME_SRCS} ${PYTHON_CELLFRAME_HEADERS})
+ target_include_directories(CellFrame INTERFACE include/)
+ #python_extension_module(${PROJECT_NAME})
+ #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR dap_python_module)
+ #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR dap_crypto_python_module)
+ #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR DapServerCore)
+ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PROJECT_NAME})
+ install(FILES CellFrame/__init__.py DESTINATION ${PROJECT_NAME})
+ install(FILES CellFrame/PublicNetworks/* DESTINATION ${PROJECT_NAME})
+ # install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdap-python/libdap_python_module.so DESTINATION CellFrame/lib)
+ # install(TARGETS dap_python_module LIBRARY DESTINATION CellFrame)
+ # install(TARGETS dap_crypto_python_module LIBRARY DESTINATION CellFrame)
+ # install(TARGETS DapServerCore LIBRARY DESTINATION CellFrame)
+ #else()
+ # add_library(${PROJECT_NAME} SHARED ${PYTHON_CELLFRAME_SRCS} ${PYTHON_CELLFRAME_HEADERS})
+ #endif()
+
+endif()
+
+
if (NOT (SUPPORT_PYTHON_PLUGINS))
if (NOT(WIN32))
set(CELLFRAME_MODULES "core chains network cs-none srv")
@@ -28,6 +75,8 @@ else()
target_compile_options(dap_plugins_python PRIVATE "-fpic")
endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
add_subdirectory(modules/dap-sdk/core)
add_subdirectory(modules/dap-sdk/crypto)
add_subdirectory(modules/dap-sdk/net/core)
@@ -96,49 +145,6 @@ target_compile_options(dap_stream_ch_chain_net_srv PRIVATE "-fpic")
-if (SUPPORT_PYTHON_PLUGINS)
- file (GLOB APP_CONTEXT_HEADER
- modules/plugins/include/dap_plugins_python_app_context.h)
-
- add_definitions("-fpic")
- add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
- add_library(${PROJECT_NAME} STATIC ${PYTHON_CELLFRAME_SRCS} ${APP_CONTEXT_HEADER} ${PYTHON_CELLFRAME_HEADERS})
-
-else()
-
- SET( CPACK_GENERATOR "DEB")
- SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
- SET( CPACK_PACKAGE_VERSION_MAJOR 0)
- SET( CPACK_PACKAGE_VERSION_MINOR 9)
- SET( CPACK_PACKAGE_VERSION_PATCH 15)
-
- add_definitions("-DDAP_VERSION_MAJOR=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
- add_definitions("-DDAP_VERSION_MINOR=\"${CPACK_PACKAGE_VERSION_MINOR}\"")
- add_definitions("-DDAP_VERSION_PATCH=\"${CPACK_PACKAGE_VERSION_PATCH}\"")
- add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}\"")
- set(SUBMODULES_NO_BUILD ON)
-
-
- #if (SKBUILD)
- message(STATUS "Make python extension")
- #find_package(PythonExtensions REQUIRED)
- add_library(CellFrame MODULE ${PYTHON_CELLFRAME_SRCS} ${PYTHON_CELLFRAME_HEADERS})
- #python_extension_module(${PROJECT_NAME})
- #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR dap_python_module)
- #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR dap_crypto_python_module)
- #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR DapServerCore)
- install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PROJECT_NAME})
- install(FILES CellFrame/__init__.py DESTINATION ${PROJECT_NAME})
- install(FILES CellFrame/PublicNetworks/* DESTINATION ${PROJECT_NAME})
- # install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdap-python/libdap_python_module.so DESTINATION CellFrame/lib)
- # install(TARGETS dap_python_module LIBRARY DESTINATION CellFrame)
- # install(TARGETS dap_crypto_python_module LIBRARY DESTINATION CellFrame)
- # install(TARGETS DapServerCore LIBRARY DESTINATION CellFrame)
- #else()
- # add_library(${PROJECT_NAME} SHARED ${PYTHON_CELLFRAME_SRCS} ${PYTHON_CELLFRAME_HEADERS})
- #endif()
-
-endif()
target_compile_options(dap_core PRIVATE "-fpic")
target_compile_options(dap_app_cli PRIVATE "-fpic")
@@ -199,4 +205,3 @@ target_link_libraries(${PROJECT_NAME} cellframe-sdk dap_python_module
${PYTHON_LIBRARIES}
)
-target_include_directories(${PROJECT_NAME} INTERFACE include/)
diff --git a/CellFrame/wrapping_dap_mempool.c b/CellFrame/wrapping_dap_mempool.c
deleted file mode 100644
index 4e887066..00000000
--- a/CellFrame/wrapping_dap_mempool.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include "wrapping_dap_mempool.h"
-
-PyMethodDef DapMempoolMethods[] = {
- {"proc", dap_chain_mempool_proc_py, METH_VARARGS | METH_STATIC, ""},
- {"txCreate", dap_chain_mempool_tx_create_py, METH_VARARGS | METH_STATIC, ""},
- {"txCreateCond", dap_chain_mempool_tx_create_cond_py, METH_VARARGS | METH_STATIC, ""},
- {"txCreateCondInput", dap_chain_mempool_tx_create_cond_input_py, METH_VARARGS | METH_STATIC, ""},
- {NULL,NULL,0,NULL}
-};
-
-PyTypeObject DapChainMempoolObjectType = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "CellFrame.DapMempool", /* tp_name */
- sizeof(PyDapMempoolObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- 0, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- 0, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT |
- Py_TPFLAGS_BASETYPE, /* tp_flags */
- "Dap mempool object", /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- DapMempoolMethods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- 0, /* tp_init */
- 0, /* tp_alloc */
- PyType_GenericNew, /* tp_new */
-};
-
-PyObject *dap_chain_mempool_proc_py(PyObject *self, PyObject *args){
- PyObject *obj_chain = NULL;
- PyObject *obj_datum = NULL;
- if (!PyArg_ParseTuple(args, "OO", &obj_datum, &obj_chain)){
- return NULL;
- }
- if (!PyDapChain_Check(obj_chain)){
- PyErr_SetString(PyExc_AttributeError, "The second function argument is invalid, it must be an "
- "instance of an object of type CellFrame.Chain.Chain ");
- return NULL;
- }
- dap_chain_t * l_chain = ((PyDapChainObject*)obj_chain)->chain_t;
- dap_chain_net_t * l_net = dap_chain_net_by_id(l_chain->net_id);
-
- char * l_gdb_group_mempool = NULL, *l_gdb_group_mempool_tmp;
- l_gdb_group_mempool = dap_chain_net_get_gdb_group_mempool(l_chain);
-
- // If full or light it doesnt work
- if(dap_chain_net_get_role(l_net).enums>= NODE_ROLE_FULL){
- char *l_str = dap_strdup_printf("Need master node role or higher for network %s to process this command", l_net->pub.name);
- PyErr_SetString(PyExc_RuntimeError, l_str);
- return NULL;
- }
-
- dap_chain_datum_t *l_datum = NULL;
- if (PyUnicode_Check(obj_datum)){
- const char *l_datum_hash_str = PyUnicode_AsUTF8(obj_datum);
- size_t l_datum_size = 0;
- l_datum = (dap_chain_datum_t*) dap_chain_global_db_gr_get(l_datum_hash_str,
- &l_datum_size, l_gdb_group_mempool);
- if (!l_datum){
- PyErr_SetString(PyExc_AttributeError, dap_strdup_printf("Failed to get data from "
- "chain %s on network %s using hash %s",
- l_chain->name, l_net->pub.name, l_datum_hash_str));
- return NULL;
- }
- size_t l_datum_size2= l_datum? dap_chain_datum_size( l_datum): 0;
- if (l_datum_size != l_datum_size2 ){
- PyErr_SetString(PyExc_RuntimeError, dap_strdup_printf("Error! Corrupted datum %s, size by datum headers is %zd when in mempool is only %zd bytes",
- l_datum_size2, l_datum_size));
- return NULL;
- }
- }
- if (PyDapChainDatum_Check(obj_datum)){
- l_datum = ((PyDapChainDatumObject*)obj_datum)->datum;
- }
-
- if (!l_datum){
- PyErr_SetString(PyExc_AttributeError, "The first function argument is not correct, it must be an"
- " instance of an object of type CellFrame.Chain.Datum or it must be a"
- " string with the datum hash represented in hexadecimal.");
- return NULL;
- }
-
- int l_verify_datum= dap_chain_net_verify_datum_for_add( l_net, l_datum) ;
- if (l_verify_datum != 0){
- PyErr_SetString(PyExc_RuntimeError, dap_strdup_printf("Error! Datum doesn't pass verifications (code %d) examine node log files",
- l_verify_datum));
- return NULL;
- }else{
- if (l_chain->callback_add_datums){
- if (l_chain->callback_add_datums(l_chain, &l_datum, 1) ==0 ){
- PyErr_SetString(PyExc_RuntimeError, "Error! Datum doesn't pass verifications, examine node log files");
- return NULL;
- }else{
- size_t l_datum_size = dap_chain_datum_size(l_datum);
- dap_hash_fast_t l_datum_hash= {0};
- dap_hash_fast(l_datum, l_datum_size, &l_datum_hash);
- char *l_datum_hash_str = dap_chain_hash_fast_to_str_new(&l_datum_hash);
- bool res_del_mempool = dap_chain_global_db_gr_del( dap_strdup(l_datum_hash_str), l_gdb_group_mempool);
- DAP_DEL_Z(l_datum_hash_str);
- if (!res_del_mempool){
- PyErr_SetString(PyExc_Warning, "Warning! Can't delete datum from mempool!");
- return NULL;
- }
- return Py_None;
- }
- }else{
- PyErr_SetString(PyExc_RuntimeError, "Error! Can't move to no-concensus chains from mempool");
- return NULL;
- }
- }
- DAP_DELETE(l_gdb_group_mempool);
-}
-
-PyObject *dap_chain_mempool_tx_create_py(PyObject *self, PyObject *args){
- (void)self;
- PyObject *obj_chain;
- PyObject *obj_key_from;
- PyObject *obj_addr_from;
- PyObject *obj_addr_to;
- PyObject *obj_addr_fee;
- char *l_token_ticker;
- uint64_t l_value;
- uint64_t l_value_fee;
- if (!PyArg_ParseTuple(args, "OOOOOskk", &obj_chain, &obj_key_from, &obj_addr_from, &obj_addr_to, &obj_addr_fee,
- &l_token_ticker, &l_value, &l_value_fee)){
- return NULL;
- }
- dap_chain_t *l_chain = ((PyDapChainObject*)obj_chain)->chain_t;
- dap_enc_key_t *l_key_from = ((PyCryptoKeyObject*)obj_key_from)->key;
- dap_chain_addr_t *l_addr_from = ((PyDapChainAddrObject*)obj_addr_from)->addr;
- dap_chain_addr_t *l_addr_to = ((PyDapChainAddrObject*)obj_addr_to)->addr;
- dap_chain_addr_t *l_addr_fee = ((PyDapChainAddrObject*)obj_addr_fee)->addr;
- uint256_t l_value_256 = dap_chain_uint256_from(l_value);
- uint256_t l_value_fee_256 = dap_chain_uint256_from(l_value_fee);
- dap_chain_hash_fast_t *l_hash_tx = dap_chain_mempool_tx_create(l_chain, l_key_from,
- l_addr_from, l_addr_to,
- l_addr_fee, l_token_ticker,
- l_value_256, l_value_fee_256);
- if (l_hash_tx == NULL){
- return Py_None;
- } else {
- PyDapHashFastObject *obj_hf = PyObject_New(PyDapHashFastObject, &DapChainHashFastObjectType);
- PyObject_Dir((PyObject*)obj_hf);
- obj_hf->hash_fast = l_hash_tx;
- return (PyObject*)obj_hf;
- }
-}
-
-PyObject *dap_chain_mempool_tx_create_cond_py(PyObject *self, PyObject *args){
- (void)self;
- PyDapChainNetObject *obj_net;
- PyObject* obj_key_from;
- PyObject* obj_key_cond;
- char *l_token_ticker;
- uint64_t l_value;
- uint64_t l_value_per_unit_max;
- PyObject *obj_unit;
- PyObject *obj_srv_uid;
- uint64_t l_fee;
- PyObject *obj_cond;
- if (!PyArg_ParseTuple(args, "OOOskkOOkO", &obj_net, &obj_key_from, &obj_key_cond, &l_token_ticker, &l_value,
- &l_value_per_unit_max, &obj_unit, &obj_srv_uid, &l_fee, &obj_cond)){
- PyErr_SetString(PyExc_AttributeError, "Function takes exactly ten arguments.");
- return NULL;
- }
- if (!PyDapChainNet_Check(obj_net)){
- PyErr_SetString(PyExc_AttributeError, "Invalid first argument passed. The first argument must "
- "be an instance of an object of type ChainNet. ");
- return NULL;
- }
- void *l_bytes_cond = PyBytes_AsString(obj_cond);
- size_t l_bytes_cond_size = PyBytes_Size(obj_cond);
- uint256_t l_value_256 = dap_chain_uint256_from(l_value);
- uint256_t l_value_per_unit_max_256 = dap_chain_uint256_from(l_value_per_unit_max);
- uint256_t l_fee_256 = dap_chain_uint256_from(l_fee);
- dap_hash_fast_t *l_hf = dap_chain_mempool_tx_create_cond(
- obj_net->chain_net,
- ((PyCryptoKeyObject*)obj_key_from)->key,
- ((PyDapPkeyObject *)obj_key_cond)->pkey,
- l_token_ticker,
- l_value_256,
- l_value_per_unit_max_256,
- ((PyDapChainNetSrvPriceUnitUIDObject*)obj_unit)->price_unit_uid,
- ((PyDapChainNetSrvUIDObject*)obj_srv_uid)->net_srv_uid,
- l_fee_256,
- l_bytes_cond,
- l_bytes_cond_size
- );
- if (!l_hf){
- return Py_None;
- }
- PyDapHashFastObject *l_obj_hf = PyObject_New(PyDapHashFastObject, &DapChainHashFastObjectType);
- l_obj_hf->hash_fast = l_hf;
- return (PyObject*)l_hf;
-}
-PyObject *dap_chain_mempool_tx_create_cond_input_py(PyObject *self, PyObject *args){
- (void)self;
- PyDapChainNetObject *obj_net;
- PyDapHashFastObject *obj_tx_prev_hash;
- PyObject *obj_addr_to;
- PyObject *obj_key_tx_sign;
- PyObject *obj_receipt;
- if (!PyArg_ParseTuple(args, "OOOOO", &obj_net, &obj_tx_prev_hash, &obj_addr_to, &obj_key_tx_sign, &obj_receipt)){
- PyErr_SetString(PyExc_AttributeError, "Function takes exactly five arguments.");
- return NULL;
- }
- if (!PyDapChainNet_Check(obj_net)) {
- PyErr_SetString(PyExc_AttributeError, "Invalid first argument passed. The first argument must "
- "be an instance of an object of type ChainNet. ");
- return NULL;
- }
- if (!PyDapHashFast_Check(obj_tx_prev_hash)){
- PyErr_SetString(PyExc_AttributeError, "Invalid second argument passed. The first argument must "
- "be an instance of an object of type ChainNet. ");
- return NULL;
- }
- if (!PyDapSignObject_Check(obj_key_tx_sign)){
- PyErr_SetString(PyExc_AttributeError, "Invalid fourth argument passed. The first argument must "
- "be an instance of an object of type DapSign.");
- return NULL;
- }
- dap_chain_hash_fast_t *l_hf =dap_chain_mempool_tx_create_cond_input(
- obj_net->chain_net,
- obj_tx_prev_hash->hash_fast,
- ((PyDapChainAddrObject *)obj_addr_to)->addr,
- ((PyCryptoKeyObject*)obj_key_tx_sign)->key,
- ((PyDapChainTXReceiptObject*)obj_receipt)->tx_receipt);
- if (!l_hf){
- return Py_None;
- }
- PyDapHashFastObject *l_obj_hf = PyObject_New(PyDapHashFastObject, &DapChainHashFastObjectType);
- l_obj_hf->hash_fast = l_hf;
- return (PyObject*)l_hf;
-}
diff --git a/modules/cellframe-sdk/app-cli/CMakeLists.txt b/modules/cellframe-sdk/app-cli/CMakeLists.txt
index 99e8143a..6335ad3f 100644
--- a/modules/cellframe-sdk/app-cli/CMakeLists.txt
+++ b/modules/cellframe-sdk/app-cli/CMakeLists.txt
@@ -21,8 +21,8 @@ endif()
file(GLOB APP_CLI_PYTHON_SRCS src/*.c)
file(GLOB APP_CLI_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${APP_CLI_PYTHON_SRCS} ${APP_CLI_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/chain/CMakeLists.txt b/modules/cellframe-sdk/chain/CMakeLists.txt
index 9ba51a86..6cd03f2d 100644
--- a/modules/cellframe-sdk/chain/CMakeLists.txt
+++ b/modules/cellframe-sdk/chain/CMakeLists.txt
@@ -194,8 +194,8 @@ endif()
file(GLOB CHAIN_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/common/CMakeLists.txt b/modules/cellframe-sdk/common/CMakeLists.txt
index fab7b4be..d91894d6 100644
--- a/modules/cellframe-sdk/common/CMakeLists.txt
+++ b/modules/cellframe-sdk/common/CMakeLists.txt
@@ -200,8 +200,8 @@ endif()
file(GLOB CHAIN_COMMON_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_COMMON_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_COMMON_PYTHON_SRCS} ${CHAIN_COMMON_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt b/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
index 7793c012..9884a9a8 100644
--- a/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
+++ b/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
@@ -200,8 +200,8 @@ endif()
file(GLOB CHAIN_COMMON_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_COMMON_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_COMMON_PYTHON_SRCS} ${CHAIN_COMMON_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/gdb/CMakeLists.txt b/modules/cellframe-sdk/gdb/CMakeLists.txt
index 8e4ad3dd..9d1ddd54 100644
--- a/modules/cellframe-sdk/gdb/CMakeLists.txt
+++ b/modules/cellframe-sdk/gdb/CMakeLists.txt
@@ -199,8 +199,8 @@ endif()
file(GLOB CHAIN_GDB_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_GDB_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_GDB_PYTHON_SRCS} ${CHAIN_GDB_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/global-db/CMakeLists.txt b/modules/cellframe-sdk/global-db/CMakeLists.txt
index e1369be6..9a91bd4a 100644
--- a/modules/cellframe-sdk/global-db/CMakeLists.txt
+++ b/modules/cellframe-sdk/global-db/CMakeLists.txt
@@ -181,8 +181,8 @@ endif()
file(GLOB CHAIN_GLOBAL_DB_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_GLOBAL_DB_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_GLOBAL_DB_PYTHON_SRCS} ${CHAIN_GLOBAL_DB_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/mempool/CMakeLists.txt b/modules/cellframe-sdk/mempool/CMakeLists.txt
index bb41c56b..589203b2 100644
--- a/modules/cellframe-sdk/mempool/CMakeLists.txt
+++ b/modules/cellframe-sdk/mempool/CMakeLists.txt
@@ -194,8 +194,8 @@ endif()
file(GLOB CHAIN_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/net/CMakeLists.txt b/modules/cellframe-sdk/net/CMakeLists.txt
index fce4f2fa..bc06001b 100644
--- a/modules/cellframe-sdk/net/CMakeLists.txt
+++ b/modules/cellframe-sdk/net/CMakeLists.txt
@@ -179,8 +179,8 @@ endif()
file(GLOB CHAIN_NET_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_NET_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_NET_PYTHON_SRCS} ${CHAIN_NET_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/net/srv/CMakeLists.txt b/modules/cellframe-sdk/net/srv/CMakeLists.txt
index 866b93e4..3d2ba96c 100644
--- a/modules/cellframe-sdk/net/srv/CMakeLists.txt
+++ b/modules/cellframe-sdk/net/srv/CMakeLists.txt
@@ -179,8 +179,8 @@ endif()
file(GLOB CHAIN_NET_SRV_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_NET_SRV_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_NET_SRV_PYTHON_SRCS} ${CHAIN_NET_SRV_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/services/datum/CMakeLists.txt b/modules/cellframe-sdk/services/datum/CMakeLists.txt
index 67713ce1..2a4579e7 100644
--- a/modules/cellframe-sdk/services/datum/CMakeLists.txt
+++ b/modules/cellframe-sdk/services/datum/CMakeLists.txt
@@ -179,8 +179,8 @@ endif()
file(GLOB CHAIN_NET_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_NET_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_NET_PYTHON_SRCS} ${CHAIN_NET_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/type/blocks/CMakeLists.txt b/modules/cellframe-sdk/type/blocks/CMakeLists.txt
index 07566ea7..ebf2ddce 100644
--- a/modules/cellframe-sdk/type/blocks/CMakeLists.txt
+++ b/modules/cellframe-sdk/type/blocks/CMakeLists.txt
@@ -194,8 +194,8 @@ endif()
file(GLOB CHAIN_CS_DAG_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_CS_DAG_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_CS_DAG_PYTHON_SRCS} ${CHAIN_CS_DAG_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/type/dag/CMakeLists.txt b/modules/cellframe-sdk/type/dag/CMakeLists.txt
index b4f1649e..7c91e162 100644
--- a/modules/cellframe-sdk/type/dag/CMakeLists.txt
+++ b/modules/cellframe-sdk/type/dag/CMakeLists.txt
@@ -194,8 +194,8 @@ endif()
file(GLOB CHAIN_CS_DAG_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_CS_DAG_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_CS_DAG_PYTHON_SRCS} ${CHAIN_CS_DAG_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/wallet/CMakeLists.txt b/modules/cellframe-sdk/wallet/CMakeLists.txt
index 479a13fa..3c2c8e1a 100644
--- a/modules/cellframe-sdk/wallet/CMakeLists.txt
+++ b/modules/cellframe-sdk/wallet/CMakeLists.txt
@@ -10,8 +10,8 @@ add_definitions("-DDAP_LOG_MT")
file(GLOB CHAIN_WALLET_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_WALLET_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_WALLET_PYTHON_SRCS} ${CHAIN_WALLET_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/core/CMakeLists.txt b/modules/dap-sdk/core/CMakeLists.txt
index 62b978e0..3338881a 100644
--- a/modules/dap-sdk/core/CMakeLists.txt
+++ b/modules/dap-sdk/core/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
file(GLOB CORE_SRCS src/*.c)
file(GLOB CORE_HEADERS src/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/core/test/CMakeLists.txt b/modules/dap-sdk/core/test/CMakeLists.txt
index d62eeae3..fd9c0206 100644
--- a/modules/dap-sdk/core/test/CMakeLists.txt
+++ b/modules/dap-sdk/core/test/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-set(Python_ADDITIONAL_VERSIONS 3.7)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
file(GLOB TPO_INCLUDES include/*.h)
diff --git a/modules/dap-sdk/crypto/CMakeLists.txt b/modules/dap-sdk/crypto/CMakeLists.txt
index cd8ef325..276efec1 100644
--- a/modules/dap-sdk/crypto/CMakeLists.txt
+++ b/modules/dap-sdk/crypto/CMakeLists.txt
@@ -28,8 +28,8 @@ endif()
file(GLOB CRYPTO_PYTHON_SRCS src/*.c)
file(GLOB CRYPTO_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CRYPTO_PYTHON_SRCS} ${CRYPTO_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/crypto/test/CMakeLists.txt b/modules/dap-sdk/crypto/test/CMakeLists.txt
index 41ae06c7..e4e9d54f 100644
--- a/modules/dap-sdk/crypto/test/CMakeLists.txt
+++ b/modules/dap-sdk/crypto/test/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-set(Python_ADDITIONAL_VERSIONS 3.7)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
file(GLOB TPO_INCLUDES include/*.h)
diff --git a/modules/dap-sdk/net/client/CMakeLists.txt b/modules/dap-sdk/net/client/CMakeLists.txt
index bcca3014..06e7c99a 100644
--- a/modules/dap-sdk/net/client/CMakeLists.txt
+++ b/modules/dap-sdk/net/client/CMakeLists.txt
@@ -74,8 +74,8 @@ endif()
file(GLOB CLIENT_PYTHON_SRCS src/*.c)
file(GLOB CLIENT_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CLIENT_PYTHON_SRCS} ${CLIENT_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/net/core/CMakeLists.txt b/modules/dap-sdk/net/core/CMakeLists.txt
index ba4ab83c..5d224e00 100644
--- a/modules/dap-sdk/net/core/CMakeLists.txt
+++ b/modules/dap-sdk/net/core/CMakeLists.txt
@@ -36,8 +36,8 @@ endif()
file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
file(GLOB SERVER_CORE_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${SERVER_CORE_PYTHON_SRCS} ${SERVER_CORE_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/net/server/enc/CMakeLists.txt b/modules/dap-sdk/net/server/enc/CMakeLists.txt
index 0326d3fb..9c0c9a89 100644
--- a/modules/dap-sdk/net/server/enc/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/enc/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
file(GLOB ENC_SERVER_SRCS src/*.c)
file(GLOB ENC_SERVER_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${ENC_SERVER_SRCS} ${ENC_SERVER_HEADERS})
diff --git a/modules/dap-sdk/net/server/http/CMakeLists.txt b/modules/dap-sdk/net/server/http/CMakeLists.txt
index 023921e0..dbeb37e6 100644
--- a/modules/dap-sdk/net/server/http/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/http/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
file(GLOB SERVER_HTTP_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_HTTP_SIMPLE_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_HTTP_SIMPLE_SRCS} ${SERVER_HTTP_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt b/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
index af8e0736..fff7e775 100644
--- a/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
file(GLOB SERVER_JSON_RPC_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_JSON_RPC_SIMPLE_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_JSON_RPC_SIMPLE_SRCS} ${SERVER_JSON_RPC_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/net/stream/stream/CMakeLists.txt b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
index 66451745..1c60d059 100644
--- a/modules/dap-sdk/net/stream/stream/CMakeLists.txt
+++ b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
file(GLOB SERVER_HTTP_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_HTTP_SIMPLE_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_HTTP_SIMPLE_SRCS} ${SERVER_HTTP_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/plugins/CMakeLists.txt b/modules/plugins/CMakeLists.txt
index b39a6fd8..1a2181f6 100644
--- a/modules/plugins/CMakeLists.txt
+++ b/modules/plugins/CMakeLists.txt
@@ -16,8 +16,8 @@ endif()
file(GLOB DAP_PLUGINS_PYTHON_SRCS src/*.c)
file(GLOB DAP_PLUGINS_PYTHON_HEADERS include/*.h)
-set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
-find_package (PythonLibs REQUIRED)
+#set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+#find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${DAP_PLUGINS_PYTHON_SRCS} ${DAP_PLUGINS_PYTHON_HEADERS})
--
GitLab