Merge remote-tracking branch 'origin/main' into alexey/nybbles-uint

shekhirin · shekhirin · commit 222d1e0aa6b9 · 2025-06-11T11:11:17.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: ["stable", "beta", "nightly", "1.81"] # MSRV
+        rust: ["stable", "beta", "nightly", "1.85"] # MSRV
         flags: ["--no-default-features", "", "--all-features"]
     steps:
       - uses: actions/checkout@v3
@@ -29,7 +29,7 @@ jobs:
       - name: build
         run: cargo build --workspace ${{ matrix.flags }}
       - name: test
-        if: ${{ matrix.rust != '1.81' }} # MSRV
+        if: ${{ matrix.rust != '1.85' }} # MSRV
         run: cargo test --workspace ${{ matrix.flags }}
 
   miri:
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ description = """
 Fast Merkle-Patricia Trie (MPT) state root calculator
 and proof generator for prefix-sorted nibbles
 """
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 license = "MIT OR Apache-2.0"
 categories = ["data-structures", "no-std"]
 keywords = ["nibbles", "trie", "mpt", "merkle", "ethereum"]
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -2,7 +2,7 @@
 
 use alloy_trie::nodes::encode_path_leaf;
 use criterion::{
-    criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion,
+    BenchmarkGroup, Criterion, criterion_group, criterion_main, measurement::WallTime,
 };
 use nybbles::Nibbles;
 use proptest::{prelude::*, strategy::ValueTree};
diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv = "1.81"
+msrv = "1.85"
diff --git a/src/account.rs b/src/account.rs
@@ -1,5 +1,5 @@
 use crate::{EMPTY_ROOT_HASH, KECCAK_EMPTY};
-use alloy_primitives::{keccak256, B256, U256};
+use alloy_primitives::{B256, U256, keccak256};
 use alloy_rlp::{RlpDecodable, RlpEncodable};
 
 /// Represents an TrieAccount in the account trie.
@@ -62,7 +62,7 @@ mod quantity {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_primitives::{hex, U256};
+    use alloy_primitives::{U256, hex};
     use alloy_rlp::Decodable;
 
     #[test]
diff --git a/src/hash_builder/mod.rs b/src/hash_builder/mod.rs
@@ -1,13 +1,13 @@
 //! The implementation of the hash builder.
 
 use super::{
+    BranchNodeCompact, EMPTY_ROOT_HASH, Nibbles, TrieMask,
     nodes::{BranchNodeRef, ExtensionNodeRef, LeafNodeRef},
     proof::ProofRetainer,
-    BranchNodeCompact, Nibbles, TrieMask, EMPTY_ROOT_HASH,
 };
-use crate::{nodes::RlpNode, proof::ProofNodes, HashMap};
+use crate::{HashMap, nodes::RlpNode, proof::ProofNodes};
 use alloc::vec::Vec;
-use alloy_primitives::{keccak256, B256};
+use alloy_primitives::{B256, keccak256};
 use alloy_rlp::EMPTY_STRING_CODE;
 use core::cmp;
 use tracing::trace;
@@ -183,11 +183,7 @@ impl HashBuilder {
 
     fn current_root(&self) -> B256 {
         if let Some(node_ref) = self.stack.last() {
-            if let Some(hash) = node_ref.as_hash() {
-                hash
-            } else {
-                keccak256(node_ref)
-            }
+            if let Some(hash) = node_ref.as_hash() { hash } else { keccak256(node_ref) }
         } else {
             EMPTY_ROOT_HASH
         }
@@ -455,7 +451,7 @@ mod tests {
     use super::*;
     use crate::{nodes::LeafNode, triehash_trie_root};
     use alloc::collections::BTreeMap;
-    use alloy_primitives::{b256, hex, U256};
+    use alloy_primitives::{U256, b256, hex};
     use alloy_rlp::Encodable;
 
     // Hashes the keys, RLP encodes the values, compares the trie builder with the upstream root.
diff --git a/src/hash_builder/value.rs b/src/hash_builder/value.rs
@@ -1,5 +1,5 @@
 use alloc::vec::Vec;
-use alloy_primitives::{hex, B256};
+use alloy_primitives::{B256, hex};
 use core::fmt;
 
 /// Hash builder value.
diff --git a/src/lib.rs b/src/lib.rs
@@ -44,7 +44,7 @@ pub use alloy_primitives::map::HashMap;
 #[doc(no_inline)]
 pub use nybbles::{self, Nibbles};
 
-use alloy_primitives::{b256, B256};
+use alloy_primitives::{B256, b256};
 
 /// Root hash of an empty trie.
 pub const EMPTY_ROOT_HASH: B256 =
diff --git a/src/mask.rs b/src/mask.rs
@@ -79,11 +79,7 @@ impl TrieMask {
     /// Returns the index of the first bit set in the mask, or `None` if the mask is empty.
     #[inline]
     pub const fn first_set_bit_index(self) -> Option<u8> {
-        if self.is_empty() {
-            None
-        } else {
-            Some(self.0.trailing_zeros() as u8)
-        }
+        if self.is_empty() { None } else { Some(self.0.trailing_zeros() as u8) }
     }
 
     /// Set bit at a specified index.
diff --git a/src/nodes/branch.rs b/src/nodes/branch.rs
@@ -1,6 +1,6 @@
-use super::{super::TrieMask, RlpNode, CHILD_INDEX_RANGE};
-use alloy_primitives::{hex, B256};
-use alloy_rlp::{length_of_length, Buf, BufMut, Decodable, Encodable, Header, EMPTY_STRING_CODE};
+use super::{super::TrieMask, CHILD_INDEX_RANGE, RlpNode};
+use alloy_primitives::{B256, hex};
+use alloy_rlp::{Buf, BufMut, Decodable, EMPTY_STRING_CODE, Encodable, Header, length_of_length};
 use core::{fmt, ops::Range, slice::Iter};
 
 use alloc::sync::Arc;
@@ -352,7 +352,7 @@ mod tests {
         assert_eq!(BranchNode::decode(&mut &encoded[..]).unwrap(), branch_with_ext);
 
         let full = BranchNode::new(
-            core::iter::repeat(RlpNode::word_rlp(&B256::repeat_byte(23))).take(16).collect(),
+            core::iter::repeat_n(RlpNode::word_rlp(&B256::repeat_byte(23)), 16).collect(),
             TrieMask::new(u16::MAX),
         );
         let encoded = alloy_rlp::encode(&full);
diff --git a/src/nodes/extension.rs b/src/nodes/extension.rs
@@ -1,6 +1,6 @@
-use super::{super::Nibbles, encode_path_leaf, unpack_path_to_nibbles, RlpNode};
-use alloy_primitives::{hex, Bytes};
-use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header};
+use super::{super::Nibbles, RlpNode, encode_path_leaf, unpack_path_to_nibbles};
+use alloy_primitives::{Bytes, hex};
+use alloy_rlp::{BufMut, Decodable, Encodable, Header, length_of_length};
 use core::fmt;
 
 #[allow(unused_imports)]
diff --git a/src/nodes/leaf.rs b/src/nodes/leaf.rs
@@ -1,6 +1,6 @@
-use super::{super::Nibbles, encode_path_leaf, unpack_path_to_nibbles, RlpNode};
-use alloy_primitives::{hex, Bytes};
-use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header};
+use super::{super::Nibbles, RlpNode, encode_path_leaf, unpack_path_to_nibbles};
+use alloy_primitives::{Bytes, hex};
+use alloy_rlp::{BufMut, Decodable, Encodable, Header, length_of_length};
 use core::fmt;
 
 #[allow(unused_imports)]
diff --git a/src/nodes/mod.rs b/src/nodes/mod.rs
@@ -1,7 +1,7 @@
 //! Various branch nodes produced by the hash builder.
 
-use alloy_primitives::{Bytes, B256};
-use alloy_rlp::{Decodable, Encodable, Header, EMPTY_STRING_CODE};
+use alloy_primitives::{B256, Bytes};
+use alloy_rlp::{Decodable, EMPTY_STRING_CODE, Encodable, Header};
 use core::ops::Range;
 use nybbles::Nibbles;
 use smallvec::SmallVec;
@@ -71,7 +71,7 @@ impl Decodable for TrieNode {
                     Ok(Self::EmptyRoot)
                 } else {
                     Err(alloy_rlp::Error::UnexpectedString)
-                }
+                };
             }
         };
 
@@ -292,7 +292,7 @@ mod tests {
 
         // branch
         let branch = TrieNode::Branch(BranchNode::new(
-            core::iter::repeat(RlpNode::word_rlp(&B256::repeat_byte(23))).take(16).collect(),
+            core::iter::repeat_n(RlpNode::word_rlp(&B256::repeat_byte(23)), 16).collect(),
             TrieMask::new(u16::MAX),
         ));
         let mut rlp = vec![];
@@ -301,13 +301,20 @@ mod tests {
             rlp_node[..],
             hex!("a0bed74980bbe29d9c4439c10e9c451e29b306fe74bcf9795ecf0ebbd92a220513")
         );
-        assert_eq!(rlp, hex!("f90211a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a0171717171717171717171717171717171717171717171717171717171717171780"));
+        assert_eq!(
+            rlp,
+            hex!(
+                "f90211a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a01717171717171717171717171717171717171717171717171717171717171717a0171717171717171717171717171717171717171717171717171717171717171780"
+            )
+        );
         assert_eq!(TrieNode::decode(&mut &rlp[..]).unwrap(), branch);
     }
 
     #[test]
     fn hashed_encode_path_regression() {
-        let nibbles = Nibbles::from_nibbles(hex!("05010406040a040203030f010805020b050c04070003070e0909070f010b0a0805020301070c0a0902040b0f000f0006040a04050f020b090701000a0a040b"));
+        let nibbles = Nibbles::from_nibbles(hex!(
+            "05010406040a040203030f010805020b050c04070003070e0909070f010b0a0805020301070c0a0902040b0f000f0006040a04050f020b090701000a0a040b"
+        ));
         let path = encode_path_leaf(&nibbles, true);
         let expected = hex!("351464a4233f1852b5c47037e997f1ba852317ca924bf0f064a45f2b9710aa4b");
         assert_eq!(path[..], expected);
diff --git a/src/nodes/rlp.rs b/src/nodes/rlp.rs
@@ -1,4 +1,4 @@
-use alloy_primitives::{hex, keccak256, B256};
+use alloy_primitives::{B256, hex, keccak256};
 use alloy_rlp::EMPTY_STRING_CODE;
 use arrayvec::ArrayVec;
 use core::fmt;
@@ -99,11 +99,7 @@ impl RlpNode {
     /// Returns hash if this is an RLP-encoded hash
     #[inline]
     pub fn as_hash(&self) -> Option<B256> {
-        if self.is_hash() {
-            Some(B256::from_slice(&self.0[1..]))
-        } else {
-            None
-        }
+        if self.is_hash() { Some(B256::from_slice(&self.0[1..])) } else { None }
     }
 }
 
diff --git a/src/proof/decoded_proof_nodes.rs b/src/proof/decoded_proof_nodes.rs
@@ -1,4 +1,4 @@
-use crate::{nodes::TrieNode, proof::ProofNodes, HashMap, Nibbles};
+use crate::{HashMap, Nibbles, nodes::TrieNode, proof::ProofNodes};
 use alloy_primitives::Bytes;
 use alloy_rlp::Decodable;
 use core::ops::Deref;
diff --git a/src/proof/decoded_retainer.rs b/src/proof/decoded_retainer.rs
@@ -1,4 +1,4 @@
-use crate::{proof::DecodedProofNodes, Nibbles};
+use crate::{Nibbles, proof::DecodedProofNodes};
 use alloy_primitives::Bytes;
 
 use alloc::vec::Vec;
diff --git a/src/proof/error.rs b/src/proof/error.rs
@@ -1,4 +1,4 @@
-use alloy_primitives::{Bytes, B256};
+use alloy_primitives::{B256, Bytes};
 use core::fmt;
 use nybbles::Nibbles;
 
diff --git a/src/proof/retainer.rs b/src/proof/retainer.rs
@@ -1,4 +1,4 @@
-use crate::{proof::ProofNodes, Nibbles};
+use crate::{Nibbles, proof::ProofNodes};
 use alloy_primitives::Bytes;
 
 use alloc::vec::Vec;
diff --git a/src/proof/verify.rs b/src/proof/verify.rs
@@ -1,12 +1,12 @@
 //! Proof verification logic.
 
 use crate::{
-    nodes::{BranchNode, RlpNode, TrieNode, CHILD_INDEX_RANGE},
-    proof::ProofVerificationError,
     EMPTY_ROOT_HASH,
+    nodes::{BranchNode, CHILD_INDEX_RANGE, RlpNode, TrieNode},
+    proof::ProofVerificationError,
 };
 use alloc::vec::Vec;
-use alloy_primitives::{Bytes, B256};
+use alloy_primitives::{B256, Bytes};
 use alloy_rlp::{Decodable, EMPTY_STRING_CODE};
 use core::ops::Deref;
 use nybbles::Nibbles;
@@ -27,7 +27,7 @@ where
     let mut proof = proof.into_iter().peekable();
 
     // If the proof is empty or contains only an empty node, the expected value must be None.
-    if proof.peek().map_or(true, |node| node.as_ref() == [EMPTY_STRING_CODE]) {
+    if proof.peek().is_none_or(|node| node.as_ref() == [EMPTY_STRING_CODE]) {
         return if root == EMPTY_ROOT_HASH {
             if expected_value.is_none() {
                 Ok(())
@@ -177,7 +177,7 @@ fn process_branch(
                                 return Ok(Some(NodeDecodingResult::Value(child_leaf.value)));
                             }
                             TrieNode::EmptyRoot => {
-                                return Err(ProofVerificationError::UnexpectedEmptyRoot)
+                                return Err(ProofVerificationError::UnexpectedEmptyRoot);
                             }
                         }
                     };
@@ -194,12 +194,13 @@ fn process_branch(
 mod tests {
     use super::*;
     use crate::{
+        HashBuilder, TrieMask,
         nodes::{BranchNode, ExtensionNode, LeafNode},
         proof::{ProofNodes, ProofRetainer},
-        triehash_trie_root, HashBuilder, TrieMask,
+        triehash_trie_root,
     };
     use alloy_primitives::hex;
-    use alloy_rlp::{Encodable, EMPTY_STRING_CODE};
+    use alloy_rlp::{EMPTY_STRING_CODE, Encodable};
     use core::str::FromStr;
 
     #[test]
diff --git a/src/root.rs b/src/root.rs
@@ -1,4 +1,4 @@
-use crate::{HashBuilder, EMPTY_ROOT_HASH};
+use crate::{EMPTY_ROOT_HASH, HashBuilder};
 use alloc::vec::Vec;
 use alloy_primitives::B256;
 use alloy_rlp::Encodable;
@@ -54,7 +54,7 @@ pub use ethereum::*;
 mod ethereum {
     use super::*;
     use crate::TrieAccount;
-    use alloy_primitives::{keccak256, Address, U256};
+    use alloy_primitives::{Address, U256, keccak256};
 
     /// Hashes storage keys, sorts them and them calculates the root hash of the storage trie.
     /// See [`storage_root_unsorted`] for more info.
