Cleanup

Author: snawaz

Cargo.lock

@@ -87,7 +87,7 @@ impl BaseTask for ArgsTask {
                 {
                     Ok(account) => account,
                     Err(e) => {
-                        log::warn!("Fallback to commit_state and send full-bytes, as rpc failed to fetch the delegated-account from base chain: {}", e);
+                        log::warn!("Fallback to commit_state and send full-bytes, as rpc failed to fetch the delegated-account from base chain, commmit_id: {} , error: {}", value.commit_id, e);
                         let args = CommitStateArgs {
                             nonce: value.commit_id,
                             lamports: value.committed_account.account.lamports,
@@ -109,10 +109,10 @@ impl BaseTask for ArgsTask {
                     diff: compute_diff(
                         account.data(),
                         value.committed_account.account.data(),
-                    ),
+                    )
+                    .to_vec(),
                     allow_undelegation: value.allow_undelegation,
                 };
-                log::warn!("DIFF computed: {:?}", args.diff);
                 dlp::instruction_builder::commit_diff(
                     *validator,
                     value.committed_account.pubkey,
@@ -168,9 +168,8 @@ impl BaseTask for ArgsTask {
                     BufferTaskType::Commit(value),
                 )))
             }
-            ArgsTaskType::CommitDiff(_) => {
-                panic!("ArgsTaskType::CommitDiff not handled")
-            }
+            // TODO (snawaz): discuss this with reviewers
+            ArgsTaskType::CommitDiff(_) => Err(self),
             ArgsTaskType::BaseAction(_)
             | ArgsTaskType::Finalize(_)
             | ArgsTaskType::Undelegate(_) => Err(self),
@@ -227,9 +226,8 @@ impl BaseTask for ArgsTask {
     }
 
     fn reset_commit_id(&mut self, commit_id: u64) {
-        // TODO (snawaz): handle CommitDiff as well?
+        // TODO (snawaz): handle CommitDiff as well? what is it about?
         let ArgsTaskType::Commit(commit_task) = &mut self.task_type else {
-            log::error!("reset_commit_id");
             return;
         };
 

magicblock-committor-service/src/tasks/args_task.rs

@@ -427,7 +427,6 @@ impl MagicblockRpcClient {
             .await?;
 
         if let Err(err) = processed_status {
-            error!("> ERROR: {:?}", err);
             return Err(MagicBlockRpcClientError::SentTransactionError(
                 err, sig,
             ));

magicblock-rpc-client/src/lib.rs

@@ -446,10 +446,7 @@ impl CommitType {
     }
 
     pub fn is_commit_diff(&self) -> bool {
-        let Self::StandaloneDiff(_) = self else {
-            return false;
-        };
-        true
+        matches!(self, Self::StandaloneDiff(_))
     }
 
     pub fn get_committed_accounts(&self) -> &Vec<CommittedAccount> {

programs/magicblock/src/magic_scheduled_base_intent.rs

@@ -1,5 +1,4 @@
 use magicblock_magic_program_api::instruction::MagicBlockInstruction;
-use solana_log_collector::ic_msg;
 use solana_program_runtime::declare_process_instruction;
 use solana_sdk::program_utils::limited_deserialize;
 
@@ -35,8 +34,6 @@ declare_process_instruction!(
             transaction_context.get_current_instruction_context()?;
         let signers = instruction_context.get_signers(transaction_context)?;
 
-        ic_msg!(invoke_context, "MagicBlockInstruction: {:?}", instruction);
-
         match instruction {
             ModifyAccounts(mut account_mods) => process_mutate_accounts(
                 signers,
@@ -52,17 +49,15 @@ declare_process_instruction!(
                     request_diff: false,
                 },
             ),
-            MagicBlockInstruction::ScheduleCommitAndUndelegate => {
-                process_schedule_commit(
-                    signers,
-                    invoke_context,
-                    ProcessScheduleCommitOptions {
-                        request_undelegation: true,
-                        request_diff: false,
-                    },
-                )
-            }
-            MagicBlockInstruction::AcceptScheduleCommits => {
+            ScheduleCommitAndUndelegate => process_schedule_commit(
+                signers,
+                invoke_context,
+                ProcessScheduleCommitOptions {
+                    request_undelegation: true,
+                    request_diff: false,
+                },
+            ),
+            AcceptScheduleCommits => {
                 process_accept_scheduled_commits(signers, invoke_context)
             }
             ScheduledCommitSent((id, _bump)) => process_scheduled_commit_sent(
@@ -87,16 +82,14 @@ declare_process_instruction!(
             EnableExecutableCheck => {
                 process_toggle_executable_check(signers, invoke_context, true)
             }
-            MagicBlockInstruction::ScheduleCommitDiffAndUndelegate => {
-                process_schedule_commit(
-                    signers,
-                    invoke_context,
-                    ProcessScheduleCommitOptions {
-                        request_undelegation: true,
-                        request_diff: true,
-                    },
-                )
-            }
+            ScheduleCommitDiffAndUndelegate => process_schedule_commit(
+                signers,
+                invoke_context,
+                ProcessScheduleCommitOptions {
+                    request_undelegation: true,
+                    request_diff: true,
+                },
+            ),
         }
     }
 );

programs/magicblock/src/magicblock_processor.rs

@@ -222,7 +222,6 @@ pub(crate) fn process_schedule_commit(
     let commit_sent_sig = action_sent_transaction.signatures[0];
 
     let commit_action = if opts.request_diff {
-        ic_msg!(invoke_context, "CommitType::StandaloneDiff");
         CommitType::StandaloneDiff(committed_accounts)
     } else {
         CommitType::Standalone(committed_accounts)