Merge branch 'feature-2336a' into 'master'

Feature 2336a

See merge request cellframe/kelvin-node!15

CMakeLists.txt

@@ -38,7 +38,7 @@ SET( CPACK_GENERATOR "DEB")
 SET( CPACK_PACKAGE_NAME  "${PROJECT_NAME}")
 SET( CPACK_PACKAGE_VERSION_MAJOR 1)
 SET( CPACK_PACKAGE_VERSION_MINOR 2)
-SET( CPACK_PACKAGE_VERSION_PATCH 1)
+SET( CPACK_PACKAGE_VERSION_PATCH 2)
 
 SET( CPACK_SYSTEM_NAME "debian-9.7-amd64")
 SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")

README.md

@@ -15,6 +15,7 @@ Or if you don't clone the project yet, run `git clone --recursive <repo>` to clo
 To successfully complete of the build, you must have following prerequisites preinstalled (packages are named as in Debian GNU/Linux 10 "buster", please found the corresponding packages for your distribution):
 
 * libjson-c-dev
+* libsqlite3-dev
 * libmemcached-dev (for libdap-server-core submodule)
 * libev-dev (for libdap-server-core submodule)
 * libmagic-dev (for libdap-server submodule)

dist/etc/network/kelvin-testnet.cfg

+# Kelvin Blockchain: development network
+# General section
+[general]
+id=0x0000000000000001
+name=kelvin-testnet
+type=development
+# Possible values: light, full, archive, master, root
+node-role=full
+#node-alias=addr-%node%
+#node-ipv4=192.168.100.92
+gdb_groups_prefix=kelvin-testnet
+
+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]
+
+[dag-poa]
+events-sign-cert=pvt.kelvin.testnet.root.0
+
+[dag-pos]
+events-sign-wallet=my_wallet

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

@@ -2,6 +2,8 @@
 id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
+# Possible values [token, emission, transaction] 
+datum_types=[transaction]
 consensus=dag_poa
 
 [files]
@@ -10,10 +12,11 @@ storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/zerochain/
 [dag]
 is_single_line=true
 is_celled=false
+is_add_directly=false
 datum_add_hashes_count=1
 
 [dag-poa]
 auth_certs_prefix=kelvin.testnet.root
 auth_certs_number=7
-auth_certs_number_verify=4
+auth_certs_number_verify=1 #4
 auth_certs_dir=/opt/kelvin-node/share/ca

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

 [chain]
 id=0x0000000000000001
 name=plasma
+# Possible values [token, emission, transaction] 
+datum_types=[token, emission]
 consensus=dag_pos
 
 [dag]
 is_single_line=false
 is_celled=true
+is_add_directly=false
 datum_add_hashes_count=3
 
 # Proof-of-State consensus config

libdap @ 6c5dd5a5

-Subproject commit 85933c820be2c81416848447b82bb8af15a34a5c
+Subproject commit 6c5dd5a5b0de5573b03ed144c651352467a56101

libdap-chain @ 0b9e1294

-Subproject commit 1d4a2b526f78ad87bb83d8c4f7004f0e73c76a59
+Subproject commit 0b9e1294e4cca6958f7245355fbaeb5b73745d58

libdap-chain-crypto @ 6e443de4

-Subproject commit ac1e577a5709c2485370c965c5bf9b86be79c70b
+Subproject commit 6e443de42cf8441fe0fe257320789d01260c4a01

libdap-chain-cs-dag @ 45dd9baa

-Subproject commit 199665d22328a91309c1aef23a0677d956048d2e
+Subproject commit 45dd9baa36330ea679f5cbd3e52b4d8a6ae1679b

libdap-chain-cs-dag-poa @ 84a79117

-Subproject commit 63f49e2036b20ef3cf68387db2550b176ff76cfa
+Subproject commit 84a791174f53f0aee5c2881ef18bc1a117e81933

libdap-chain-cs-dag-pos @ 70546e34

-Subproject commit b93f1aa97fd56f59f1d9a55c8cac9105ca718f6c
+Subproject commit 70546e34bae06f1023dedbc21282be8cf615d75d

libdap-chain-global-db @ 23bf6fd9

-Subproject commit e3b156b3b8b479bb132e4fbaa5a280369b1b55fd
+Subproject commit 23bf6fd9ae12cdaa17fd4817227f565e88221806

libdap-chain-net @ 41543a5e

-Subproject commit e2037726c32fda74dabfa000c7844a3a23ace5f2
+Subproject commit 41543a5eaff387317880fc720b6b32d24eacdfc4

libdap-chain-wallet @ ff9cd260

-Subproject commit fc2f0f6e239a2bea48f5e77245d7065b1d701ff1
+Subproject commit ff9cd2603160aba03c39d44571d18a3bfa04afe4

libdap-server-http-db-auth @ 57990d82

-Subproject commit bdab475c9dfe0ad876cd642a798e1b0b54ca314e
+Subproject commit 57990d82d6a26e305a7c6fa29cb7fa9d9f532ca9

sources/main.c

@@ -341,7 +341,7 @@ int main( int argc, const char **argv )
     }
 
     if ( l_server ) { // If listener server is initialized
-        bool is_traffick_track_enable = dap_config_get_item_bool_default(g_config, "traffic_track", "enable", false);
+        //bool is_traffick_track_enable = dap_config_get_item_bool_default(g_config, "traffic_track", "enable", false);
 
 #if 0
         if ( is_traffick_track_enable ) {

sources/main_node_cli.c

@@ -182,8 +182,12 @@ int main(int argc, const char * argv[])
     //    command_execution_string = shell_script_filename = (char *) NULL;
 
     dap_common_init(DAP_APP_NAME " Console interface", NULL);
-    dap_log_level_set(L_CRITICAL );
-    dap_config_init( SYSTEM_CONFIG_GLOBAL_FILENAME );
+    dap_log_level_set(L_CRITICAL);
+    dap_config_init(SYSTEM_CONFIGS_DIR);
+    if((g_config = dap_config_open(DAP_APP_NAME)) == NULL) {
+        printf("Can't init general configurations\n");
+        exit(-1);
+    }
     // connect to node
     cparam = node_cli_connect();
     if(!cparam)