chore: update toolchain and fix clippy

.github/workflows/ci-lint.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
           build_cache_key_name: "magicblock-validator-ci-lint-v002"
-          rust_toolchain_release: "1.84.1"
+          rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/ci-test-integration.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
           build_cache_key_name: "magicblock-validator-ci-test-integration-${{ github.ref_name }}-${{ hashFiles('magicblock-validator/Cargo.lock') }}"
-          rust_toolchain_release: "1.84.1"
+          rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/ci-test-unit.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: ./magicblock-validator/.github/actions/setup-build-env
         with:
           build_cache_key_name: "magicblock-validator-ci-test-unit-v000"
-          rust_toolchain_release: "1.84.1"
+          rust_toolchain_release: "1.91.1"
           github_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/deploy-testnet-by-pr-comment.yml

@@ -159,4 +159,4 @@ jobs:
               repo: context.repo.repo,
               issue_number: context.payload.issue.number,
               body: `❌ Failed to trigger deploy for branch \`${{ steps.get_branch.outputs.branch }}\`. Make sure you have permission or use the manual deploy link in the PR comment.`
-            });
+            });

magicblock-accounts-db/src/index.rs

@@ -359,7 +359,7 @@ impl AccountsDbIndex {
     /// Obtain a wrapped cursor to query account offsets repeatedly
     pub(crate) fn offset_finder(
         &self,
-    ) -> AccountsDbResult<AccountOffsetFinder> {
+    ) -> AccountsDbResult<AccountOffsetFinder<'_>> {
         let txn = self.env.begin_ro_txn()?;
         AccountOffsetFinder::new(&self.accounts, txn)
     }

magicblock-accounts-db/src/lib.rs

@@ -186,7 +186,7 @@ impl AccountsDb {
         &self,
         program: &Pubkey,
         filter: F,
-    ) -> AccountsDbResult<AccountsScanner<F>>
+    ) -> AccountsDbResult<AccountsScanner<'_, F>>
     where
         F: Fn(&AccountSharedData) -> bool + 'static,
     {
@@ -246,7 +246,7 @@ impl AccountsDb {
     pub fn set_slot(self: &Arc<Self>, slot: u64) {
         self.storage.set_slot(slot);
 
-        if 0 != slot % self.snapshot_frequency {
+        if !slot.is_multiple_of(self.snapshot_frequency) {
             return;
         }
         let this = self.clone();

magicblock-accounts/src/errors.rs

@@ -61,7 +61,13 @@ pub enum ScheduledCommitsProcessorError {
     #[error("RecvError: {0}")]
     RecvError(#[from] RecvError),
     #[error("CommittorSerivceError")]
-    CommittorSerivceError(#[from] CommittorServiceError),
+    CommittorSerivceError(Box<CommittorServiceError>),
+}
+
+impl From<CommittorServiceError> for ScheduledCommitsProcessorError {
+    fn from(e: CommittorServiceError) -> Self {
+        Self::CommittorSerivceError(Box::new(e))
+    }
 }
 
 pub type ScheduledCommitsProcessorResult<

magicblock-api/src/errors.rs

@@ -13,16 +13,16 @@ pub enum ApiError {
     RpcError(#[from] magicblock_aperture::error::RpcError),
 
     #[error("Accounts error: {0}")]
-    AccountsError(#[from] magicblock_accounts::errors::AccountsError),
+    AccountsError(Box<magicblock_accounts::errors::AccountsError>),
 
     #[error("AccountCloner error: {0}")]
-    AccountClonerError(#[from] magicblock_account_cloner::AccountClonerError),
+    AccountClonerError(Box<magicblock_account_cloner::AccountClonerError>),
 
     #[error("Ledger error: {0}")]
-    LedgerError(#[from] magicblock_ledger::errors::LedgerError),
+    LedgerError(Box<magicblock_ledger::errors::LedgerError>),
 
     #[error("Chainlink error: {0}")]
-    ChainlinkError(#[from] magicblock_chainlink::errors::ChainlinkError),
+    ChainlinkError(Box<magicblock_chainlink::errors::ChainlinkError>),
 
     #[error("Failed to obtain balance for validator '{0}' from chain. ({1})")]
     FailedToObtainValidatorOnChainBalance(Pubkey, String),
@@ -32,7 +32,7 @@ pub enum ApiError {
 
     #[error("CommittorServiceError")]
     CommittorServiceError(
-        #[from] magicblock_committor_service::error::CommittorServiceError,
+        Box<magicblock_committor_service::error::CommittorServiceError>,
     ),
 
     #[error("Failed to load programs into bank: {0}")]
@@ -91,11 +91,51 @@ pub enum ApiError {
 
     #[error("TaskSchedulerServiceError")]
     TaskSchedulerServiceError(
-        #[from] magicblock_task_scheduler::TaskSchedulerError,
+        Box<magicblock_task_scheduler::TaskSchedulerError>,
     ),
 
     #[error("Failed to sanitize transaction: {0}")]
     FailedToSanitizeTransaction(
         #[from] solana_sdk::transaction::TransactionError,
     ),
 }
+
+impl From<magicblock_accounts::errors::AccountsError> for ApiError {
+    fn from(e: magicblock_accounts::errors::AccountsError) -> Self {
+        Self::AccountsError(Box::new(e))
+    }
+}
+
+impl From<magicblock_account_cloner::AccountClonerError> for ApiError {
+    fn from(e: magicblock_account_cloner::AccountClonerError) -> Self {
+        Self::AccountClonerError(Box::new(e))
+    }
+}
+
+impl From<magicblock_ledger::errors::LedgerError> for ApiError {
+    fn from(e: magicblock_ledger::errors::LedgerError) -> Self {
+        Self::LedgerError(Box::new(e))
+    }
+}
+
+impl From<magicblock_chainlink::errors::ChainlinkError> for ApiError {
+    fn from(e: magicblock_chainlink::errors::ChainlinkError) -> Self {
+        Self::ChainlinkError(Box::new(e))
+    }
+}
+
+impl From<magicblock_committor_service::error::CommittorServiceError>
+    for ApiError
+{
+    fn from(
+        e: magicblock_committor_service::error::CommittorServiceError,
+    ) -> Self {
+        Self::CommittorServiceError(Box::new(e))
+    }
+}
+
+impl From<magicblock_task_scheduler::TaskSchedulerError> for ApiError {
+    fn from(e: magicblock_task_scheduler::TaskSchedulerError) -> Self {
+        Self::TaskSchedulerServiceError(Box::new(e))
+    }
+}

magicblock-chainlink/src/chainlink/account_still_undelegating_on_chain.rs

@@ -15,7 +15,7 @@ use solana_pubkey::Pubkey;
 /// - `pubkey`: the account pubkey
 /// - `is_delegated_on_chain`: whether the account is currently delegated to us on chain
 /// - `remote_slot_in_bank`: the chain slot at which we last fetched and cloned state
-///                  of the account in our bank
+///   of the account in our bank
 /// - `delegation_record`: the delegation record associated with the account in our bank, if found
 /// - `validator_auth`: the validator authority pubkey
 /// - returns `true` if the account is still undelegating, `false` otherwise.

magicblock-chainlink/src/remote_account_provider/errors.rs

@@ -8,7 +8,7 @@ pub type RemoteAccountProviderResult<T> =
 pub enum RemoteAccountProviderError {
     #[error("Pubsub client error: {0}")]
     PubsubClientError(
-        #[from] solana_pubsub_client::pubsub_client::PubsubClientError,
+        Box<solana_pubsub_client::pubsub_client::PubsubClientError>,
     ),
 
     #[error(transparent)]
@@ -88,3 +88,11 @@ pub enum RemoteAccountProviderError {
     )]
     LoaderV4StateDeserializationFailed(Pubkey, String),
 }
+
+impl From<solana_pubsub_client::pubsub_client::PubsubClientError>
+    for RemoteAccountProviderError
+{
+    fn from(e: solana_pubsub_client::pubsub_client::PubsubClientError) -> Self {
+        Self::PubsubClientError(Box::new(e))
+    }
+}

magicblock-committor-program/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::manual_is_multiple_of)]
+
 use solana_pubkey::declare_id;
 pub mod consts;
 pub mod error;

magicblock-committor-program/src/state/changeset.rs

@@ -369,7 +369,7 @@ impl CommitableAccount {
             1
         } else {
             let count = len / chunk_size as usize;
-            if len % chunk_size as usize > 0 {
+            if len % chunk_size as usize != 0 {
                 count + 1
             } else {
                 count

magicblock-committor-program/src/state/chunks.rs

@@ -184,7 +184,7 @@ mod test {
     use super::*;
 
     impl Chunks {
-        pub(super) fn iter(&self) -> ChunksIter {
+        pub(super) fn iter(&self) -> ChunksIter<'_> {
             ChunksIter {
                 chunks: self,
                 idx: 0,

magicblock-committor-service/src/compute_budget.rs

@@ -60,8 +60,7 @@ impl BufferWriteChunkBudget {
                 .unwrap_or(u32::MAX as usize),
         )
         .unwrap_or(u32::MAX)
-        .checked_add(self.base_budget)
-        .unwrap_or(u32::MAX)
+        .saturating_add(self.base_budget)
     }
 
     pub fn instructions(&self, bytes_count: usize) -> Vec<Instruction> {

magicblock-committor-service/src/error.rs

@@ -41,12 +41,12 @@ pub enum CommittorServiceError {
 
     #[error("Failed to send init changeset account: {0} ({0:?})")]
     FailedToSendInitChangesetAccount(
-        solana_rpc_client_api::client_error::Error,
+        Box<solana_rpc_client_api::client_error::Error>,
     ),
 
     #[error("Failed to confirm init changeset account: {0} ({0:?})")]
     FailedToConfirmInitChangesetAccount(
-        solana_rpc_client_api::client_error::Error,
+        Box<solana_rpc_client_api::client_error::Error>,
     ),
     #[error("Init transaction '{0}' was not confirmed")]
     InitChangesetAccountNotConfirmed(String),

magicblock-committor-service/src/intent_execution_manager/intent_execution_engine.rs

@@ -361,7 +361,7 @@ where
 #[cfg(test)]
 mod tests {
     use std::{
-        collections::{HashMap, HashSet},
+        collections::HashSet,
         sync::{
             atomic::{AtomicUsize, Ordering},
             Arc,
@@ -386,9 +386,6 @@ mod tests {
         },
         intent_executor::{
             error::{IntentExecutorError as ExecutorError, InternalError},
-            task_info_fetcher::{
-                ResetType, TaskInfoFetcher, TaskInfoFetcherResult,
-            },
             IntentExecutionResult,
         },
         persist::IntentPersisterImpl,
@@ -821,29 +818,4 @@ mod tests {
             Ok(())
         }
     }
-
-    #[derive(Clone)]
-    pub struct MockInfoFetcher;
-    #[async_trait]
-    impl TaskInfoFetcher for MockInfoFetcher {
-        async fn fetch_next_commit_ids(
-            &self,
-            pubkeys: &[Pubkey],
-        ) -> TaskInfoFetcherResult<HashMap<Pubkey, u64>> {
-            Ok(pubkeys.iter().map(|&k| (k, 1)).collect())
-        }
-
-        async fn fetch_rent_reimbursements(
-            &self,
-            pubkeys: &[Pubkey],
-        ) -> TaskInfoFetcherResult<Vec<Pubkey>> {
-            Ok(pubkeys.iter().map(|_| Pubkey::new_unique()).collect())
-        }
-
-        fn peek_commit_id(&self, _pubkey: &Pubkey) -> Option<u64> {
-            None
-        }
-
-        fn reset(&self, _: ResetType) {}
-    }
 }

magicblock-committor-service/src/intent_executor/error.rs

@@ -22,7 +22,13 @@ pub enum InternalError {
     #[error("SignerError: {0}")]
     SignerError(#[from] SignerError),
     #[error("MagicBlockRpcClientError: {0}")]
-    MagicBlockRpcClientError(#[from] MagicBlockRpcClientError),
+    MagicBlockRpcClientError(Box<MagicBlockRpcClientError>),
+}
+
+impl From<MagicBlockRpcClientError> for InternalError {
+    fn from(e: MagicBlockRpcClientError) -> Self {
+        Self::MagicBlockRpcClientError(Box::new(e))
+    }
 }
 
 impl InternalError {
@@ -144,7 +150,7 @@ pub enum TransactionStrategyExecutionError {
 
 impl From<MagicBlockRpcClientError> for TransactionStrategyExecutionError {
     fn from(value: MagicBlockRpcClientError) -> Self {
-        Self::InternalError(InternalError::MagicBlockRpcClientError(value))
+        Self::InternalError(InternalError::from(value))
     }
 }
 

magicblock-committor-service/src/intent_executor/mod.rs

@@ -688,7 +688,7 @@ where
                     InternalError::MagicBlockRpcClientError(err) => {
                         map_magicblock_client_error(
                             &self.transaction_error_mapper,
-                            err,
+                            *err,
                         )
                     }
                     err => {

magicblock-committor-service/src/intent_executor/task_info_fetcher.rs

@@ -13,8 +13,7 @@ use magicblock_rpc_client::{MagicBlockRpcClientError, MagicblockRpcClient};
 use solana_pubkey::Pubkey;
 use solana_sdk::signature::Signature;
 
-const NUM_FETCH_RETRIES: NonZeroUsize =
-    unsafe { NonZeroUsize::new_unchecked(5) };
+const NUM_FETCH_RETRIES: NonZeroUsize = NonZeroUsize::new(5).unwrap();
 const MUTEX_POISONED_MSG: &str = "CacheTaskInfoFetcher mutex poisoned!";
 
 #[async_trait]
@@ -51,8 +50,7 @@ pub struct CacheTaskInfoFetcher {
 
 impl CacheTaskInfoFetcher {
     pub fn new(rpc_client: MagicblockRpcClient) -> Self {
-        const CACHE_SIZE: NonZeroUsize =
-            unsafe { NonZeroUsize::new_unchecked(1000) };
+        const CACHE_SIZE: NonZeroUsize = NonZeroUsize::new(1000).unwrap();
 
         Self {
             rpc_client,
@@ -274,7 +272,13 @@ pub enum TaskInfoFetcherError {
     #[error("InvalidAccountDataError for: {0}")]
     InvalidAccountDataError(Pubkey),
     #[error("MagicBlockRpcClientError: {0}")]
-    MagicBlockRpcClientError(#[from] MagicBlockRpcClientError),
+    MagicBlockRpcClientError(Box<MagicBlockRpcClientError>),
+}
+
+impl From<MagicBlockRpcClientError> for TaskInfoFetcherError {
+    fn from(e: MagicBlockRpcClientError) -> Self {
+        Self::MagicBlockRpcClientError(Box::new(e))
+    }
 }
 
 impl TaskInfoFetcherError {

magicblock-committor-service/src/persist/db.rs

@@ -853,7 +853,8 @@ mod tests {
     fn test_set_commit_id() {
         let (mut db, _file) = setup_test_db();
         let row = create_test_row(1, 0);
-        db.insert_commit_status_rows(&[row.clone()]).unwrap();
+        db.insert_commit_status_rows(std::slice::from_ref(&row))
+            .unwrap();
 
         // Update commit_id
         db.set_commit_id(1, &row.pubkey, 100).unwrap();
@@ -867,7 +868,8 @@ mod tests {
     fn test_update_status_by_message() {
         let (mut db, _file) = setup_test_db();
         let row = create_test_row(1, 0);
-        db.insert_commit_status_rows(&[row.clone()]).unwrap();
+        db.insert_commit_status_rows(std::slice::from_ref(&row))
+            .unwrap();
 
         let new_status = CommitStatus::Pending;
         db.update_status_by_message(1, &row.pubkey, &new_status)
@@ -881,7 +883,8 @@ mod tests {
     fn test_update_status_by_commit() {
         let (mut db, _file) = setup_test_db();
         let row = create_test_row(1, 100); // Set commit_id to 100
-        db.insert_commit_status_rows(&[row.clone()]).unwrap();
+        db.insert_commit_status_rows(std::slice::from_ref(&row))
+            .unwrap();
 
         let new_status = CommitStatus::Succeeded(CommitStatusSignatures {
             commit_stage_signature: Signature::new_unique(),
@@ -898,7 +901,8 @@ mod tests {
     fn test_set_commit_strategy() {
         let (mut db, _file) = setup_test_db();
         let row = create_test_row(1, 100);
-        db.insert_commit_status_rows(&[row.clone()]).unwrap();
+        db.insert_commit_status_rows(std::slice::from_ref(&row))
+            .unwrap();
 
         let new_strategy = CommitStrategy::FromBuffer;
         db.set_commit_strategy(100, &row.pubkey, new_strategy)