diff --git a/Cargo.lock b/Cargo.lock index 6e39af6b18453d..ab5874283bc759 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9018,11 +9018,12 @@ name = "solana-svm-transaction" version = "2.2.0" dependencies = [ "solana-hash", + "solana-message", "solana-nonce", - "solana-program", "solana-pubkey", "solana-sdk-ids", "solana-signature", + "solana-system-interface", "solana-transaction", "static_assertions", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index a91d145496c440..4aabc16f3c955e 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7600,7 +7600,7 @@ name = "solana-svm-transaction" version = "2.2.0" dependencies = [ "solana-hash", - "solana-program", + "solana-message", "solana-pubkey", "solana-sdk-ids", "solana-signature", diff --git a/svm-transaction/Cargo.toml b/svm-transaction/Cargo.toml index cbd28187241dff..e6d690a501332b 100644 --- a/svm-transaction/Cargo.toml +++ b/svm-transaction/Cargo.toml @@ -11,12 +11,14 @@ edition = { workspace = true } [dependencies] solana-hash = { workspace = true } -solana-program = { workspace = true, default-features = false } +solana-message = { workspace = true } solana-pubkey = { workspace = true } solana-sdk-ids = { workspace = true } solana-signature = { workspace = true } solana-transaction = { workspace = true } [dev-dependencies] +solana-message = { workspace = true, features = ["bincode"] } solana-nonce = { workspace = true } +solana-system-interface = { workspace = true } static_assertions = { workspace = true } diff --git a/svm-transaction/src/instruction.rs b/svm-transaction/src/instruction.rs index bd8804764dbe38..acf1cb06502909 100644 --- a/svm-transaction/src/instruction.rs +++ b/svm-transaction/src/instruction.rs @@ -1,4 +1,4 @@ -use solana_program::instruction::CompiledInstruction; +use solana_message::compiled_instruction::CompiledInstruction; /// A non-owning version of [`CompiledInstruction`] that references /// slices of account indexes and data. diff --git a/svm-transaction/src/message_address_table_lookup.rs b/svm-transaction/src/message_address_table_lookup.rs index 2edb3792d1e8ca..4bb013df36f1f6 100644 --- a/svm-transaction/src/message_address_table_lookup.rs +++ b/svm-transaction/src/message_address_table_lookup.rs @@ -1,4 +1,4 @@ -use {solana_program::message::v0, solana_pubkey::Pubkey}; +use {solana_message::v0, solana_pubkey::Pubkey}; /// A non-owning version of [`v0::MessageAddressTableLookup`]. /// This simply references the data in the original message. diff --git a/svm-transaction/src/svm_message.rs b/svm-transaction/src/svm_message.rs index b9f0efc2c6f92b..3b2e6fd9a41d79 100644 --- a/svm-transaction/src/svm_message.rs +++ b/svm-transaction/src/svm_message.rs @@ -4,7 +4,7 @@ use { }, core::fmt::Debug, solana_hash::Hash, - solana_program::message::AccountKeys, + solana_message::AccountKeys, solana_pubkey::Pubkey, solana_sdk_ids::system_program, }; diff --git a/svm-transaction/src/svm_message/sanitized_message.rs b/svm-transaction/src/svm_message/sanitized_message.rs index fe3c524336e69a..c225cb975bd2b1 100644 --- a/svm-transaction/src/svm_message/sanitized_message.rs +++ b/svm-transaction/src/svm_message/sanitized_message.rs @@ -4,7 +4,7 @@ use { svm_message::SVMMessage, }, solana_hash::Hash, - solana_program::message::{AccountKeys, SanitizedMessage}, + solana_message::{AccountKeys, SanitizedMessage}, solana_pubkey::Pubkey, }; diff --git a/svm-transaction/src/svm_message/sanitized_transaction.rs b/svm-transaction/src/svm_message/sanitized_transaction.rs index e45085a4c71f17..8486981140f20a 100644 --- a/svm-transaction/src/svm_message/sanitized_transaction.rs +++ b/svm-transaction/src/svm_message/sanitized_transaction.rs @@ -4,7 +4,7 @@ use { svm_message::SVMMessage, }, solana_hash::Hash, - solana_program::message::AccountKeys, + solana_message::AccountKeys, solana_pubkey::Pubkey, solana_transaction::sanitized::SanitizedTransaction, }; diff --git a/svm-transaction/src/tests.rs b/svm-transaction/src/tests.rs index 6f0d5097d4417f..36c80eece4d36d 100644 --- a/svm-transaction/src/tests.rs +++ b/svm-transaction/src/tests.rs @@ -2,18 +2,16 @@ use { crate::svm_message::SVMMessage, solana_hash::Hash, - solana_program::{ - instruction::CompiledInstruction, - message::{ - legacy, - v0::{self, LoadedAddresses, MessageAddressTableLookup}, - MessageHeader, SanitizedMessage, SanitizedVersionedMessage, SimpleAddressLoader, - VersionedMessage, - }, - system_instruction::SystemInstruction, + solana_message::{ + compiled_instruction::CompiledInstruction, + legacy, + v0::{self, LoadedAddresses, MessageAddressTableLookup}, + MessageHeader, SanitizedMessage, SanitizedVersionedMessage, SimpleAddressLoader, + VersionedMessage, }, solana_pubkey::Pubkey, solana_sdk_ids::system_program, + solana_system_interface::instruction::SystemInstruction, std::collections::HashSet, }; diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 014dfa0e8af56a..7bd58e61e953d3 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -6945,7 +6945,7 @@ name = "solana-svm-transaction" version = "2.2.0" dependencies = [ "solana-hash", - "solana-program", + "solana-message", "solana-pubkey", "solana-sdk-ids", "solana-signature",