From 5b8193d8e4f60a99c0ded1f84a470584e83585e6 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sat, 9 Nov 2019 15:21:05 +0700
Subject: [PATCH] [*] Manual merge
---
CMakeLists.txt | 2 +-
dist/etc/network/kelvin-testnet/chain-0.cfg | 1 +
dist/etc/network/kelvin-testnet/chain-plasma.cfg | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e1266e1e..6ca23fc28 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 6)
-SET( CPACK_PACKAGE_VERSION_PATCH 0)
+SET( CPACK_PACKAGE_VERSION_PATCH 1)
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/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg
index a3710c62e..c3b23117b 100644
--- a/dist/etc/network/kelvin-testnet/chain-0.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-0.cfg
@@ -2,6 +2,7 @@
id=0x0000000000000000
shard_id=0x0000000000000000
name=zerochain
+load_priority=1
# Possible values [token, emission, transaction]
datum_types=[token,emission,shard,ca]
consensus=dag_poa
diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
index 6eb6bf24d..5fed52b05 100644
--- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg
@@ -1,6 +1,7 @@
[chain]
id=0x0000000000000001
name=plasma
+load_priority=2
# Possible values [token, emission, transaction]
datum_types=[transaction,ca]
consensus=dag_pos
--
GitLab