Skip to content
Snippets Groups Projects
Commit ca45a8e3 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'feature-autoproc' into 'master' 

feature-autoproc

See merge request !135
parents 3b97a1a4 f3241002
No related branches found
No related tags found
1 merge request!135feature-autoproc
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ ca45a8e3
...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) ...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 3) SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 3) SET( CPACK_PACKAGE_VERSION_MINOR 3)
SET( CPACK_PACKAGE_VERSION_PATCH 5) SET( CPACK_PACKAGE_VERSION_PATCH 6)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
cellframe-sdk @ d03762de
Compare d27598ed...d03762de
Subproject commit d27598edc2acf65938983fb8e5dd38b7e75cc677 Subproject commit d03762defa8f9320fe1a22494fc06aad026cc04a
dist/etc/network/core-t/chain-0.cfg
+ 28
− 27
View file @ ca45a8e3
[chain] [chain]
id=0x0000000000000000 id=0x0000000000000000
shard_id=0x0000000000000000 shard_id=0x0000000000000000
name=zerochain name=zerochain
load_priority=1 load_priority=1
# Possible values [token, emission, transaction] # Possible values [token, emission, transaction]
datum_types=[token,emission,shard,ca,transaction] datum_types=[token,emission,shard,ca,transaction]
consensus=dag_poa mempool_auto_types=[emission,transaction]
consensus=dag_poa
[files]
storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/ [files]
storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/
[dag]
is_single_line=true [dag]
is_celled=false is_single_line=true
is_add_directly=true is_celled=false
datum_add_hashes_count=1 is_add_directly=true
datum_add_hashes_count=1
is_static_genesis_event=true
static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8 is_static_genesis_event=true
static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8
[dag-poa]
auth_certs_prefix=core-t [dag-poa]
auth_certs_number=3 auth_certs_prefix=core-t
auth_certs_number_verify=1 #4 auth_certs_number=3
auth_certs_dir=/opt/cellframe-node/share/ca auth_certs_number_verify=1 #4
auth_certs_dir=/opt/cellframe-node/share/ca
dist/etc/network/core-t/chain-plasma.cfg
+ 31
− 30
View file @ ca45a8e3
[chain] [chain]
id=0x0000000000000001 id=0x0000000000000001
name=plasma name=plasma
load_priority=2 load_priority=2
# Possible values [token, emission, transaction] # Possible values [token, emission, transaction]
datum_types=[transaction,ca] datum_types=[transaction,ca]
consensus=dag_pos mempool_auto_types=[transaction]
consensus=dag_pos
[dag]
is_single_line=false [dag]
is_celled=true is_single_line=false
is_add_directly=true is_celled=true
datum_add_hashes_count=3 is_add_directly=true
datum_add_hashes_count=3
is_static_genesis_event=true
static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87 is_static_genesis_event=true
static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87
# Proof-of-State consensus config
[dag-pos] # Proof-of-State consensus config
# Tokens hold and hold_value must be equel size [dag-pos]
# KELT - test token, KEL - main tokem # Tokens hold and hold_value must be equel size
tokens_hold=[CFNT] # KELT - test token, KEL - main tokem
# 1000 coins for both tokens_hold=[CFNT]
tokens_hold_value=[1000000000000] # 1000 coins for both
# Confirmations minimum tokens_hold_value=[1000000000000]
confirmations_minimum=1 # Confirmations minimum
confirmations_minimum=1
[files]
storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma [files]
storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma
dist/etc/network/kelvin-testnet/chain-0.cfg
+ 29
− 28
View file @ ca45a8e3
[chain] [chain]
id=0x0000000000000000 id=0x0000000000000000
shard_id=0x0000000000000000 shard_id=0x0000000000000000
name=zerochain name=zerochain
load_priority=1 load_priority=1
# Possible values [token, emission, transaction] # Possible values [token, emission, transaction]
datum_types=[token,emission,shard,ca] datum_types=[token,emission,shard,ca]
consensus=dag_poa mempool_auto_types=[emission]
consensus=dag_poa
[files]
storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/ [files]
storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/
[dag]
is_single_line=true [dag]
is_celled=false is_single_line=true
is_add_directly=true is_celled=false
datum_add_hashes_count=1 is_add_directly=true
datum_add_hashes_count=1
# Switched off to false because hash symbols below are not well recognized
# Switched off to false because hash symbols below are not well recognized
is_static_genesis_event=false
static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF is_static_genesis_event=false
static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF
[dag-poa]
auth_certs_prefix=kelvin.testnet.root [dag-poa]
auth_certs_number=5 auth_certs_prefix=kelvin.testnet.root
auth_certs_number_verify=1 #4 auth_certs_number=5
auth_certs_dir=/opt/cellframe-node/share/ca auth_certs_number_verify=1 #4
auth_certs_dir=/opt/cellframe-node/share/ca
dist/etc/network/kelvin-testnet/chain-plasma.cfg
+ 28
− 27
View file @ ca45a8e3
[chain] [chain]
id=0x0000000000000001 id=0x0000000000000001
name=plasma name=plasma
load_priority=2 load_priority=2
# Possible values [token, emission, transaction] # Possible values [token, emission, transaction]
datum_types=[transaction,ca] datum_types=[transaction,ca]
consensus=dag_pos mempool_auto_types=[transaction]
consensus=dag_pos
[dag]
is_single_line=false [dag]
is_celled=true is_single_line=false
is_add_directly=true is_celled=true
datum_add_hashes_count=3 is_add_directly=true
datum_add_hashes_count=3
# Proof-of-State consensus config
[dag-pos] # Proof-of-State consensus config
# Tokens hold and hold_value must be equel size [dag-pos]
# KELT - test token, KEL - main tokem # Tokens hold and hold_value must be equel size
tokens_hold=[KELT,KEL] # KELT - test token, KEL - main tokem
# 1000 coins for both tokens_hold=[KELT,KEL]
tokens_hold_value=[1000000000,1000000000] # 1000 coins for both
# Confirmations minimum tokens_hold_value=[1000000000,1000000000]
confirmations_minimum=1 # Confirmations minimum
confirmations_minimum=1
[files]
storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma [files]
storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment