Automatic project update

Author: tonjen

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = '2018'
 name = 'ton_node'
-version = '0.48.13'
+version = '0.48.17'
 
 [workspace]
 members = [ 'storage' ]
@@ -10,7 +10,6 @@ resolver = '2'
 [dependencies]
 async-trait = '0.1.22'
 base64 = '0.13'
-bincode = '1.2.1'
 bitflags = '1.2.1'
 chrono = '0.4.10'
 clap = '2.33.1'
@@ -37,22 +36,22 @@ 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.63' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.64' }
 catchain = { path = 'catchain' }
-dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.60' }
+dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.61' }
 lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.48' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.59' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.49' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.60' }
 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.1.6' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.116' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.35' }
-ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.6.32' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.45' }
+ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.1.7' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.117' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.36' }
+ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.6.33' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.47' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
 ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.27' }
 validator_session = { path = 'validator-session' }
@@ -74,6 +73,9 @@ trace_alloc = [  ]
 trace_alloc_detail = [ 'trace_alloc' ]
 validator = [ 'async_collator', 'async_validator' ]
 
+[profile]
+release = { debug = true }
+
 [target.'cfg(unix)'.dependencies.rdkafka]
 optional = true
 version = '0.26.0'

catchain/Cargo.toml

@@ -19,12 +19,12 @@ metrics-runtime = '0.13.0'
 rand = '0.8'
 regex = '1.3.1'
 sha2 = '0.9'
-adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.63' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.48' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.59' }
+adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.64' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.49' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.60' }
 storage = { path = '../storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.116' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.117' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
 
 [dev-dependencies]

catchain/src/catchain.rs

@@ -1947,7 +1947,7 @@ impl CatchainProcessor {
 
         //overlay creation
 
-        let sources_as_int256: Vec<::ton_api::ton::int256> = sources
+        let sources_as_int256: Vec<UInt256> = sources
             .clone()
             .into_iter()
             .map(|key| public_key_hash_to_int256(&key))

catchain/src/received_block.rs

@@ -853,9 +853,7 @@ impl ReceivedBlockImpl {
                 bail!("Invalid source (first block) {}", block.src);
             }
 
-            if UInt256::from(block.data_hash.0) != *receiver.get_incarnation()
-                || block.signature.len() != 0
-            {
+            if (&block.data_hash != receiver.get_incarnation()) || (block.signature.len() != 0) {
                 bail!("Invalid first block");
             }
         }
@@ -868,7 +866,7 @@ impl ReceivedBlockImpl {
         block: &ton::Block,
         payload: &BlockPayloadPtr,
     ) -> Result<()> {
-        if UInt256::from(block.incarnation.0) != *receiver.get_incarnation() {
+        if &block.incarnation != receiver.get_incarnation() {
             bail!("Invalid session ID".to_string());
         }
 
@@ -1059,7 +1057,11 @@ impl ReceivedBlockImpl {
         body.incarnation = receiver.get_incarnation().clone();
 
         if log_enabled!(log::Level::Debug) {
-            trace!("...create new block with payload: hash={:?}, source_id={}, height={}, data_hash={:?}, signature={:?}", body.hash, body.source_id, body.height, body.data_hash, body.signature);
+            trace!(
+                "...create new block with payload: \
+                hash={:?}, source_id={}, height={}, data_hash={:?}, signature={:?}", 
+                body.hash, body.source_id, body.height, body.data_hash, body.signature
+            )
         }
 
         let new_block = ReceivedBlockImpl::wrap(&mut Rc::new(RefCell::new(body)));
@@ -1081,15 +1083,19 @@ impl ReceivedBlockImpl {
         let mut body: ReceivedBlockImpl =
             ReceivedBlockImpl::new(receiver.get_received_blocks_instance_counter());
 
-        body.data_hash = UInt256::from(block.data_hash.0);
+        body.data_hash = block.data_hash.clone();
         body.signature = block.signature.clone();
         body.hash = get_block_dependency_hash(block, receiver);
         body.source_id = block.src as usize;
         body.height = block.height as BlockHeight;
         body.incarnation = receiver.get_incarnation().clone();
 
         if log_enabled!(log::Level::Debug) {
-            trace!("...create new block dependency: hash={:?}, source_id={}, height={}, data_hash={:?}, signature={:?}", body.hash, body.source_id, body.height, body.data_hash, body.signature);
+            trace!(
+                "...create new block dependency: \
+                hash={:?}, source_id={}, height={}, data_hash={:?}, signature={:?}", 
+                body.hash, body.source_id, body.height, body.data_hash, body.signature
+            )
         }
 
         let new_block = ReceivedBlockImpl::wrap(&mut Rc::new(RefCell::new(body)));

catchain/src/receiver.rs

@@ -311,16 +311,14 @@ impl Receiver for ReceiverImpl {
             }
         }
 
-        if UInt256::from(block.incarnation.0) != self.incarnation {
+        if block.incarnation != self.incarnation {
             let message = format!(
                 "Block from source {} incarnation mismatch: expected {} but received {:?}",
                 adnl_id,
                 self.incarnation.to_hex_string(),
-                UInt256::from(block.incarnation.0)
+                block.incarnation
             );
-
             warn!("{}", message);
-
             return Err(err_msg(message));
         }
 
@@ -967,7 +965,7 @@ impl ReceiverImpl {
 
     fn get_block_id(&self, block: &ton::Block, payload: &RawBuffer) -> ton::BlockId {
         utils::get_block_id(
-            &UInt256::from(block.incarnation.0),
+            &block.incarnation,
             &self.get_source_public_key_hash(block.src as usize),
             block.height,
             payload,
@@ -979,9 +977,8 @@ impl ReceiverImpl {
         let source_hash = self.get_source_public_key_hash(dep.src as usize);
         let height = dep.height;
         let data_hash = dep.data_hash;
-
         ::ton_api::ton::catchain::block::id::Id {
-            incarnation: incarnation.into(),
+            incarnation: incarnation.clone(),
             src: public_key_hash_to_int256(source_hash),
             height,
             data_hash,
@@ -1365,7 +1362,7 @@ impl ReceiverImpl {
 
         let _source = self.get_source(block.src as usize);
 
-        assert!(block.incarnation == self.incarnation.clone().into());
+        assert!(block.incarnation == self.incarnation);
 
         if let Err(err) = self.validate_block_with_payload(&block, &payload) {
             let message = format!(
@@ -1916,7 +1913,7 @@ impl ReceiverImpl {
         trace!("Got GetBlockQuery: {:?}", query);
 
         let block_hash = query.block;
-        let block_result = self.get_block_by_hash(&UInt256::from(block_hash.0));
+        let block_result = self.get_block_by_hash(&block_hash);
 
         if let Some(block_ptr) = block_result {
             let block = block_ptr.borrow();
@@ -1954,7 +1951,7 @@ impl ReceiverImpl {
         let mut response_blocks_count = 0;
 
         for block_hash in &query.blocks.0 {
-            if let Some(block_ptr) = self.get_block_by_hash(&UInt256::from(block_hash.0)) {
+            if let Some(block_ptr) = self.get_block_by_hash(&block_hash) {
                 let mut block = block_ptr.borrow_mut();
 
                 assert!(block.get_payload().data().len() > 0);
@@ -2006,7 +2003,7 @@ impl ReceiverImpl {
 
         let mut response_blocks_count = 0;
 
-        if let Some(block) = self.get_block_by_hash(&UInt256::from(query.block.0)) {
+        if let Some(block) = self.get_block_by_hash(&query.block) {
             //limit height by the requested block height
 
             let block_height = block.borrow().get_height() as i64;
@@ -2025,7 +2022,7 @@ impl ReceiverImpl {
 
                 //terminate loop if the termination block has been found
 
-                if block_terminators.contains(&block.get_hash().into()) {
+                if block_terminators.contains(block.get_hash()) {
                     break;
                 }
 

catchain/src/utils.rs

@@ -163,16 +163,16 @@ pub fn get_hash_from_block_payload(data: &BlockPayloadPtr) -> BlockHash {
     UInt256::calc_file_hash(&data.data().0)
 }
 
-pub fn int256_to_public_key_hash(public_key: &::ton_api::ton::int256) -> PublicKeyHash {
-    adnl::common::KeyId::from_data(public_key.0)
+pub fn int256_to_public_key_hash(public_key: &UInt256) -> PublicKeyHash {
+    adnl::common::KeyId::from_data(*public_key.as_slice())
 }
 
 pub fn get_public_key_hash(public_key: &PublicKey) -> PublicKeyHash {
     public_key.id().clone()
 }
 
-pub fn public_key_hash_to_int256(v: &PublicKeyHash) -> ::ton_api::ton::int256 {
-    ::ton_api::ton::int256(*v.data())
+pub fn public_key_hash_to_int256(v: &PublicKeyHash) -> UInt256 {
+    UInt256::with_array(*v.data())
 }
 
 pub fn get_overlay_id(first_block: &ton_api::ton::catchain::FirstBlock) -> Result<SessionId> {

commit_hash.txt

@@ -1 +1 @@
-14109d623e0b34510e7d9c3c85cb9e1f22838854
+b740dde28492097794fcf7bb7f33397570847c54

deps_map.json

@@ -1 +1 @@
-{"adnl":"2587e9f5b9622940de20c51ef49e8d316e168b26","dht":"6529fcd71524c434407aa7240a1c89b2203e7b73","overlay":"864ea30a7fee351e6225d971a4d8836e3fec74c9","rldp":"14c7858004c3c941b97523cc49c1d83f47665eee","ton-labs-abi":"a74609a928d17cd02985ced2fcaf93f50321c21e","ton-tl":"8a4777b6bc1065019a9b5c52ac2a740a48fd926c","ton-block":"447a265d0013336b3c506cad45558922aa67f9f6","ton-block-json":"0fba14f552e67b9144404503612dc159b49d7e6b","ton-executor":"979410555a2961ffb080a112f8ebb4db90e466de","ton-types":"164867fa842b1efd0eeb378e727a17677ae8a322","ton-vm":"95512b5a06fb90695bfefda4ba99f7b0bd2d35d0"}
+{"adnl":"a7dc836ea3ef176079c80dda16edc21af1c7e68f","dht":"241d9ffe8a25849de3c103a2813a3025852b1717","overlay":"0201a432755b8fd5db94579a549a59c38778277b","rldp":"7dbffd9d94556f552f8b1b0e140180b969fa7229","ton-labs-abi":"ec48e6f90fc0ad6b73ce5c2501807a94b38c056a","ton-tl":"44cb7e493735f425c1191e5df6239a4a6fd53d26","ton-block":"20dd6ecb7dec5163d7316fdacd9bb2876008a8c7","ton-block-json":"db40f4ae81a182125417fe839dece77d692f0309","ton-executor":"64f4e238d3d84df75e563104bdb40bae0eeddc85","ton-types":"164867fa842b1efd0eeb378e727a17677ae8a322","ton-vm":"95512b5a06fb90695bfefda4ba99f7b0bd2d35d0"}

src/block.rs

@@ -92,7 +92,6 @@ impl BlockStuff {
 
 
     pub fn block(&self) -> &Block { &self.block }
-
 
     pub fn id(&self) -> &BlockIdExt { &self.id }
 
@@ -260,48 +259,6 @@ impl BlockIdExtExtention for BlockIdExt {
     }
 }
 
-pub fn convert_block_id_ext_api2blk(id: &ton_api::ton::ton_node::blockidext::BlockIdExt) -> Result<BlockIdExt> {
-    Ok(
-        BlockIdExt::with_params(
-            ton_block::ShardIdent::with_tagged_prefix(id.workchain, id.shard as u64)?,
-            id.seqno as u32,
-            UInt256::from(&id.root_hash.0),
-            UInt256::from(&id.file_hash.0),
-        )
-    )
-}
-
-#[allow(dead_code)]
-pub fn convert_block_id_ext_blk2api(id: &BlockIdExt) -> ton_api::ton::ton_node::blockidext::BlockIdExt {
-    ton_api::ton::ton_node::blockidext::BlockIdExt {
-        workchain: id.shard_id.workchain_id(),
-        shard: id.shard_id.shard_prefix_with_tag() as i64, // FIXME: why signed int???
-        seqno: if id.seq_no <= std::i32::MAX as u32 {
-                id.seq_no as i32
-            } else {
-                panic!("too big block seq_no") // FIXME: what to do?
-            },
-        root_hash: ton_api::ton::int256(id.root_hash.as_slice().to_owned()),
-        file_hash: ton_api::ton::int256(id.file_hash.as_slice().to_owned()),
-    }
-}
-
-#[allow(dead_code)]
-pub fn convert_block_id_ext_blk_vec(vec: &Vec<BlockIdExt>) -> Vec<ton_api::ton::ton_node::blockidext::BlockIdExt> {
-    vec.iter().fold(Vec::new(), |mut vec, item| {
-        vec.push(convert_block_id_ext_blk2api(item));
-        vec
-    })
-}
-
-#[allow(dead_code)]
-pub fn compare_block_ids(id: &BlockIdExt, id_api: &ton_api::ton::ton_node::blockidext::BlockIdExt) -> bool {
-    id.shard_id.shard_prefix_with_tag() == id_api.shard as u64
-        && id.shard_id.workchain_id() == id_api.workchain
-        && id.root_hash.as_slice() == &id_api.root_hash.0
-        && id.file_hash.as_slice() == &id_api.file_hash.0
-}
-
 // unpack_block_prev_blk_try in t-node
 pub fn construct_and_check_prev_stuff(
     block_root: &Cell,

src/block_proof.rs

@@ -13,7 +13,7 @@
 
 use ton_block::{
     Block, BlockProof, BlockIdExt, Deserializable, MerkleProof, BlockInfo,
-    ValidatorDescr, ValidatorSet, CatchainConfig, AccountIdPrefixFull, Serializable
+    ValidatorDescr, ValidatorSet, CatchainConfig, Serializable
 };
 use ton_types::{
     Cell, Result, fail, error, HashmapType, deserialize_tree_of_cells, serialize_tree_of_cells,
@@ -183,8 +183,7 @@ impl BlockProofStuff {
                 let zerostate = engine.load_mc_zero_state().await?;
                 self.check_with_master_state_(&zerostate, &virt_block, &virt_block_info)?;
             } else {
-                let mc_pfx = AccountIdPrefixFull::any_masterchain();
-                let handle = engine.find_block_by_seq_no(&mc_pfx, prev_key_block_seqno).await
+                let handle = engine.find_mc_block_by_seq_no(prev_key_block_seqno).await
                     .map_err(|err|
                         error!(
                             "Couldn't find previous MC key block by seq_no = {}: {}",
@@ -193,8 +192,11 @@ impl BlockProofStuff {
                         )
                     )?;
                 let prev_key_block_proof = engine.load_block_proof(&handle, false).await?;
-
-                self.check_with_prev_key_block_proof_(&prev_key_block_proof, &virt_block, &virt_block_info)?;
+                self.check_with_prev_key_block_proof_(
+                    &prev_key_block_proof, 
+                    &virt_block, 
+                    &virt_block_info
+                )?;
             }
 
             log::trace!("Checked proof for block: {}   TIME {}ms", self.id(), now.elapsed().as_millis());