diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 index 3eb9a5ee1d149e33869204613860fc9ac59ffccd..5e4cad826c80a472f9267f80780d03a2024d804b --- a/.gitmodules +++ b/.gitmodules @@ -114,3 +114,6 @@ [submodule "libdap-chain-cs-dag-pos"] path = libdap-chain-cs-dag-pos url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-pos +[submodule "libdap-server-http-db-auth"] + path = libdap-server-http-db-auth + url = https://github.com/kelvinblockchain/libdap-server-http-db-auth diff --git a/CMakeLists.txt b/CMakeLists.txt index b855f2fc505277fca6c0b83d180fe6f254709636..d0a5a6a3fdb3768ad12173429ffc8165e9dc954b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ add_subdirectory(libdap) add_subdirectory(libdap-server-core) add_subdirectory(libdap-server-udp) add_subdirectory(libdap-server) +add_subdirectory(libdap-server-http-db-auth) add_subdirectory(libdap-chain) add_subdirectory(libdap-chain-crypto) @@ -88,7 +89,7 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_en 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_net_srv_vpn - dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic ) + dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic dap_server_http_db_auth) target_link_libraries(${PROJECT_NAME}-cli m dap_chain_net curl) target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_core_server 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 diff --git a/libdap-chain b/libdap-chain index 95fddaf8bf662801f14ceeaf6602a16b0a9aa7a0..3d888505892e13fed004c94ee00ecedcfb61d295 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 95fddaf8bf662801f14ceeaf6602a16b0a9aa7a0 +Subproject commit 3d888505892e13fed004c94ee00ecedcfb61d295 diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index ee1ec0d3d02638dc9bee6c588c8164f663f9a6e9..92f403b4347d3cf459dca7839e2ea8c7f57e94c3 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit ee1ec0d3d02638dc9bee6c588c8164f663f9a6e9 +Subproject commit 92f403b4347d3cf459dca7839e2ea8c7f57e94c3 diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index 43424e586ca06cab2037e6804b8ff36b1830109b..8e17e97f272f214cab4f7b0d192ff174a85083e9 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit 43424e586ca06cab2037e6804b8ff36b1830109b +Subproject commit 8e17e97f272f214cab4f7b0d192ff174a85083e9 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 74352cbbf3ad4136f33b145d25c5bd38f4a3e80f..20f5b95d0181a06a26fd86cd0009e82002eb23af 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 74352cbbf3ad4136f33b145d25c5bd38f4a3e80f +Subproject commit 20f5b95d0181a06a26fd86cd0009e82002eb23af diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 9bf249477e7a409cb8be1f75bf8ff19f33e0006e..170794645355e8fec3572163f02e6d9bd9088454 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 9bf249477e7a409cb8be1f75bf8ff19f33e0006e +Subproject commit 170794645355e8fec3572163f02e6d9bd9088454 diff --git a/libdap-chain-net b/libdap-chain-net index 502488f6d213637eb113a9f203dbe1f23fe724f0..b62b1ab2cb6e90f218961e1ca4d5f9070dc3a2a1 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 502488f6d213637eb113a9f203dbe1f23fe724f0 +Subproject commit b62b1ab2cb6e90f218961e1ca4d5f9070dc3a2a1 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 70681d2b885cfa66522eef9abc032956d45157b3..68bb77e18766c49887eb0d35ccec202c20ef017c 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 70681d2b885cfa66522eef9abc032956d45157b3 +Subproject commit 68bb77e18766c49887eb0d35ccec202c20ef017c diff --git a/libdap-chain-net-srv-mining b/libdap-chain-net-srv-mining deleted file mode 160000 index 7ce617ebdc33f812c161a6c500e157da5ee0f1f1..0000000000000000000000000000000000000000 --- a/libdap-chain-net-srv-mining +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ce617ebdc33f812c161a6c500e157da5ee0f1f1 diff --git a/libdap-chain-net-srv-mining-pool b/libdap-chain-net-srv-mining-pool deleted file mode 160000 index eff1668d22c4747684781fe969cce4aac05937d7..0000000000000000000000000000000000000000 --- a/libdap-chain-net-srv-mining-pool +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eff1668d22c4747684781fe969cce4aac05937d7 diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index f2f9e237c87835de0ee9f83924548ef5497d5e14..69766d73f500b5e6f7f75b2ed5b850565bd279ac 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit f2f9e237c87835de0ee9f83924548ef5497d5e14 +Subproject commit 69766d73f500b5e6f7f75b2ed5b850565bd279ac diff --git a/libdap-client b/libdap-client index b2a861ca8ecb5159ea44f94d9dfe49d82d1d1eec..70b7f287b45fe64c6babed603ad9e8ceb83d7eb1 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit b2a861ca8ecb5159ea44f94d9dfe49d82d1d1eec +Subproject commit 70b7f287b45fe64c6babed603ad9e8ceb83d7eb1 diff --git a/libdap-server-http-db-auth b/libdap-server-http-db-auth new file mode 160000 index 0000000000000000000000000000000000000000..bdab475c9dfe0ad876cd642a798e1b0b54ca314e --- /dev/null +++ b/libdap-server-http-db-auth @@ -0,0 +1 @@ +Subproject commit bdab475c9dfe0ad876cd642a798e1b0b54ca314e diff --git a/libdap-stream b/libdap-stream index 9729b3341b4a1d5cc90007be760d3c8931f2bf3d..5dae49ff06f804459c991b335924ba0fbb12bcee 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit 9729b3341b4a1d5cc90007be760d3c8931f2bf3d +Subproject commit 5dae49ff06f804459c991b335924ba0fbb12bcee diff --git a/libdap-stream-ch b/libdap-stream-ch index 4bbbc29723737ffce14ae38e5865d9b8ea6cce80..268f422bde88a5f4f254a31b7d52b18d2cad71fc 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit 4bbbc29723737ffce14ae38e5865d9b8ea6cce80 +Subproject commit 268f422bde88a5f4f254a31b7d52b18d2cad71fc diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index e4d293afa36ffb9f34a0daa0f9e42affd6f1017c..8255e0a38f74c5de25c34f12cd5dd925e69c41a3 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit e4d293afa36ffb9f34a0daa0f9e42affd6f1017c +Subproject commit 8255e0a38f74c5de25c34f12cd5dd925e69c41a3 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index 052e9ff8714595151a8474a8f568a8caca40c639..c6d121ef187aa119d36e7d80d39c71df0bb4a439 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit 052e9ff8714595151a8474a8f568a8caca40c639 +Subproject commit c6d121ef187aa119d36e7d80d39c71df0bb4a439