Merge 63ff4e5 into 69ab2da

crates/proof-impl/btc-blockspace/src/merkle.rs

@@ -50,7 +50,7 @@ fn merkle_root_r(hashes: &mut [Buf32]) -> Buf32 {
         return hashes[0];
     }
 
-    for idx in 0..((hashes.len() + 1) / 2) {
+    for idx in 0..hashes.len().div_ceil(2) {
         let idx1 = 2 * idx;
         let idx2 = std::cmp::min(idx1 + 1, hashes.len() - 1);
         let mut vec = Vec::with_capacity(64);

crates/reth/node/src/payload_builder.rs

@@ -415,7 +415,7 @@ where
             tx_type: tx.tx_type(),
             success: result.is_success(),
             cumulative_gas_used,
-            logs: result.into_logs().into_iter().map(Into::into).collect(),
+            logs: result.into_logs().into_iter().collect(),
             ..Default::default()
         }));
 

crates/reth/rpc/src/eth/pending_block.rs

@@ -126,7 +126,7 @@ where
                     .map(|tx| tx.blob_gas_used().unwrap_or_default())
                     .sum::<u64>()
             }),
-            excess_blob_gas: block_env.get_blob_excess_gas().map(Into::into),
+            excess_blob_gas: block_env.get_blob_excess_gas(),
             extra_data: Default::default(),
             parent_beacon_block_root: is_cancun.then_some(B256::ZERO),
             requests_hash: is_prague.then_some(EMPTY_REQUESTS_HASH),
@@ -154,7 +154,7 @@ where
             tx_type: tx.tx_type(),
             success: result.is_success(),
             cumulative_gas_used,
-            logs: result.into_logs().into_iter().map(Into::into).collect(),
+            logs: result.into_logs().into_iter().collect(),
             ..Default::default()
         }
     }

crates/util/mmr/src/lib.rs

@@ -50,7 +50,7 @@ impl<H: MerkleHasher + Clone> MerkleMr<H> {
         let mut roots = vec![zero(); compact.cap_log2 as usize];
         let mut at = 0;
         for i in 0..compact.cap_log2 {
-            if compact.entries >> i & 1 != 0 {
+            if (compact.entries >> i) & 1 != 0 {
                 roots[i as usize] = compact.roots[at as usize];
                 at += 1;
             }

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-12-12"
+channel = "nightly-2025-02-01"
 components = [
   "cargo",
   "clippy",