Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • cellframe/python-cellframe
1 result
Show changes
Commits on Source (13)
Hide whitespace changes
Inline Side-by-side
Showing
with 82 additions and 61 deletions
CMakeLists.txt
View file @ c22833d8
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
if (SUPPORT_PYTHON_PLUGINS)
project(API_CellFrame C)
......@@ -20,9 +20,9 @@ set(SUBMODULES_NO_BUILD ON)
if (NOT (SUPPORT_PYTHON_PLUGINS))
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 srv-stake")
set(CELLFRAME_MODULES "core chains network cs-none")
else()
set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake")
set(CELLFRAME_MODULES "core chains network cs-none")
endif()
include(cellframe-sdk/cmake/OS_Detection.cmake)
add_subdirectory(cellframe-sdk)
......@@ -35,6 +35,8 @@ add_subdirectory(modules/dap-sdk/core)
add_subdirectory(modules/dap-sdk/crypto)
add_subdirectory(modules/dap-sdk/net/core)
add_subdirectory(modules/dap-sdk/net/client)
add_subdirectory(modules/dap-sdk/net/server/enc)
add_subdirectory(modules/dap-sdk/net/server/http)
add_subdirectory(modules/cellframe-sdk/common)
add_subdirectory(modules/cellframe-sdk/net)
add_subdirectory(modules/cellframe-sdk/gdb)
......@@ -54,12 +56,13 @@ add_subdirectory(modules/cellframe-sdk/wallet)
target_compile_options(dap_core PRIVATE "-fpic")
target_compile_options(dap_core_unix PRIVATE "-fpic")
target_compile_options(dap_app_cli PRIVATE "-fpic")
target_compile_options(dap_crypto PRIVATE "-fpic")
target_compile_options(dap_chain PRIVATE "-fpic")
target_compile_options(dap_chain_common PRIVATE "-fpic")
target_compile_options(dap_chain_wallet PRIVATE "-fpic" )
target_compile_options(dap_chain_crypto PRIVATE "-fpic" )
#target_compile_options(dap_chain_crypto PRIVATE "-fpic" )
target_compile_options(dap_chain_mempool PRIVATE "-fpic" )
target_compile_options(dap_chain_net PRIVATE "-fpic" )
target_compile_options(dap_server_core PRIVATE "-fpic" )
......@@ -70,26 +73,29 @@ target_compile_options(dap_stream PRIVATE "-fpic" )
target_compile_options(dap_stream_ch PRIVATE "-fpic" )
target_compile_options(dap_stream_ch_chain_net PRIVATE "-fpic" )
target_compile_options(dap_stream_ch_chain PRIVATE "-fpic" )
target_compile_options(dap_chain_net_srv PRIVATE "-fpic" )
#target_compile_options(dap_chain_net_srv PRIVATE "-fpic" )
#target_compile_options(dap_chain_net_srv_stake PRIVATE "-fpic")
if(NOT WIN32)
target_compile_options(dap_chain_net_srv_vpn PRIVATE "-fpic" )
# target_compile_options(dap_chain_net_srv_vpn PRIVATE "-fpic" )
endif()
target_compile_options(dap_chain_cs_none PRIVATE "-fpic" )
#target_compile_options(dap_chain_cs_none PRIVATE "-fpic" )
target_compile_options(dap_enc_server PRIVATE "-fpic")
target_compile_options(dap_http_server PRIVATE "-fpic")
target_compile_options(dap_session PRIVATE "-fpic")
target_compile_options(dap_stream_ch_chain_net_srv PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag_pos PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag_pos 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} ${PYTHON_CELLFRAME_HEADERS})
add_library(${PROJECT_NAME} STATIC ${PYTHON_CELLFRAME_SRCS} ${APP_CONTEXT_HEADER} ${PYTHON_CELLFRAME_HEADERS})
else()
......@@ -133,7 +139,7 @@ target_compile_options(dap_crypto PRIVATE "-fpic")
target_compile_options(dap_chain PRIVATE "-fpic")
target_compile_options(dap_chain_common PRIVATE "-fpic")
target_compile_options(dap_chain_wallet PRIVATE "-fpic" )
target_compile_options(dap_chain_crypto PRIVATE "-fpic" )
#target_compile_options(dap_chain_crypto PRIVATE "-fpic" )
target_compile_options(dap_chain_mempool PRIVATE "-fpic" )
target_compile_options(dap_chain_net PRIVATE "-fpic" )
target_compile_options(dap_server_core PRIVATE "-fpic" )
......@@ -144,18 +150,19 @@ target_compile_options(dap_stream PRIVATE "-fpic" )
target_compile_options(dap_stream_ch PRIVATE "-fpic" )
target_compile_options(dap_stream_ch_chain_net PRIVATE "-fpic" )
target_compile_options(dap_stream_ch_chain PRIVATE "-fpic" )
target_compile_options(dap_chain_net_srv PRIVATE "-fpic" )
#target_compile_options(dap_chain_net_srv PRIVATE "-fpic" )
if (NOT WIN32)
target_compile_options(dap_chain_net_srv_vpn PRIVATE "-fpic" )
#target_compile_options(dap_chain_net_srv_vpn PRIVATE "-fpic" )
endif()
target_compile_options(dap_chain_cs_none PRIVATE "-fpic" )
#target_compile_options(dap_chain_cs_none PRIVATE "-fpic" )
target_compile_options(dap_enc_server PRIVATE "-fpic")
target_compile_options(dap_http_server PRIVATE "-fpic")
target_compile_options(dap_session PRIVATE "-fpic")
target_compile_options(dap_stream_ch_chain_net_srv PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag_pos PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
#target_compile_options(dap_chain_cs_dag_pos PRIVATE "-fpic")
target_compile_options(dap_server_core_python_module PRIVATE "-fpic")
if (WIN32)
......@@ -166,6 +173,8 @@ endif()
target_link_libraries(${PROJECT_NAME} cellframe-sdk dap_python_module
dap_crypto_python_module
dap_server_core_python_module
dap_enc_server_python_module
dap_server_http_python_module
dap_chain_python_module
dap_chain_net_python_module
dap_chain_gdb_python_module
......
CellFrame/python-cellframe.c
View file @ c22833d8
......@@ -291,7 +291,7 @@ PyObject *python_cellframe_init(PyObject *self, PyObject *args){
return NULL;
}
s_init_wallet = true;
} else if (strcmp(c_value, "ChainCSDag") == 0){
/* } else if (strcmp(c_value, "ChainCSDag") == 0){
if (dap_chain_cs_dag_init() != 0)
{
PyErr_SetString(CellFrame_error, "Failed to initialize ChainCSDag module. ");
......@@ -306,7 +306,7 @@ PyObject *python_cellframe_init(PyObject *self, PyObject *args){
if (dap_chain_cs_dag_pos_init() != 0){
PyErr_SetString(CellFrame_error, "Failed to initialize ChainCSDagPos module. ");
return NULL;
}
} */
} else if (strcmp(c_value, "ChainNetSrv") == 0){
if (dap_chain_net_srv_init(g_config) != 0){
PyErr_SetString(CellFrame_error, "Failed to initialize ChainNetSrv module. ");
......@@ -414,13 +414,20 @@ PyMODINIT_FUNC PyInit_libCellFrame(void){
PyType_Ready(&DapChainGDBObject_DapChainGDBType) < 0 ||
PyType_Ready(&DapHTTP_DapHTTPType) < 0 ||
PyType_Ready(&DapEncHTTP_DapEncHTTPType) < 0 ||
PyType_Ready(&DapEncServer_DapEncServerType) < 0 ||
PyType_Ready(&DapStream_DapStreamType) < 0 ||
PyType_Ready(&DapStreamCtl_DapStreamCtlType) < 0 ||
PyType_Ready(&DapMempool_DapMempoolType) < 0 ||
// ====
PyType_Ready(&DapAppCli_dapAppCliType ) < 0 ||
PyType_Ready(&DapChainWallet_dapChainWalletType) < 0
PyType_Ready(&DapChainWallet_dapChainWalletType) < 0 ||
PyType_Ready(&HTTPCode_HTTPCodeType) < 0 ||
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
PyType_Ready(&DapHTTPSimple_DapHTTPSimpleType) < 0 ||
PyType_Ready(&dapAppContext_dapAppContextType) < 0
#else
PyType_Ready(&DapHTTPSimple_DapHTTPSimpleType) < 0
#endif
){
log_it(L_CRITICAL,"Not all py modules are ready for init");
return NULL;
......@@ -494,7 +501,9 @@ PyMODINIT_FUNC PyInit_libCellFrame(void){
PyModule_AddObject(module, "ChainWallet", (PyObject*)&DapChainWallet_dapChainWalletType);
PyModule_AddObject(module, "Http", (PyObject*)&DapHTTP_DapHTTPType);
PyModule_AddObject(module, "EncHttp", (PyObject*)&DapEncHTTP_DapEncHTTPType);
PyModule_AddObject(module, "HttpSimple", (PyObject*)&DapHTTPSimple_DapHTTPSimpleType);
PyModule_AddObject(module, "HttpCode", (PyObject*)&HTTPCode_HTTPCodeType);
PyModule_AddObject(module, "EncHttp", (PyObject*)&DapEncServer_DapEncServerType);
PyModule_AddObject(module, "Stream", (PyObject*)&DapStream_DapStreamType);
PyModule_AddObject(module, "StreamCtl", (PyObject*)&DapStreamCtl_DapStreamCtlType);
PyModule_AddObject(module, "Mempool", (PyObject*)&DapMempool_DapMempoolType);
......@@ -502,6 +511,9 @@ PyMODINIT_FUNC PyInit_libCellFrame(void){
// ==============
PyModule_AddObject(module, "AppCli", (PyObject*)&DapAppCli_dapAppCliType);
PyModule_AddObject(module, "AppCliServer", (PyObject*)&DapChainNodeCliObject_DapChainNodeCliObjectType);
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
PyModule_AddObject(module, "AppContext", (PyObject*)&dapAppContext_dapAppContextType);
#endif
return module;
}
......
CellFrame/wrapping_dap_enc_http.c deleted 100644 → 0
View file @ a26bb987
#include "wrapping_dap_enc_http.h"
PyObject *enc_http_add_proc_py(PyObject *self, PyObject *args){
PyObject *obj_server;
const char *HTTP_URL;
if (!PyArg_ParseTuple(args, "O|s", &obj_server, &HTTP_URL))
return NULL;
enc_http_add_proc(DAP_HTTP(((PyDapServerObject*)obj_server)->t_server), HTTP_URL);
return PyLong_FromLong(0);
}
cellframe-sdk @ eec40837
Compare 2cf9459c...eec40837
Subproject commit 2cf9459cd7f5faca341a3793433fbf17e6c84afa
Subproject commit eec40837af57d515dee388bfee64c3f06abcbb0b
dists/examples/0.Beginning/CMakeLists.txt
View file @ c22833d8
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
project (0.Beginning)
FILE(COPY MyChains.py DESTINATION .)
......
dists/examples/3.Stock/CMakeLists.txt
View file @ c22833d8
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
project (1.Stock)
FILE(COPY MyStock.py DESTINATION .)
......
dists/examples/CMakeLists.txt
View file @ c22833d8
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0)
FIND_PACKAGE(PythonInterp)
......
include/python-cellframe.h
View file @ c22833d8
......@@ -38,9 +38,9 @@
//#include "dap_http_client_simple.h"
//#include "dap_chain_wallet.h"
#include "dap_chain_cs.h"
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_poa.h"
#include "dap_chain_cs_dag_pos.h"
//#include "dap_chain_cs_dag.h"
//#include "dap_chain_cs_dag_poa.h"
//#include "dap_chain_cs_dag_pos.h"
#include "dap_chain_net_srv.h"
#include "dap_http_simple.h"
#include "dap_stream_ch_chain.h"
......@@ -67,6 +67,12 @@
BOOL WINAPI consoleHandler(DWORD);
#else
#include "signal.h"
#include "wrapping_http_status_code.h"
#include "wrapping_dap_http_simple.h"
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
#include "../modules/plugins/include/dap_plugins_python_app_context.h"
#endif
void sigfunc(int sig);
#endif
......
modules/cellframe-sdk/app-cli/CMakeLists.txt
View file @ c22833d8
project(dap_app_cli_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/cellframe-sdk/chain/CMakeLists.txt
View file @ c22833d8
project(dap_chain_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......@@ -202,7 +202,7 @@ add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
target_link_libraries(${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto dap_server_core dap_chain_net dap_crypto_python_module dap_python_module dap_chain_common_python_module)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_server_core dap_chain_net dap_crypto_python_module dap_python_module dap_chain_common_python_module)
target_include_directories(${PROJECT_NAME} PUBLIC include/ )
modules/cellframe-sdk/common/CMakeLists.txt
View file @ c22833d8
project(dap_chain_common_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/cellframe-sdk/gdb/CMakeLists.txt
View file @ c22833d8
project(dap_chain_gdb_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/cellframe-sdk/net/CMakeLists.txt
View file @ c22833d8
project(dap_chain_net_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......@@ -197,7 +197,7 @@ target_link_libraries(${PROJECT_NAME})
#)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto dap_server_core dap_chain_net dap_chain_python_module dap_client_python_module)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_server_core dap_chain_net dap_chain_python_module dap_client_python_module)
#target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_global_db dap_chain_crypto dap_chain_mempool
#
# ) #dap_chain_crypto dap_chain_mempool dap_chain_global_db )
......
modules/cellframe-sdk/net/src/wrapping_dap_chain_net_node_client.c
View file @ c22833d8
......@@ -8,27 +8,31 @@ void dap_chain_node_client_deinit_py(void){
}
PyObject *dap_chain_client_connect_py(PyObject *self, PyObject *args){
PyObject *obj_net;
PyObject *obj_node_info;
PyObject *obj_client_stage;
const char *active_channels;
if (!PyArg_ParseTuple(args, "O|O|s", &obj_node_info, &obj_client_stage, &active_channels))
if (!PyArg_ParseTuple(args, "O|O|s",&obj_net, &obj_node_info, &active_channels))
return NULL;
PyObject *obj_node_client = _PyObject_New(&DapChainNodeClientObject_DapChainNodeClientObjectType);
((PyDapChainNodeClientObject*)obj_node_client)->node_client =dap_chain_client_connect(
((PyDapChainNodeInfoObject*)obj_node_info)->node_info,
((PyDapClientStageObject*)obj_client_stage)->stage, active_channels);
((PyDapChainNodeClientObject*)obj_node_client)->node_client =dap_chain_node_client_connect_channels(
((PyDapChainNetObject*) obj_net)->chain_net,
((PyDapChainNodeInfoObject*)obj_node_info)->node_info, active_channels);
return Py_BuildValue("O", obj_node_client);
}
PyObject *dap_chain_node_client_connect_py(PyObject *self, PyObject *args){
if (self != NULL){
PyErr_SetString(PyExc_SyntaxWarning, "This is method called statically");
return NULL;
}
PyObject *obj_net;
PyObject *obj_node_info;
if (!PyArg_ParseTuple(args, "O", &obj_node_info))
if (!PyArg_ParseTuple(args, "O|O",&obj_net, &obj_node_info))
return NULL;
PyObject *obj_node_client = _PyObject_New(&DapChainNodeClientObject_DapChainNodeClientObjectType);
((PyDapChainNodeClientObject*)obj_node_client)->node_client = dap_chain_node_client_connect(((PyDapChainNodeInfoObject*)obj_node_info)->node_info);
((PyDapChainNodeClientObject*)obj_node_client)->node_client = dap_chain_node_client_connect(
((PyDapChainNetObject*) obj_net)->chain_net,
((PyDapChainNodeInfoObject*)obj_node_info)->node_info);
return Py_BuildValue("O", obj_node_client);
}
PyObject *dap_chain_node_client_close_py(PyObject *self, PyObject *args){
......
modules/cellframe-sdk/wallet/CMakeLists.txt
View file @ c22833d8
project(dap_chain_wallet_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......@@ -21,7 +21,7 @@ target_link_libraries(${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME} dap_core
dap_crypto
dap_crypto_python_module
dap_chain dap_chain_crypto
dap_chain
dap_chain_python_module
dap_chain_net
dap_chain_wallet )
......
modules/dap-sdk/core/CMakeLists.txt
View file @ c22833d8
project(dap_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/dap-sdk/core/test/CMakeLists.txt
View file @ c22833d8
project(TPO C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/dap-sdk/crypto/CMakeLists.txt
View file @ c22833d8
project(dap_crypto_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/dap-sdk/crypto/test/CMakeLists.txt
View file @ c22833d8
project(TPO C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......
modules/dap-sdk/net/client/CMakeLists.txt
View file @ c22833d8
project(dap_client_python_module C)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
......