From f35686a4141d2a15c228a110fbd655d8e0c51d32 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Thu, 16 Jan 2025 03:35:34 +0400 Subject: [PATCH] use loader-instruction crate in transaction-status --- Cargo.lock | 1 + programs/sbf/Cargo.lock | 1 + svm/examples/Cargo.lock | 1 + transaction-status/Cargo.toml | 1 + transaction-status/src/parse_bpf_loader.rs | 17 +++++------------ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a623b042c1ea52..9200932bab2065 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10037,6 +10037,7 @@ dependencies = [ "solana-clock", "solana-hash", "solana-instruction", + "solana-loader-instruction", "solana-message", "solana-program", "solana-pubkey", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 9183b2a0e7c6ae..65c035a1f9bb48 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -8347,6 +8347,7 @@ dependencies = [ "solana-clock", "solana-hash", "solana-instruction", + "solana-loader-instruction", "solana-message", "solana-program", "solana-pubkey", diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index ab6897635b1a57..e64aedba80d523 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7693,6 +7693,7 @@ dependencies = [ "solana-clock", "solana-hash", "solana-instruction", + "solana-loader-instruction", "solana-message", "solana-program", "solana-pubkey", diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index aa503324e1b270..2fc6ad2959fd9e 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -24,6 +24,7 @@ solana-account-decoder = { workspace = true } solana-clock = { workspace = true } solana-hash = { workspace = true } solana-instruction = { workspace = true } +solana-loader-instruction = { workspace = true, features = ["bincode"] } solana-message = { workspace = true } solana-program = { workspace = true } solana-pubkey = { workspace = true } diff --git a/transaction-status/src/parse_bpf_loader.rs b/transaction-status/src/parse_bpf_loader.rs index 4849fd0d94fb52..9432c08eb31350 100644 --- a/transaction-status/src/parse_bpf_loader.rs +++ b/transaction-status/src/parse_bpf_loader.rs @@ -5,11 +5,9 @@ use { base64::{prelude::BASE64_STANDARD, Engine}, bincode::deserialize, serde_json::json, + solana_loader_instruction::LoaderInstruction, solana_message::{compiled_instruction::CompiledInstruction, AccountKeys}, - solana_program::{ - loader_instruction::LoaderInstruction, - loader_upgradeable_instruction::UpgradeableLoaderInstruction, - }, + solana_program::loader_upgradeable_instruction::UpgradeableLoaderInstruction, }; pub fn parse_bpf_loader( @@ -224,12 +222,8 @@ mod test { let account_keys = vec![fee_payer, account_pubkey]; let missing_account_keys = vec![account_pubkey]; - let instruction = solana_program::loader_instruction::write( - &account_pubkey, - &program_id, - offset, - bytes.clone(), - ); + let instruction = + solana_loader_instruction::write(&account_pubkey, &program_id, offset, bytes.clone()); let mut message = Message::new(&[instruction], Some(&fee_payer)); assert_eq!( parse_bpf_loader( @@ -258,8 +252,7 @@ mod test { ) .is_err()); - let instruction = - solana_program::loader_instruction::finalize(&account_pubkey, &program_id); + let instruction = solana_loader_instruction::finalize(&account_pubkey, &program_id); let mut message = Message::new(&[instruction], Some(&fee_payer)); assert_eq!( parse_bpf_loader(