Get account using RpcClient

Author: snawaz

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

@@ -242,6 +242,7 @@ 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/tasks/args_task.rs

@@ -1,14 +1,24 @@
 use dlp::args::{CallHandlerArgs, CommitDiffArgs, CommitStateArgs};
+use solana_account::ReadableAccount;
 use solana_pubkey::Pubkey;
-use solana_sdk::instruction::{AccountMeta, Instruction};
+use solana_rpc_client::rpc_client::RpcClient;
+use solana_sdk::{
+    commitment_config::CommitmentConfig,
+    instruction::{AccountMeta, Instruction},
+};
 
 #[cfg(test)]
 use crate::tasks::TaskStrategy;
-use crate::tasks::{
-    buffer_task::{BufferTask, BufferTaskType},
-    visitor::Visitor,
-    BaseActionTask, BaseTask, BaseTaskError, BaseTaskResult, CommitTask,
-    FinalizeTask, PreparationState, TaskType, UndelegateTask,
+use crate::{
+    config::ChainConfig,
+    diff::compute_diff,
+    tasks::{
+        buffer_task::{BufferTask, BufferTaskType},
+        visitor::Visitor,
+        BaseActionTask, BaseTask, BaseTaskError, BaseTaskResult, CommitTask,
+        FinalizeTask, PreparationState, TaskType, UndelegateTask,
+    },
+    ComputeBudgetConfig,
 };
 
 /// Task that will be executed on Base layer via arguments
@@ -59,44 +69,64 @@ impl BaseTask for ArgsTask {
                     args,
                 )
             }
-            // algo:
-            // - delegated_account, prev
-            // - changed delegated_account
-            // - diff = prev - delegated_account
-            // - commit
-            // - prev = delegated_account
-            // - update cache with prev
-            //
-            // relevant files/modules/crates:
-            // -
-            // - https://docs.rs/scc/latest/scc/#hashcache
-            //
-            // diff:
-            // - [offset1][offset2]data
-            //
-            // 100
-            //
-            // 11..15
-            //
-            // 31...40
-            //
-            // - complete: [2] [5][11] [10][31] [11..15 31 ..40]
-            //
-            // - [3][8][11..15 31 ..40]
-            //
             ArgsTaskType::CommitDiff(value) => {
+                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 {
+                        commitment: chain_config.commitment,
+                    },
+                );
+
+                let account = match rpc_client
+                    .get_account(&value.committed_account.pubkey)
+                {
+                    Ok(account) => {
+                        log::info!("Account Found: {:?}", account);
+                        account
+                    }
+                    Err(e) => {
+                        log::error!("error while receiving account: {}", e);
+                        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,
+                        );
+                    }
+                };
+
                 let args = CommitDiffArgs {
                     nonce: value.commit_id,
                     lamports: value.committed_account.account.lamports,
-                    diff: vec![], // compute diff for this field
+                    diff: compute_diff(
+                        //&vec![0; value.committed_account.account.data().len()],
+                        account.data(),
+                        value.committed_account.account.data(),
+                    ),
                     allow_undelegation: value.allow_undelegation,
                 };
-                dlp::instruction_builder::commit_diff(
+                log::info!("commit_diff: create instruction");
+                let ix = dlp::instruction_builder::commit_diff(
                     *validator,
                     value.committed_account.pubkey,
                     value.committed_account.account.owner,
                     args,
-                )
+                );
+                log::info!("commit_diff: created instruction");
+                ix
             }
             ArgsTaskType::Finalize(value) => {
                 dlp::instruction_builder::finalize(

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

@@ -54,6 +54,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.
         self.instruction(validator)
             .accounts
             .iter()

run-schedulecommit-ephm.sh

@@ -1,3 +1,3 @@
 #!/bin/bash  
 
-RUST_LOG_STYLE="EPHEM" VALIDATOR_KEYPAIR="62LxqpAW6SWhp7iKBjCQneapn1w6btAhW7xHeREWSpPzw3xZbHCfAFesSR4R76ejQXCLWrndn37cKCCLFvx6Swps" "cargo" "run" "--" "/Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/schedulecommit-conf-fees.ephem.toml"
+RUST_LOG=info RUST_LOG_STYLE="EPHEM" VALIDATOR_KEYPAIR="62LxqpAW6SWhp7iKBjCQneapn1w6btAhW7xHeREWSpPzw3xZbHCfAFesSR4R76ejQXCLWrndn37cKCCLFvx6Swps" "cargo" "run" "--" "/Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/schedulecommit-conf-fees.ephem.toml"