diff --git a/.gitmodules b/.gitmodules index e27df003d77cbf6733ddb33c3decc699459bb7de..f31f256df596e3e938234d1081ac70db5c7d9780 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,9 @@ [submodule "libdap-python"] path = libdap-python url = https://gitlab.demlabs.net/cellframe/libdap-python.git +[submodule "libdap-chain-net-srv-vpn"] + path = libdap-chain-net-srv-vpn + url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-vpn.git +[submodule "libdap-server-http-db"] + path = libdap-server-http-db + url = https://gitlab.demlabs.net/cellframe/libdap-server-http-db.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2147abd257879ea342886b534f4d49a99d0f7aad..2603c2ce4f01aaa1e6bf026530ce5ef2c4ba171a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_C_STANDARD 11) add_definitions("-fpic") +add_definitions("-DDAP_LOG_MT") add_definitions ("-DNODE_NETNAME=\"cellframe\"") if(UNIX) @@ -160,9 +161,20 @@ if (NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) "-fpic" ) endif() -# if (NOT (TARGET dap_chain_net_srv_vpn)) -# add_subdirectory(libdap-chain-net-srv-vpn) -# endif() + if (NOT (TARGET dap_chain_net_srv_vpn)) + add_subdirectory(libdap-chain-net-srv-vpn) + target_compile_options( + dap_chain_net_srv_vpn PRIVATE + "-fpic" + ) + endif() + if (NOT (TARGET dap_server_http_db)) + add_subdirectory(libdap-server-http-db) + target_compile_options( + dap_server_http_db PRIVATE + "-fpic" + ) + endif() endif() #add_definitions("-DDAP_APP_NAME=\"TestPRJ\" -DSYSTEM_CONFIGS_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\"") diff --git a/include/wrapping_dap_chain_datum_tx.h b/include/wrapping_dap_chain_datum_tx.h index 1b2564ec1d6ccd6eee9a2668edf92e5b421d9eda..62203de76935f602016be83eb17592eea206ce3b 100644 --- a/include/wrapping_dap_chain_datum_tx.h +++ b/include/wrapping_dap_chain_datum_tx.h @@ -23,7 +23,7 @@ PyObject *TX_ITEM_TYPE_SIG_PY(void); PyObject *TX_ITEM_TYPE_TOKEN_PY(void); PyObject *TX_ITEM_TYPE_IN_COND_PY(void); PyObject *TX_ITEM_TYPE_OUT_COND_PY(void); -PyObject *TX_ITEM_TYPE_OUT_SERVICE_RECEIPT_PY(void); +PyObject *TX_ITEM_TYPE_RECEIPT_PY(void); static PyMethodDef PyDapChainTxItemTypeObjectMethods[] ={ {"TX_ITEM_TYPE_IN", (PyCFunction)TX_ITEM_TYPE_IN_PY, METH_NOARGS | METH_STATIC, ""}, @@ -33,7 +33,7 @@ static PyMethodDef PyDapChainTxItemTypeObjectMethods[] ={ {"TX_ITEM_TYPE_TOKEN", (PyCFunction)TX_ITEM_TYPE_TOKEN_PY, METH_NOARGS | METH_STATIC, ""}, {"TX_ITEM_TYPE_IN_COND", (PyCFunction)TX_ITEM_TYPE_IN_COND_PY, METH_NOARGS | METH_STATIC, ""}, {"TX_ITEM_TYPE_OUT_COND", (PyCFunction)TX_ITEM_TYPE_OUT_COND_PY, METH_NOARGS | METH_STATIC, ""}, - {"TX_ITEM_TYPE_OUT_SERVICE_RECEIPT", (PyCFunction)TX_ITEM_TYPE_OUT_SERVICE_RECEIPT_PY, + {"TX_ITEM_TYPE_RECEIPT", (PyCFunction)TX_ITEM_TYPE_RECEIPT_PY, METH_NOARGS | METH_STATIC, ""}, {NULL, NULL, 0, NULL} }; diff --git a/libdap b/libdap index 4e8e7c7de1c2b87ca4599e63f2719504a3b41206..08177c98b8d52f069ac4ef3a140d925d440d80e0 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 4e8e7c7de1c2b87ca4599e63f2719504a3b41206 +Subproject commit 08177c98b8d52f069ac4ef3a140d925d440d80e0 diff --git a/libdap-chain b/libdap-chain index 5952caa80d23284c73074a267c96a8927e68adeb..ec0498403cf7fb9de7e4c89bb41cbc4de27a5461 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 5952caa80d23284c73074a267c96a8927e68adeb +Subproject commit ec0498403cf7fb9de7e4c89bb41cbc4de27a5461 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index 3f9ca3093acde91b6cd92c7c3b95d8c1d9dea66d..94899eb05efd7c66bdd6f88a73fb3e5e92f7daf9 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit 3f9ca3093acde91b6cd92c7c3b95d8c1d9dea66d +Subproject commit 94899eb05efd7c66bdd6f88a73fb3e5e92f7daf9 diff --git a/libdap-chain-gdb b/libdap-chain-gdb index 6ef661685f2792242433bf340f253d255f39e881..e9d57285c3d2383e13e1d949935628cb56c694cc 160000 --- a/libdap-chain-gdb +++ b/libdap-chain-gdb @@ -1 +1 @@ -Subproject commit 6ef661685f2792242433bf340f253d255f39e881 +Subproject commit e9d57285c3d2383e13e1d949935628cb56c694cc diff --git a/libdap-chain-global-db b/libdap-chain-global-db index c877f6176af12172c125a40b5fde75fe8aa2dfc2..6a574e4bd23354672773a9e4b8cbb2b656249c15 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit c877f6176af12172c125a40b5fde75fe8aa2dfc2 +Subproject commit 6a574e4bd23354672773a9e4b8cbb2b656249c15 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index baf3fd7bdaead5d008a2e3595486792ea5083b20..86046978d73ef5902292123e829d4a7cf4ac561f 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit baf3fd7bdaead5d008a2e3595486792ea5083b20 +Subproject commit 86046978d73ef5902292123e829d4a7cf4ac561f diff --git a/libdap-chain-net b/libdap-chain-net index f1654804d37d534215f5d16a7d09c8f02966143c..350907cdc684f43d95cf77a17ae93a67d1e7d87a 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit f1654804d37d534215f5d16a7d09c8f02966143c +Subproject commit 350907cdc684f43d95cf77a17ae93a67d1e7d87a diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index be35813a341b88738d909329974407cab87c0143..d2f249c4e87e98e189db5137f29ea700bc37dbab 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit be35813a341b88738d909329974407cab87c0143 +Subproject commit d2f249c4e87e98e189db5137f29ea700bc37dbab diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn new file mode 160000 index 0000000000000000000000000000000000000000..5dcc0643dff2e49129d0a49aab502ff0888e65d4 --- /dev/null +++ b/libdap-chain-net-srv-vpn @@ -0,0 +1 @@ +Subproject commit 5dcc0643dff2e49129d0a49aab502ff0888e65d4 diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 7cbed9ab134af5fb033a017cd17c4ead14356694..612b4290de348c137c0feb0e865fd762a5951c8d 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 7cbed9ab134af5fb033a017cd17c4ead14356694 +Subproject commit 612b4290de348c137c0feb0e865fd762a5951c8d diff --git a/libdap-client b/libdap-client index 9f47ebe9e7b1f326800a5ddde661a3e30a4381c2..d3f5458f352294547b1ac68404d5ccdc8dea28ba 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit 9f47ebe9e7b1f326800a5ddde661a3e30a4381c2 +Subproject commit d3f5458f352294547b1ac68404d5ccdc8dea28ba diff --git a/libdap-crypto b/libdap-crypto index bb48d2efb77ee770c6f36c296811688f2ad9c348..17f8218833f473d2c954113617ae63cb5dc9400f 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit bb48d2efb77ee770c6f36c296811688f2ad9c348 +Subproject commit 17f8218833f473d2c954113617ae63cb5dc9400f diff --git a/libdap-server b/libdap-server index fdcfd4fe6727f4d4151affef761007c95d5a36eb..a194011ac545126faa9b0a566c4f4d79fb8a16a0 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit fdcfd4fe6727f4d4151affef761007c95d5a36eb +Subproject commit a194011ac545126faa9b0a566c4f4d79fb8a16a0 diff --git a/libdap-server-core b/libdap-server-core index 73dfe6c2616ef8a805231560051de3c407d7cd89..73a86ef8202ee67a05098d186aac2deacb207f63 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 73dfe6c2616ef8a805231560051de3c407d7cd89 +Subproject commit 73a86ef8202ee67a05098d186aac2deacb207f63 diff --git a/libdap-server-http-db b/libdap-server-http-db new file mode 160000 index 0000000000000000000000000000000000000000..f3f0b0ed919d37368e86210940ebb9de686879a1 --- /dev/null +++ b/libdap-server-http-db @@ -0,0 +1 @@ +Subproject commit f3f0b0ed919d37368e86210940ebb9de686879a1 diff --git a/libdap-server-http-db-auth b/libdap-server-http-db-auth index bdab475c9dfe0ad876cd642a798e1b0b54ca314e..fe5e400dfcdb695e44b6e1ba9cd2005aea28e590 160000 --- a/libdap-server-http-db-auth +++ b/libdap-server-http-db-auth @@ -1 +1 @@ -Subproject commit bdab475c9dfe0ad876cd642a798e1b0b54ca314e +Subproject commit fe5e400dfcdb695e44b6e1ba9cd2005aea28e590 diff --git a/libdap-server-udp b/libdap-server-udp index 2aaaad5981206379c1a7e7c8af3dc3d6aa26e2e7..a14daa6c39aed9bba32684872d03afc7778db61e 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit 2aaaad5981206379c1a7e7c8af3dc3d6aa26e2e7 +Subproject commit a14daa6c39aed9bba32684872d03afc7778db61e diff --git a/libdap-stream b/libdap-stream index a7ee4c8a206e6e5bb1290ba83b00abe0052f2183..85398ae2d3a6b3d49089817ebc7dcfece8150b05 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit a7ee4c8a206e6e5bb1290ba83b00abe0052f2183 +Subproject commit 85398ae2d3a6b3d49089817ebc7dcfece8150b05 diff --git a/libdap-stream-ch b/libdap-stream-ch index f2eabb784a6286356359e69cb50a2957a57aa0b0..daeb35e4680f659d41ade4da7514138e56278685 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit f2eabb784a6286356359e69cb50a2957a57aa0b0 +Subproject commit daeb35e4680f659d41ade4da7514138e56278685 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 5f869621cac54e87615ed031aed81b48d38df9b0..d614be3773d73516d7f56f3f439232a3a09539d7 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 5f869621cac54e87615ed031aed81b48d38df9b0 +Subproject commit d614be3773d73516d7f56f3f439232a3a09539d7 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index b43008b98e4a7220059457732e81aa6a80021739..6875d05d0d3c3da2c9562b4840f48a5267e865ca 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit b43008b98e4a7220059457732e81aa6a80021739 +Subproject commit 6875d05d0d3c3da2c9562b4840f48a5267e865ca diff --git a/src/wrapping_dap_chain_datum_tx.c b/src/wrapping_dap_chain_datum_tx.c index 49bc2c7df64e9574d4f0770e940797b0bd473501..8a81df217a4ab0721f4e8762cf9e2223071db4ed 100644 --- a/src/wrapping_dap_chain_datum_tx.c +++ b/src/wrapping_dap_chain_datum_tx.c @@ -23,8 +23,8 @@ PyObject *TX_ITEM_TYPE_IN_COND_PY(void){ PyObject *TX_ITEM_TYPE_OUT_COND_PY(void){ return PyLong_FromLong(TX_ITEM_TYPE_OUT_COND); } -PyObject *TX_ITEM_TYPE_OUT_SERVICE_RECEIPT_PY(void){ - return PyLong_FromLong(TX_ITEM_TYPE_OUT_SERVICE_RECEIPT); +PyObject *TX_ITEM_TYPE_RECEIPT_PY(void){ + return PyLong_FromLong(TX_ITEM_TYPE_RECEIPT); } /* -------------------------------------- */