remove solana-sdk from transaction-status

transaction-status/Cargo.toml

@@ -21,9 +21,19 @@ serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-account-decoder = { workspace = true }
+solana-clock = { workspace = true }
+solana-hash = { workspace = true }
+solana-instruction = { workspace = true }
 solana-message = { workspace = true }
+solana-program = { workspace = true }
 solana-pubkey = { workspace = true }
-solana-sdk = { workspace = true }
+solana-reserved-account-keys = { workspace = true }
+solana-reward-info = { workspace = true }
+solana-sdk-ids = { workspace = true }
+solana-signature = { workspace = true }
+solana-system-interface = { workspace = true }
+solana-transaction = { workspace = true }
+solana-transaction-error = { workspace = true }
 solana-transaction-status-client-types = { workspace = true }
 spl-associated-token-account = { workspace = true, features = ["no-entrypoint"] }
 spl-memo = { workspace = true, features = ["no-entrypoint"] }
@@ -35,6 +45,7 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 bytemuck = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
 spl-token-confidential-transfer-proof-extraction = { workspace = true }
 
 [package.metadata.docs.rs]

transaction-status/benches/extract_memos.rs

@@ -4,7 +4,7 @@ extern crate test;
 
 use {
     solana_message::{compiled_instruction::CompiledInstruction, Message},
-    solana_sdk::pubkey::Pubkey,
+    solana_pubkey::Pubkey,
     solana_transaction_status::extract_memos::{spl_memo_id_v1, spl_memo_id_v3, ExtractMemos},
     test::Bencher,
 };

transaction-status/src/extract_memos.rs

@@ -3,7 +3,7 @@ use {
     solana_message::{
         compiled_instruction::CompiledInstruction, AccountKeys, Message, SanitizedMessage,
     },
-    solana_sdk::pubkey::Pubkey,
+    solana_pubkey::Pubkey,
 };
 
 // A helper function to convert spl_memo::v1::id() as spl_sdk::pubkey::Pubkey to

transaction-status/src/lib.rs

@@ -2,7 +2,7 @@
 
 pub use {
     crate::extract_memos::extract_and_fmt_memos,
-    solana_sdk::reward_type::RewardType,
+    solana_reward_info::RewardType,
     solana_transaction_status_client_types::{
         option_serializer, ConfirmedTransactionStatusWithSignature, EncodeError,
         EncodedConfirmedBlock, EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
@@ -23,19 +23,21 @@ use {
         parse_instruction::parse,
     },
     base64::{prelude::BASE64_STANDARD, Engine},
+    solana_clock::{Slot, UnixTimestamp},
+    solana_hash::Hash,
     solana_message::{
         compiled_instruction::CompiledInstruction,
         v0::{self, LoadedAddresses, LoadedMessage},
         AccountKeys, Message, VersionedMessage,
     },
-    solana_sdk::{
-        clock::{Slot, UnixTimestamp},
-        hash::Hash,
-        pubkey::Pubkey,
-        reserved_account_keys::ReservedAccountKeys,
-        signature::Signature,
-        transaction::{Transaction, TransactionError, TransactionVersion, VersionedTransaction},
+    solana_pubkey::Pubkey,
+    solana_reserved_account_keys::ReservedAccountKeys,
+    solana_signature::Signature,
+    solana_transaction::{
+        versioned::{TransactionVersion, VersionedTransaction},
+        Transaction,
     },
+    solana_transaction_error::TransactionError,
     std::collections::HashSet,
     thiserror::Error,
 };
@@ -120,7 +122,7 @@ pub fn parse_ui_instruction(
 /// Maps a list of inner instructions from `solana_sdk` into a list of this
 /// crate's representation of inner instructions (with instruction indices).
 pub fn map_inner_instructions(
-    inner_instructions: solana_sdk::inner_instruction::InnerInstructionsList,
+    inner_instructions: solana_message::inner_instruction::InnerInstructionsList,
 ) -> impl Iterator<Item = InnerInstructions> {
     inner_instructions
         .into_iter()

transaction-status/src/parse_accounts.rs

@@ -1,7 +1,7 @@
 pub use solana_transaction_status_client_types::{ParsedAccount, ParsedAccountSource};
 use {
     solana_message::{v0::LoadedMessage, Message},
-    solana_sdk::reserved_account_keys::ReservedAccountKeys,
+    solana_reserved_account_keys::ReservedAccountKeys,
 };
 
 pub fn parse_legacy_message_accounts(message: &Message) -> Vec<ParsedAccount> {
@@ -41,7 +41,8 @@ mod test {
     use {
         super::*,
         solana_message::{v0, v0::LoadedAddresses, MessageHeader},
-        solana_sdk::{pubkey::Pubkey, reserved_account_keys::ReservedAccountKeys},
+        solana_pubkey::Pubkey,
+        solana_reserved_account_keys::ReservedAccountKeys,
     };
 
     #[test]

transaction-status/src/parse_address_lookup_table.rs

@@ -5,7 +5,7 @@ use {
     bincode::deserialize,
     serde_json::json,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::address_lookup_table::instruction::ProgramInstruction,
+    solana_program::address_lookup_table::instruction::ProgramInstruction,
 };
 
 pub fn parse_address_lookup_table(
@@ -114,10 +114,8 @@ fn check_num_address_lookup_table_accounts(
 #[cfg(test)]
 mod test {
     use {
-        super::*,
-        solana_message::Message,
-        solana_sdk::{address_lookup_table::instruction, pubkey::Pubkey, system_program},
-        std::str::FromStr,
+        super::*, solana_message::Message, solana_program::address_lookup_table::instruction,
+        solana_pubkey::Pubkey, solana_sdk_ids::system_program, std::str::FromStr,
     };
 
     #[test]

transaction-status/src/parse_associated_token.rs

@@ -5,7 +5,7 @@ use {
     borsh::BorshDeserialize,
     serde_json::json,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::pubkey::Pubkey,
+    solana_pubkey::Pubkey,
     spl_associated_token_account::instruction::AssociatedTokenAccountInstruction,
 };
 
@@ -96,7 +96,7 @@ mod test {
     use {
         super::*,
         solana_message::Message,
-        solana_sdk::sysvar,
+        solana_sdk_ids::sysvar,
         spl_associated_token_account::{
             get_associated_token_address, get_associated_token_address_with_program_id,
             instruction::{
@@ -123,7 +123,7 @@ mod test {
                 "account": associated_account_address.to_string(),
                 "wallet": wallet_address.to_string(),
                 "mint": mint.to_string(),
-                "systemProgram": solana_sdk::system_program::id().to_string(),
+                "systemProgram": solana_sdk_ids::system_program::id().to_string(),
                 "tokenProgram": spl_token::id().to_string(),
             }),
         };
@@ -186,7 +186,7 @@ mod test {
                     "account": associated_account_address.to_string(),
                     "wallet": wallet_address.to_string(),
                     "mint": mint.to_string(),
-                    "systemProgram": solana_sdk::system_program::id().to_string(),
+                    "systemProgram": solana_sdk_ids::system_program::id().to_string(),
                     "tokenProgram": token_program_id.to_string(),
                 })
             }
@@ -228,7 +228,7 @@ mod test {
                     "account": associated_account_address.to_string(),
                     "wallet": wallet_address.to_string(),
                     "mint": mint.to_string(),
-                    "systemProgram": solana_sdk::system_program::id().to_string(),
+                    "systemProgram": solana_sdk_ids::system_program::id().to_string(),
                     "tokenProgram": token_program_id.to_string(),
                 })
             }

transaction-status/src/parse_bpf_loader.rs

@@ -6,7 +6,7 @@ use {
     bincode::deserialize,
     serde_json::json,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::{
+    solana_program::{
         loader_instruction::LoaderInstruction,
         loader_upgradeable_instruction::UpgradeableLoaderInstruction,
     },
@@ -209,11 +209,9 @@ mod test {
         super::*,
         serde_json::Value,
         solana_message::Message,
-        solana_sdk::{
-            bpf_loader_upgradeable,
-            pubkey::{self, Pubkey},
-            system_program, sysvar,
-        },
+        solana_program::bpf_loader_upgradeable,
+        solana_pubkey::{self as pubkey, Pubkey},
+        solana_sdk_ids::{system_program, sysvar},
     };
 
     #[test]
@@ -226,7 +224,7 @@ mod test {
         let account_keys = vec![fee_payer, account_pubkey];
         let missing_account_keys = vec![account_pubkey];
 
-        let instruction = solana_sdk::loader_instruction::write(
+        let instruction = solana_program::loader_instruction::write(
             &account_pubkey,
             &program_id,
             offset,
@@ -260,7 +258,8 @@ mod test {
         )
         .is_err());
 
-        let instruction = solana_sdk::loader_instruction::finalize(&account_pubkey, &program_id);
+        let instruction =
+            solana_program::loader_instruction::finalize(&account_pubkey, &program_id);
         let mut message = Message::new(&[instruction], Some(&fee_payer));
         assert_eq!(
             parse_bpf_loader(

transaction-status/src/parse_instruction.rs

@@ -14,7 +14,8 @@ use {
     serde_json::Value,
     solana_account_decoder::parse_token::spl_token_ids,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::{address_lookup_table, pubkey::Pubkey, stake, system_program, vote},
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::{address_lookup_table, stake, system_program, vote},
     std::{
         collections::HashMap,
         str::{from_utf8, Utf8Error},
@@ -23,15 +24,16 @@ use {
 };
 
 lazy_static! {
-    static ref ADDRESS_LOOKUP_PROGRAM_ID: Pubkey = address_lookup_table::program::id();
+    static ref ADDRESS_LOOKUP_PROGRAM_ID: Pubkey = address_lookup_table::id();
     static ref ASSOCIATED_TOKEN_PROGRAM_ID: Pubkey = spl_associated_token_id();
-    static ref BPF_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader::id();
-    static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader_upgradeable::id();
+    static ref BPF_LOADER_PROGRAM_ID: Pubkey = solana_sdk_ids::bpf_loader::id();
+    static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey =
+        solana_sdk_ids::bpf_loader_upgradeable::id();
     static ref MEMO_V1_PROGRAM_ID: Pubkey = spl_memo_id_v1();
     static ref MEMO_V3_PROGRAM_ID: Pubkey = spl_memo_id_v3();
-    static ref STAKE_PROGRAM_ID: Pubkey = stake::program::id();
+    static ref STAKE_PROGRAM_ID: Pubkey = stake::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
-    static ref VOTE_PROGRAM_ID: Pubkey = vote::program::id();
+    static ref VOTE_PROGRAM_ID: Pubkey = vote::id();
     static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableProgram> = {
         let mut m = HashMap::new();
         m.insert(

transaction-status/src/parse_stake.rs

@@ -5,7 +5,7 @@ use {
     bincode::deserialize,
     serde_json::{json, Map, Value},
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::stake::instruction::StakeInstruction,
+    solana_program::stake::instruction::StakeInstruction,
 };
 
 pub fn parse_stake(
@@ -331,17 +331,15 @@ fn check_num_stake_accounts(accounts: &[u8], num: usize) -> Result<(), ParseInst
 mod test {
     use {
         super::*,
+        solana_instruction::Instruction,
         solana_message::Message,
-        solana_sdk::{
-            instruction::Instruction,
-            pubkey::Pubkey,
-            stake::{
-                config,
-                instruction::{self, LockupArgs},
-                state::{Authorized, Lockup, StakeAuthorize},
-            },
-            sysvar,
+        solana_program::stake::{
+            config,
+            instruction::{self, LockupArgs},
+            state::{Authorized, Lockup, StakeAuthorize},
         },
+        solana_pubkey::Pubkey,
+        solana_sdk_ids::sysvar,
         std::iter::repeat_with,
     };
 

transaction-status/src/parse_system.rs

@@ -5,7 +5,7 @@ use {
     bincode::deserialize,
     serde_json::json,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_sdk::system_instruction::SystemInstruction,
+    solana_system_interface::instruction::SystemInstruction,
 };
 
 pub fn parse_system(
@@ -208,9 +208,8 @@ fn check_num_system_accounts(accounts: &[u8], num: usize) -> Result<(), ParseIns
 #[cfg(test)]
 mod test {
     use {
-        super::*,
-        solana_message::Message,
-        solana_sdk::{pubkey::Pubkey, system_instruction, sysvar},
+        super::*, solana_message::Message, solana_pubkey::Pubkey, solana_sdk_ids::sysvar,
+        solana_system_interface::instruction as system_instruction,
     };
 
     #[test]