chore: extract magic-program from magicblock-core (#531)

GabrielePicco · web-flow · commit 433354ffa0ea · 2025-09-05T18:12:35.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,6 +21,7 @@ members = [
   "magicblock-config-helpers",
   "magicblock-config-macro",
   "magicblock-core",
+  "magicblock-magic-program-api",
   "magicblock-geyser-plugin",
   "magicblock-ledger",
   "magicblock-metrics",
@@ -129,6 +130,7 @@ magicblock-mutator = { path = "./magicblock-mutator" }
 magicblock-perf-service = { path = "./magicblock-perf-service" }
 magicblock-processor = { path = "./magicblock-processor" }
 magicblock-program = { path = "./programs/magicblock" }
+magicblock-magic-program-api = { path = "./magicblock-magic-program-api" }
 magicblock-pubsub = { path = "./magicblock-pubsub" }
 magicblock-rpc = { path = "./magicblock-rpc" }
 magicblock-rpc-client = { path = "./magicblock-rpc-client" }
diff --git a/magicblock-account-cloner/Cargo.toml b/magicblock-account-cloner/Cargo.toml
@@ -18,7 +18,7 @@ magicblock-account-dumper = { workspace = true }
 magicblock-accounts-api = { workspace = true }
 magicblock-rpc-client = { workspace = true }
 magicblock-config = { workspace = true }
-magicblock-core = { workspace = true }
+magicblock-program = { workspace = true }
 magicblock-committor-service = { workspace = true }
 magicblock-metrics = { workspace = true }
 magicblock-mutator = { workspace = true }
diff --git a/magicblock-account-cloner/src/account_cloner.rs b/magicblock-account-cloner/src/account_cloner.rs
@@ -12,7 +12,6 @@ use magicblock_committor_service::{
     error::{CommittorServiceError, CommittorServiceResult},
     BaseIntentCommittor,
 };
-use magicblock_core::magic_program;
 use magicblock_rpc_client::MagicblockRpcClient;
 use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature};
 use thiserror::Error;
@@ -210,8 +209,8 @@ pub fn standard_blacklisted_accounts(
     blacklisted_accounts.insert(solana_sdk::sysvar::slot_history::ID);
     blacklisted_accounts.insert(solana_sdk::sysvar::stake_history::ID);
     blacklisted_accounts.insert(NATIVE_SOL_ID);
-    blacklisted_accounts.insert(magic_program::ID);
-    blacklisted_accounts.insert(magic_program::MAGIC_CONTEXT_PUBKEY);
+    blacklisted_accounts.insert(magicblock_program::ID);
+    blacklisted_accounts.insert(magicblock_program::MAGIC_CONTEXT_PUBKEY);
     blacklisted_accounts.insert(*validator_id);
     blacklisted_accounts.insert(*faucet_id);
     blacklisted_accounts
diff --git a/magicblock-account-dumper/src/account_dumper_bank.rs b/magicblock-account-dumper/src/account_dumper_bank.rs
@@ -146,10 +146,7 @@ impl AccountDumper for AccountDumperBank {
         .map_err(AccountDumperError::MutatorModificationError)?;
         let program_idl_modification =
             program_idl.map(|(program_idl_pubkey, program_idl_account)| {
-                AccountModification::from((
-                    &program_idl_pubkey,
-                    &program_idl_account,
-                ))
+                from_account(program_idl_pubkey, &program_idl_account)
             });
         let needs_upgrade = self.bank.has_account(program_id_pubkey);
         let transaction = transaction_to_clone_program(
@@ -180,7 +177,7 @@ impl AccountDumper for AccountDumperBank {
         );
 
         let mut program_id_modification =
-            AccountModification::from((program_pubkey, program_account));
+            from_account(*program_pubkey, program_account);
         // point program account to the derived program data account address
         let program_id_state =
             bincode::serialize(&UpgradeableLoaderState::Program {
@@ -211,3 +208,14 @@ impl AccountDumper for AccountDumperBank {
         self.execute_transaction(transaction)
     }
 }
+
+fn from_account(pubkey: Pubkey, account: &Account) -> AccountModification {
+    AccountModification {
+        pubkey,
+        lamports: Some(account.lamports),
+        owner: Some(account.owner),
+        executable: Some(account.executable),
+        data: Some(account.data.clone()),
+        rent_epoch: Some(account.rent_epoch),
+    }
+}
diff --git a/magicblock-accounts/Cargo.toml b/magicblock-accounts/Cargo.toml
@@ -22,6 +22,7 @@ magicblock-accounts-api = { workspace = true }
 magicblock-bank = { workspace = true }
 magicblock-committor-service = { workspace = true }
 magicblock-core = { workspace = true }
+magicblock-magic-program-api = { workspace = true }
 magicblock-metrics = { workspace = true }
 magicblock-mutator = { workspace = true }
 magicblock-processor = { workspace = true }
diff --git a/magicblock-accounts/src/external_accounts_manager.rs b/magicblock-accounts/src/external_accounts_manager.rs
@@ -29,7 +29,7 @@ use magicblock_committor_service::{
     transactions::MAX_PROCESS_PER_TX,
     types::{ScheduledBaseIntentWrapper, TriggerType},
 };
-use magicblock_core::magic_program;
+use magicblock_magic_program_api::{self, MAGIC_CONTEXT_PUBKEY};
 use magicblock_program::{
     magic_scheduled_base_intent::{
         CommitType, CommittedAccount, MagicBaseIntent, ScheduledBaseIntent,
@@ -445,7 +445,7 @@ where
 }
 
 fn should_clone_account(pubkey: &Pubkey) -> bool {
-    pubkey != &magic_program::MAGIC_CONTEXT_PUBKEY
+    pubkey != &MAGIC_CONTEXT_PUBKEY
 }
 
 /// Creates deterministic hashes from account lamports, owner and data
diff --git a/magicblock-api/Cargo.toml b/magicblock-api/Cargo.toml
@@ -26,6 +26,7 @@ magicblock-bank = { workspace = true }
 magicblock-committor-service = { workspace = true }
 magicblock-config = { workspace = true }
 magicblock-core = { workspace = true }
+magicblock-magic-program-api = { workspace = true }
 magicblock-geyser-plugin = { workspace = true }
 magicblock-ledger = { workspace = true }
 magicblock-metrics = { workspace = true }
diff --git a/magicblock-api/src/fund_account.rs b/magicblock-api/src/fund_account.rs
@@ -1,7 +1,9 @@
 use std::path::Path;
 
 use magicblock_bank::bank::Bank;
-use magicblock_core::magic_program;
+use magicblock_magic_program_api::{
+    self, MAGIC_CONTEXT_PUBKEY, MAGIC_CONTEXT_SIZE,
+};
 use solana_sdk::{
     account::Account, clock::Epoch, pubkey::Pubkey, signature::Keypair,
     signer::Signer, system_program,
@@ -73,8 +75,8 @@ pub(crate) fn funded_faucet(
 pub(crate) fn fund_magic_context(bank: &Bank) {
     fund_account_with_data(
         bank,
-        &magic_program::MAGIC_CONTEXT_PUBKEY,
+        &MAGIC_CONTEXT_PUBKEY,
         u64::MAX,
-        vec![0; magic_program::MAGIC_CONTEXT_SIZE],
+        vec![0; MAGIC_CONTEXT_SIZE],
     );
 }
diff --git a/magicblock-api/src/tickers.rs b/magicblock-api/src/tickers.rs
@@ -9,8 +9,8 @@ use std::{
 use log::*;
 use magicblock_accounts::{AccountsManager, ScheduledCommitsProcessor};
 use magicblock_bank::bank::Bank;
-use magicblock_core::magic_program;
 use magicblock_ledger::Ledger;
+use magicblock_magic_program_api::{self, MAGIC_CONTEXT_PUBKEY};
 use magicblock_metrics::metrics;
 use magicblock_processor::execute_transaction::execute_legacy_transaction;
 use magicblock_program::{instruction_utils::InstructionUtils, MagicContext};
@@ -54,8 +54,11 @@ pub fn init_slot_ticker<C: ScheduledCommitsProcessor>(
 
             // If accounts were scheduled to be committed, we accept them here
             // and processs the commits
-            let magic_context_acc = bank.get_account(&magic_program::MAGIC_CONTEXT_PUBKEY)
-                .expect("Validator found to be running without MagicContext account!");
+            let magic_context_acc = bank
+                .get_account(&MAGIC_CONTEXT_PUBKEY)
+                .expect(
+                "Validator found to be running without MagicContext account!",
+            );
             if MagicContext::has_scheduled_commits(magic_context_acc.data()) {
                 handle_scheduled_commits(
                     &bank,
diff --git a/magicblock-core/Cargo.toml b/magicblock-core/Cargo.toml
@@ -8,7 +8,4 @@ license.workspace = true
 edition.workspace = true
 
 [dependencies]
-solana-program = { workspace = true }
-bincode = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-solana-account = { workspace = true }
+magicblock-magic-program-api = { workspace = true }
diff --git a/magicblock-core/src/lib.rs b/magicblock-core/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod magic_program;
 pub mod traits;
 
 /// A macro that panics when running a debug build and logs the panic message
diff --git a/magicblock-magic-program-api/Cargo.toml b/magicblock-magic-program-api/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "magicblock-magic-program-api"
+description = "Magicblock magic program api"
+license = "MIT"
+version.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
+
+[dependencies]
+solana-program = { workspace = true }
+bincode = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
diff --git a/magicblock-magic-program-api/src/args.rs b/magicblock-magic-program-api/src/args.rs
diff --git a/magicblock-magic-program-api/src/instruction.rs b/magicblock-magic-program-api/src/instruction.rs
@@ -1,10 +1,9 @@
 use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
-use solana_account::Account;
 use solana_program::pubkey::Pubkey;
 
-use crate::magic_program::args::MagicBaseIntentArgs;
+use crate::args::MagicBaseIntentArgs;
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 pub enum MagicBlockInstruction {
@@ -87,21 +86,6 @@ pub struct AccountModification {
     pub rent_epoch: Option<u64>,
 }
 
-impl From<(&Pubkey, &Account)> for AccountModification {
-    fn from(
-        (account_pubkey, account): (&Pubkey, &Account),
-    ) -> AccountModification {
-        AccountModification {
-            pubkey: *account_pubkey,
-            lamports: Some(account.lamports),
-            owner: Some(account.owner),
-            executable: Some(account.executable),
-            data: Some(account.data.clone()),
-            rent_epoch: Some(account.rent_epoch),
-        }
-    }
-}
-
 #[derive(Default, Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 pub struct AccountModificationForInstruction {
     pub lamports: Option<u64>,
diff --git a/magicblock-magic-program-api/src/lib.rs b/magicblock-magic-program-api/src/lib.rs
@@ -1,8 +1,8 @@
-use solana_program::{declare_id, pubkey, pubkey::Pubkey};
-
 pub mod args;
 pub mod instruction;
 
+pub use solana_program::{declare_id, pubkey, pubkey::Pubkey};
+
 declare_id!("Magic11111111111111111111111111111111111111");
 
 pub const MAGIC_CONTEXT_PUBKEY: Pubkey =
diff --git a/programs/magicblock/Cargo.toml b/programs/magicblock/Cargo.toml
@@ -8,6 +8,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+magicblock-magic-program-api = { workspace = true }
 bincode = { workspace = true }
 lazy_static = { workspace = true }
 num-derive = { workspace = true }
diff --git a/programs/magicblock/src/lib.rs b/programs/magicblock/src/lib.rs
@@ -10,7 +10,7 @@ mod test_utils;
 mod utils;
 pub mod validator;
 
-pub use magicblock_core::magic_program::*;
+pub use magicblock_magic_program_api::*;
 pub use mutate_accounts::*;
 pub use schedule_transactions::{
     process_scheduled_commit_sent, register_scheduled_commit_sent,
diff --git a/programs/magicblock/src/magic_context.rs b/programs/magicblock/src/magic_context.rs
@@ -1,6 +1,6 @@
 use std::mem;
 
-use magicblock_core::magic_program;
+use magicblock_magic_program_api::MAGIC_CONTEXT_SIZE;
 use serde::{Deserialize, Serialize};
 use solana_sdk::{
     account::{AccountSharedData, ReadableAccount},
@@ -22,7 +22,7 @@ pub struct MagicContext {
 }
 
 impl MagicContext {
-    pub const SIZE: usize = magic_program::MAGIC_CONTEXT_SIZE;
+    pub const SIZE: usize = MAGIC_CONTEXT_SIZE;
     pub const ZERO: [u8; Self::SIZE] = [0; Self::SIZE];
     pub(crate) fn deserialize(
         data: &AccountSharedData,
diff --git a/programs/magicblock/src/magic_scheduled_base_intent.rs b/programs/magicblock/src/magic_scheduled_base_intent.rs
@@ -1,6 +1,6 @@
 use std::{cell::RefCell, collections::HashSet};
 
-use magicblock_core::magic_program::args::{
+use magicblock_magic_program_api::args::{
     ActionArgs, BaseActionArgs, CommitAndUndelegateArgs, CommitTypeArgs,
     MagicBaseIntentArgs, UndelegateTypeArgs,
 };
diff --git a/programs/magicblock/src/magicblock_processor.rs b/programs/magicblock/src/magicblock_processor.rs
@@ -1,4 +1,4 @@
-use magicblock_core::magic_program::instruction::MagicBlockInstruction;
+use magicblock_magic_program_api::instruction::MagicBlockInstruction;
 use solana_program_runtime::declare_process_instruction;
 use solana_sdk::program_utils::limited_deserialize;
 
diff --git a/programs/magicblock/src/mutate_accounts/process_mutate_accounts.rs b/programs/magicblock/src/mutate_accounts/process_mutate_accounts.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
-use magicblock_core::magic_program::instruction::AccountModificationForInstruction;
+use magicblock_magic_program_api::instruction::AccountModificationForInstruction;
 use solana_log_collector::ic_msg;
 use solana_program_runtime::invoke_context::InvokeContext;
 use solana_sdk::{
@@ -268,7 +268,7 @@ mod tests {
     use std::collections::HashMap;
 
     use assert_matches::assert_matches;
-    use magicblock_core::magic_program::instruction::AccountModification;
+    use magicblock_magic_program_api::instruction::AccountModification;
     use solana_sdk::{
         account::{Account, AccountSharedData},
         pubkey::Pubkey,
diff --git a/programs/magicblock/src/schedule_transactions/mod.rs b/programs/magicblock/src/schedule_transactions/mod.rs
@@ -7,7 +7,7 @@ mod process_scheduled_commit_sent;
 mod schedule_base_intent_processor;
 pub(crate) mod transaction_scheduler;
 
-use magicblock_core::magic_program::MAGIC_CONTEXT_PUBKEY;
+use magicblock_magic_program_api::MAGIC_CONTEXT_PUBKEY;
 pub(crate) use process_accept_scheduled_commits::*;
 pub(crate) use process_schedule_base_intent::*;
 pub(crate) use process_schedule_commit::*;
diff --git a/programs/magicblock/src/schedule_transactions/process_schedule_base_intent.rs b/programs/magicblock/src/schedule_transactions/process_schedule_base_intent.rs
@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use magicblock_core::magic_program::args::MagicBaseIntentArgs;
+use magicblock_magic_program_api::args::MagicBaseIntentArgs;
 use solana_log_collector::ic_msg;
 use solana_program_runtime::invoke_context::InvokeContext;
 use solana_sdk::{
diff --git a/programs/magicblock/src/schedule_transactions/process_schedule_commit_tests.rs b/programs/magicblock/src/schedule_transactions/process_schedule_commit_tests.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use assert_matches::assert_matches;
-use magicblock_core::magic_program::{
+use magicblock_magic_program_api::{
     instruction::MagicBlockInstruction, MAGIC_CONTEXT_PUBKEY,
 };
 use solana_sdk::{
diff --git a/programs/magicblock/src/schedule_transactions/schedule_base_intent_processor.rs b/programs/magicblock/src/schedule_transactions/schedule_base_intent_processor.rs
@@ -1,4 +1,4 @@
-use magicblock_core::magic_program::args::MagicBaseIntentArgs;
+use magicblock_magic_program_api::args::MagicBaseIntentArgs;
 use solana_sdk::instruction::InstructionError;
 
 use crate::{
diff --git a/programs/magicblock/src/utils/instruction_utils.rs b/programs/magicblock/src/utils/instruction_utils.rs
diff --git a/test-integration/Cargo.lock b/test-integration/Cargo.lock
diff --git a/test-integration/Cargo.toml b/test-integration/Cargo.toml
diff --git a/test-integration/schedulecommit/test-scenarios/Cargo.toml b/test-integration/schedulecommit/test-scenarios/Cargo.toml
diff --git a/test-integration/schedulecommit/test-scenarios/tests/01_commits.rs b/test-integration/schedulecommit/test-scenarios/tests/01_commits.rs
diff --git a/test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs b/test-integration/schedulecommit/test-scenarios/tests/02_commit_and_undelegate.rs
diff --git a/test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs b/test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs
diff --git a/test-integration/schedulecommit/test-security/Cargo.toml b/test-integration/schedulecommit/test-security/Cargo.toml
diff --git a/test-integration/schedulecommit/test-security/tests/01_invocations.rs b/test-integration/schedulecommit/test-security/tests/01_invocations.rs
diff --git a/test-integration/schedulecommit/test-security/tests/utils/mod.rs b/test-integration/schedulecommit/test-security/tests/utils/mod.rs
