From 90d6bdf293f0111cd15adfbde159653c9a942bc1 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Thu, 19 Dec 2024 18:16:07 +0400 Subject: [PATCH] fix deps --- Cargo.lock | 3 +++ programs/sbf/Cargo.lock | 1 + runtime-transaction/Cargo.toml | 5 ++++- runtime-transaction/benches/get_signature_details.rs | 8 ++++---- .../src/runtime_transaction/sdk_transactions.rs | 7 +++---- .../src/runtime_transaction/transaction_view.rs | 11 +++++++---- runtime-transaction/src/signature_details.rs | 12 ++++++------ svm/examples/Cargo.lock | 1 + 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee26908a0c55e5..4a4325d00b3462 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8719,7 +8719,9 @@ dependencies = [ "solana-compute-budget", "solana-compute-budget-instruction", "solana-compute-budget-interface", + "solana-feature-set", "solana-hash", + "solana-instruction", "solana-keypair", "solana-message", "solana-program", @@ -8732,6 +8734,7 @@ dependencies = [ "solana-system-interface", "solana-system-transaction", "solana-transaction", + "solana-transaction-error", "thiserror 2.0.8", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 58b66d1180feff..0555f146812cf9 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6871,6 +6871,7 @@ dependencies = [ "solana-signature", "solana-svm-transaction", "solana-transaction", + "solana-transaction-error", "thiserror 2.0.8", ] diff --git a/runtime-transaction/Cargo.toml b/runtime-transaction/Cargo.toml index 91cefb6766412b..dc37d849bf928d 100644 --- a/runtime-transaction/Cargo.toml +++ b/runtime-transaction/Cargo.toml @@ -21,6 +21,7 @@ solana-sdk-ids = { workspace = true } solana-signature = { workspace = true } solana-svm-transaction = { workspace = true } solana-transaction = { workspace = true } +solana-transaction-error = { workspace = true } thiserror = { workspace = true } [lib] @@ -33,11 +34,13 @@ criterion = { workspace = true } rand = { workspace = true } solana-compute-budget-instruction = { workspace = true, features = ["dev-context-only-utils"] } solana-compute-budget-interface = { workspace = true } +solana-feature-set = { workspace = true } +solana-instruction = { workspace = true } solana-keypair = { workspace = true } solana-program = { workspace = true } solana-reserved-account-keys = { workspace = true } solana-signer = { workspace = true } -solana-system-interface = { workspace = true, features = ["bincode"]} +solana-system-interface = { workspace = true, features = ["bincode"] } solana-system-transaction = { workspace = true } [package.metadata.docs.rs] diff --git a/runtime-transaction/benches/get_signature_details.rs b/runtime-transaction/benches/get_signature_details.rs index e82da4fcc265ec..061f062f0fa9b9 100644 --- a/runtime-transaction/benches/get_signature_details.rs +++ b/runtime-transaction/benches/get_signature_details.rs @@ -52,8 +52,8 @@ fn bench_get_signature_details_no_sigs_unique(c: &mut Criterion) { fn bench_get_signature_details_packed_sigs(c: &mut Criterion) { let program_ids = [ - solana_sdk::secp256k1_program::id(), - solana_sdk::ed25519_program::id(), + solana_sdk_ids::secp256k1_program::id(), + solana_sdk_ids::ed25519_program::id(), ]; for num_instructions in [4, 64] { let instructions = (0..num_instructions) @@ -87,8 +87,8 @@ fn bench_get_signature_details_packed_sigs(c: &mut Criterion) { fn bench_get_signature_details_mixed_sigs(c: &mut Criterion) { let program_ids = [ - solana_sdk::secp256k1_program::id(), - solana_sdk::ed25519_program::id(), + solana_sdk_ids::secp256k1_program::id(), + solana_sdk_ids::ed25519_program::id(), ] .into_iter() .chain((0..6).map(|_| Pubkey::new_unique())) diff --git a/runtime-transaction/src/runtime_transaction/sdk_transactions.rs b/runtime-transaction/src/runtime_transaction/sdk_transactions.rs index bb64cafa67afc2..61167b7c253713 100644 --- a/runtime-transaction/src/runtime_transaction/sdk_transactions.rs +++ b/runtime-transaction/src/runtime_transaction/sdk_transactions.rs @@ -9,10 +9,9 @@ use { solana_pubkey::Pubkey, solana_svm_transaction::instruction::SVMInstruction, solana_transaction::{ - sanitized::SanitizedTransaction, + sanitized::{MessageHash, SanitizedTransaction}, simple_vote_transaction_checker::is_simple_vote_transaction, versioned::{sanitized::SanitizedVersionedTransaction, VersionedTransaction}, - MessageHash, }, solana_transaction_error::TransactionResult as Result, std::{borrow::Cow, collections::HashSet}, @@ -159,12 +158,12 @@ mod tests { solana_hash::Hash, solana_instruction::Instruction, solana_keypair::Keypair, - solana_message::Message, + solana_message::{Message, SimpleAddressLoader}, solana_program::vote::{self, state::Vote}, solana_reserved_account_keys::ReservedAccountKeys, solana_signer::Signer, solana_system_interface::instruction as system_instruction, - solana_transaction::{versioned::VersionedTransaction, SimpleAddressLoader, Transaction}, + solana_transaction::{versioned::VersionedTransaction, Transaction}, }; fn vote_sanitized_versioned_transaction() -> SanitizedVersionedTransaction { diff --git a/runtime-transaction/src/runtime_transaction/transaction_view.rs b/runtime-transaction/src/runtime_transaction/transaction_view.rs index 74c178f2306c46..0a09fc2c310cae 100644 --- a/runtime-transaction/src/runtime_transaction/transaction_view.rs +++ b/runtime-transaction/src/runtime_transaction/transaction_view.rs @@ -18,9 +18,11 @@ use { solana_pubkey::Pubkey, solana_svm_transaction::svm_message::SVMMessage, solana_transaction::{ - simple_vote_transaction_checker::is_simple_vote_transaction_impl, MessageHash, Result, - SanitizedTransaction, TransactionError, VersionedTransaction, + sanitized::{MessageHash, SanitizedTransaction}, + simple_vote_transaction_checker::is_simple_vote_transaction_impl, + versioned::VersionedTransaction, }, + solana_transaction_error::{TransactionError, TransactionResult as Result}, std::{borrow::Cow, collections::HashSet}, }; @@ -191,10 +193,11 @@ mod tests { use { super::*, solana_hash::Hash, + solana_keypair::Keypair, solana_message::{v0, AddressLookupTableAccount, SimpleAddressLoader}, solana_reserved_account_keys::ReservedAccountKeys, - solana_signature::{Keypair, Signature}, - solana_solana_system_interface::instruction as system_instruction, + solana_signature::Signature, + solana_system_interface::instruction as system_instruction, solana_system_transaction as system_transaction, }; diff --git a/runtime-transaction/src/signature_details.rs b/runtime-transaction/src/signature_details.rs index 888376a960d7e6..36170da1451352 100644 --- a/runtime-transaction/src/signature_details.rs +++ b/runtime-transaction/src/signature_details.rs @@ -90,9 +90,9 @@ impl SignatureDetailsFilter { #[inline] fn check_program_id(program_id: &Pubkey) -> ProgramIdStatus { - if program_id == &solana_sdk::secp256k1_program::ID { + if program_id == &solana_sdk_ids::secp256k1_program::ID { ProgramIdStatus::Secp256k1 - } else if program_id == &solana_sdk::ed25519_program::ID { + } else if program_id == &solana_sdk_ids::ed25519_program::ID { ProgramIdStatus::Ed25519 } else if program_id == &solana_sdk_ids::secp256r1_program::ID { ProgramIdStatus::Secp256r1 @@ -148,8 +148,8 @@ mod tests { fn test_get_signature_details_signatures_mixed() { let program_ids = [ Pubkey::new_unique(), - solana_sdk::secp256k1_program::ID, - solana_sdk::ed25519_program::ID, + solana_sdk_ids::secp256k1_program::ID, + solana_sdk_ids::ed25519_program::ID, solana_sdk_ids::secp256r1_program::ID, ]; let instructions = [ @@ -172,8 +172,8 @@ mod tests { #[test] fn test_get_signature_details_missing_num_signatures() { let program_ids = [ - solana_sdk::secp256k1_program::ID, - solana_sdk::ed25519_program::ID, + solana_sdk_ids::secp256k1_program::ID, + solana_sdk_ids::ed25519_program::ID, solana_sdk_ids::secp256r1_program::ID, ]; let instructions = [ diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index f05434978d4580..abe8f2a25ad5e2 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -6690,6 +6690,7 @@ dependencies = [ "solana-signature", "solana-svm-transaction", "solana-transaction", + "solana-transaction-error", "thiserror 2.0.8", ]