Skip to content

Commit f9ea352

Browse files
committed
Automatic project update
1 parent 5a6955c commit f9ea352

38 files changed

+1527
-743
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## Version: 0.50.15
5+
## Version: 0.50.21
66

77
### New
88

Cargo.toml

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
edition = '2018'
33
name = 'ton_node'
4-
version = '0.50.15'
4+
version = '0.50.21'
55

66

77
[workspace]
@@ -42,25 +42,25 @@ sha2 = '0.9'
4242
spin = '0.7.1'
4343
stream-cancel = '0.8.0'
4444
string-builder = '^0.2.0'
45-
adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.71' }
45+
adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.74' }
4646
catchain = { path = 'catchain' }
47-
dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.65' }
48-
ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.18' }
47+
dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.68' }
48+
ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.25' }
4949
lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
50-
overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.55' }
51-
rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.65' }
50+
overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.58' }
51+
rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.68' }
5252
rustracing = { optional = true, version = '0.4.0' }
5353
rustracing_jaeger = { optional = true, version = '0.4.1' }
5454
statsd = { optional = true, version = '0.14.0' }
5555
storage = { path = 'storage' }
5656
tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
57-
ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.2.2' }
58-
ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.125' }
59-
ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.43' }
60-
ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.12' }
61-
ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.65' }
62-
ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.14' }
63-
ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.33' }
57+
ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.2.8' }
58+
ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.128' }
59+
ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.51' }
60+
ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.19' }
61+
ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.74' }
62+
ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.2' }
63+
ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.39' }
6464
validator_session = { path = 'validator-session' }
6565

6666
[target.'cfg(unix)'.dependencies.rdkafka]
@@ -72,8 +72,6 @@ features = [ 'cmake_build' ]
7272
optional = true
7373
version = '0.26.0'
7474

75-
[dev-dependencies]
76-
7775
[features]
7876
default = [ 'telemetry' ]
7977
external_db = [ 'rdkafka' ]

catchain/Cargo.toml

+6-17
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,13 @@ regex = '1.3.1'
2222
sha2 = '0.9'
2323
tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
2424

25-
adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.71' }
26-
ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.18' }
27-
overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.55' }
28-
rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.65' }
25+
adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.74' }
26+
ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.25' }
27+
overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.58' }
28+
rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.68' }
2929
storage = { path = '../storage' }
30-
ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.125' }
31-
ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.14' }
32-
33-
[dev-dependencies]
34-
env_logger = '0.7.1'
35-
chrono = '0.4.10'
36-
37-
[target.'cfg(windows)'.dev-dependencies.rocksdb]
38-
git = 'https://github.com/rust-rocksdb/rust-rocksdb.git'
39-
40-
[target.'cfg(unix)'.dev-dependencies.rocksdb]
41-
git = 'https://github.com/rust-rocksdb/rust-rocksdb.git'
42-
features = [ 'jemalloc' ]
30+
ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.128' }
31+
ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.2' }
4332

4433
[features]
4534
default = [ ]

commit_hash.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e033eb17b9cb5b0b43276bbd21123458d82e2c90
1+
cb8db8ea29a0892fa687c0fa38aa68b6ccbb104b

common

deps_map.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"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"}
1+
{"adnl":"7990b983666db36418391e6d1794b7a1616cf445","dht":"936b00f0831073258eef99257ada358d5cec92cf","ever-crypto":"d49d218ffd4854597e5bbc61ecbd65d2af8b5e0e","overlay":"f3addfc7200b691be23606baba346819bdddb9b7","rldp":"220c43de2887cc8cfdb91a6c86e7308ce3349ecf","ton-labs-abi":"87620862896790292c459f1f1ce73e18d9dfb7d4","ton-tl":"933ca241c710504621e93e0a514ae5045fea3a5f","ton-block":"2cc40984dd97bd72d56a53cc4d44b5868c40f8a6","ton-block-json":"eab6b7b1a3907533e350744365d8ba27be362542","ton-executor":"10ebcf0f3d40a3a7960abb7962e6b111813c3198","ton-types":"f254c3062585938012fab693eb8375ebfd69bfee","ton-vm":"732839957130feb1c2eabc7d7caaf18ded1e30e2"}

recomended_rust

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.61.0
1+
1.58.1

src/boot.rs

+9
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ async fn get_key_blocks(
106106
let mut download_new_key_blocks_until = engine.now() + engine.time_for_blockchain_init();
107107
let mut key_blocks = vec!(handle.clone());
108108
loop {
109+
if engine.check_stop() {
110+
fail!("Boot was stopped");
111+
}
109112
log::info!(target: "boot", "download_next_key_blocks_ids {}", handle.id());
110113
let (ids, _incomplete) = match engine.download_next_key_blocks_ids(handle.id(), 10).await {
111114
Err(err) => {
@@ -243,6 +246,9 @@ pub(crate) async fn download_zerostate(
243246
}
244247
log::info!(target: "boot", "download zero state {}", block_id);
245248
loop {
249+
if engine.check_stop() {
250+
fail!("Boot was stopped");
251+
}
246252
match engine.download_zerostate(block_id).await {
247253
Ok((state, state_bytes)) => {
248254
log::info!(target: "boot", "zero state {} received", block_id);
@@ -270,6 +276,9 @@ async fn download_key_block_proof(
270276
}
271277
}
272278
loop {
279+
if engine.check_stop() {
280+
fail!("Boot was stopped");
281+
}
273282
let proof = engine.download_block_proof(block_id, false, true).await?;
274283
let result = if let Some(prev_block_proof) = prev_block_proof {
275284
proof.check_with_prev_key_block_proof(prev_block_proof)

0 commit comments

Comments
 (0)