From 3d56aa7ee6610f9107196b3f12f4248bda2366c1 Mon Sep 17 00:00:00 2001
From: Olzhas <oljas.jarasbaev@demlabs.net>
Date: Mon, 23 Sep 2024 15:42:37 +0700
Subject: [PATCH] [*] merge

---
 cellframe-sdk                         |  2 +-
 dap-sdk                               |  2 +-
 dist/share/configs/cellframe-node.cfg | 41 +++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/cellframe-sdk b/cellframe-sdk
index f917d433e..8a93990b0 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit f917d433e7abdd3195051f823e322454d2688407
+Subproject commit 8a93990b03e001e15a699fc75e42760dc8aee1c6
diff --git a/dap-sdk b/dap-sdk
index 1fc8d642b..a318ac98b 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 1fc8d642bd93f0301f42c8386a268a2906e17b07
+Subproject commit a318ac98bc34a399b3a9f95f7b819143ed868f40
diff --git a/dist/share/configs/cellframe-node.cfg b/dist/share/configs/cellframe-node.cfg
index 5f75bb960..c1f66cb45 100644
--- a/dist/share/configs/cellframe-node.cfg
+++ b/dist/share/configs/cellframe-node.cfg
@@ -8,6 +8,7 @@ debug_dump_stream_headers=false
 #debug_reactor=false
 # Debug HTTP protocol, false by default
 #debug_http=false
+# debug-config=false
 
 # seed mode. WARNING. Used true only when you start the new network
 #seed_mode=false
@@ -22,6 +23,7 @@ enabled=
 news_url_enabled=false
 bugreport_url_enabled=false
 listen_address=
+# listen-port-tcp=
 # External IPv4 address
 #ext_address=8.9.10.11
 # External IPv6 address
@@ -30,6 +32,10 @@ listen_address=
 # If not set - used listen_port_tcp for node table auto fill
 #ext_port_tcp=8089
 
+[server_options]
+# proxy_enable=false
+# proxy_enable2=false
+
 [notify_server]
 # Listening path have priority above listening address examples to use
 # listen_path=[listen_path1:listen_path_mode,listen_path2:listen_path_mode,...]
@@ -41,10 +47,17 @@ listen_address=
 # For now its IAES but thats depricated
 #preferred_encryption=SALSA2012 
 # Debug stream protocol
+# debug_channels=false
+# debug_dump_stream_headers=false
 #debug=true
 
 # Build in DNS client (need for bootstraping)
 [dns_client]
+# debug_more=false
+# max_tries=5
+# timeout=10
+# timeout_read_after_connect=5
+# ssl_cert_path=
 #request_timeout=10
 
 # Bootstrap balancer server
@@ -54,6 +67,7 @@ http_server=true
 
 # Ledger defaults
 [ledger]
+# cache_enabled=false
 # More debug output
 # debug_more=true
 
@@ -67,6 +81,7 @@ http_server=true
 [link_manager]
 #timer_update_states=5000
 #max_attempts_num=2
+# reconnect_delay=
 #debug_more=true
 
 [srv]
@@ -80,9 +95,18 @@ pricelist=[]
 
 # Mempool
 [mempool]
+# gdb_group=
 # Automatically false, for enabling need role master or higher
 auto_proc=false
 
+[chain]
+# debug_more=true
+# sync_timeout=
+# sync_ack_window_size=
+# debug_legacy=false
+# pack_size=
+# sync_idle_time=
+
 # Chain network settings
 [chain_net]
 # debug_more=true
@@ -96,6 +120,13 @@ auto_proc=false
 [stake]
 # debug_more=true
 
+[crypto]
+# debug_more=true
+
+[gossip]
+# debug_more=true
+
+
 [stream_ch_chain]
 # Uncomment to have more debug information in stream channel Chain
 # False by default
@@ -122,10 +153,17 @@ network_mask=255.255.255.0
 #wallet_addr=
 # The name of the certificate for signing receipts. Must match the master node certificate.
 #receipt_sign_cert=
+# allow_free_srv=false
+
+[srv_xchange]
+# debug_more=false
+
 
 # Console interface server
 [cli-server]
 enabled=true
+# debug_more=false
+# debug-cli=false
 #listen_port_tcp=12345
 #listen_unix_socket_path=../var/run/node_cli
 # Default permissions 770
@@ -145,11 +183,14 @@ pid_path=../var/run/cellframe-node.pid
 log_file=../var/log/cellframe-node.log
 wallets_path=../var/lib/wallet
 ca_folders=[../var/lib/ca,../share/ca]
+# geoip_db_path=
+# datum_folder=
 
 [global_db]
 path=../var/lib/global_db
 driver=
 #debug_more=true
+# mdbx_upper_limit_of_db_size=1024
 
 # Plugins
 [plugins]
-- 
GitLab