Merge pull request #17 from kelvinblockchain/master

master->feature-2272

.gitmodules

@@ -34,11 +34,6 @@
 	path = libdap-stream-ch-chain
 	url = https://github.com/kelvinblockchain/libdap-stream-ch-chain
 	branch = master
-
-
-
-
-
 [submodule "libdap-chain-net"]
 	path = libdap-chain-net
 	url = https://github.com/kelvinblockchain/libdap-chain-net
@@ -59,10 +54,6 @@
 	path = libdap-chain-net-srv-tx
 	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-tx
 	branch = master
-[submodule "libdap-chain-net-srv-mining-pool"]
-	path = libdap-chain-net-srv-mining-pool
-	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-mining-pool
-	branch = master
 [submodule "libdap-chain-net-srv-vpn"]
 	path = libdap-chain-net-srv-vpn
 	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-vpn
@@ -75,10 +66,6 @@
 	path = libdap-chain-crypto
 	url = https://github.com/kelvinblockchain/libdap-chain-crypto
 	branch = master
-[submodule "libdap-chain-mine"]
-	path = libdap-chain-mine
-	url = https://github.com/kelvinblockchain/libdap-chain-mine
-	branch = master
 [submodule "libdap-chain-net-srv-app"]
 	path = libdap-chain-net-srv-app
 	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-app
@@ -87,10 +74,6 @@
 	path = libdap-chain-net-srv-app-db
 	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-app-db
 	branch = master
-[submodule "libdap-chain-net-srv-mining"]
-	path = libdap-chain-net-srv-mining
-	url = https://github.com/kelvinblockchain/libdap-chain-net-srv-mining
-	branch = master
 [submodule "libdap-stream-ch"]
 	path = libdap-stream-ch
 	url = https://github.com/kelvinblockchain/libdap-stream-ch
@@ -122,27 +105,12 @@
 [submodule "libdap-chain-mempool"]
 	path = libdap-chain-mempool
 	url = https://github.com/kelvinblockchain/libdap-chain-mempool
-[submodule "libdap-chain-cs-block"]
-	path = libdap-chain-cs-block
-	url = https://github.com/kelvinblockchain/libdap-chain-cs-block
-[submodule "libdap-chain-cs-block-pow"]
-	path = libdap-chain-cs-block-pow
-	url = https://github.com/kelvinblockchain/libdap-chain-cs-block-pow
-[submodule "libdap-chain-cs-block-poa"]
-	path = libdap-chain-cs-block-poa
-	url = https://github.com/kelvinblockchain/libdap-chain-cs-block-poa
 [submodule "libdap-chain-cs-dag"]
 	path = libdap-chain-cs-dag
 	url = https://github.com/kelvinblockchain/libdap-chain-cs-dag
-[submodule "libdap-chain-cs-dag-hashgraph"]
-	path = libdap-chain-cs-dag-hashgraph
-	url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-hashgraph
 [submodule "libdap-chain-cs-dag-poa"]
 	path = libdap-chain-cs-dag-poa
 	url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-poa
-[submodule "libdap-chain-cs-dag-poh"]
-	path = libdap-chain-cs-dag-poh
-	url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-poh
 [submodule "libdap-chain-cs-dag-pos"]
 	path = libdap-chain-cs-dag-pos
 	url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-pos

dist/etc/kelvin-node.cfg

@@ -15,7 +15,6 @@ listen_port_tcp=8079
 # Mempool
 [mempool]
 accept=false
-gdb_group=datum-pool
 
 # VPN stream channel processing module
 [vpn]

dist/etc/network/kelvin-testnet.cfg

@@ -5,8 +5,12 @@ id=0x0000000000000001
 name=kelvin-testnet
 type=development
 # Possible values: light, full, archive, master, root
-node-role=full  
-# Default local node for this network
+node-role=root
 node-alias=localnode
-# Root nodes
-node-roots=[root-0.testnet.klvn.io,root-0.testnet.klvn.io,root-1.testnet.klvn.io,root-2.testnet.klvn.io,root-3.testnet.klvn.io,root-4.testnet.klvn.io,root-5.testnet.klvn.io,root-6.testnet.klvn.io,root-7.testnet.klvn.io]
+gdb_groups_prefix=kelvin.testnet.
+
+#[dag-poa]
+#node-ca-sign=pvt.localcert
+
+#[dag-pos]
+#node-ca-wallet=mywallet

dist/etc/network/kelvin-testnet/chain-0.cfg

 [chain]
 id=0x0000000000000000
 shard_id=0x0000000000000000
-name=ZeroChain
+name=zerochain
 consensus=dag-poa
 
 [files]
-storage_dir=/opt/kelvin-node/var/lib/kelvin-testnet/
+storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/zerochain/
 
 [dag]
 is_single_line=true
+is_celled=false
+datum_add_hashes_count=1
 
 [dag-poa]
 auth_certs_prefix=kelvin.testnet.root
 auth_certs_number=8
 auth_certs_number_verify=5
+auth_certs_dir=/opt/kelvin-node/share/ca

dist/etc/network/kelvin-testnet/chain-plasma.cfg

 [chain]
 id=0x0000000000000001
-name=Plasma
+name=plasma
 consensus=dag-pos
 
 [dag]
 is_single_line=false
+is_celled=true
+datum_add_hashes_count=3
 
 # Proof-of-State consensus config
 [dag-pos]
 # Tokens hold and hold_value must be equel size
-# KLVNT - test token, SHT1 - shit token 1
-tokens_hold=[KLVNT,SHT1]
+# KELT - test token, KEL - main tokem
+tokens_hold=[KELT,KEL]
 # 1000 coins for both
 tokens_hold_value=[1000000000000000,1000000000000000]
 
+
 [files]
-storage=/opt/kelvin-node/var/lib/kelvin-testnet/chain-plasma.dap_chain
+storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/plasma
 

dist/etc/node/root_dev_0.cfg

-[node]
-primary_cert=root_dev_0

libdap-chain @ e57d9d47

-Subproject commit 73c853c47c3524ff55519ed27c5f9f782c031494
+Subproject commit e57d9d47d4e79ab12e91959aba5d7c431f7f8925

libdap-chain-crypto @ 0f25b085

-Subproject commit 114abf9aaf78a56d424b604c17bac57454ebc8c1
+Subproject commit 0f25b0859fba05080388b24c0661dda3d845e18d

libdap-chain-cs-block @ dea947a8

-Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f

libdap-chain-cs-block-poa @ 25de9a1e

-Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3

libdap-chain-cs-block-pow @ 02a9f374

-Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e

libdap-chain-cs-dag @ 865d2227

-Subproject commit 2c00af193a07682edd8dc083836dacede525ceff
+Subproject commit 865d2227229f224cf3123b960a11d52acb5b32cd

libdap-chain-cs-dag-hashgraph @ d30d1f4a

-Subproject commit d30d1f4a3028ecef9578c253f421a9e0a967efeb

libdap-chain-cs-dag-poa @ f812a7e2

-Subproject commit 12003e1cb8a0039090e2fa2e54691425682f6403
+Subproject commit f812a7e2ed3006ba466d06fe3bf605a1d23d6e5c

libdap-chain-cs-dag-poh @ bc964f0d

-Subproject commit bc964f0dcf0985aa9e56028d2275e246ee3a8ef4

libdap-chain-cs-dag-pos @ 0a602c62

-Subproject commit 3df616d5fbe8bab3ad66106da929e26b442805c7
+Subproject commit 0a602c620d6c7261ec6772c75e6507132d8d9806

libdap-chain-mempool @ ef124147

-Subproject commit 34fdd1084926156576678043a4180d3df7138c4c
+Subproject commit ef1241476b857d71db0c5079af93ed7761d7b8e1

libdap-chain-mine @ 1c2d1d7f

-Subproject commit 1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4

libdap-chain-net @ 49012c77

-Subproject commit db815cb587eab65ba13d0add4daf4b6625d8a900
+Subproject commit 49012c77f97666d7e3b33d618f175042f293d56d

libdap-chain-net-srv @ 98725cd5

-Subproject commit 0783ba715d28b71d6c2c7fb8ea2df4ad0d5bb894
+Subproject commit 98725cd5408b097914f85b3183729376372a3005