diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index cadfaeb6c9fd449ba5efa667ab8ad014d8353553..29c23c22b770a08f3d15bdda7de38ac06bee33f4 100755 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -2,7 +2,7 @@ id=0x0000000000000000 shard_id=0x0000000000000000 name=zerochain -consensus=dag-poa +consensus=dag_poa [files] storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/zerochain/ diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg index 4721e6bae96c62fd69919590457a48738e6c357b..06c147f04e37119f581b8daabad01498bead662e 100755 --- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg +++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg @@ -1,7 +1,7 @@ [chain] id=0x0000000000000001 name=plasma -consensus=dag-pos +consensus=dag_pos [dag] is_single_line=false diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl index c20d050045a6a459813a3975010a357bd8e9d356..a7864c65cd038b60e7235206b4479670299a4399 100755 --- a/dist/share/configs/network/kelvin-testnet.cfg.tpl +++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl @@ -5,14 +5,14 @@ id=0x0000000000000001 name=kelvin-testnet type=development # Possible values: light, full, archive, master, root -node-role=root -node-alias=kelvin.testnet.root.0 +node-role=full +node-alias=addr-%node_addr% gdb_groups_prefix=kelvin.testnet seed_nodes_ipv4=[159.89.228.115,165.227.17.239,104.248.89.205,157.230.240.104,167.99.87.197,46.101.149.240,159.89.122.48] seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4,kelvin.testnet.root.5,kelvin.testnet.root.6] -[dag-poa] -node-ca-sign=pvt.kelvin.testnet.root.0 +#[dag-poa] +#events-sign-cert=mycert -[dag-pos] -node-ca-wallet=naeper +#[dag-pos] +#events-sign-wallet=mywallet diff --git a/libdap-chain b/libdap-chain index c328ebef5bbfca18408ccc6a4d5b822916425b3f..6f36af74b70ce71161579f8eb78ac251aaabad09 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit c328ebef5bbfca18408ccc6a4d5b822916425b3f +Subproject commit 6f36af74b70ce71161579f8eb78ac251aaabad09 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index febf13426e98fccbd47238548f6ac66b6d64daea..6627a859a67525d46fce09354618773183b484ed 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit febf13426e98fccbd47238548f6ac66b6d64daea +Subproject commit 6627a859a67525d46fce09354618773183b484ed diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 9433046b49f4c1cfd254b071c61bfd780636530e..b2fac94e39243ea981161167d156c30dbed059f3 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 9433046b49f4c1cfd254b071c61bfd780636530e +Subproject commit b2fac94e39243ea981161167d156c30dbed059f3 diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index 241ad741e9d5f099398ec4f2062ae01f194c5326..43424e586ca06cab2037e6804b8ff36b1830109b 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit 241ad741e9d5f099398ec4f2062ae01f194c5326 +Subproject commit 43424e586ca06cab2037e6804b8ff36b1830109b diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos index 0a602c620d6c7261ec6772c75e6507132d8d9806..51e14115c837f2eb929f4f0dce1fb5df8ba80950 160000 --- a/libdap-chain-cs-dag-pos +++ b/libdap-chain-cs-dag-pos @@ -1 +1 @@ -Subproject commit 0a602c620d6c7261ec6772c75e6507132d8d9806 +Subproject commit 51e14115c837f2eb929f4f0dce1fb5df8ba80950 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index ef1241476b857d71db0c5079af93ed7761d7b8e1..c44dcde6cb65c78a6e6a81a839175ef864e9e13c 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit ef1241476b857d71db0c5079af93ed7761d7b8e1 +Subproject commit c44dcde6cb65c78a6e6a81a839175ef864e9e13c diff --git a/libdap-chain-net b/libdap-chain-net index b6726042bad2af82b951c5b341cf3ac79d7d3986..46a382ad02a711b3c10bafcdf8039c56d3b5b602 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit b6726042bad2af82b951c5b341cf3ac79d7d3986 +Subproject commit 46a382ad02a711b3c10bafcdf8039c56d3b5b602 diff --git a/sources/main.c b/sources/main.c index 144b1e79ed85956597699f967fb66adbd8583de2..270207b08c54262eb30fcd3a4706f69721f586ce 100755 --- a/sources/main.c +++ b/sources/main.c @@ -167,46 +167,46 @@ int main(int argc, const char * argv[]) if( dap_chain_cs_dag_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain dag consensus module"); - return -6; + return -62; } if( dap_chain_cs_dag_poa_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain dag consensus PoA module"); - return -6; + return -63; } if( dap_chain_cs_dag_pos_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain dag consensus PoA module"); - return -6; + return -64; } if( dap_chain_net_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network module"); - return -6; + return -65; } if( dap_chain_net_srv_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network service module"); - return -6; + return -66; } if( dap_chain_net_srv_app_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network service applications module"); - return -6; + return -67; } if( dap_chain_net_srv_datum_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network service datum module"); - return -6; + return -68; } if( dap_chain_net_srv_datum_pool_init() !=0){ log_it(L_CRITICAL,"Can't init dap chain network service datum pool module"); - return -6; + return -69; } if( dap_chain_net_srv_vpn_init(g_config) !=0){ log_it(L_CRITICAL,"Can't init dap chain network service vpn module"); - return -6; + return -70; } if(enc_http_init() !=0){ @@ -325,6 +325,8 @@ int main(int argc, const char * argv[]) if (dap_config_get_item_bool_default(g_config,"vpn","enabled",false)) dap_stream_ch_vpn_deinit(); + // Load default chain network + dap_chain_net_load("default"); // Endless loop for server's requests processing rc = dap_server_loop(l_server); // After loop exit actions