Automatic project update

Author: tonjen

CHANGELOG.md

@@ -1,10 +1,23 @@
-# Changelog
+# Release Notes
 
 All notable changes to this project will be documented in this file.
 
-## Version: 0.50.21
+## Version: 0.50.23
 
 ### New
 
 
+## Version: 0.50.23
 
+### New
+
+- Bumped block version to 31
+- Removed unused code
+
+## Version: 0.50.22
+
+### New
+
+- Fixed build warnings
+- `crc32c` crate changed to common `crc`
+- Added rust version to node info

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
-edition = '2018'
+edition = '2021'
 name = 'ton_node'
-version = '0.50.21'
+version = '0.50.23'
+build = 'common/build/build.rs'
 
 
 [workspace]
@@ -42,25 +43,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.75' }
 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.25' }
+dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.72' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.29' }
 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.59' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.69' }
 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.9' }
-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.19' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.74' }
-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.39' }
+ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.3.1' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.129' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.8.0' }
+ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.24' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.78' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.3' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.40' }
 validator_session = { path = 'validator-session' }
 
 [target.'cfg(unix)'.dependencies.rdkafka]
@@ -88,3 +89,4 @@ telemetry = [
 ]
 trace_alloc_detail = [ 'trace_alloc' ]
 trace_alloc = [  ]
+workchains = [  ]

catchain/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-edition = '2018'
+edition = '2021'
 build = '../common/build/build.rs'
 name = 'catchain'
 version = '0.1.0'
@@ -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.25' }
-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.75' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.29' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.59' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.69' }
 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.129' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.3' }
 
 [features]
 default = [  ]

catchain/src/receiver.rs

@@ -977,7 +977,7 @@ impl ReceiverImpl {
         let incarnation = &self.incarnation;
         let source_hash = self.get_source_public_key_hash(dep.src as usize);
         let height = dep.height;
-        let data_hash = dep.data_hash;
+        let data_hash = dep.data_hash.clone();
         ::ton_api::ton::catchain::block::id::Id {
             incarnation: incarnation.clone(),
             src: public_key_hash_to_int256(source_hash),
@@ -1913,7 +1913,7 @@ impl ReceiverImpl {
 
         trace!("Got GetBlockQuery: {:?}", query);
 
-        let block_hash = query.block;
+        let block_hash = query.block.clone();
         let block_result = self.get_block_by_hash(&block_hash);
 
         if let Some(block_ptr) = block_result {

catchain/src/utils.rs

@@ -199,7 +199,7 @@ pub fn get_block_dependency_id(block: &ton::BlockDep, receiver: &dyn Receiver) -
         incarnation: receiver.get_incarnation().clone().into(),
         src: public_key_hash_to_int256(receiver.get_source_public_key_hash(block.src as usize)),
         height: block.height,
-        data_hash: block.data_hash,
+        data_hash: block.data_hash.clone(),
     }
     .into_boxed()
 }

commit_hash.txt

@@ -1 +1 @@
-cb8db8ea29a0892fa687c0fa38aa68b6ccbb104b
+f44cd2c64fa4876d9f785f691c9ca1c7e076fd45

common

@@ -1 +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"}
+{"adnl":"429fde6f0d5d0b0f445c4a7a8b32fd05de3f2daa","dht":"ae70dc4f635efb3d04ffe29ae361d6367bb8e0a4","ever-crypto":"4a9cefdfca1f20906c1c940cbca0af4b17e4b100","overlay":"9c6b0652d2b07b65a6245036cb4974175adeb46e","rldp":"fdec766db7f08c56665e360e04397055176f71a5","ton-labs-abi":"038e5c5ce85ca9a660780065a26e3520af5ad485","ton-tl":"99156ea96968bd86bc2d28814940253597fa2c2b","ton-block":"44683365a549ac28b1516b081621fa91c356d741","ton-block-json":"2f3766e2dcfad3aae8d3f190a66b47be7158f388","ton-executor":"aad4e507c4ec982aa57bc117691232147cecc79e","ton-types":"d04d4938a776665c7c276bff6bd860b0a6a1f45e","ton-vm":"8448a4627dd9d957cf4f187602582027b29c6b77"}

deps_map.json

@@ -14,12 +14,12 @@
 use std::{io::Cursor, collections::HashMap, cmp::max, sync::Arc};
 use std::io::Write;
 use ton_block::{
-    Block, BlockIdExt, BlkPrevInfo, CatchainConfig, ConfigParams, Deserializable,
-    ShardIdent, ShardDescr, ShardHashes, ValidatorSet, HashmapAugType,
+    Block, BlockIdExt, BlkPrevInfo, Deserializable, ExtBlkRef, ShardDescr, ShardIdent, 
+    ShardHashes, HashmapAugType
 };
 use ton_types::{Cell, Result, types::UInt256, deserialize_tree_of_cells, error, fail, HashmapType};
 
-use crate::{error::NodeError, shard_state::ShardHashesStuff};
+use crate::shard_state::ShardHashesStuff;
 
 
 pub struct BlockPrevStuff {
@@ -95,9 +95,10 @@ impl BlockStuff {
 
     pub fn id(&self) -> &BlockIdExt { &self.id }
 
-    pub fn shard(&self) -> &ShardIdent { 
-        self.id.shard() 
-    }
+// Unused
+//    pub fn shard(&self) -> &ShardIdent { 
+//        self.id.shard() 
+//    }
 
     pub fn root_cell(&self) -> &Cell { &self.root }
 
@@ -109,7 +110,7 @@ impl BlockStuff {
 //    }
 
     pub fn gen_utime(&self) -> Result<u32> {
-        Ok(self.block.read_info()?.gen_utime().0)
+        Ok(self.block.read_info()?.gen_utime().as_u32())
     }
 
 // Unused
@@ -157,20 +158,17 @@ impl BlockStuff {
     }
 
     pub fn construct_master_id(&self) -> Result<BlockIdExt> {
-        let mc_id = self
+        let mc_id = self.get_master_id()?;
+        Ok(BlockIdExt::from_ext_blk(mc_id))
+    }
+
+    pub fn get_master_id(&self) -> Result<ExtBlkRef> {
+        Ok(self
             .block
             .read_info()?
             .read_master_ref()?
             .ok_or_else(|| error!("Can't get master ref: given block is a master block"))?
-            .master;
-        Ok(
-            BlockIdExt {
-                shard_id: ShardIdent::masterchain(),
-                seq_no: mc_id.seq_no,
-                root_hash: mc_id.root_hash,
-                file_hash: mc_id.file_hash
-            }
-        )
+            .master)
     }
 
     pub fn write_to<T: Write>(&self, dst: &mut T) -> Result<()> {
@@ -222,20 +220,22 @@ impl BlockStuff {
         Ok(shards)
     }
 
-    pub fn config(&self) -> Result<ConfigParams> {
-        self
-            .block()
-            .read_extra()?
-            .read_custom()?
-            .and_then(|custom| custom.config().cloned())
-            .ok_or_else(|| error!(NodeError::InvalidArg(
-                "State doesn't contain `custom` field".to_string()
-            )))
-    }
+// Unused
+//    pub fn config(&self) -> Result<ConfigParams> {
+//        self
+//            .block()
+//            .read_extra()?
+//            .read_custom()?
+//            .and_then(|custom| custom.config().cloned())
+//            .ok_or_else(|| error!(NodeError::InvalidArg(
+//                "State doesn't contain `custom` field".to_string()
+//            )))
+//    }
 
-    pub fn read_cur_validator_set_and_cc_conf(&self) -> Result<(ValidatorSet, CatchainConfig)> {
-        self.block().read_cur_validator_set_and_cc_conf()
-    }
+// Unused
+//    pub fn read_cur_validator_set_and_cc_conf(&self) -> Result<(ValidatorSet, CatchainConfig)> {
+//        self.block().read_cur_validator_set_and_cc_conf()
+//    }
 
     pub fn calculate_tr_count(&self) -> Result<usize> {
         let now = std::time::Instant::now();

src/block.rs

@@ -12,8 +12,8 @@
 */
 
 use ton_block::{
-    Block, BlockProof, BlockIdExt, Deserializable, MerkleProof, BlockInfo,
-    ValidatorDescr, ValidatorSet, CatchainConfig, Serializable
+    Block, BlockIdExt, BlockInfo, BlockProof, Deserializable, MerkleProof, Serializable,
+    ValidatorDescr
 };
 use ton_types::{
     Cell, Result, fail, error, HashmapType, deserialize_tree_of_cells, serialize_tree_of_cells,
@@ -113,6 +113,7 @@ impl BlockProofStuff {
         &self.id
     }
 
+    #[cfg(feature="external_db")]
     pub fn proof(&self) -> &BlockProof {
         &self.proof
     }
@@ -204,26 +205,24 @@ impl BlockProofStuff {
         Ok(())
     }
 
-    pub fn get_cur_validators_set(&self) -> Result<(ValidatorSet, CatchainConfig)> {
-        let (virt_key_block, prev_key_block_info) = self.pre_check_block_proof()?;
-
-        if !prev_key_block_info.key_block() {
-            fail!(NodeError::InvalidData(format!(
-                "proof for key block {} contains a Merkle proof which declares non key block",
-                self.id(),
-            )))
-        }
-
-        let (cur_validator_set, cc_config) = virt_key_block.read_cur_validator_set_and_cc_conf()
-            .map_err(|err| { 
-                NodeError::InvalidData(format!(
-                    "Сan't extract config params from key block's proof {}: {}",
-                    self.id, err
-                ))
-            })?;
-
-        Ok((cur_validator_set, cc_config))
-    }
+// Unused
+//    pub fn get_cur_validators_set(&self) -> Result<(ValidatorSet, CatchainConfig)> {
+//        let (virt_key_block, prev_key_block_info) = self.pre_check_block_proof()?;
+//        if !prev_key_block_info.key_block() {
+//            fail!(NodeError::InvalidData(format!(
+//                "proof for key block {} contains a Merkle proof which declares non key block",
+//                self.id(),
+//            )))
+//        }
+//        let (cur_validator_set, cc_config) = virt_key_block.read_cur_validator_set_and_cc_conf()
+//            .map_err(|err| { 
+//                NodeError::InvalidData(format!(
+//                    "Сan't extract config params from key block's proof {}: {}",
+//                    self.id, err
+//                ))
+//            })?;
+//        Ok((cur_validator_set, cc_config))
+//    }
 
     pub fn check_with_prev_key_block_proof_(
         &self,
@@ -257,7 +256,7 @@ impl BlockProofStuff {
             )))
         }
         let (validators, validators_hash_short) =
-            self.process_prev_key_block_proof(prev_key_block_proof, virt_block_info.gen_utime().0)?;
+            self.process_prev_key_block_proof(prev_key_block_proof, virt_block_info.gen_utime().as_u32())?;
 
         if virt_block_info.key_block() {
             self.pre_check_key_block_proof(virt_block)?;
@@ -396,14 +395,17 @@ impl BlockProofStuff {
         }
         let _catchain_config = config.config(28)?;
         if let Err(e) = config.workchains() {
-            log::warn!("{}", e);
+            log::trace!("{}", e);
         }
 
         Ok(())
     }
 
-    fn process_prev_key_block_proof(&self, prev_key_block_proof: &BlockProofStuff, gen_utime: u32)
-    -> Result<(Vec<ValidatorDescr>, u32)> {
+    fn process_prev_key_block_proof(
+        &self, 
+        prev_key_block_proof: &BlockProofStuff, 
+        gen_utime: u32
+    ) -> Result<(Vec<ValidatorDescr>, u32)> {
         let (virt_key_block, prev_key_block_info) = prev_key_block_proof.pre_check_block_proof()?;
 
         if !prev_key_block_info.key_block() {

src/block_proof.rs

@@ -838,7 +838,7 @@ impl CollatorTestBundle {
             prev_blocks: prev_blocks_ids,
             created_by: candidate.created_by.clone(),
             rand_seed: None,
-            now: b.block().read_info()?.gen_utime().0,
+            now: b.block().read_info()?.gen_utime().as_u32(),
             fake: true,
             contains_ethalon: false,
             contains_candidate: true,
@@ -1045,7 +1045,7 @@ impl CollatorTestBundle {
             prev_blocks: prev_blocks_ids,
             created_by: extra.created_by().clone(),
             rand_seed: Some(extra.rand_seed().clone()),
-            now: info.gen_utime().0,
+            now: info.gen_utime().as_u32(),
             fake: true,
             contains_ethalon: true,
             contains_candidate: false,