Base layer actions

Cargo.toml

@@ -74,6 +74,7 @@ conjunto-transwise = { git = "https://github.com/magicblock-labs/conjunto.git",
 console-subscriber = "0.2.0"
 crossbeam-channel = "0.5.11"
 const_format = "0.2.34"
+dyn-clone = "1.0.20"
 ed25519-dalek = "1.0.1"
 enum-iterator = "1.5.0"
 env_logger = "0.11.2"
@@ -118,7 +119,7 @@ magicblock-config = { path = "./magicblock-config" }
 magicblock-config-helpers = { path = "./magicblock-config-helpers" }
 magicblock-config-macro = { path = "./magicblock-config-macro" }
 magicblock-core = { path = "./magicblock-core" }
-magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "4af7f1c" }
+magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "00d720", features = ["no-entrypoint"] }
 magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "ea04d46", default-features = false }
 magicblock-geyser-plugin = { path = "./magicblock-geyser-plugin" }
 magicblock-ledger = { path = "./magicblock-ledger" }
@@ -195,6 +196,7 @@ spl-token-2022 = "=6.0"
 static_assertions = "1.1.0"
 strum = "0.24"
 strum_macros = "0.24"
+lru = "0.16.0"
 syn = "2.0"
 tempfile = "3.10.1"
 test-tools = { path = "./test-tools" }

magicblock-account-cloner/Cargo.toml

@@ -16,6 +16,7 @@ magicblock-account-fetcher = { workspace = true }
 magicblock-account-updates = { workspace = true }
 magicblock-account-dumper = { workspace = true }
 magicblock-accounts-api = { workspace = true }
+magicblock-rpc-client = { workspace = true }
 magicblock-config = { workspace = true }
 magicblock-core = { workspace = true }
 magicblock-committor-service = { workspace = true }

magicblock-account-cloner/src/account_cloner.rs

@@ -10,9 +10,10 @@ use magicblock_account_fetcher::AccountFetcherError;
 use magicblock_account_updates::AccountUpdatesError;
 use magicblock_committor_service::{
     error::{CommittorServiceError, CommittorServiceResult},
-    ChangesetCommittor,
+    BaseIntentCommittor,
 };
 use magicblock_core::magic_program;
+use magicblock_rpc_client::MagicblockRpcClient;
 use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature};
 use thiserror::Error;
 use tokio::sync::oneshot::{self, Sender};
@@ -76,9 +77,9 @@ pub enum AccountClonerUnclonableReason {
     DelegatedAccountsNotClonedWhileHydrating,
 }
 
-pub async fn map_committor_request_result<T, CC: ChangesetCommittor>(
+pub async fn map_committor_request_result<T, CC: BaseIntentCommittor>(
     res: oneshot::Receiver<CommittorServiceResult<T>>,
-    changeset_committor: Arc<CC>,
+    intent_committor: Arc<CC>,
 ) -> AccountClonerResult<T> {
     match res.await.map_err(|err| {
         // Send request error
@@ -96,10 +97,21 @@ pub async fn map_committor_request_result<T, CC: ChangesetCommittor>(
                             format!("{:?}", table_mania_err),
                         ));
                     };
-                    let cus =
-                        changeset_committor.get_transaction_cus(&sig).await;
-                    let logs =
-                        changeset_committor.get_transaction_logs(&sig).await;
+                    let (logs, cus) = if let Ok(Ok(transaction)) =
+                        intent_committor.get_transaction(&sig).await
+                    {
+                        let cus = MagicblockRpcClient::get_cus_from_transaction(
+                            &transaction,
+                        );
+                        let logs =
+                            MagicblockRpcClient::get_logs_from_transaction(
+                                &transaction,
+                            );
+                        (logs, cus)
+                    } else {
+                        (None, None)
+                    };
+
                     let cus_str = cus
                         .map(|cus| format!("{:?}", cus))
                         .unwrap_or("N/A".to_string());

magicblock-account-cloner/src/remote_account_cloner_client.rs

@@ -11,7 +11,7 @@ use magicblock_account_dumper::AccountDumper;
 use magicblock_account_fetcher::AccountFetcher;
 use magicblock_account_updates::AccountUpdates;
 use magicblock_accounts_api::InternalAccountProvider;
-use magicblock_committor_service::ChangesetCommittor;
+use magicblock_committor_service::BaseIntentCommittor;
 use solana_sdk::pubkey::Pubkey;
 use tokio::sync::oneshot::channel;
 
@@ -34,7 +34,7 @@ impl RemoteAccountClonerClient {
         AFE: AccountFetcher,
         AUP: AccountUpdates,
         ADU: AccountDumper,
-        CC: ChangesetCommittor,
+        CC: BaseIntentCommittor,
     {
         Self {
             clone_request_sender: worker.get_clone_request_sender(),

magicblock-account-cloner/src/remote_account_cloner_worker.rs

@@ -17,7 +17,7 @@ use magicblock_account_dumper::AccountDumper;
 use magicblock_account_fetcher::AccountFetcher;
 use magicblock_account_updates::{AccountUpdates, AccountUpdatesResult};
 use magicblock_accounts_api::InternalAccountProvider;
-use magicblock_committor_service::ChangesetCommittor;
+use magicblock_committor_service::BaseIntentCommittor;
 use magicblock_config::{
     AccountsCloneConfig, LedgerResumeStrategyConfig, PrepareLookupTables,
 };
@@ -137,7 +137,7 @@ where
     AFE: AccountFetcher,
     AUP: AccountUpdates,
     ADU: AccountDumper,
-    CC: ChangesetCommittor,
+    CC: BaseIntentCommittor,
 {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
@@ -716,11 +716,10 @@ where
 
                 // Allow the committer service to reserve pubkeys in lookup tables
                 // that could be needed when we commit this account
-                if let Some(committor) = self.changeset_committor.as_ref() {
+                if let Some(committor) = self.changeset_committor.clone() {
                     if self.clone_config.prepare_lookup_tables
                         == PrepareLookupTables::Always
                     {
-                        let committor = Arc::clone(committor);
                         let pubkey = *pubkey;
                         let owner = delegation_record.owner;
                         tokio::spawn(async move {

magicblock-account-dumper/src/account_dumper_bank.rs

@@ -181,7 +181,6 @@ impl AccountDumper for AccountDumperBank {
 
         let mut program_id_modification =
             AccountModification::from((program_pubkey, program_account));
-
         // point program account to the derived program data account address
         let program_id_state =
             bincode::serialize(&UpgradeableLoaderState::Program {

magicblock-accounts-api/src/bank_account_provider.rs

@@ -1,7 +1,9 @@
 use std::sync::Arc;
 
 use magicblock_bank::bank::Bank;
-use solana_sdk::{account::AccountSharedData, clock::Slot, pubkey::Pubkey};
+use solana_sdk::{
+    account::AccountSharedData, clock::Slot, hash::Hash, pubkey::Pubkey,
+};
 
 use crate::InternalAccountProvider;
 
@@ -33,4 +35,7 @@ impl InternalAccountProvider for BankAccountProvider {
     fn get_slot(&self) -> Slot {
         self.bank.slot()
     }
+    fn get_blockhash(&self) -> Hash {
+        self.bank.last_blockhash()
+    }
 }

magicblock-accounts-api/src/internal_account_provider.rs

@@ -1,9 +1,12 @@
-use solana_sdk::{account::AccountSharedData, clock::Slot, pubkey::Pubkey};
+use solana_sdk::{
+    account::AccountSharedData, clock::Slot, hash::Hash, pubkey::Pubkey,
+};
 
 pub trait InternalAccountProvider: Send + Sync {
     fn has_account(&self, pubkey: &Pubkey) -> bool;
     fn remove_account(&self, _pubkey: &Pubkey) {}
     fn get_account(&self, pubkey: &Pubkey) -> Option<AccountSharedData>;
     fn get_all_accounts(&self) -> Vec<(Pubkey, AccountSharedData)>;
     fn get_slot(&self) -> Slot;
+    fn get_blockhash(&self) -> Hash;
 }

magicblock-accounts-api/src/internal_account_provider_stub.rs

@@ -3,13 +3,16 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-use solana_sdk::{account::AccountSharedData, clock::Slot, pubkey::Pubkey};
+use solana_sdk::{
+    account::AccountSharedData, clock::Slot, hash::Hash, pubkey::Pubkey,
+};
 
 use crate::InternalAccountProvider;
 
 #[derive(Debug, Clone, Default)]
 pub struct InternalAccountProviderStub {
     slot: Slot,
+    hash: Hash,
     accounts: Arc<RwLock<HashMap<Pubkey, AccountSharedData>>>,
 }
 
@@ -37,4 +40,7 @@ impl InternalAccountProvider for InternalAccountProviderStub {
     fn get_slot(&self) -> Slot {
         self.slot
     }
+    fn get_blockhash(&self) -> Hash {
+        self.hash
+    }
 }

magicblock-accounts/Cargo.toml

@@ -12,6 +12,7 @@ async-trait = { workspace = true }
 conjunto-transwise = { workspace = true }
 magicblock-delegation-program = { workspace = true }
 futures-util = { workspace = true }
+itertools = { workspace = true }
 log = { workspace = true }
 magicblock-account-fetcher = { workspace = true }
 magicblock-account-updates = { workspace = true }
@@ -30,6 +31,7 @@ solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-sdk = { workspace = true }
 tokio = { workspace = true }
+tokio-util = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 

magicblock-accounts/README.md

@@ -14,8 +14,8 @@ Implements a `AccountsManager`, which is reponsible for:
   - Implemented by a `ExternalAccountsManager`
   - depends on an `InternalAccountProvider` (implemented by `BankAccountProvider`)
   - depends on an `AccountCloner` (implemented by `RemoteAccountCloner`)
-  - depends on an `AccountCommitter` (implemented by `RemoteAccountCommitter`)
   - depends on a `Transwise`
+  - denepds on a `CommittorServiceExt` that is used for Manual commits
   - Implements `ensure_accounts` function
   - Maintains a local cache of accounts already validated and cloned
 
@@ -25,9 +25,6 @@ Implements a `AccountsManager`, which is reponsible for:
 - `RemoteAccountCloner`
   - depends on a `Bank`
 
-- `RemoteAccountCommitter`
-  - depends on an `RpcClient`
-
 # Notes
 
 *How does `ensure_accounts` work:*