BitVM2: bump rust nightly

bin/prover-client/src/task.rs

@@ -82,7 +82,7 @@ impl TaskTracker {
                 let all_dependencies_completed = dependent_task.dependencies.iter().all(|dep_id| {
                     tasks
                         .get(dep_id)
-                        .map_or(false, |t| t.status == ProvingTaskStatus::Completed)
+                        .is_some_and(|t| t.status == ProvingTaskStatus::Completed)
                 });
                 // Return the task ID and completion status of dependencies
                 (*id, all_dependencies_completed)

bin/strata-cli/src/recovery.rs

@@ -49,9 +49,9 @@
             .map(|(pubk, privk)| [pubk.to_string(), privk.to_string()])
             .map(|[pubk, privk]| {
                 (
-                    (pubk.as_bytes().len() as u32).to_le_bytes(),
+                    (pubk.len() as u32).to_le_bytes(),
                     pubk,
-                    (privk.as_bytes().len() as u32).to_le_bytes(),
+                    (privk.len() as u32).to_le_bytes(),
                     privk,
                 )
             });
@@ -78,7 +78,7 @@
         let keymap_len = keymap_iter
             .clone()
             .map(|(pubk_len, pubk, privk_len, privk)| {
-                pubk_len.len() + pubk.as_bytes().len() + privk_len.len() + privk.as_bytes().len()
+                pubk_len.len() + pubk.len() + privk_len.len() + privk.len()
             })
             .sum::<usize>();
 

crates/btcio/src/rpc/types.rs

@@ -393,7 +393,7 @@ where
 {
     struct SatVisitor;
 
-    impl<'d> Visitor<'d> for SatVisitor {
+    impl Visitor<'_> for SatVisitor {
         type Value = Amount;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -418,7 +418,7 @@ where
 {
     struct SatVisitor;
 
-    impl<'d> Visitor<'d> for SatVisitor {
+    impl Visitor<'_> for SatVisitor {
         type Value = SignedAmount;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -456,7 +456,7 @@ where
 {
     struct TxidVisitor;
 
-    impl<'d> Visitor<'d> for TxidVisitor {
+    impl Visitor<'_> for TxidVisitor {
         type Value = Txid;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -482,7 +482,7 @@ where
 {
     struct TxVisitor;
 
-    impl<'d> Visitor<'d> for TxVisitor {
+    impl Visitor<'_> for TxVisitor {
         type Value = Transaction;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -512,7 +512,7 @@ where
     D: Deserializer<'d>,
 {
     struct AddressVisitor;
-    impl<'d> Visitor<'d> for AddressVisitor {
+    impl Visitor<'_> for AddressVisitor {
         type Value = Address<NetworkUnchecked>;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -539,7 +539,7 @@ where
 {
     struct BlockHashVisitor;
 
-    impl<'d> Visitor<'d> for BlockHashVisitor {
+    impl Visitor<'_> for BlockHashVisitor {
         type Value = BlockHash;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -565,7 +565,7 @@ where
 {
     struct HeightVisitor;
 
-    impl<'d> Visitor<'d> for HeightVisitor {
+    impl Visitor<'_> for HeightVisitor {
         type Value = Height;
 
         fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/reth/exex/src/cache_db_provider.rs

@@ -136,6 +136,6 @@
     fn block_hash_ref(&self, number: u64) -> Result<B256, Self::Error> {
         self.provider
             .block_hash(number)?
-            .ok_or_else(|| ProviderError::BlockBodyIndicesNotFound(number))
+            .ok_or(ProviderError::BlockBodyIndicesNotFound(number))
     }
 }

crates/state/src/bridge_state.rs

@@ -94,6 +94,7 @@ impl OperatorTable {
     }
 
     /// Sanity checks the operator table for sensibility.
+    #[allow(dead_code)] // #FIXME: remove this.
     fn sanity_check(&self) {
         if !self.operators.is_sorted_by_key(|e| e.idx) {
             panic!("bridge_state: operators list not sorted");
@@ -205,6 +206,7 @@ impl DepositsTable {
     }
 
     /// Sanity checks the operator table for sensibility.
+    #[allow(dead_code)] // #FIXME: remove this.
     fn sanity_check(&self) {
         if !self.deposits.is_sorted_by_key(|e| e.deposit_idx) {
             panic!("bridge_state: deposits list not sorted");

crates/state/src/lib.rs

@@ -1,5 +1,5 @@
-#![allow(dead_code)] // TODO: remove once the bridge state `sanity_check` fn is used.
-#![feature(is_sorted)] // TODO: switch to using crate
+#![allow(stable_features)] // FIX: this is needed for sp1 toolchain.
+#![feature(is_sorted, is_none_or)]
 
 //! Rollup types relating to the consensus-layer state of the rollup.
 //!

crates/state/src/operation.rs

@@ -239,7 +239,7 @@
                     if !l1v
                         .last_finalized_checkpoint
                         .as_ref()
-                        .map_or(true, |prev_chp| {
+                        .is_none_or(|prev_chp| {
                             checkpt.batch_info.idx() == prev_chp.batch_info.idx() + 1
                         })
                     {

crates/storage/src/cache.rs

@@ -85,13 +85,15 @@ impl<K: Clone + Eq + Hash, V: Clone> CacheTable<K, V> {
 
     /// Gets the number of elements in the cache.
     // TODO replace this with an atomic we update after every op
+    #[allow(dead_code)] // #FIXME: remove this.
     pub async fn get_len_async(&self) -> usize {
         let cache = self.cache.lock().await;
         cache.len()
     }
 
     /// Gets the number of elements in the cache.
     // TODO replace this with an atomic we update after every op
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn get_len_blocking(&self) -> usize {
         let cache = self.cache.blocking_lock();
         cache.len()
@@ -110,13 +112,15 @@ impl<K: Clone + Eq + Hash, V: Clone> CacheTable<K, V> {
     }
 
     /// Inserts an entry into the table, dropping the previous value.
+    #[allow(dead_code)] // #FIXME: remove this.
     pub async fn insert_async(&self, k: K, v: V) {
         let slot = Arc::new(RwLock::new(SlotState::Ready(v)));
         let mut cache = self.cache.lock().await;
         cache.put(k, slot);
     }
 
     /// Inserts an entry into the table, dropping the previous value.
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn insert_blocking(&self, k: K, v: V) {
         let slot = Arc::new(RwLock::new(SlotState::Ready(v)));
         let mut cache = self.cache.blocking_lock();

crates/storage/src/exec.rs

@@ -12,6 +12,7 @@ pub use tracing::*;
 pub type DbRecv<T> = tokio::sync::oneshot::Receiver<DbResult<T>>;
 
 /// Shim to opaquely execute the operation without being aware of the underlying impl.
+#[allow(dead_code)] // #FIXME: remove this.
 pub struct OpShim<T, R> {
     executor_fn: Arc<dyn Fn(T) -> DbResult<R> + Sync + Send + 'static>,
 }
@@ -21,6 +22,7 @@ where
     T: Sync + Send + 'static,
     R: Sync + Send + 'static,
 {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn wrap<F>(op: F) -> Self
     where
         F: Fn(T) -> DbResult<R> + Sync + Send + 'static,
@@ -31,6 +33,7 @@ where
     }
 
     /// Executes the operation on the provided thread pool and returns the result over.
+    #[allow(dead_code)] // #FIXME: remove this.
     pub async fn exec_async(&self, pool: &threadpool::ThreadPool, arg: T) -> DbResult<R> {
         let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
 
@@ -50,6 +53,7 @@ where
     }
 
     /// Executes the operation directly.
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn exec_blocking(&self, arg: T) -> DbResult<R> {
         (self.executor_fn)(arg)
     }

crates/tasks/src/pending_tasks.rs

@@ -24,6 +24,7 @@ impl PendingTasks {
         }
     }
 
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn current(&self) -> usize {
         self.counter.load(Ordering::SeqCst)
     }

crates/test-utils/src/bitcoin.rs

@@ -65,7 +65,7 @@ impl BtcChainSegment {
     }
 
     pub fn get_block(&self, height: u32) -> &Block {
-        return self.custom_blocks.get(&height).unwrap();
+        self.custom_blocks.get(&height).unwrap()
     }
 
     /// Retrieves the timestamps of `N` blocks from a given height

crates/zkvm/adapters/sp1/src/input.rs

@@ -5,7 +5,7 @@ use strata_zkvm::{AggregationInput, ZKVMInputBuilder};
 // A wrapper around SP1Stdin
 pub struct SP1ProofInputBuilder(SP1Stdin);
 
-impl<'a> ZKVMInputBuilder<'a> for SP1ProofInputBuilder {
+impl ZKVMInputBuilder<'_> for SP1ProofInputBuilder {
     type Input = SP1Stdin;
     fn new() -> SP1ProofInputBuilder {
         SP1ProofInputBuilder(SP1Stdin::new())

provers/sp1/tests/helpers/btc.rs

@@ -16,6 +16,7 @@ use crate::helpers::proof_generator::ProofGenerator;
 pub struct BtcBlockProofGenerator;
 
 impl BtcBlockProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new() -> Self {
         Self
     }

provers/sp1/tests/helpers/checkpoint.rs

@@ -21,6 +21,7 @@ pub struct CheckpointProofGenerator {
 }
 
 impl CheckpointProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new(
         l1_batch_proof_generator: L1BatchProofGenerator,
         l2_batch_proof_generator: L2BatchProofGenerator,

provers/sp1/tests/helpers/cl.rs

@@ -20,6 +20,7 @@ pub struct ClProofGenerator {
 }
 
 impl ClProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new(el_proof_generator: ElProofGenerator) -> Self {
         Self { el_proof_generator }
     }

provers/sp1/tests/helpers/el.rs

@@ -14,6 +14,7 @@ use crate::helpers::proof_generator::ProofGenerator;
 pub struct ElProofGenerator;
 
 impl ElProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new() -> Self {
         Self
     }

provers/sp1/tests/helpers/l1_batch.rs

@@ -19,6 +19,7 @@ pub struct L1BatchProofGenerator {
 }
 
 impl L1BatchProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new(btc_proof_generator: BtcBlockProofGenerator) -> Self {
         Self {
             btc_proof_generator,

provers/sp1/tests/helpers/l2_batch.rs

@@ -16,6 +16,7 @@ pub struct L2BatchProofGenerator {
 }
 
 impl L2BatchProofGenerator {
+    #[allow(dead_code)] // #FIXME: remove this.
     pub fn new(cl_proof_generator: ClProofGenerator) -> Self {
         Self { cl_proof_generator }
     }

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-07-27"
+channel = "nightly-2024-12-12"
 components = [
   "cargo",
   "clippy",