Merge pull request #60 from tonlabs/0.28.10-rc

Release 0.28.10

Author: d3p

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 All notable changes to this project will be documented in this file.
 
+## 0.28.10 Oct 13, 2021
+### Fixed
+- Internal fixes in order to fix building.
+
 ## 0.28.9 Sep 24, 2021
 ### Fixed
 - Internal fixes in order to fix building.

ton-node-se/ton_node/Cargo.toml

@@ -27,7 +27,7 @@ serde_json = {version = "^1.0.41", features = ["preserve_order"]}
 sha2 = "^0.8.0"
 stream-cancel="0.4.4"
 tokio = "0.1.20"
-x25519-dalek = "^0.5.2"
+x25519-dalek = "1.2"
 tokio-io-timeout = "0.3.1"
 
 # Domestic
@@ -55,11 +55,11 @@ iron = "0.6.1"
 router = "0.6.0"
 
 [target.'cfg(windows)'.dependencies.rdkafka]
-version = "0.23.0"
+version = "0.26.0"
 features = ["cmake_build"]
 
 [target.'cfg(unix)'.dependencies.rdkafka]
-version = "0.23.0"
+version = "0.26.0"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

ton-node-se/ton_node/src/node_engine/blocks_finality.rs

@@ -9,7 +9,7 @@ use std::io::{ErrorKind, Read, Seek, Write};
 use std::path::PathBuf;
 use ton_block::{InMsg, OutMsg, AccountStatus, ExtOutMessageHeader, MsgEnvelope};
 use ton_block::{HashmapAugType, BlkPrevInfo, Deserializable, ShardIdent};
-use ton_types::{UInt256, deserialize_tree_of_cells, BagOfCells};
+use ton_types::{UInt256, deserialize_tree_of_cells};
 
 #[cfg(test)]
 #[path = "../../../tonos-se-tests/unit/test_block_finality.rs"]
@@ -101,9 +101,7 @@ debug!("FINBLK {:?}", hashes);
                     lt: info.end_lt(),
                     hash: sb.block_hash.clone(),
                 };
-                let mut shard = vec![];
-                BagOfCells::with_root(&sb.shard_state.serialize()?)
-                    .write_to(&mut shard, false)?;
+                let shard = sb.shard_state.write_to_bytes()?;
                 // save shard state
                 self.shard_state_storage.save_serialized_shardstate_ex(
                     &ShardStateUnsplit::default(), Some(shard), &sb.block.block().read_state_update()?.new_hash,
@@ -718,10 +716,7 @@ impl ShardBlock {
 
         // Test-lite-client requires hash od unsigned block
         // TODO will to think, how to do better
-        let mut block_data = vec![];
-        let cell = sblock.block().serialize().unwrap(); // TODO process result
-        let bag = BagOfCells::with_root(&cell);
-        bag.write_to(&mut block_data, false).unwrap(); // TODO process result
+        let block_data = sblock.block().write_to_bytes().unwrap(); // TODO process result
 
         let mut hasher = Sha256::new();
 		hasher.input(block_data.as_slice());
@@ -742,12 +737,11 @@ impl ShardBlock {
         let mut buf = Vec::new();
         buf.extend_from_slice(&self.seq_no.to_le_bytes());
         buf.extend_from_slice(&(self.serialized_block.len() as u32).to_le_bytes());
-        buf.append(&mut self.serialized_block.clone());
-        buf.append(&mut self.block_hash.as_slice().to_vec());
-        buf.append(&mut self.file_hash.as_slice().to_vec());
+        buf.extend_from_slice(self.serialized_block.as_slice());
+        buf.extend_from_slice(self.block_hash.as_slice());
+        buf.extend_from_slice(self.file_hash.as_slice());
 
-        BagOfCells::with_root(&self.shard_state.serialize()?)
-            .write_to(&mut buf, false)?;
+        buf.append(&mut self.shard_state.write_to_bytes()?);
 
         let mut block_buf = Vec::new();
         self.block.write_to(&mut block_buf)?;

ton-node-se/ton_node_startup/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "../build/build.rs"
 name = "ton_node_startup"
-version = "0.28.9"
+version = "0.28.10"
 
 [dependencies]
 clap = "2.32.0"