tvmlabs · ignaty8 · Aug 26, 2024 · Aug 26, 2024 · Aug 26, 2024 · Aug 26, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.24.6] - 2025-11-10
+## Fixed
+- Hash used for calculating BOC depth when applying BOC size limits
+- Modified tests to match Rust 2024 Standard
+
 ## [2.24.5] - 2025-11-03
 ## Fixed
 - Fix mvreward

diff --git a/tvm_block/src/tests/test_merkle_update.rs b/tvm_block/src/tests/test_merkle_update.rs
@@ -361,7 +361,7 @@ fn test_merkle_update4() {
     let mut root1 = BuilderData::new();
     root1.append_raw(&[0], 8).unwrap();
 
-    for i in 0..1024 {
+    for i in 0..800 {
         let mut new_root = BuilderData::new();
         new_root.append_raw(&[i as u8], 8).unwrap();
         new_root.checked_append_reference(root1.clone().into_cell().unwrap()).unwrap();

diff --git a/tvm_client/src/crypto/tests.rs b/tvm_client/src/crypto/tests.rs
@@ -1294,7 +1294,7 @@ async fn test_crypto_box_signing_boxes() -> tvm_types::Result<()> {
     }
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "crypto.clear_crypto_box_secret_cache",
             RegisteredCryptoBox { handle: crypto_box.handle },
         )
@@ -1421,7 +1421,7 @@ async fn test_crypto_box_encryption_boxes() -> tvm_types::Result<()> {
     }
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "crypto.clear_crypto_box_secret_cache",
             RegisteredCryptoBox { handle: crypto_box.handle },
         )

diff --git a/tvm_client/src/proofs/tests/mod.rs b/tvm_client/src/proofs/tests/mod.rs
@@ -763,7 +763,7 @@ async fn test_proof_block_data() -> Result<()> {
     .await?;
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "proofs.proof_block_data",
             ParamsOfProofBlockData { block: block_json.clone() },
         )
@@ -772,7 +772,7 @@ async fn test_proof_block_data() -> Result<()> {
     block_json["boc"] = Value::Null;
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "proofs.proof_block_data",
             ParamsOfProofBlockData { block: block_json.clone() },
         )
@@ -968,7 +968,7 @@ async fn test_proof_block_data() -> Result<()> {
     .await?;
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "proofs.proof_block_data",
             ParamsOfProofBlockData { block: block_json.clone() },
         )
@@ -983,7 +983,7 @@ async fn test_proof_block_data() -> Result<()> {
     .await?;
 
     client
-        .request_async(
+        .request_async::<_, ()>(
             "proofs.proof_block_data",
             ParamsOfProofBlockData { block: block_json.clone() },
         )

diff --git a/tvm_types/src/cell/data_cell.rs b/tvm_types/src/cell/data_cell.rs
@@ -47,7 +47,6 @@ impl Default for DataCell {
 }
 
 thread_local! {
-    static UNIQUE_CELLS: RefCell<BTreeSet<HashableCell>> = const { RefCell::new(BTreeSet::new()) };
     static UNIQUE_BLOOM: RefCell<BloomFilter> = RefCell::new(BloomFilter::with_false_pos(0.00001).expected_items(1000000));
 }
 
@@ -137,15 +136,11 @@ impl DataCell {
         let mut count = 0u64;
         let mut counts = Vec::new();
         for r in references.iter() {
-            // if unique_cells.contains(r) {
-            // } else {
-            //     UNIQUE_CELLS. (|x: BTreeSet<Cell>| x.contains(r));
-            // }
             if UNIQUE_BLOOM.with_borrow(|x| x.contains(&HashableCell::Any(r.clone()))) {
-                // println!("repeat cell");
+                // Do not count cells we've already seen.
             } else {
                 UNIQUE_BLOOM.with_borrow_mut(|x| x.insert(&HashableCell::Any(r.clone())));
-                // println!("new cell");
+                // Count new cell exactly once
                 depths.push(r.depths());
                 depth = depth.max(r.depths().iter().sum::<u16>());
                 depth2 = depth2.saturating_add(r.tree_cell_count());
@@ -166,11 +161,6 @@ impl DataCell {
         if let Some(c) = extern_tree_cell_count {
             tree_cell_count = tree_cell_count.saturating_add(c)
         }
-        // for reference in &references {
-        //     tree_bits_count =
-        // tree_bits_count.saturating_add(reference.tree_bits_count());
-        //     tree_cell_count =
-        // tree_cell_count.saturating_add(reference.tree_cell_count()); }
         if tree_bits_count > MAX_56_BITS {
             tree_bits_count = MAX_56_BITS;
         }

diff --git a/tvm_types/src/cell/mod.rs b/tvm_types/src/cell/mod.rs
@@ -261,7 +261,9 @@ lazy_static::lazy_static! {
 
 impl std::hash::Hash for HashableCell {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        core::mem::discriminant(self).hash(state);
+        match self {
+            HashableCell::Any(cell) => cell.hash(MAX_LEVEL).hash(state),
+        }
     }
 
     fn hash_slice<H: std::hash::Hasher>(data: &[Self], state: &mut H)

diff --git a/tvm_vm/src/tests/test_executor.rs b/tvm_vm/src/tests/test_executor.rs
@@ -13,6 +13,7 @@ use std::collections::HashSet;
 use std::time::Duration;
 use std::time::Instant;
 
+use log4rs::append;
 use rand::Rng;
 use rand::RngCore;
 use rand::thread_rng;
@@ -1447,13 +1448,18 @@ fn test_run_wasm_fuel_error_from_hash() {
 
 #[test]
 fn test_bocdepth() {
-    // let mut cell = BuilderData::new();
-    // cell.append_raw(&[0u8; 10230], 10230).unwrap();
-    // cell.finalize(2048).unwrap();
-    let _cell = TokenValue::write_bytes(&[100u8; 128 * 2000], &ABI_VERSION_2_4)
-        .unwrap()
+    let mut data = [100u8; 98 * 1024 + 1248].to_vec();
+    let _cell = TokenValue::write_bytes(&data.as_slice(), &ABI_VERSION_2_4)
+        .unwrap()                              //1398101
         .into_cell()
         .unwrap();
+
+    data.append(&mut [100u8].to_vec());
+    let res = TokenValue::write_bytes(&data.as_slice(), &ABI_VERSION_2_4)
+        .unwrap()                              //1398101
+        .into_cell();
+    assert!(res.is_err());
+
     println!("Success");
 }