diff --git a/Cargo.lock b/Cargo.lock index 0b4880230fdc23..653f1ed41d602b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9867,6 +9867,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", + "solana-pubkey", "solana-sdk", "solana-transaction-status-client-types", "spl-associated-token-account", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index af9ba38b532a29..9077645b6dbef4 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -8200,6 +8200,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", + "solana-pubkey", "solana-sdk", "solana-transaction-status-client-types", "spl-associated-token-account", diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 9f07eef8f54ae7..5d5538c2f9aeb8 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7536,6 +7536,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", + "solana-pubkey", "solana-sdk", "solana-transaction-status-client-types", "spl-associated-token-account", diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index c4de162f9a8e7f..2c87f07aa7959a 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -21,6 +21,7 @@ serde = { workspace = true } serde_derive = { workspace = true } serde_json = { workspace = true } solana-account-decoder = { workspace = true } +solana-pubkey = { workspace = true } solana-sdk = { workspace = true } solana-transaction-status-client-types = { workspace = true } spl-associated-token-account = { workspace = true, features = ["no-entrypoint"] } diff --git a/transaction-status/src/extract_memos.rs b/transaction-status/src/extract_memos.rs index c040ad3b903649..d089c095aa2031 100644 --- a/transaction-status/src/extract_memos.rs +++ b/transaction-status/src/extract_memos.rs @@ -8,13 +8,13 @@ use { }; // A helper function to convert spl_memo::v1::id() as spl_sdk::pubkey::Pubkey to -// solana_sdk::pubkey::Pubkey +// solana_pubkey::Pubkey pub fn spl_memo_id_v1() -> Pubkey { *MEMO_PROGRAM_ID_V1 } // A helper function to convert spl_memo::id() as spl_sdk::pubkey::Pubkey to -// solana_sdk::pubkey::Pubkey +// solana_pubkey::Pubkey pub fn spl_memo_id_v3() -> Pubkey { *MEMO_PROGRAM_ID_V3 } diff --git a/transaction-status/src/parse_associated_token.rs b/transaction-status/src/parse_associated_token.rs index 868f453f1ce22b..3444f510ed7a69 100644 --- a/transaction-status/src/parse_associated_token.rs +++ b/transaction-status/src/parse_associated_token.rs @@ -9,7 +9,7 @@ use { }; // A helper function to convert spl_associated_token_account::id() as spl_sdk::pubkey::Pubkey -// to solana_sdk::pubkey::Pubkey +// to solana_pubkey::Pubkey pub fn spl_associated_token_id() -> Pubkey { Pubkey::new_from_array(spl_associated_token_account::id().to_bytes()) } diff --git a/transaction-status/src/parse_token.rs b/transaction-status/src/parse_token.rs index 5660da3024afdc..93bf8f48000410 100644 --- a/transaction-status/src/parse_token.rs +++ b/transaction-status/src/parse_token.rs @@ -1782,7 +1782,7 @@ mod test { } fn test_token_ix_not_enough_keys(program_id: &Pubkey) { - let keys: Vec = repeat_with(solana_sdk::pubkey::new_rand).take(10).collect(); + let keys: Vec = repeat_with(solana_pubkey::new_rand).take(10).collect(); // Test InitializeMint variations let initialize_mint_ix = diff --git a/transaction-status/src/parse_token/extension/cpi_guard.rs b/transaction-status/src/parse_token/extension/cpi_guard.rs index a6a8f26dfb47aa..112abd4fadb0c6 100644 --- a/transaction-status/src/parse_token/extension/cpi_guard.rs +++ b/transaction-status/src/parse_token/extension/cpi_guard.rs @@ -40,7 +40,7 @@ pub(in crate::parse_token) fn parse_cpi_guard_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{ extension::cpi_guard::instruction::{disable_cpi_guard, enable_cpi_guard}, solana_program::message::Message, diff --git a/transaction-status/src/parse_token/extension/default_account_state.rs b/transaction-status/src/parse_token/extension/default_account_state.rs index a5f8a7b016a599..fac02cca7bc51b 100644 --- a/transaction-status/src/parse_token/extension/default_account_state.rs +++ b/transaction-status/src/parse_token/extension/default_account_state.rs @@ -54,7 +54,7 @@ pub(in crate::parse_token) fn parse_default_account_state_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{ extension::default_account_state::instruction::{ initialize_default_account_state, update_default_account_state, diff --git a/transaction-status/src/parse_token/extension/group_member_pointer.rs b/transaction-status/src/parse_token/extension/group_member_pointer.rs index 24d0503dc51ef7..af30b2d6617358 100644 --- a/transaction-status/src/parse_token/extension/group_member_pointer.rs +++ b/transaction-status/src/parse_token/extension/group_member_pointer.rs @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_group_member_pointer_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_group_member_pointer_instruction() { diff --git a/transaction-status/src/parse_token/extension/group_pointer.rs b/transaction-status/src/parse_token/extension/group_pointer.rs index 5800a2fd8850f9..303b58ce9edcd3 100644 --- a/transaction-status/src/parse_token/extension/group_pointer.rs +++ b/transaction-status/src/parse_token/extension/group_pointer.rs @@ -68,7 +68,7 @@ pub(in crate::parse_token) fn parse_group_pointer_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_group_pointer_instruction() { diff --git a/transaction-status/src/parse_token/extension/memo_transfer.rs b/transaction-status/src/parse_token/extension/memo_transfer.rs index 6106e2fab64abe..6e1f4e79d907bc 100644 --- a/transaction-status/src/parse_token/extension/memo_transfer.rs +++ b/transaction-status/src/parse_token/extension/memo_transfer.rs @@ -40,7 +40,7 @@ pub(in crate::parse_token) fn parse_memo_transfer_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{ extension::memo_transfer::instruction::{ disable_required_transfer_memos, enable_required_transfer_memos, diff --git a/transaction-status/src/parse_token/extension/metadata_pointer.rs b/transaction-status/src/parse_token/extension/metadata_pointer.rs index 657078ca80af53..855b2057d60052 100644 --- a/transaction-status/src/parse_token/extension/metadata_pointer.rs +++ b/transaction-status/src/parse_token/extension/metadata_pointer.rs @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_metadata_pointer_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_metadata_pointer_instruction() { diff --git a/transaction-status/src/parse_token/extension/mint_close_authority.rs b/transaction-status/src/parse_token/extension/mint_close_authority.rs index 6108796122ada9..2f6756440af22e 100644 --- a/transaction-status/src/parse_token/extension/mint_close_authority.rs +++ b/transaction-status/src/parse_token/extension/mint_close_authority.rs @@ -23,7 +23,7 @@ mod test { use { super::*, serde_json::Value, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{instruction::*, solana_program::message::Message}, }; diff --git a/transaction-status/src/parse_token/extension/permanent_delegate.rs b/transaction-status/src/parse_token/extension/permanent_delegate.rs index 262d5ec04afd81..87a520c535c788 100644 --- a/transaction-status/src/parse_token/extension/permanent_delegate.rs +++ b/transaction-status/src/parse_token/extension/permanent_delegate.rs @@ -19,7 +19,7 @@ pub(in crate::parse_token) fn parse_initialize_permanent_delegate_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{instruction::*, solana_program::message::Message}, }; diff --git a/transaction-status/src/parse_token/extension/reallocate.rs b/transaction-status/src/parse_token/extension/reallocate.rs index 623f8e1b5c81eb..c9f1bac993ee44 100644 --- a/transaction-status/src/parse_token/extension/reallocate.rs +++ b/transaction-status/src/parse_token/extension/reallocate.rs @@ -31,7 +31,7 @@ pub(in crate::parse_token) fn parse_reallocate_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{instruction::reallocate, solana_program::message::Message}, }; diff --git a/transaction-status/src/parse_token/extension/token_group.rs b/transaction-status/src/parse_token/extension/token_group.rs index c62a3c20d15163..3ca5ee1a6c92b5 100644 --- a/transaction-status/src/parse_token/extension/token_group.rs +++ b/transaction-status/src/parse_token/extension/token_group.rs @@ -74,7 +74,7 @@ pub(in crate::parse_token) fn parse_token_group_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_token_group_instruction() { diff --git a/transaction-status/src/parse_token/extension/token_metadata.rs b/transaction-status/src/parse_token/extension/token_metadata.rs index a061a453ef75f4..2c800b008789c3 100644 --- a/transaction-status/src/parse_token/extension/token_metadata.rs +++ b/transaction-status/src/parse_token/extension/token_metadata.rs @@ -104,7 +104,7 @@ pub(in crate::parse_token) fn parse_token_metadata_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_token_metadata_instruction() { diff --git a/transaction-status/src/parse_token/extension/transfer_fee.rs b/transaction-status/src/parse_token/extension/transfer_fee.rs index bd582d5c1da97f..99c7159b74de63 100644 --- a/transaction-status/src/parse_token/extension/transfer_fee.rs +++ b/transaction-status/src/parse_token/extension/transfer_fee.rs @@ -161,7 +161,7 @@ pub(in crate::parse_token) fn parse_transfer_fee_instruction( mod test { use { super::*, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, spl_token_2022::{ extension::transfer_fee::instruction::*, solana_program::message::Message, }, diff --git a/transaction-status/src/parse_token/extension/transfer_hook.rs b/transaction-status/src/parse_token/extension/transfer_hook.rs index 68e3bab2b78cea..c28520ec6692af 100644 --- a/transaction-status/src/parse_token/extension/transfer_hook.rs +++ b/transaction-status/src/parse_token/extension/transfer_hook.rs @@ -68,7 +68,7 @@ pub(in crate::parse_token) fn parse_transfer_hook_instruction( #[cfg(test)] mod test { - use {super::*, solana_sdk::pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; + use {super::*, solana_pubkey::Pubkey, spl_token_2022::solana_program::message::Message}; #[test] fn test_parse_transfer_hook_instruction() {