From 23042de95e6021073f5704fb87be06879813a8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Fri, 1 Nov 2019 21:33:01 +0500 Subject: [PATCH] update modules and version to 2.5.10 --- CMakeLists.txt | 2 +- dist/share/configs/network/private.cfg.tpl | 24 ++++++++++++++++++++++ libdap-chain | 2 +- libdap-chain-net | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 dist/share/configs/network/private.cfg.tpl diff --git a/CMakeLists.txt b/CMakeLists.txt index 699c37437..c66939786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 5) -SET( CPACK_PACKAGE_VERSION_PATCH 9) +SET( CPACK_PACKAGE_VERSION_PATCH 10) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/share/configs/network/private.cfg.tpl b/dist/share/configs/network/private.cfg.tpl new file mode 100644 index 000000000..3ee047e32 --- /dev/null +++ b/dist/share/configs/network/private.cfg.tpl @@ -0,0 +1,24 @@ +# Kelvin Blockchain: development network +# General section +[general] +id=0xFF00000000000001 +name=private +type=testing +# Possible values: light, full, archive, master, root +node-role={NODE_TYPE} +#node-alias=addr-%node_addr% +gdb_groups_prefix=private +#node-addr=0x10 +# node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) +node-addr-expired=168 + +seed_nodes_ipv4=[195.154.133.160, 62.210.90.227] +seed_nodes_port=[8079, 8079] +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=mycert + +#[dag-pos] +#events-sign-wallet=mywallet diff --git a/libdap-chain b/libdap-chain index 11e21d249..edf168612 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 11e21d249a12103f1d2b756e5f0aa77c305387eb +Subproject commit edf168612d2d62bfc212070687145bb411e44648 diff --git a/libdap-chain-net b/libdap-chain-net index 8cde2a07a..d6c27c6dd 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 8cde2a07ad857426f1a68bc4d6ba104e9cdf72ae +Subproject commit d6c27c6dd93ac3ea8a3e57bc38224e52f8194980 -- GitLab