diff --git a/dist/etc/kelvin-node.cfg b/dist/etc/kelvin-node.cfg deleted file mode 100755 index 4d854a396a25c0ef9539a2b5aca1f937cc5d3caa..0000000000000000000000000000000000000000 --- a/dist/etc/kelvin-node.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# General section -[general] -debug_mode=false -wallets_path=/opt/kelvin-node/var/lib/wallet -wallets_default=default -node_role=full - -# Server part -[server] -# By default you don't need to open you to the world -enabled=true -listen_address=0.0.0.0 -listen_port_tcp=8079 - -# Mempool -[mempool] -accept=false - -# VPN stream channel processing module -[vpn] -# Turn to true if you want to share VPN service from you node -enabled=false -# List of loca security access groups. Built in: expats,admins,services,nobody,everybody -access_groups=expats,services,admins -network_address=10.0.0.0 -network_mask=255.255.255.0 - -# Application Resources -[resources] -# 0 means auto detect -threads_cnt=0 -pid_path=/opt/kelvin-node/var/run/kelvin-node.pid -log_file=/opt/kelvin-node/var/log/kelvin-node.log -ca_folders=[/opt/kelvin-node/share/ca,/opt/kelvin-node/var/lib/ca] -dap_global_db_path=/opt/kelvin-node/var/whitelist.ldb - diff --git a/dist/etc/network/kelvin-testnet.cfg b/dist/etc/network/kelvin-testnet.cfg deleted file mode 100755 index 2789b8a1e2bfb524e37991aff5c93bb64bbc3c0e..0000000000000000000000000000000000000000 --- a/dist/etc/network/kelvin-testnet.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# Kelvin Blockchain: development network -# General section -[general] -id=0x0000000000000001 -name=kelvin-testnet -type=development -# Possible values: light, full, archive, master, root -node-role=root -node-alias=localnode -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.localcert - -#[dag-pos] -#node-ca-wallet=mywallet diff --git a/dist/share/configs/kelvin-node.cfg.tpl b/dist/share/configs/kelvin-node.cfg.tpl index 0e98b9781ad25566bc0aff0f99984ca68dff4a0c..528d33dc0769d48f52af3f5715b3e52cfd2f395d 100755 --- a/dist/share/configs/kelvin-node.cfg.tpl +++ b/dist/share/configs/kelvin-node.cfg.tpl @@ -1,15 +1,11 @@ # General section [general] debug_mode=false -ca_folders=[/opt/kelvin-node/, /opt/kelvin-node,var/lib/ca] -wallets_path = /opt/kelvin-node/var/lib/wallet -wallets_default=naeper -node_role=root -node_cert=kelvin.testnet.root.0 - -# Mempool -[mempool] -accept=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 +#seed_mode=false # Server part @@ -19,6 +15,10 @@ enabled=true listen_address=0.0.0.0 listen_port_tcp=8079 +# Mempool +[mempool] +accept=false + # VPN stream channel processing module [vpn] # Turn to true if you want to share VPN service from you node @@ -34,12 +34,6 @@ 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 -dap_global_db_path=/opt/kelvin-node/var/whitelist.ldb ca_folders=[/opt/kelvin-node/share/ca,/opt/kelvin-node/var/lib/ca] +dap_global_db_path=/opt/kelvin-node/var/whitelist.ldb -# Small builtin WWW server -[www] -# Really who need this?? -enabled=false -www_root=/opt/dapserver/www -url=/ diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl index a213e3220b80fb13c7245a5a667a3eb5dd93238a..c20d050045a6a459813a3975010a357bd8e9d356 100755 --- a/dist/share/configs/network/kelvin-testnet.cfg.tpl +++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl @@ -5,13 +5,14 @@ id=0x0000000000000001 name=kelvin-testnet type=development # Possible values: light, full, archive, master, root -node-role=full +node-role=root +node-alias=kelvin.testnet.root.0 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] -# Only for root nodes -#[dag-poa] -#node-ca-sign=pvt.mycert +[dag-poa] +node-ca-sign=pvt.kelvin.testnet.root.0 -# Only for master nodes -#[dag-pos] -#node-ca-wallet=mywallet +[dag-pos] +node-ca-wallet=naeper diff --git a/libdap-chain b/libdap-chain index a94e74fb4248bef7a1a8b59501f84b0ae88ab87e..c328ebef5bbfca18408ccc6a4d5b822916425b3f 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit a94e74fb4248bef7a1a8b59501f84b0ae88ab87e +Subproject commit c328ebef5bbfca18408ccc6a4d5b822916425b3f diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 865d2227229f224cf3123b960a11d52acb5b32cd..9433046b49f4c1cfd254b071c61bfd780636530e 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 865d2227229f224cf3123b960a11d52acb5b32cd +Subproject commit 9433046b49f4c1cfd254b071c61bfd780636530e diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index f812a7e2ed3006ba466d06fe3bf605a1d23d6e5c..241ad741e9d5f099398ec4f2062ae01f194c5326 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit f812a7e2ed3006ba466d06fe3bf605a1d23d6e5c +Subproject commit 241ad741e9d5f099398ec4f2062ae01f194c5326 diff --git a/libdap-chain-net b/libdap-chain-net index e20e4df9fb40f0177c062755af62a517d59607d6..b6726042bad2af82b951c5b341cf3ac79d7d3986 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit e20e4df9fb40f0177c062755af62a517d59607d6 +Subproject commit b6726042bad2af82b951c5b341cf3ac79d7d3986