diff --git a/.gitmodules b/.gitmodules index 89dd574069c9e1cedd460757bf665abdce78c613..aac10606b55e87e1e852bbae747f641a089c10e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -122,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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9fb3aaa7597d8572efdd52991912bf83949896..80ef9c029be84ed38132f1f3f14d329a79bffee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ 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 23) +SET( CPACK_PACKAGE_VERSION_PATCH 24) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") @@ -141,8 +141,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) diff --git a/libdap-chain-common b/libdap-chain-common new file mode 160000 index 0000000000000000000000000000000000000000..cea7aa6e47002f5aa65451689d0dea37d108b80c --- /dev/null +++ b/libdap-chain-common @@ -0,0 +1 @@ +Subproject commit cea7aa6e47002f5aa65451689d0dea37d108b80c diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index ecabf1c82b2f2ad3acd28b00833238b03a7d34ac..6d8da648ced7801cbbe78956051021bba24eae49 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit ecabf1c82b2f2ad3acd28b00833238b03a7d34ac +Subproject commit 6d8da648ced7801cbbe78956051021bba24eae49