From f1eda84d0fe41e33cb3952798b5566605943af1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Thu, 25 Jul 2019 21:57:33 +0500 Subject: [PATCH] update modules and configs --- dist/share/configs/kelvin-node.cfg.tpl | 2 +- dist/share/configs/network/kelvin-testnet.cfg.tpl | 11 ++++++++--- libdap-chain | 2 +- libdap-chain-crypto | 2 +- libdap-chain-cs-dag | 2 +- libdap-chain-global-db | 2 +- libdap-chain-net | 2 +- libdap-chain-wallet | 2 +- libdap-crypto | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dist/share/configs/kelvin-node.cfg.tpl b/dist/share/configs/kelvin-node.cfg.tpl index dd7be8b5..ebc4f0fb 100644 --- a/dist/share/configs/kelvin-node.cfg.tpl +++ b/dist/share/configs/kelvin-node.cfg.tpl @@ -2,7 +2,6 @@ [general] debug_mode=false debug_dump_stream_headers=false -wallets_path=/opt/kelvin-node/var/lib/wallet wallets_default=default node_role=full # seed mode. WARNING. Used true only when you start the new network @@ -35,6 +34,7 @@ network_mask=255.255.255.0 threads_cnt=0 pid_path=/opt/kelvin-node/var/run/kelvin-node.pid log_file=/opt/kelvin-node/var/log/kelvin-node.log +wallets_path=/opt/kelvin-node/var/lib/wallet ca_folders=[/opt/kelvin-node/var/lib/ca,/opt/kelvin-node/share/ca] dap_global_db_path=/opt/kelvin-node/var/lib/global_db dap_global_db_driver=cdb diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl index e98bcfb0..2c10affe 100644 --- a/dist/share/configs/network/kelvin-testnet.cfg.tpl +++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl @@ -8,9 +8,14 @@ type=development 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] -seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002,ffff::0000::0000::0003,ffff::0000::0000::0004,ffff::0000::0000::0005,ffff::0000::0000::0006,ffff::0000::0000::0007] +seed_nodes_ipv4=[195.154.133.160, 62.210.90.227] +seed_nodes_port=[8097, 8097] +seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1] +seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002] + +#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] +#seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002,ffff::0000::0000::0003,ffff::0000::0000::0004,ffff::0000::0000::0005,ffff::0000::0000::0006,ffff::0000::0000::0007] #[dag-poa] #events-sign-cert=mycert diff --git a/libdap-chain b/libdap-chain index 058cfbd3..d89a4363 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 058cfbd38cd15d3dc7c5bb60dab794742a6f8201 +Subproject commit d89a43639c8bf047ccef5d1e3655a3974823584b diff --git a/libdap-chain-crypto b/libdap-chain-crypto index 1ee48381..ee5c4539 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit 1ee483816f9cf924d2d43a61115e702a032956db +Subproject commit ee5c45399e86e4639b8b1426131aa7e9bfe87163 diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 53a3ef9b..199665d2 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 53a3ef9b2df185584650845411e9e64f396ae08e +Subproject commit 199665d22328a91309c1aef23a0677d956048d2e diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 4a2d8708..b26e3cdc 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 4a2d8708670f03bc55753efc0723671e83db18fb +Subproject commit b26e3cdc752affb9b24b98de0863a3afe89eeae0 diff --git a/libdap-chain-net b/libdap-chain-net index 3c45d994..a894e027 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 3c45d99412505921076df6e63b1896db49090e37 +Subproject commit a894e02789114445745e82d0384654af2df45da9 diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 0406c6ea..8b94d3d0 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 0406c6ea5c656afe498e171f9e3463f132c23db2 +Subproject commit 8b94d3d071e553f4098b97c71b1fb8bd6077835d diff --git a/libdap-crypto b/libdap-crypto index bcfcef1c..ddb65e66 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit bcfcef1cd87cc6cfbc7e47887894c0fa3742a218 +Subproject commit ddb65e66ad93281f37ba4e250cd7e20e569db864 -- GitLab