From c473695f6baabbdbd6de49ee5717c9be24edf2f1 Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Sat, 8 Sep 2018 19:26:40 +0700 Subject: [PATCH] [*] Vers and subs update --- .gitmodules | 12 ++++++++++++ CMakeLists.txt | 21 +++++++++++++++++++++ libdap-chain | 2 +- libdap-chain-crypto | 1 + libdap-chain-mine | 1 + libdap-chain-net | 2 +- libdap-chain-net-srv | 2 +- libdap-chain-net-srv-mining-pool | 2 +- libdap-chain-net-srv-tx | 2 +- libdap-chain-wallet | 1 + 10 files changed, 41 insertions(+), 5 deletions(-) create mode 160000 libdap-chain-crypto create mode 160000 libdap-chain-mine create mode 160000 libdap-chain-wallet diff --git a/.gitmodules b/.gitmodules index a31f0617..936bbfe6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -98,3 +98,15 @@ path = libdap-chain-net-srv-vpn url = https://github.com/kelvinblockchain/libdap-chain-net-srv-vpn branch = master +[submodule "libdap-chain-wallet"] + path = libdap-chain-wallet + url = https://github.com/kelvinblockchain/libdap-chain-wallet + branch = master +[submodule "libdap-chain-crypto"] + path = libdap-chain-crypto + url = https://github.com/kelvinblockchain/libdap-chain-crypto + branch = master +[submodule "libdap-chain-mine"] + path = libdap-chain-mine + url = https://github.com/kelvinblockchain/libdap-chain-mine + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f6cf948..5561faa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,30 @@ add_subdirectory(libdap) add_subdirectory(libdap-server-core) add_subdirectory(libdap-server) add_subdirectory(libdap-chain) +add_subdirectory(libdap-chain-crypto) +add_subdirectory(libdap-chain-wallet) +add_subdirectory(libdap-chain-mine) +add_subdirectory(libdap-chain-block) +add_subdirectory(libdap-chain-block-cs) +add_subdirectory(libdap-chain-block-cs-poa) +add_subdirectory(libdap-chain-block-cs-pow) +add_subdirectory(libdap-chain-dag) +add_subdirectory(libdap-chain-dag-cs) +add_subdirectory(libdap-chain-dag-cs-poa) +add_subdirectory(libdap-chain-dag-cs-hashgraph) +add_subdirectory(libdap-chain-dag-cs-poh) +add_subdirectory(libdap-chain-net) +add_subdirectory(libdap-chain-net-srv) +add_subdirectory(libdap-chain-net-srv-tx) +add_subdirectory(libdap-chain-net-srv-vpn) +add_subdirectory(libdap-chain-net-srv-mining-pool) +add_subdirectory(libdap-chain-net-srv) add_subdirectory(libdap-stream) add_subdirectory(libdap-stream-ch-vpn) add_subdirectory(libdap-stream-ch-chain) +add_subdirectory(libdap-stream-ch-chain-net) +add_subdirectory(libdap-stream-ch-chain-net-srv) +add_subdirectory(libdap-stream-ch-chat) #include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}") diff --git a/libdap-chain b/libdap-chain index aa6da650..080ab4b9 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit aa6da6505da33c32dd2990499345cca928301f64 +Subproject commit 080ab4b94f57ed2a7b5e0ec2286921dcd2bcb488 diff --git a/libdap-chain-crypto b/libdap-chain-crypto new file mode 160000 index 00000000..80c7bff5 --- /dev/null +++ b/libdap-chain-crypto @@ -0,0 +1 @@ +Subproject commit 80c7bff55c99a24f682dc519eb9974417a0d9562 diff --git a/libdap-chain-mine b/libdap-chain-mine new file mode 160000 index 00000000..bc20da92 --- /dev/null +++ b/libdap-chain-mine @@ -0,0 +1 @@ +Subproject commit bc20da929e3a4eab889d99dbd0549d5cd1875bd2 diff --git a/libdap-chain-net b/libdap-chain-net index c291bee0..240625f9 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit c291bee02b0c3789a14644b38e1b51f7e7b9cdc3 +Subproject commit 240625f9b7b47ce66dcdd41608ceea0a176cf230 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 22f4faae..6c358bba 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 22f4faae0a892de4c1d26d81aa24f3a221dfff29 +Subproject commit 6c358bbad435c84e8a11a27cec366d97f7539aeb diff --git a/libdap-chain-net-srv-mining-pool b/libdap-chain-net-srv-mining-pool index afc76d1c..2dfb6ee6 160000 --- a/libdap-chain-net-srv-mining-pool +++ b/libdap-chain-net-srv-mining-pool @@ -1 +1 @@ -Subproject commit afc76d1cbd7f2d2c7d0c117c1af6c45cf4f4e071 +Subproject commit 2dfb6ee67ab54a765a9780093ea7271ca79d6c36 diff --git a/libdap-chain-net-srv-tx b/libdap-chain-net-srv-tx index 0779971a..4016a836 160000 --- a/libdap-chain-net-srv-tx +++ b/libdap-chain-net-srv-tx @@ -1 +1 @@ -Subproject commit 0779971a41db5ddeb7dd3cd709b319a21d870581 +Subproject commit 4016a83634b709a000e015c5c37ced3da009262a diff --git a/libdap-chain-wallet b/libdap-chain-wallet new file mode 160000 index 00000000..75df93ac --- /dev/null +++ b/libdap-chain-wallet @@ -0,0 +1 @@ +Subproject commit 75df93acd6f0c58ead5b3a0111334d551c73c629 -- GitLab