Skip to content
Snippets Groups Projects
Commit 7237dacb authored by Alexandr Mruchok's avatar Alexandr Mruchok
Browse files

Merge branch 'master' into feature-2648 

# Conflicts:
#	CMakeLists.txt
#	sources/main.c
parents b732fe8f 5cb4e545
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 55 deletions
.gitmodules
+ 8
− 20
View file @ 7237dacb
......@@ -14,18 +14,6 @@
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-stream-ch-av"]
path = libdap-stream-ch-av
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-av.git
branch = master
[submodule "libdap-stream-ch-chat"]
path = libdap-stream-ch-chat
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chat.git
branch = master
[submodule "libdap-server-core"]
path = libdap-server-core
url = https://gitlab.demlabs.net/cellframe/libdap-server-core.git
......@@ -34,6 +22,10 @@
path = libdap-stream-ch-chain
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chain.git
branch = master
[submodule "libdap-stream-ch-chat"]
path = libdap-stream-ch-chat
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-chat.git
branch = master
[submodule "libdap-chain-net"]
path = libdap-chain-net
url = https://gitlab.demlabs.net/cellframe/libdap-chain-net.git
......@@ -122,14 +114,6 @@
path = libdap-crypto
url = https://gitlab.demlabs.net/cellframe/libdap-crypto.git
branch = master
[submodule "libdap-stream-ch-iot"]
path = libdap-stream-ch-iot
url = https://gitlab.demlabs.net/cellframe/libdap-stream-ch-iot.git
branch = master
[submodule "libdap-iot"]
path = libdap-iot
url = https://gitlab.demlabs.net/cellframe/libdap-iot.git
branch = master
[submodule "test/libdap-test"]
path = test/libdap-test
url = https://gitlab.demlabs.net/cellframe/libdap-test.git
......@@ -138,3 +122,7 @@
path = libdap-server-http-db
url = https://gitlab.demlabs.net/cellframe/libdap-server-http-db
branch = master
[submodule "libdap-chain-common"]
path = libdap-chain-common
url = https://gitlab.demlabs.net/cellframe/libdap-chain-common
branch = master
CMakeLists.txt 100755 → 100644
+ 10
− 13
View file @ 7237dacb
......@@ -51,8 +51,8 @@ SET(DESTDIR "/opt/${PROJECT_NAME}")
SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 2)
SET( CPACK_PACKAGE_VERSION_MINOR 6)
SET( CPACK_PACKAGE_VERSION_PATCH 12)
SET( CPACK_PACKAGE_VERSION_MINOR 8)
SET( CPACK_PACKAGE_VERSION_PATCH 7)
SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
......@@ -86,6 +86,7 @@ if(WIN32)
add_definitions("-DHAVE_PREAD")
add_definitions("-DHAVE_MMAP")
add_definitions("-DHAVE_STRNDUP")
add_compile_definitions(WINVER=0x0600 _WIN32_WINNT=0x0600)
if(DAP_RELEASE)
set(_CCOPT "-static -std=gnu11 -Wall -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
......@@ -98,12 +99,11 @@ if(WIN32)
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
include_directories(libdap/src/win32/)
include_directories(3rdparty/wepoll/include/)
include_directories(3rdparty/uthash/src/)
include_directories(3rdparty/libjson-c/)
include_directories(3rdparty/curl/include/)
include_directories(3rdparty/libsqlite3/)
include_directories(sources/wepoll/)
include_directories(libdap-server-http-db-auth/)
include_directories(libdap-chain-net-srv-vpn/)
endif()
......@@ -145,8 +145,9 @@ add_subdirectory(libdap-server-udp)
add_subdirectory(libdap-server)
add_subdirectory(libdap-chain)
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)
......@@ -169,8 +170,8 @@ add_subdirectory(libdap-stream)
add_subdirectory(libdap-stream-ch)
add_subdirectory(libdap-client)
add_subdirectory(libdap-stream-ch-vpn)
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)
......@@ -219,7 +220,6 @@ if(WIN32)
target_link_libraries(${NODE_CLI_TARGET} dap_chain_net
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
......@@ -252,7 +252,7 @@ if(WIN32)
)
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_vpn dap_stream_ch_chain dap_stream_ch_chain_net
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_app dap_chain_net_srv_app_db
......@@ -260,7 +260,6 @@ if(WIN32)
dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_cuttdb
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
......@@ -293,16 +292,14 @@ if(WIN32)
)
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_vpn dap_stream_ch_chain dap_stream_ch_chain_net
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_app dap_chain_net_srv_app_db
dap_chain_net_srv_datum dap_chain_net_srv_datum_pool
dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libsqlite3[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libmongoc[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/lib/[x86_64CLANG]/libbson[x86_64CLANG].a
......@@ -347,7 +344,7 @@ if(UNIX)
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_vpn dap_stream_ch_chain dap_stream_ch_chain_net
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_app dap_chain_net_srv_app_db
......
dist/etc/network/kelvin-testnet/chain-plasma.cfg
+ 3
− 1
View file @ 7237dacb
......@@ -18,7 +18,9 @@ datum_add_hashes_count=3
# KELT - test token, KEL - main tokem
tokens_hold=[KELT,KEL]
# 1000 coins for both
tokens_hold_value=[1000000000000000,1000000000000000]
tokens_hold_value=[1000000000,1000000000]
# Confirmations minimum
confirmations_minimum=3
[files]
storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma
......
dist/share/configs/cellframe-node.cfg.tpl
+ 2
− 8
View file @ 7237dacb
......@@ -38,19 +38,13 @@ tx_cond_create=false
# tx_cond_templates=[mywallet0:0.00001:3600:KELT:kelvin-testnet,mywallet1:0.000001:3600:cETH:kelvin-testnet,mywallet0:1:10:WOOD:private]
# VPN stream channel processing module
[vpn]
[srv_vpn]
# Turn to true if you want to share VPN service from you node
enabled=false
# List of loca security access groups. Built in: expats,admins,services,nobody,everybody
access_groups=expats,services,admins
network_address=10.11.12.0
network_mask=255.255.255.0
# old VPN server
[vpn_old]
enabled=true
network_address=10.11.11.0
network_mask=255.255.255.0
pricelist=[kelvin-testnet:0.00001:KELT:3600:SEC:mywallet0,kelvin-testnet:0.00001:cETH:3600:SEC:mywallet1,private:1:WOOD:10:SEC:mywallet0]
# Console interface server
[conserver]
......
dist/share/configs/service/vpn.cfg 0 → 100644
+ 4
− 0
View file @ 7237dacb
[general]
enabled=true
uid=0x0000000000000001
pricelist=[kelvin-testnet:0.00001:KELT:3600:SEC:mywallet0,kelvin-testnet:0.00001:cETH:3600:SEC:mywallet1,private:1:WOOD:10:SEC:mywallet0]
lib/[x86_64CLANG]/wepoll[x86_64CLANG].a deleted 100644 → 0
+ 0
− 0
View file @ b732fe8f
File deleted
libdap @ ee6e8617
Compare 1c061479...ee6e8617
Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
Subproject commit ee6e8617e1f589b45f15e327ed18cddfa87915f8
libdap-chain @ 777394aa
Compare 04be73e6...777394aa
Subproject commit 04be73e68e1994e86a71154370616a3a3b2b85ae
Subproject commit 777394aa9c175db4e6245c95c990a6f2c5717a58
libdap-chain-common @ 5af3788f
Subproject commit 5af3788fc532f217678165ff7f625a579083f0f1
libdap-chain-crypto @ 73d80a90
Compare f8dfd888...73d80a90
Subproject commit f8dfd888432234c0314057f5551a578dd770003c
Subproject commit 73d80a90c7adb46f7322595ce899c718b78eea71
libdap-chain-cs-dag @ 1319d136
Compare 447d6db4...1319d136
Subproject commit 447d6db4e8587d6118e968eb1109fbf2a3356247
Subproject commit 1319d136f54fa65962a73881680df6216ce78086
libdap-chain-cs-dag-poa @ 810db1b6
Compare db06bbd6...810db1b6
Subproject commit db06bbd6a784ff2496f2d1bb9cbb54924efe83b6
Subproject commit 810db1b64905477cde62e981d6f160da501660c7
libdap-chain-cs-dag-pos @ 25a1256e
Compare b1a0d674...25a1256e
Subproject commit b1a0d674dbb56938e0ba58862ad1d638420e554f
Subproject commit 25a1256e47a85854e143c540fbabc8dc3fe1f7ae
libdap-chain-gdb @ 25f96687
Compare 76181225...25f96687
Subproject commit 76181225215f91f3a2a42671f735f70ade46d045
Subproject commit 25f9668706f8e728351db9295e6a1fe0111d32bc
libdap-chain-global-db @ 6b1f0c34
Compare 8c6bbf44...6b1f0c34
Subproject commit 8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33
Subproject commit 6b1f0c34cf0fd9c2e20441b4c0ce621c8febf1b8
libdap-chain-mempool @ a063222c
Compare 4bbdcf60...a063222c
Subproject commit 4bbdcf60e10de8462820e45d7cc3715dca4c2139
Subproject commit a063222c80bc25cf70fdb3b6391f202bb2c08c65
libdap-chain-net @ 1c70a8e8
Compare 94ff5a32...1c70a8e8
Subproject commit 94ff5a32e30465d3e5986a11753caf57f67e5096
Subproject commit 1c70a8e84f80c7441b13eb9f4d71574b1c4e184e
libdap-chain-net-srv @ 72da7097
Compare 5edea70a...72da7097
Subproject commit 5edea70af6a5ede0c759e9d83a5741376f4da9fb
Subproject commit 72da709759280291f16399cfaf4198eb819ebb9f
libdap-chain-net-srv-app @ dc6e3b30
Compare e5f23784...dc6e3b30
Subproject commit e5f23784de6b8cc16b80b4bc755c67df5fc7565f
Subproject commit dc6e3b30992d3988c7f9f3a159c8286e28bea9ae
libdap-chain-net-srv-app-db @ 99556891
Compare ce7f0333...99556891
Subproject commit ce7f0333b77f8290428949b593e0ca2bd3df01b3
Subproject commit 995568917a9796dec412ad13124628fb8fff53ba
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment