Merge pull request #243 from everx-labs/smft-rc

Stability patches for SMFT. Support for Mesh

Author: bvscd

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 0.58.6
+
+- Send SMFT messages to random workchain nodes to improve delivery across workchain
+
+## Version 0.58.5
+
+- Support Mesh networks
+
 ## Version 0.58.4
 
 - Added support for due payment fix
@@ -652,4 +660,4 @@ All notable changes to this project will be documented in this file.
 
 ### New
 
-- Switched to Rust 2021 edition
+- Switched to Rust 2021 edition

Cargo.toml

@@ -2,7 +2,7 @@
 build = 'common/build/build.rs'
 edition = '2021'
 name = 'ever-node'
-version = '0.58.4'
+version = '0.58.6'
 
 [workspace]
 members = [ 'storage' ]
@@ -86,20 +86,19 @@ 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/everx-labs/ever-adnl.git', tag = '0.10.24' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/everx-labs/ever-adnl.git', tag = '0.10.26' }
 catchain = { path = 'catchain' }
-ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git', tag = '2.5.3' }
-ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.2' }
-ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.8.6' }
-ever_executor = { git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.17.6' }
-ever_vm = { git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.1.5' }
+ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git', tag = '2.5.5' }
+ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' }
+ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.8.9' }
+ever_executor = { git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.17.9' }
+ever_vm = { git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.1.7' }
 lockfree = { git = 'https://github.com/everx-labs/lockfree.git' }
 storage = { path = 'storage' }
-ton_api = { git = 'https://github.com/everx-labs/ever-tl.git', package = 'ton_api', tag = '0.3.79' }
+ton_api = { git = 'https://github.com/everx-labs/ever-tl.git', package = 'ton_api', tag = '0.3.82' }
 validator_session = { path = 'validator-session' }
 
 [dev-dependencies]
-async-trait = '0.1'
 difference = '2.0'
 ed25519-dalek = '1.0.1'
 external-ip = '4.1.0'
@@ -132,3 +131,4 @@ version = '0.26.0'
 features = [ 'cmake_build' ]
 optional = true
 version = '0.26.0'
+

bin/console.rs

@@ -946,12 +946,12 @@ mod test {
         ShardIdent, ShardStateUnsplit, ValidatorDescr, ValidatorSet
     };
     use ever_node::{
-        collator_test_bundle::{create_engine_telemetry, create_engine_allocated},
+        block::BlockKind, collator_test_bundle::{create_engine_telemetry, create_engine_allocated},
         config::TonNodeConfig, engine_traits::{EngineAlloc, EngineOperations},
         internal_db::{InternalDbConfig, InternalDb, state_gc_resolver::AllowStateGcSmartResolver}, 
         network::{control::{ControlServer, DataSource}, node_network::NodeNetwork},
-        shard_state::ShardStateStuff,
-        validator::validator_manager::ValidationStatus, shard_states_keeper::PinnedShardStateGuard,
+        shard_state::ShardStateStuff, shard_states_keeper::PinnedShardStateGuard,
+        validator::validator_manager::ValidationStatus
     };
     #[cfg(feature = "telemetry")]
     use ever_node::engine_traits::EngineTelemetry;
@@ -1058,7 +1058,7 @@ mod test {
             db.create_or_load_block_handle(
                 &master_state_id,
                 None,
-                None,
+                BlockKind::Block,
                 Some(1),
                 None
             ).unwrap()._to_created().unwrap();
@@ -1438,7 +1438,7 @@ mod test {
         let allocated = create_engine_allocated();
         let network = NodeNetwork::new(
             node_config,
-            Arc::new(tokio_util::sync::CancellationToken::new()),
+            tokio_util::sync::CancellationToken::new(),
             #[cfg(feature = "telemetry")]
             telemetry.clone(),
             allocated.clone()

catchain/Cargo.toml

@@ -13,16 +13,15 @@ hex = '0.4'
 lazy_static = '1.4.0'
 log = '0.4'
 metrics = '0.21.0'
-metrics-core = '0.5.2'
 metrics-util = '0.15.0'
 quanta = '0.11.1'
 rand = '0.8'
 regex = '1.3.1'
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-adnl = { features = [ 'node' ], git = 'https://github.com/everx-labs/ever-adnl.git', tag = '0.10.24' }
-ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.2' }
+adnl = { features = [ 'node' ], git = 'https://github.com/everx-labs/ever-adnl.git', tag = '0.10.26' }
+ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' }
 storage = { path = '../storage' }
-ton_api = { git = 'https://github.com/everx-labs/ever-tl.git', package = 'ton_api', tag = '0.3.79' }
+ton_api = { git = 'https://github.com/everx-labs/ever-tl.git', package = 'ton_api', tag = '0.3.82' }
 
 [dev-dependencies]
 chrono = '0.4.10'