diff --git a/magicblock-api/src/fund_account.rs b/magicblock-api/src/fund_account.rs index 12583887b..e64934a66 100644 --- a/magicblock-api/src/fund_account.rs +++ b/magicblock-api/src/fund_account.rs @@ -30,7 +30,6 @@ pub(crate) fn fund_account_with_data( ) { let account = if let Some(mut acc) = accountsdb.get_account(pubkey) { acc.set_lamports(lamports); - acc.set_data(vec![0; size]); acc } else { AccountSharedData::new(lamports, size, &Default::default()) @@ -70,16 +69,20 @@ pub(crate) fn funded_faucet( } pub(crate) fn fund_magic_context(accountsdb: &AccountsDb) { + const CONTEXT_LAMPORTS: u64 = u64::MAX; + fund_account_with_data( accountsdb, &magic_program::MAGIC_CONTEXT_PUBKEY, - u64::MAX, + CONTEXT_LAMPORTS, MagicContext::SIZE, ); let mut magic_context = accountsdb .get_account(&magic_program::MAGIC_CONTEXT_PUBKEY) - .unwrap(); + .expect("magic context should have been created"); magic_context.set_delegated(true); + magic_context.set_owner(magic_program::ID); + let _ = accountsdb .insert_account(&magic_program::MAGIC_CONTEXT_PUBKEY, &magic_context); } diff --git a/test-integration/Cargo.lock b/test-integration/Cargo.lock index e372ed370..cda87e884 100644 --- a/test-integration/Cargo.lock +++ b/test-integration/Cargo.lock @@ -2251,10 +2251,10 @@ dependencies = [ [[package]] name = "guinea" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "serde", "solana-program", ] @@ -3273,7 +3273,7 @@ dependencies = [ [[package]] name = "magicblock-account-cloner" -version = "0.7.0" +version = "0.8.0" dependencies = [ "async-trait", "bincode", @@ -3283,7 +3283,7 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-ledger", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "magicblock-program", "magicblock-rpc-client", "rand 0.9.2", @@ -3305,7 +3305,7 @@ dependencies = [ [[package]] name = "magicblock-accounts" -version = "0.7.0" +version = "0.8.0" dependencies = [ "async-trait", "magicblock-account-cloner", @@ -3327,7 +3327,7 @@ dependencies = [ [[package]] name = "magicblock-accounts-db" -version = "0.7.0" +version = "0.8.0" dependencies = [ "lmdb-rkv", "magicblock-config", @@ -3342,7 +3342,7 @@ dependencies = [ [[package]] name = "magicblock-aperture" -version = "0.7.0" +version = "0.8.0" dependencies = [ "agave-geyser-plugin-interface", "arc-swap", @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "magicblock-api" -version = "0.7.0" +version = "0.8.0" dependencies = [ "anyhow", "borsh 1.6.0", @@ -3405,7 +3405,7 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-ledger", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "magicblock-metrics", "magicblock-processor", "magicblock-program", @@ -3445,7 +3445,7 @@ dependencies = [ [[package]] name = "magicblock-chainlink" -version = "0.7.0" +version = "0.8.0" dependencies = [ "arc-swap", "async-trait", @@ -3457,7 +3457,7 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-delegation-program 1.1.3 (git+https://github.com/magicblock-labs/delegation-program.git?rev=2cb491032f372)", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "magicblock-metrics", "parking_lot", "scc", @@ -3499,7 +3499,7 @@ dependencies = [ [[package]] name = "magicblock-committor-program" -version = "0.7.0" +version = "0.8.0" dependencies = [ "borsh 1.6.0", "paste", @@ -3511,7 +3511,7 @@ dependencies = [ [[package]] name = "magicblock-committor-service" -version = "0.7.0" +version = "0.8.0" dependencies = [ "async-trait", "base64 0.21.7", @@ -3555,7 +3555,7 @@ dependencies = [ [[package]] name = "magicblock-config" -version = "0.7.0" +version = "0.8.0" dependencies = [ "clap", "derive_more", @@ -3573,10 +3573,10 @@ dependencies = [ [[package]] name = "magicblock-core" -version = "0.7.0" +version = "0.8.0" dependencies = [ "flume", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "solana-account", "solana-account-decoder", "solana-hash", @@ -3628,12 +3628,12 @@ dependencies = [ "solana-security-txt", "static_assertions", "strum 0.27.2", - "thiserror 1.0.69", + "thiserror 2.0.17", ] [[package]] name = "magicblock-ledger" -version = "0.7.0" +version = "0.8.0" dependencies = [ "arc-swap", "bincode", @@ -3684,7 +3684,7 @@ dependencies = [ [[package]] name = "magicblock-magic-program-api" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", "serde", @@ -3693,7 +3693,7 @@ dependencies = [ [[package]] name = "magicblock-metrics" -version = "0.7.0" +version = "0.8.0" dependencies = [ "http-body-util", "hyper 1.8.1", @@ -3707,7 +3707,7 @@ dependencies = [ [[package]] name = "magicblock-processor" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", "magicblock-accounts-db", @@ -3743,12 +3743,12 @@ dependencies = [ [[package]] name = "magicblock-program" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", "lazy_static", "magicblock-core", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "num-derive", "num-traits", "parking_lot", @@ -3775,7 +3775,7 @@ dependencies = [ [[package]] name = "magicblock-rpc-client" -version = "0.7.0" +version = "0.8.0" dependencies = [ "solana-account", "solana-account-decoder-client-types", @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "magicblock-table-mania" -version = "0.7.0" +version = "0.8.0" dependencies = [ "ed25519-dalek", "magicblock-metrics", @@ -3823,7 +3823,7 @@ dependencies = [ [[package]] name = "magicblock-task-scheduler" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", "chrono", @@ -3849,7 +3849,7 @@ dependencies = [ [[package]] name = "magicblock-validator-admin" -version = "0.7.0" +version = "0.8.0" dependencies = [ "magicblock-delegation-program 1.1.3 (git+https://github.com/magicblock-labs/delegation-program.git?rev=2cb491032f372)", "magicblock-program", @@ -3866,7 +3866,7 @@ dependencies = [ [[package]] name = "magicblock-version" -version = "0.7.0" +version = "0.8.0" dependencies = [ "git-version", "rustc_version", @@ -4766,7 +4766,7 @@ dependencies = [ "bincode", "borsh 1.6.0", "ephemeral-rollups-sdk", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "serde", "solana-program", ] @@ -4790,7 +4790,7 @@ dependencies = [ "borsh 1.6.0", "ephemeral-rollups-sdk", "magicblock-delegation-program 1.1.3 (git+https://github.com/magicblock-labs/delegation-program.git?rev=2cb491032f372)", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "rkyv 0.7.45", "solana-program", "static_assertions", @@ -5824,7 +5824,7 @@ dependencies = [ "ephemeral-rollups-sdk", "integration-test-tools", "magicblock-core", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "program-schedulecommit", "rand 0.8.5", "schedulecommit-client", @@ -5842,7 +5842,7 @@ version = "0.0.0" dependencies = [ "integration-test-tools", "magicblock-core", - "magicblock-magic-program-api 0.7.0", + "magicblock-magic-program-api 0.8.0", "program-schedulecommit", "program-schedulecommit-security", "schedulecommit-client", @@ -8561,7 +8561,7 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "0.7.0" +version = "0.8.0" dependencies = [ "bincode", "bs58", @@ -10062,7 +10062,7 @@ dependencies = [ [[package]] name = "test-kit" -version = "0.7.0" +version = "0.8.0" dependencies = [ "guinea", "magicblock-accounts-db",