From 6f78b455b7a6642f2ae62e6efe4a495a9425f7dc Mon Sep 17 00:00:00 2001
From: Dmtiriy Gerasimov <naeper@demlabs.net>
Date: Mon, 6 May 2019 14:06:10 +0700
Subject: [PATCH] [*] Changed conf files [-] Removed not in use submodules
---
dist/etc/kelvin-node.cfg | 1 -
dist/etc/network/kelvin-testnet.cfg | 12 ++++++++----
dist/etc/network/kelvin-testnet/chain-0.cfg | 7 +++++--
dist/etc/network/kelvin-testnet/chain-plasma.cfg | 11 +++++++----
dist/etc/node/root_dev_0.cfg | 2 --
libdap-chain | 2 +-
libdap-chain-crypto | 2 +-
libdap-chain-cs-block | 1 -
libdap-chain-cs-block-poa | 1 -
libdap-chain-cs-block-pow | 1 -
libdap-chain-cs-dag | 2 +-
libdap-chain-cs-dag-hashgraph | 1 -
libdap-chain-cs-dag-poa | 2 +-
libdap-chain-cs-dag-poh | 1 -
libdap-chain-cs-dag-pos | 2 +-
libdap-chain-mempool | 2 +-
libdap-chain-mine | 1 -
libdap-chain-net | 2 +-
sources/main_node_cli.c | 13 +++----------
19 files changed, 30 insertions(+), 36 deletions(-)
delete mode 100755 dist/etc/node/root_dev_0.cfg
delete mode 160000 libdap-chain-cs-block
delete mode 160000 libdap-chain-cs-block-poa
delete mode 160000 libdap-chain-cs-block-pow
delete mode 160000 libdap-chain-cs-dag-hashgraph
delete mode 160000 libdap-chain-cs-dag-poh
delete mode 160000 libdap-chain-mine
diff --git a/dist/etc/kelvin-node.cfg b/dist/etc/kelvin-node.cfg
index 679780362..4d854a396 100755
--- a/dist/etc/kelvin-node.cfg
+++ b/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]
diff --git a/dist/etc/network/kelvin-testnet.cfg b/dist/etc/network/kelvin-testnet.cfg
index f98ba17e9..a455dcf25 100755
--- a/dist/etc/network/kelvin-testnet.cfg
+++ b/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
diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg
index 8106b3413..6756a302e 100755
--- a/dist/etc/network/kelvin-testnet/chain-0.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-0.cfg
@@ -1,16 +1,19 @@
[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
diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
index 4ba01a430..4721e6bae 100755
--- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
@@ -1,19 +1,22 @@
[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
diff --git a/dist/etc/node/root_dev_0.cfg b/dist/etc/node/root_dev_0.cfg
deleted file mode 100755
index ea9372836..000000000
--- a/dist/etc/node/root_dev_0.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[node]
-primary_cert=root_dev_0
diff --git a/libdap-chain b/libdap-chain
index 92d57ccc7..e57d9d47d 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 92d57ccc743288f9565a9e9642e0fdbe1e5ca6a2
+Subproject commit e57d9d47d4e79ab12e91959aba5d7c431f7f8925
diff --git a/libdap-chain-crypto b/libdap-chain-crypto
index 72bf97029..0f25b0859 160000
--- a/libdap-chain-crypto
+++ b/libdap-chain-crypto
@@ -1 +1 @@
-Subproject commit 72bf9702902b5d50fc551a03387e2d62923bb673
+Subproject commit 0f25b0859fba05080388b24c0661dda3d845e18d
diff --git a/libdap-chain-cs-block b/libdap-chain-cs-block
deleted file mode 160000
index dea947a8a..000000000
--- a/libdap-chain-cs-block
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dea947a8aa69945f61f87d43df0ad2b096357e1f
diff --git a/libdap-chain-cs-block-poa b/libdap-chain-cs-block-poa
deleted file mode 160000
index 25de9a1e9..000000000
--- a/libdap-chain-cs-block-poa
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25de9a1e9e8d2fbda45690dc38983534dee780b3
diff --git a/libdap-chain-cs-block-pow b/libdap-chain-cs-block-pow
deleted file mode 160000
index 02a9f3743..000000000
--- a/libdap-chain-cs-block-pow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02a9f374344ffc8fa1f47082c26db9efaa591e7e
diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag
index 2c00af193..865d22272 160000
--- a/libdap-chain-cs-dag
+++ b/libdap-chain-cs-dag
@@ -1 +1 @@
-Subproject commit 2c00af193a07682edd8dc083836dacede525ceff
+Subproject commit 865d2227229f224cf3123b960a11d52acb5b32cd
diff --git a/libdap-chain-cs-dag-hashgraph b/libdap-chain-cs-dag-hashgraph
deleted file mode 160000
index d30d1f4a3..000000000
--- a/libdap-chain-cs-dag-hashgraph
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d30d1f4a3028ecef9578c253f421a9e0a967efeb
diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa
index 12003e1cb..f812a7e2e 160000
--- a/libdap-chain-cs-dag-poa
+++ b/libdap-chain-cs-dag-poa
@@ -1 +1 @@
-Subproject commit 12003e1cb8a0039090e2fa2e54691425682f6403
+Subproject commit f812a7e2ed3006ba466d06fe3bf605a1d23d6e5c
diff --git a/libdap-chain-cs-dag-poh b/libdap-chain-cs-dag-poh
deleted file mode 160000
index bc964f0dc..000000000
--- a/libdap-chain-cs-dag-poh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc964f0dcf0985aa9e56028d2275e246ee3a8ef4
diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos
index 3df616d5f..0a602c620 160000
--- a/libdap-chain-cs-dag-pos
+++ b/libdap-chain-cs-dag-pos
@@ -1 +1 @@
-Subproject commit 3df616d5fbe8bab3ad66106da929e26b442805c7
+Subproject commit 0a602c620d6c7261ec6772c75e6507132d8d9806
diff --git a/libdap-chain-mempool b/libdap-chain-mempool
index b6ecf4b83..ef1241476 160000
--- a/libdap-chain-mempool
+++ b/libdap-chain-mempool
@@ -1 +1 @@
-Subproject commit b6ecf4b83dcbe54b788fabe2a59d1adc52350419
+Subproject commit ef1241476b857d71db0c5079af93ed7761d7b8e1
diff --git a/libdap-chain-mine b/libdap-chain-mine
deleted file mode 160000
index 1c2d1d7f7..000000000
--- a/libdap-chain-mine
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1c2d1d7f7ab97ff6542b669c4f8ed73d6d15a9a4
diff --git a/libdap-chain-net b/libdap-chain-net
index bf3ddaf6b..49012c77f 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit bf3ddaf6b7883e49f1e363161931cc21f1566259
+Subproject commit 49012c77f97666d7e3b33d618f175042f293d56d
diff --git a/sources/main_node_cli.c b/sources/main_node_cli.c
index 56f203c73..4f9937a4f 100755
--- a/sources/main_node_cli.c
+++ b/sources/main_node_cli.c
@@ -79,7 +79,7 @@ static char** split_word(char *line, int *argc)
int execute_line(char *line)
{
register int i;
- const COMMAND *command;
+ dap_chain_node_cmd_item_t *command;
char *word;
/* Isolate the command word. */
@@ -198,19 +198,12 @@ int main(int argc, const char * argv[])
free_cmd_state(cmd);
}*/
- const COMMAND *command = NULL;
- // in the first argument of command line look for the command
- if(argc > 1)
- command = find_command(argv[1]);
-
- // command found
- if(command)
- {
+ if(argc > 1){
// Call the function
//int res = ((*(command->func))(argc - 2, argv + 2));
cmd_state cmd;
memset(&cmd, 0, sizeof(cmd_state));
- cmd.cmd_name = (char *) argv[1];
+ cmd.cmd_name = strdup(argv[1]);
cmd.cmd_param_count = argc - 2;
if(cmd.cmd_param_count > 0)
cmd.cmd_param = (char**) (argv + 2);
--
GitLab