From 14f1e387ea14ab310b979bf508dba891d4b3e1a3 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Tue, 14 Mar 2023 14:17:06 +0300
Subject: [PATCH] [*] Config changes

---
 cellframe-sdk                                 |  2 +-
 dist/etc/network/Backbone/chain-0.cfg         |  6 ++--
 dist/etc/network/Backbone/main.cfg            | 32 ++++++-------------
 dist/etc/network/kelvpn-minkowski/chain-0.cfg |  6 ++--
 dist/etc/network/kelvpn-minkowski/main.cfg    | 29 +++++------------
 dist/etc/network/mileena/chain-0.cfg          |  8 ++---
 dist/etc/network/mileena/main.cfg             | 29 +++++------------
 dist/etc/network/subzero/chain-0.cfg          | 10 +++---
 dist/etc/network/subzero/main.cfg             |  8 ++---
 dist/share/configs/cellframe-node.cfg.tpl     | 19 +++++++----
 dist/share/configs/network/Backbone.cfg.tpl   |  7 ++--
 .../configs/network/kelvpn-minkowski.cfg.tpl  |  6 ++--
 dist/share/configs/network/mileena.cfg.tpl    |  7 ++--
 dist/share/configs/network/private.cfg.tpl    |  6 ++--
 dist/share/configs/network/subzero.cfg.tpl    |  6 ++--
 version.mk                                    |  2 +-
 16 files changed, 75 insertions(+), 108 deletions(-)

diff --git a/cellframe-sdk b/cellframe-sdk
index fed066d62..9a06a2352 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit fed066d62c980e145e79e06e470fb559afc73a0c
+Subproject commit 9a06a23529b4f8cb3c09bdc7c76acd81f47d1556
diff --git a/dist/etc/network/Backbone/chain-0.cfg b/dist/etc/network/Backbone/chain-0.cfg
index 4bda8e9e2..f176d4bfe 100755
--- a/dist/etc/network/Backbone/chain-0.cfg
+++ b/dist/etc/network/Backbone/chain-0.cfg
@@ -3,9 +3,9 @@ id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
 load_priority=0
-# Possible values [token, emission, transaction, ca] 
-datum_types=[token,emission,ca,transaction]
-default_datum_types=[token,emission,ca]
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[token,emission,ca,decree]
+default_datum_types=[token,emission,ca,decree]
 mempool_auto_types=[]
 consensus=dag_poa
 
diff --git a/dist/etc/network/Backbone/main.cfg b/dist/etc/network/Backbone/main.cfg
index 2fe3f7987..179d3994c 100755
--- a/dist/etc/network/Backbone/main.cfg
+++ b/dist/etc/network/Backbone/main.cfg
@@ -2,12 +2,12 @@
 id=0x0000000000000002
 shard_id=0x0000000000000000
 name=main
-load_priority=2
-# Possible values [token, emission, transaction, ca] 
-datum_types=[transaction]
+load_priority=1
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[transaction,anchor]
 default_datum_types=[transaction]
 mempool_auto_types=[transaction]
-consensus=block_ton
+consensus=esbocs
 
 [files]
 storage_dir=../../../var/lib/network/scorpion/main/
@@ -18,23 +18,9 @@ is_celled=false
 is_static_genesis_event=true
 static_genesis_event=0xD3E07282FC1C4FC733AEE7898BA1017DF7659CA7B64047886FA12EDD82759C23
 
-[block-ton]
-stake_tokens=0
-stake_tokens_value=0
-# verifications_minimum=1
-
-ton_nodes_addrs=[DFAB::CDC2::A6BA::48FB]
+[esbocs]
+#consensus_debug=true
+min_validators_count=1
 auth_certs_prefix=scorpion.master
-auth_certs_number=3
-consensus_debug=false
-validators_list_by_stake=false
-round_start_sync_timeout=10
-round_start_multiple_of=35
-allowed_clock_offset=10
-session_idle_min=10
-round_candidates_max=5
-next_candidate_delay=2
-round_attempts_max=5
-round_attempt_duration=20
-first_message_delay=2
-my_candidate_attempts_max=2
+validators_addrs=[DFAB::CDC2::A6BA::48FB]
+new_round_delay=30
\ No newline at end of file
diff --git a/dist/etc/network/kelvpn-minkowski/chain-0.cfg b/dist/etc/network/kelvpn-minkowski/chain-0.cfg
index 0c220fb42..66103d584 100755
--- a/dist/etc/network/kelvpn-minkowski/chain-0.cfg
+++ b/dist/etc/network/kelvpn-minkowski/chain-0.cfg
@@ -3,9 +3,9 @@ id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
 load_priority=0
-# Possible values [token, emission, transaction, ca] 
-datum_types=[token,emission,ca,transaction]
-default_datum_types=[token,emission,ca]
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[token,emission,ca,decree]
+default_datum_types=[token,emission,ca,decree]
 mempool_auto_types=[]
 consensus=dag_poa
 
diff --git a/dist/etc/network/kelvpn-minkowski/main.cfg b/dist/etc/network/kelvpn-minkowski/main.cfg
index 74aa662a8..44a57c205 100755
--- a/dist/etc/network/kelvpn-minkowski/main.cfg
+++ b/dist/etc/network/kelvpn-minkowski/main.cfg
@@ -3,11 +3,11 @@ id=0x0000000000000001
 shard_id=0x0000000000000000
 name=main
 load_priority=1
-# Possible values [token, emission, transaction, ca] 
-datum_types=[transaction]
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[transaction,anchor]
 default_datum_types=[transaction]
 mempool_auto_types=[transaction]
-consensus=block_ton
+consensus=esbocs
 
 [files]
 storage_dir=../../../var/lib/network/kelvpn-minkowski/main/
@@ -17,22 +17,9 @@ is_celled=false
 is_static_genesis_event=true
 static_genesis_event=0x5C6C3BDD89F7317A1E3D01E6C440021D81C17F16431ECF3D2BFCA0BE50143728
 
-[block-ton]
-ton_nodes_addrs=[1234::0000::0000::0000]
+[esbocs]
+#consensus_debug=true
+min_validators_count=1
 auth_certs_prefix=minkowski.master
-auth_certs_number=2
-stake_tokens=0
-stake_tokens_value=0
-
-consensus_debug=true
-validators_list_by_stake=false
-round_start_sync_timeout=10
-round_start_multiple_of=35
-allowed_clock_offset=10
-session_idle_min=10
-round_candidates_max=5
-next_candidate_delay=2
-round_attempts_max=5
-round_attempt_duration=45
-first_message_delay=2
-my_candidate_attempts_max=2
+validators_addrs=[1234::0000::0000::0000]
+new_round_delay=30
\ No newline at end of file
diff --git a/dist/etc/network/mileena/chain-0.cfg b/dist/etc/network/mileena/chain-0.cfg
index d6c97349b..6b970f90d 100755
--- a/dist/etc/network/mileena/chain-0.cfg
+++ b/dist/etc/network/mileena/chain-0.cfg
@@ -3,10 +3,10 @@ id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
 load_priority=0
-# Possible values [token, emission, transaction, ca] 
-datum_types=[token,emission,shard,ca,transaction]
-default_datum_types=[token,emission,ca]
-mempool_auto_types=[emission,ca,transaction]
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[token,emission,ca,decree]
+default_datum_types=[token,emission,ca,decree]
+mempool_auto_types=[]
 consensus=dag_poa
 
 [files]
diff --git a/dist/etc/network/mileena/main.cfg b/dist/etc/network/mileena/main.cfg
index 6073f51b5..1f66f7203 100755
--- a/dist/etc/network/mileena/main.cfg
+++ b/dist/etc/network/mileena/main.cfg
@@ -3,11 +3,11 @@ id=0x0000000000000001
 shard_id=0x0000000000000000
 name=main
 load_priority=2
-# Possible values [token, emission, transaction, ca] 
-datum_types=[transaction]
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[transaction,anchor]
 default_datum_types=[transaction]
 mempool_auto_types=[transaction]
-consensus=block_ton
+consensus=esbocs
 
 [files]
 storage_dir=../../../var/lib/network/mileena/main/
@@ -17,22 +17,9 @@ is_celled=false
 is_static_genesis_event=true
 static_genesis_event=0x1DB1E136B583A1553E4829D6A0453338B7413DDB1B12189F8456B064E822667F
 
-[block-ton]
-ton_nodes_addrs=[CCCC::1234::0000::0000,CCCC::1234::0000::0001]
+[esbocs]
+#consensus_debug=true
+min_validators_count=2
 auth_certs_prefix=mileena.master
-auth_certs_number=2
-stake_tokens=0
-stake_tokens_value=0
-
-consensus_debug=true
-validators_list_by_stake=false
-round_start_sync_timeout=10
-round_start_multiple_of=35
-allowed_clock_offset=10
-session_idle_min=10
-round_candidates_max=5
-next_candidate_delay=2
-round_attempts_max=5
-round_attempt_duration=20
-first_message_delay=2
-my_candidate_attempts_max=2
+validators_addrs=[CCCC::1234::0000::0000,CCCC::1234::0000::0001]
+new_round_delay=30
diff --git a/dist/etc/network/subzero/chain-0.cfg b/dist/etc/network/subzero/chain-0.cfg
index 82148b7e6..292ed3f86 100644
--- a/dist/etc/network/subzero/chain-0.cfg
+++ b/dist/etc/network/subzero/chain-0.cfg
@@ -2,11 +2,11 @@
 id=0x0000000000000000
 shard_id=0x0000000000000000
 name=zerochain
-load_priority=1
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,ca]
-default_datum_types=[token,emission,ca]
-mempool_auto_types=[emission,ca]
+load_priority=0
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[token,emission,ca,decree]
+default_datum_types=[token,emission,ca,decree]
+mempool_auto_types=[]
 consensus=dag_poa
 
 [files]
diff --git a/dist/etc/network/subzero/main.cfg b/dist/etc/network/subzero/main.cfg
index f1cae583f..6c638b3c1 100644
--- a/dist/etc/network/subzero/main.cfg
+++ b/dist/etc/network/subzero/main.cfg
@@ -2,9 +2,9 @@
 id=0x0000000000000001
 shard_id=0x0000000000000000
 name=main
-load_priority=2
-# Possible values [token, emission, transaction, ca]
-datum_types=[token,emission,shard,ca,transaction]
+load_priority=1
+# Possible values [token, emission, transaction, ca, decree, anchor]
+datum_types=[transaction,anchor]
 default_datum_types=[transaction]
 mempool_auto_types=[transaction]
 consensus=esbocs
@@ -21,4 +21,4 @@ min_validators_count=2
 poa_mode=true
 auth_certs_prefix=subzero.master
 validators_addrs=[ACCA::1234::0000::0000,ACCA::1234::0000::0001]
-new_round_delay=1
+new_round_delay=30
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index 2a9b3c337..90f8930dc 100644
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -63,6 +63,10 @@ http_server=false
 # More debug output
 # debug_more=true
 
+# Synchronizatiob defaults
+[node_client]
+#timer_update_states=300
+
 [srv]
 order_signed_only=false
 
@@ -72,7 +76,7 @@ pricelist=[]
 
 # Mempool
 [mempool]
-# Automaticaly false, for enabling need role master or higher
+# Automatically false, for enabling need role master or higher
 auto_proc=false
 
 # Chain network settings
@@ -83,7 +87,6 @@ auto_proc=false
 # Uncomment to have more debug information in stream channel Chain
 # False by default
 #debug_more=true
-ban_list_sync_groups=[*.orders-test-stat]
 
 # Number of hashes packed into the one update packet
 # Increase it to reduce update latency
@@ -120,18 +123,20 @@ notify_path={PREFIX}/var/run/node_notify
 #notify_permissions=770
 #notify_user=myuser
 #notify_group=mygroup
-
 pid_path={PREFIX}/var/run/cellframe-node.pid
 log_file={PREFIX}/var/log/cellframe-node.log
 wallets_path={PREFIX}/var/lib/wallet
 ca_folders=[{PREFIX}/var/lib/ca,{PREFIX}/share/ca]
-dap_global_db_path={PREFIX}/var/lib/global_db
-#global_db_driver=mdbx
-#global_db_drvmode_async=false
+
+[global_db]
+driver=mdbx
+path={PREFIX}/var/lib/global_db
+#debug_more=true
 
 # Plugins
 #[plugins]
+#enabled=true
 # Load Python-based plugins
-#py_load=false   
+#py_load=true   
 # Path to Pyhon-based plugins
 #py_path={PREFIX}/var/lib/plugins
diff --git a/dist/share/configs/network/Backbone.cfg.tpl b/dist/share/configs/network/Backbone.cfg.tpl
index cd307e2fd..2ede46fa3 100755
--- a/dist/share/configs/network/Backbone.cfg.tpl
+++ b/dist/share/configs/network/Backbone.cfg.tpl
@@ -24,8 +24,7 @@ require_links=3
 [dag-poa]
 #events-sign-cert=scorpion.root.0
 
-[block-ton]
-#blocks-sign-cert=scorpion.root.0
-
-#[block-poa]
+#[esbocs]
 #blocks-sign-cert=mycert
+#minimum_fee=1.0
+#fee_addr=myaddr
diff --git a/dist/share/configs/network/kelvpn-minkowski.cfg.tpl b/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
index 314e837bd..96bd6690e 100755
--- a/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
+++ b/dist/share/configs/network/kelvpn-minkowski.cfg.tpl
@@ -23,7 +23,9 @@ seed_nodes_port=[8090,8090,8090]
 #[dag-poa]
 #events-sign-cert=kelvpn-minkowski.root.0
 
-#[block-ton]
-#blocks-sign-cert=minkowski.master.pvt.0
+#[esbocs]
+#blocks-sign-cert=mycert
+#minimum_fee=1.0
+#fee_addr=myaddr
 
 
diff --git a/dist/share/configs/network/mileena.cfg.tpl b/dist/share/configs/network/mileena.cfg.tpl
index eaa6decc9..1adb2e0a4 100755
--- a/dist/share/configs/network/mileena.cfg.tpl
+++ b/dist/share/configs/network/mileena.cfg.tpl
@@ -26,8 +26,7 @@ require_links=2
 #[dag-poa]
 #events-sign-cert=mileena.0.root
 
-#[block-ton]
-#blocks-sign-cert=mileena.0.master
-
-#[block-poa]
+#[esbocs]
 #blocks-sign-cert=mycert
+#minimum_fee=1.0
+#fee_addr=myaddr
diff --git a/dist/share/configs/network/private.cfg.tpl b/dist/share/configs/network/private.cfg.tpl
index 52ea08496..45530a9de 100644
--- a/dist/share/configs/network/private.cfg.tpl
+++ b/dist/share/configs/network/private.cfg.tpl
@@ -20,5 +20,7 @@ seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002]
 #[dag-poa]
 #events-sign-cert=mycert
 
-#[dag-pos]
-#events-sign-wallet=mywallet
+#[esbocs]
+#blocks-sign-cert=mycert
+#minimum_fee=1.0
+#fee_addr=myaddr
diff --git a/dist/share/configs/network/subzero.cfg.tpl b/dist/share/configs/network/subzero.cfg.tpl
index d02521d37..c8e7b29c5 100755
--- a/dist/share/configs/network/subzero.cfg.tpl
+++ b/dist/share/configs/network/subzero.cfg.tpl
@@ -5,7 +5,6 @@
 id=0x000000000000acca
 name=subzero
 native_ticker=tCELL
-links_static_only=true
 gdb_groups_prefix=subzero
 
 # Possible values: light, full, archive, master, root
@@ -21,9 +20,10 @@ seed_nodes_port=[8190,8190,8190]
 #acl_accept_ca_gdb=
 #acl_accept_ca_chains=all
 
-
 #[dag-poa]
 #events-sign-cert=mycert
 
-#[block-poa]
+#[esbocs]
 #blocks-sign-cert=mycert
+#minimum_fee=1.0
+#fee_addr=myaddr
\ No newline at end of file
diff --git a/version.mk b/version.mk
index f500cc6b1..1b058cd22 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 VERSION_MAJOR=5
 VERSION_MINOR=2
-VERSION_PATCH=12
+VERSION_PATCH=13
-- 
GitLab