Cleanup

Author: snawaz

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

@@ -242,7 +242,6 @@ where
         execution_permit: OwnedSemaphorePermit,
         result_sender: broadcast::Sender<BroadcastedIntentExecutionResult>,
     ) {
-        info!("execute: {:#?}", intent);
         let result = executor
             .execute(intent.inner.clone(), persister)
             .await

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

@@ -4,12 +4,11 @@ pub mod single_stage_executor;
 pub mod task_info_fetcher;
 pub mod two_stage_executor;
 
-use core::slice;
 use std::{ops::ControlFlow, sync::Arc, time::Duration};
 
 use async_trait::async_trait;
 use futures_util::future::try_join_all;
-use log::{error, info, trace, warn};
+use log::{error, trace, warn};
 use magicblock_program::{
     magic_scheduled_base_intent::ScheduledBaseIntent,
     validator::validator_authority,
@@ -21,7 +20,6 @@ use magicblock_rpc_client::{
 use solana_pubkey::Pubkey;
 use solana_rpc_client_api::client_error::ErrorKind;
 use solana_sdk::{
-    instruction::CompiledInstruction,
     message::VersionedMessage,
     signature::{Keypair, Signature, Signer, SignerError},
     transaction::{TransactionError, VersionedTransaction},
@@ -687,26 +685,9 @@ where
         // This is needed because DEFAULT_MAX_TIME_TO_PROCESSED is 50 sec
         while start.elapsed() < RETRY_FOR || i < MIN_RETRIES {
             i += 1;
-            let message = prepared_message.clone();
-            let changed = {
-                let len = message.instructions().len();
-                let ixs = unsafe {
-                    let ix = message.instructions().as_ptr()
-                        as *mut CompiledInstruction;
-                    slice::from_raw_parts_mut(ix, len)
-                };
-                let mut changed = 0;
-                for ix in ixs.iter_mut() {
-                    if ix.data.len() != 0 && ix.data[0] == 16 {
-                        //ix.data[0] = 1; // CommitState
-                        changed += 1;
-                    }
-                }
-                changed
-            };
-            info!("> changed [{changed}] prepared_message: {:?}", message);
 
-            let result = self.send_prepared_message(message).await;
+            let result =
+                self.send_prepared_message(prepared_message.clone()).await;
             let flow = match result {
                 Ok(result) => {
                     return match result.into_result() {
@@ -727,7 +708,6 @@ where
                     // TransactionError can be mapped to known set of error
                     // We return right away to retry recovery, because this can't be fixed with retries
                     ControlFlow::Break(TransactionStrategyExecutionError::from_transaction_error(err, tasks, |err| {
-                        error!("> ERROR: {:?}", err);
                         MagicBlockRpcClientError::SentTransactionError(err, signature)
                     }))
                 }

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

@@ -75,10 +75,6 @@ impl BaseTask for ArgsTask {
                 let chain_config =
                     ChainConfig::local(ComputeBudgetConfig::new(1_000_000));
 
-                log::info!(
-                    "Fetch account from the main chain: {}",
-                    value.committed_account.pubkey
-                );
                 let rpc_client = RpcClient::new_with_commitment(
                     chain_config.rpc_uri.to_string(),
                     CommitmentConfig {
@@ -89,36 +85,9 @@ impl BaseTask for ArgsTask {
                 let account = match rpc_client
                     .get_account(&value.committed_account.pubkey)
                 {
-                    Ok(account) => {
-                        log::debug!(
-                            "Account Found with datalen: {:?}",
-                            account
-                        );
-                        if account.data().len() == 0 {
-                            let args = CommitStateArgs {
-                                nonce: value.commit_id,
-                                lamports: value
-                                    .committed_account
-                                    .account
-                                    .lamports,
-                                data: value
-                                    .committed_account
-                                    .account
-                                    .data
-                                    .clone(),
-                                allow_undelegation: value.allow_undelegation,
-                            };
-                            return dlp::instruction_builder::commit_state(
-                                *validator,
-                                value.committed_account.pubkey,
-                                value.committed_account.account.owner,
-                                args,
-                            );
-                        }
-                        account
-                    }
+                    Ok(account) => account,
                     Err(e) => {
-                        log::error!("error while receiving account: {}", e);
+                        log::warn!("Fallback to commit_state and send full-bytes, as rpc failed to fetch the delegated-account from base chain: {}", e);
                         let args = CommitStateArgs {
                             nonce: value.commit_id,
                             lamports: value.committed_account.account.lamports,
@@ -133,17 +102,16 @@ impl BaseTask for ArgsTask {
                         );
                     }
                 };
+
                 let args = CommitDiffArgs {
                     nonce: value.commit_id,
                     lamports: value.committed_account.account.lamports,
-                    //diff: value.committed_account.account.data.clone(),
                     diff: compute_diff(
                         account.data(),
                         value.committed_account.account.data(),
                     ),
                     allow_undelegation: value.allow_undelegation,
                 };
-
                 dlp::instruction_builder::commit_diff(
                     *validator,
                     value.committed_account.pubkey,

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

@@ -53,8 +53,8 @@ pub enum TaskStrategy {
 pub trait BaseTask: Send + Sync + DynClone {
     /// Gets all pubkeys that involved in Task's instruction
     fn involved_accounts(&self, validator: &Pubkey) -> Vec<Pubkey> {
-        // TODO (snawaz): can be optimized.
-        // currently it is slow as it discards lots of computations and memory allocations.
+        // TODO (snawaz): rewrite it.
+        // currently it is slow as it discards heavy computations and memory allocations.
         self.instruction(validator)
             .accounts
             .iter()

programs/magicblock/src/magic_scheduled_base_intent.rs

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

programs/magicblock/src/schedule_transactions/process_accept_scheduled_commits.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use solana_log_collector::{ic_msg, log};
+use solana_log_collector::ic_msg;
 use solana_program_runtime::invoke_context::InvokeContext;
 use solana_sdk::{
     account::ReadableAccount, instruction::InstructionError, pubkey::Pubkey,
@@ -108,7 +108,5 @@ pub fn process_accept_scheduled_commits(
             InstructionError::GenericError
         })?;
 
-    log::info!("process_accept_scheduled_commits DONE");
-
     Ok(())
 }

programs/magicblock/src/schedule_transactions/process_schedule_commit.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use solana_log_collector::{ic_msg, log};
+use solana_log_collector::ic_msg;
 use solana_program_runtime::invoke_context::InvokeContext;
 use solana_sdk::{
     account::{Account, ReadableAccount},
@@ -255,7 +255,5 @@ pub(crate) fn process_schedule_commit(
         commit_sent_sig,
     );
 
-    log::info!("process_schedule_commit DONE");
-
     Ok(())
 }

programs/magicblock/src/schedule_transactions/process_scheduled_commit_sent.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use lazy_static::lazy_static;
-use solana_log_collector::{ic_msg, log};
+use solana_log_collector::ic_msg;
 use solana_program_runtime::invoke_context::InvokeContext;
 use solana_sdk::{
     clock::Slot, hash::Hash, instruction::InstructionError, pubkey::Pubkey,
@@ -230,8 +230,6 @@ pub fn process_scheduled_commit_sent(
         ic_msg!(invoke_context, "ScheduledCommitSent requested commit_diff",);
     }
 
-    log::info!("process_scheduled_commit_sent DONE");
-
     Ok(())
 }