Skip to content
Snippets Groups Projects
Commit 62ad01e0 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

[-] Removed block chains, left only DAG 

[*] Lot of changes in submodules init
parent c010ac00
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 50 deletions
CMakeLists.txt
+ 5
− 11
View file @ 62ad01e0
......@@ -12,14 +12,14 @@ SET (DESTDIR "/opt/${PROJECT_NAME}")
SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 0)
SET( CPACK_PACKAGE_VERSION_MINOR 1)
SET( CPACK_PACKAGE_VERSION_PATCH 1)
SET( CPACK_PACKAGE_VERSION_MINOR 9)
SET( CPACK_PACKAGE_VERSION_PATCH 0)
SET( CPACK_SYSTEM_NAME "debian-9.5-amd64")
SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@ldemlabs.net>" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "Kelvin Blockchain Node software" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "DAP server" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "Kelvin Node" )
SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" )
SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4)")
......@@ -45,13 +45,9 @@ add_subdirectory(libdap-server)
add_subdirectory(libdap-chain)
add_subdirectory(libdap-chain-crypto)
add_subdirectory(libdap-chain-wallet)
add_subdirectory(libdap-chain-cs-block)
add_subdirectory(libdap-chain-cs-block-poa)
add_subdirectory(libdap-chain-cs-dag)
add_subdirectory(libdap-chain-cs-dag-poa)
add_subdirectory(libdap-chain-cs-dag-pos)
add_subdirectory(libdap-chain-cs-dag-hashgraph)
add_subdirectory(libdap-chain-cs-dag-poh)
add_subdirectory(libdap-chain-net)
add_subdirectory(libdap-chain-net-srv)
add_subdirectory(libdap-chain-net-srv-app)
......@@ -89,8 +85,7 @@ add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" )
target_link_libraries(${PROJECT_NAME} 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
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_block dap_chain_cs_block_poa
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_hashgraph dap_chain_cs_dag_poh
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 )
......@@ -98,8 +93,7 @@ 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
dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
dap_chain_cs_block dap_chain_cs_block_poa
dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_hashgraph dap_chain_cs_dag_poh
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 )
......
dist/etc/kelvin-node.cfg
+ 8
− 8
View file @ 62ad01e0
# General section
[general]
debug_mode=false
wallets_path=/opt/kelvin-node/var/lib/wallet
wallets_default=default
node_role=full
# Server part
[server]
......@@ -10,6 +12,11 @@ enabled=true
listen_address=0.0.0.0
listen_port_tcp=8079
# Mempool
[mempool]
accept=false
gdb_group=datum-pool
# VPN stream channel processing module
[vpn]
# Turn to true if you want to share VPN service from you node
......@@ -26,10 +33,3 @@ threads_cnt=0
pid_path=/opt/kelvin-node/var/run/kelvin-node.pid
log_file=/opt/kelvin-node/var/log/kelvin-node.log
# Small builtin WWW server
[www]
# Really who need this??
enabled=false
www_root=/opt/dapserver/www
url=/
libdap @ fadec6d1
Compare ecb057b2...fadec6d1
Subproject commit ecb057b20e266378da4cdbf614df360b45768e58
Subproject commit fadec6d18dbb3243d4a67323ed4921d444bd1ef7
libdap-chain @ c3994437
Compare 14f5a4dc...c3994437
Subproject commit 14f5a4dc95b4283dc33b1d06b71f0b7c1e2df77e
Subproject commit c39944378b92d6281686dfec6745278160c8d8f7
libdap-chain-cs-block @ dea947a8
Compare dea947a8...dea947a8
Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f
libdap-chain-cs-block-poa @ 25de9a1e
Compare 25de9a1e...25de9a1e
Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3
libdap-chain-cs-block-pow @ 02a9f374
Compare 02a9f374...02a9f374
Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e
libdap-chain-cs-dag @ af392de1
Compare 11a9b34a...af392de1
Subproject commit 11a9b34a59a7d4c8a94d2298b1017dfa72436fb8
Subproject commit af392de1e7f565242b73a9f4ecd0ad918b60dc36
libdap-chain-cs-dag-hashgraph @ d30d1f4a
Compare d30d1f4a...d30d1f4a
Subproject commit d30d1f4a3028ecef9578c253f421a9e0a967efeb
libdap-chain-cs-dag-poa @ 991228b7
Compare 51b928cc...991228b7
Subproject commit 51b928cc850fa757f330615e11d7e1cddee59ca0
Subproject commit 991228b7c10680c8d0c890e51dc0eb7f225e95ee
libdap-chain-cs-dag-poh @ bc964f0d
Compare bc964f0d...bc964f0d
Subproject commit bc964f0dcf0985aa9e56028d2275e246ee3a8ef4
libdap-chain-cs-dag-pos @ c4f9cf53
Compare dca6aeec...c4f9cf53
Subproject commit dca6aeec788481b3a6f0da217f62a1ffd172815b
Subproject commit c4f9cf53522b8eca1e7cd1f2be195166d4743735
libdap-chain-mempool @ 08d0dab9
Compare c363e143...08d0dab9
Subproject commit c363e14345d14a7018213224c1d48a1fe4d81420
Subproject commit 08d0dab9c29d080b147920988f40c40f98484034
libdap-chain-mine @ 1c2d1d7f
Compare 1c2d1d7f...1c2d1d7f
Subproject commit 1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4
libdap-chain-net @ 024f2075
Compare 94278f06...024f2075
Subproject commit 94278f06e822cee4ce0b75854681035622f152f0
Subproject commit 024f2075a0a5bc01f8f1ed05182ae4e9fb76835b
libdap-stream @ f6c1c2cd
Compare 4e5680f4...f6c1c2cd
Subproject commit 4e5680f4bf48ca52817298d9d35fc594ef885395
Subproject commit f6c1c2cd593ca61b6cc5140855d5dbd9bc61aed3
libdap-stream-ch @ 4bbbc297
Compare dfbdaa1d...4bbbc297
Subproject commit dfbdaa1df0498069e60ffaf42de963375bffa816
Subproject commit 4bbbc29723737ffce14ae38e5865d9b8ea6cce80
sources/main.c
+ 11
− 16
View file @ 62ad01e0
......@@ -45,9 +45,8 @@
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_hashgraph.h"
#include "dap_chain_cs_dag_poa.h"
#include "dap_chain_cs_dag_poh.h"
#include "dap_chain_cs_dag_pos.h"
#include "dap_chain_net.h"
#include "dap_chain_net_srv.h"
......@@ -98,8 +97,6 @@
void parse_args(int argc, const char * argv[]);
void exit_if_server_already_running(void);
static dap_config_t * g_config = NULL;
int main(int argc, const char * argv[])
{
dap_server_t * l_server = NULL; // DAP Server instance
......@@ -149,12 +146,14 @@ int main(int argc, const char * argv[])
log_it(L_CRITICAL,"Can't init encryption key storage module");
return -57;
}
if( dap_chain_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain modules");
return -58;
}
if( dap_chain_wallet_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain wallet module");
return -59;
......@@ -182,18 +181,14 @@ int main(int argc, const char * argv[])
return -6;
}
if( dap_chain_cs_dag_hashgraph_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus hashgraph module");
return -6;
}
if( dap_chain_cs_dag_poa_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus PoA module");
return -6;
}
if( dap_chain_cs_dag_poh_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus PoH module");
if( dap_chain_cs_dag_pos_init() !=0){
log_it(L_CRITICAL,"Can't init dap chain dag consensus PoA module");
return -6;
}
......@@ -311,20 +306,20 @@ int main(int argc, const char * argv[])
dap_stream_add_proc_http(DAP_HTTP(l_server), STREAM_URL);
dap_stream_ctl_add_proc(DAP_HTTP(l_server), STREAM_CTL_URL);
const char *str_start_mempool = dap_config_get_item_str(g_config, "server", "accept_mempool_request");
dap_datum_mempool_init();
const char *str_start_mempool = dap_config_get_item_str(g_config, "mempool", "accept");
if(str_start_mempool && !strcmp(str_start_mempool, "true")) {
dap_chain_mempool_add_proc(DAP_HTTP(l_server), MEMPOOL_URL);
}
// Built in WWW server
/*if ( dap_config_get_item_bool_default(g_config,"www","enabled",false) ){
if ( dap_config_get_item_bool_default(g_config,"www","enabled",false) ){
dap_http_folder_add(DAP_HTTP(l_server), "/",
dap_config_get_item_str_default(g_config,
dap_config_get_item_str(g_config,
"resources",
"www_root",
"/opt/kelvin-node/www"));
}*/
"www_root"));
}
}
}else
......
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