Fix 1.76 complier warnings. Update default config with REMP options

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 0.55.93
+
+- Fix compiler warnings
+- Add REMP settings to default configs
+
 ## Version 0.55.92
 
 - Added ability not to split out message queues during shard split

Cargo.toml

@@ -2,7 +2,7 @@
 build = 'common/build/build.rs'
 edition = '2021'
 name = 'ton_node'
-version = '0.55.92'
+version = '0.55.93'
 
 [workspace]
 members = [ 'storage' ]
@@ -16,6 +16,7 @@ chrono = '=0.4.19'
 clap = '2.33.1'
 colored = '1.9.3'
 crossbeam-channel = '0.4.2'
+ctrlc = { features = [ 'termination' ], version = '3.4.0' }
 dashmap = '5.4.0'
 dirs = '2.0.2'
 enum-as-inner = '=0.5.1'
@@ -29,6 +30,8 @@ log = '0.4'
 log4rs = '1.2'
 log4rs-rolling-file = '0.2.0'
 metrics = '0.21.0'
+metrics-exporter-prometheus = { optional = true, version = '0.12.1' }
+metrics-exporter-statsd = { optional = true, version = '0.5.0' }
 num-bigint = '0.4'
 num_cpus = '1.13'
 openssl = '0.10.35'
@@ -39,28 +42,25 @@ serde = '1.0.105'
 serde_derive = '1.0.105'
 serde_json = '1.0.64'
 spin = '0.7.1'
+statsd = { optional = true, version = '0.15' }
 stream-cancel = '0.8.0'
 string-builder = '^0.2.0'
+tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
 tokio-util = '0.7'
-adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ever-adnl.git', tag = '0.9.20' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ever-adnl.git', tag = '0.9.22' }
 catchain = { path = 'catchain' }
-ctrlc = { features = [ 'termination' ], version = '3.4.0' }
-dht = { git = 'https://github.com/tonlabs/ever-dht.git', tag = '0.6.85' }
+dht = { git = 'https://github.com/tonlabs/ever-dht.git', tag = '0.6.87' }
 lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-metrics-exporter-prometheus = { optional = true, version = '0.12.1' }
-metrics-exporter-statsd = { optional = true, version = '0.5.0' }
-overlay = { git = 'https://github.com/tonlabs/ever-overlay.git', tag = '0.7.17' }
-rldp = { git = 'https://github.com/tonlabs/ever-rldp.git', tag = '0.8.13' }
-statsd = { optional = true, version = '0.15' }
+overlay = { git = 'https://github.com/tonlabs/ever-overlay.git', tag = '0.7.19' }
+rldp = { git = 'https://github.com/tonlabs/ever-rldp.git', tag = '0.8.15' }
 storage = { path = 'storage' }
-tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', optional = true, tag = '2.4.13' }
-ton_api = { git = 'https://github.com/tonlabs/ever-tl.git', package = 'ton_api', tag = '0.3.57' }
-ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.121' }
-ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.209' }
-ton_executor = { git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.108' }
-ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.31' }
-ton_vm = { git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.9.5' }
+ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', optional = true, tag = '2.4.14' }
+ton_api = { git = 'https://github.com/tonlabs/ever-tl.git', package = 'ton_api', tag = '0.3.59' }
+ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.122' }
+ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.212' }
+ton_executor = { git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.110' }
+ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.32' }
+ton_vm = { git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.9.7' }
 validator_session = { path = 'validator-session' }
 
 [dev-dependencies]
@@ -86,7 +86,6 @@ trace_alloc_detail = [ 'trace_alloc' ]
 
 [profile]
 
-
 [target.'cfg(unix)'.dependencies.rdkafka]
 optional = true
 version = '0.26.0'

catchain/Cargo.toml

@@ -18,13 +18,13 @@ metrics-util = '0.15.0'
 quanta = '0.11.1'
 rand = '0.8'
 regex = '1.3.1'
-adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ever-adnl.git', tag = '0.9.20' }
-overlay = { git = 'https://github.com/tonlabs/ever-overlay.git', tag = '0.7.17' }
-rldp = { git = 'https://github.com/tonlabs/ever-rldp.git', tag = '0.8.13' }
-storage = { path = '../storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_api = { git = 'https://github.com/tonlabs/ever-tl.git', package = 'ton_api', tag = '0.3.57' }
-ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.31' }
+adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ever-adnl.git', tag = '0.9.22' }
+overlay = { git = 'https://github.com/tonlabs/ever-overlay.git', tag = '0.7.19' }
+rldp = { git = 'https://github.com/tonlabs/ever-rldp.git', tag = '0.8.15' }
+storage = { path = '../storage' }
+ton_api = { git = 'https://github.com/tonlabs/ever-tl.git', package = 'ton_api', tag = '0.3.59' }
+ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.32' }
 
 [dev-dependencies]
 chrono = '0.4.10'

configs/default_config.json

@@ -1,67 +1,213 @@
 {
-    "log_config_name": "log_cfg.yml",
-    "ton_global_config_name": "ton-global.config.json",
-    "internal_db_path": "node_db",
-    "ip_address": "0.0.0.0:30303",
-    "control_server_port": 4925,
-    "shard_keeper": {
-        "get_peer_attempt_timeout_ms": 1000,
-        "download_next_block_full_timeout_ms": 1000,
-        "download_block_full_timeout_ms": 1000
+  "log_config_name": "log_cfg.yml",
+  "ton_global_config_name": "ton-global.config.json",
+  "internal_db_path": "node_db",
+  "ip_address": "0.0.0.0:30303",
+  "control_server_port": 3031,
+  "validation_countdown_mode": null,
+  "unsafe_catchain_patches_path": null,
+  "validator_keys": null,
+  "kafka_consumer_config": {
+    "group_id": "101",
+    "brokers": "kafka",
+    "topic": "requests",
+    "session_timeout_ms": 6000,
+    "run_attempt_timeout_ms": 1000
+  },
+  "external_db_config": {
+    "raw_block_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 1000,
+      "topic": "raw_blocks",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "/blob-storage",
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": "http:///ton-node:80/"
     },
-    "kafka_consumer_config": {
-        "group_id": "101",
-        "brokers": "kafka",
-        "topic": "requests",
-        "session_timeout_ms": 6000,
-        "run_attempt_timeout_ms": 1000
+      "block_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 100,
+      "topic": "blocks",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "big-blocks",
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
     },
-    "external_db_config": {
-        "block_producer": {
-            "enabled": true,
-            "brokers": "kafka",
-            "message_timeout_ms": 100,
-            "topic": "blocks",
-            "attempt_timeout_ms": 100,
-            "message_max_size": 3000000,
-            "big_messages_storage": "big-blocks"
-        },
-        "message_producer": {
-            "enabled": true,
-            "brokers": "kafka",
-            "message_timeout_ms": 1000,
-            "topic": "messages",
-            "attempt_timeout_ms": 100,
-            "message_max_size": 3000000,
-            "big_messages_storage": "big-messages"
-        },
-        "transaction_producer": {
-            "enabled": true,
-            "brokers": "kafka",
-            "message_timeout_ms": 1000,
-            "topic": "transactions",
-            "attempt_timeout_ms": 100,
-            "message_max_size": 3000000,
-            "big_messages_storage": "big-transactions"
-        },
-        "account_producer": {
-            "enabled": true,
-            "brokers": "kafka",
-            "message_timeout_ms": 1000,
-            "topic": "accounts",
-            "attempt_timeout_ms": 100,
-            "message_max_size": 3000000,
-            "big_messages_storage": "big-accounts"
-        },
-        "block_proof_producer": {
-            "enabled": true,
-            "brokers": "kafka",
-            "message_timeout_ms": 1000,
-            "topic": "blocks_signatures",
-            "attempt_timeout_ms": 100,
-            "message_max_size": 3000000,
-            "big_messages_storage": "big-block-proofs"
-        },
-        "bad_blocks_storage": "bad-blocks"
+    "message_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 1000,
+      "topic": "messages",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "big-messages",
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "transaction_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 1000,
+      "topic": "transactions",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "big-transactions",
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "account_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 1000,
+      "topic": "accounts",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "/blob-storage",
+      "big_message_max_size": 30000000,
+      "external_message_ref_address_prefix": "http:///ton-node:80/"
+    },
+    "block_proof_producer": {
+      "enabled": false,
+      "brokers": "kafka",
+      "message_timeout_ms": 1000,
+      "topic": "blocks_signatures",
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 100,
+      "message_max_size": 3000000,
+      "big_messages_storage": "big-block-proofs",
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "raw_block_proof_producer": {
+      "enabled": false,
+      "brokers": "",
+      "message_timeout_ms": 0,
+      "topic": null,
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 0,
+      "message_max_size": 0,
+      "big_messages_storage": null,
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "chain_range_producer": {
+      "enabled": false,
+      "brokers": "",
+      "message_timeout_ms": 0,
+      "topic": null,
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 0,
+      "message_max_size": 0,
+      "big_messages_storage": null,
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "remp_statuses_producer": {
+      "enabled": false,
+      "brokers": "",
+      "message_timeout_ms": 0,
+      "topic": null,
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 0,
+      "message_max_size": 0,
+      "big_messages_storage": null,
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "shard_hashes_producer": {
+      "enabled": false,
+      "brokers": "",
+      "message_timeout_ms": 0,
+      "topic": null,
+      "sharded_topics": null,
+      "sharding_depth": 0,
+      "attempt_timeout_ms": 0,
+      "message_max_size": 0,
+      "big_messages_storage": null,
+      "big_message_max_size": null,
+      "external_message_ref_address_prefix": null
+    },
+    "bad_blocks_storage": "bad-blocks"
+  },
+  "default_rldp_roundtrip_ms": null,
+  "test_bundles_config": {
+    "collator": {
+      "build_for_unknown_errors": false,
+      "known_errors": [],
+      "build_for_errors": false,
+      "errors": [],
+      "path": ""
+    },
+    "validator": {
+      "build_for_unknown_errors": false,
+      "known_errors": [],
+      "build_for_errors": false,
+      "errors": [],
+      "path": ""
+    }
+  },
+  "connectivity_check_config": {
+    "enabled": true,
+    "long_len": 2048,
+    "short_period_ms": 1000,
+    "long_mult": 5
+  },
+  "gc": {
+    "enable_for_archives": true,
+    "archives_life_time_hours": 48,
+    "enable_for_shard_state_persistent": true,
+    "cells_gc_config": {
+      "gc_interval_sec": 900,
+      "cells_lifetime_sec": 1800
     }
+  },
+  "validator_key_ring": null,
+  "remp": {
+    "client_enabled": true,
+    "remp_client_pool": null,
+    "service_enabled": true,
+    "message_queue_max_len": 10000,
+    "max_incoming_broadcast_delay_millis": 0
+  },
+  "restore_db": true,
+  "low_memory_mode": true,
+  "cells_db_config": {
+    "states_db_queue_len": 1000,
+    "max_pss_slowdown_mcs": 750,
+    "prefill_cells_counters": false,
+    "cache_cells_counters": true,
+    "cache_size_bytes": 4294967296
+  },
+  "collator_config": {
+    "cutoff_timeout_ms": 1000,
+    "stop_timeout_ms": 1500,
+    "clean_timeout_percentage_points": 150,
+    "optimistic_clean_percentage_points": 1000,
+    "max_secondary_clean_timeout_percentage_points": 350,
+    "max_collate_threads": 1,
+    "retry_if_empty": false,
+    "finalize_empty_after_ms": 800,
+    "empty_collation_sleep_ms": 100
+  },
+  "skip_saving_persistent_states": false,
+  "states_cache_mode": "Moderate",
+  "states_cache_cleanup_diff": 1000
 }

configs/default_config_mainet_initblock.json → configs/default_config_mainet_initblock_test.json

@@ -1,6 +1,6 @@
 {
     "log_config_name": "../common/config/log_cfg_debug.yml",
-    "ton_global_config_name": "../configs/ton-global.config-mainet-initblock.json",
+    "ton_global_config_name": "../configs/ton-global.config-mainet-initblock-test.json",
     "internal_db_path": "target/node_db",
     "ip_address": "0.0.0.0:30303",
     "control_server_port": 4925,

configs/default_config_mainet.json → configs/default_config_mainet_test.json

@@ -1,6 +1,6 @@
 {
     "log_config_name": "../common/config/log_cfg_debug.yml",
-    "ton_global_config_name": "../configs/ton-global.config-mainet.json",
+    "ton_global_config_name": "../configs/ton-global.config-mainet-test.json",
     "internal_db_path": "target/node_db",
     "ip_address": "0.0.0.0:30303",
     "control_server_port": 4925,