Revert "Merge branch 'tmp-rc' into master"

This reverts commit 65f6ff8, reversing
changes made to c7b2a7a.

Author: AtomXY

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## Version: 0.50.19
+## Version: 0.50.15
 
 ### New
 

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 edition = '2018'
 name = 'ton_node'
-version = '0.50.19'
+version = '0.50.15'
+
 
 [workspace]
 members = [ 'storage' ]
@@ -41,25 +42,25 @@ sha2 = '0.9'
 spin = '0.7.1'
 stream-cancel = '0.8.0'
 string-builder = '^0.2.0'
-adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.74' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.71' }
 catchain = { path = 'catchain' }
-dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.68' }
-ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.24' }
+dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.65' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.18' }
 lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.58' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.68' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.55' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.65' }
 rustracing = { optional = true, version = '0.4.0' }
 rustracing_jaeger = { optional = true, version = '0.4.1' }
 statsd = { optional = true, version = '0.14.0' }
 storage = { path = 'storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.2.8' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.128' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.51' }
-ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.18' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.72' }
-ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.2' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.38' }
+ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.2.2' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.125' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.43' }
+ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.12' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.65' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.14' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.33' }
 validator_session = { path = 'validator-session' }
 
 [target.'cfg(unix)'.dependencies.rdkafka]

catchain/Cargo.toml

@@ -22,13 +22,13 @@ regex = '1.3.1'
 sha2 = '0.9'
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
 
-adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.74' }
-ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.24' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.58' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.68' }
+adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.71' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.18' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.55' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.65' }
 storage = { path = '../storage' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.128' }
-ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.2' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.125' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.14' }
 
 [dev-dependencies]
 env_logger = '0.7.1'

commit_hash.txt

@@ -1 +1 @@
-fa32d331725543df68c946a32b42be95ca233eca
+e033eb17b9cb5b0b43276bbd21123458d82e2c90

deps_map.json

@@ -1 +1 @@
-{"adnl":"865222c13ed07d8f27de68aa35a5efbd9f476913","dht":"f2102a4161a7fa55647eaf5218378b4d5a6f94a8","ever-crypto":"f3ad46f6ac0e175b0240e159296c5e2a217f3aec","overlay":"1d44e7e67af07912ad71aab4807eae797083aeae","rldp":"cc41a8f8353cb665fe6f1356f34b67609ae3b2ac","ton-labs-abi":"8e143a32a34ff5836f5309767a14ed62ffedbcee","ton-tl":"74cbaa3fdd69c00a6eed63343b31c28013c78bd3","ton-block":"2cc40984dd97bd72d56a53cc4d44b5868c40f8a6","ton-block-json":"164c360d622544515b865b972f8575dd75b6eb8e","ton-executor":"93576a35bb0906daabd7e08c7066f04a991ecabe","ton-types":"f254c3062585938012fab693eb8375ebfd69bfee","ton-vm":"0ac66c6b5ccbe2154831b5fb19ee4839ee22c1cc"}
+{"adnl":"d1fe667cf81f691888d8d26d86616db211cf97b1","dht":"c56d68877ca8b239c7d51bae87601104e1b942ff","ever-crypto":"1888ee62ceee0e8cafee17d13113584713fd2206","overlay":"4a2396286f641f92ab900c5bdc396b1eb5e1cd11","rldp":"d39ac31b127c339830252a671a3a3016a49dd788","ton-labs-abi":"d2db9e80299491c36197c98764eba44206c8f20c","ton-tl":"806a66af5691be619c7986e7f7af2c7d4faa9314","ton-block":"33b32099a69a59659389667ecc7e3632357c03c4","ton-block-json":"d21b3fb4aab3dc91258b0e5aab50006ac95015a5","ton-executor":"0a842963c07a5c99d050a54164fc7b9d02c7c824","ton-types":"bfb76ae3db7f793772dcdf74b7cd9f4bdf9d3b31","ton-vm":"ec071f932c63c9018841a7bd32d1c18ee787c9d1"}

src/boot.rs

@@ -106,9 +106,6 @@ async fn get_key_blocks(
     let mut download_new_key_blocks_until = engine.now() + engine.time_for_blockchain_init();
     let mut key_blocks = vec!(handle.clone());
     loop {
-        if engine.check_stop() {
-            fail!("Boot was stopped");
-        }
         log::info!(target: "boot", "download_next_key_blocks_ids {}", handle.id());
         let (ids, _incomplete) = match engine.download_next_key_blocks_ids(handle.id(), 10).await {
             Err(err) => {
@@ -246,9 +243,6 @@ pub(crate) async fn download_zerostate(
     }
     log::info!(target: "boot", "download zero state {}", block_id);
     loop {
-        if engine.check_stop() {
-            fail!("Boot was stopped");
-        }
         match engine.download_zerostate(block_id).await {
             Ok((state, state_bytes)) => {
                 log::info!(target: "boot", "zero state {} received", block_id);
@@ -276,9 +270,6 @@ async fn download_key_block_proof(
         }
     }
     loop {
-        if engine.check_stop() {
-            fail!("Boot was stopped");
-        }
         let proof = engine.download_block_proof(block_id, false, true).await?;
         let result = if let Some(prev_block_proof) = prev_block_proof {
             proof.check_with_prev_key_block_proof(prev_block_proof)