From 1b36926a2fcc7775fd98c6132f9409c8c21f1836 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 9 Dec 2024 20:44:01 +0400 Subject: [PATCH] remove solana-sdk from solana-entry (#3998) * remove solana-sdk from solana-entry * sort deps --- Cargo.lock | 13 ++++++++++- entry/Cargo.toml | 13 ++++++++++- entry/benches/entry_sigverify.rs | 15 +++++++------ entry/src/entry.rs | 38 ++++++++++++++++---------------- entry/src/poh.rs | 6 +++-- programs/sbf/Cargo.lock | 6 ++++- svm/examples/Cargo.lock | 6 ++++- 7 files changed, 65 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 315ba7db14fd56..55d38fbd924e31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6963,14 +6963,25 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", + "solana-hash", + "solana-keypair", "solana-logger", "solana-measure", "solana-merkle-tree", + "solana-message", "solana-metrics", + "solana-packet", "solana-perf", + "solana-pubkey", "solana-rayon-threadlimit", + "solana-reserved-account-keys", "solana-runtime-transaction", - "solana-sdk", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-transaction", + "solana-transaction-error", ] [[package]] diff --git a/entry/Cargo.toml b/entry/Cargo.toml index 75c429d35f8e80..413d2ba6e4053e 100644 --- a/entry/Cargo.toml +++ b/entry/Cargo.toml @@ -18,18 +18,29 @@ log = { workspace = true } rand = { workspace = true } rayon = { workspace = true } serde = { workspace = true } +solana-hash = { workspace = true } solana-measure = { workspace = true } solana-merkle-tree = { workspace = true } solana-metrics = { workspace = true } +solana-packet = { workspace = true } solana-perf = { workspace = true } solana-rayon-threadlimit = { workspace = true } solana-runtime-transaction = { workspace = true } -solana-sdk = { workspace = true } +solana-sha256-hasher = { workspace = true } +solana-transaction = { workspace = true } +solana-transaction-error = { workspace = true } [dev-dependencies] assert_matches = { workspace = true } +solana-keypair = { workspace = true } solana-logger = { workspace = true } +solana-message = { workspace = true } solana-perf = { workspace = true, features = ["dev-context-only-utils"] } +solana-pubkey = { workspace = true } +solana-reserved-account-keys = { workspace = true } +solana-signature = { workspace = true } +solana-signer = { workspace = true } +solana-system-transaction = { workspace = true } [lib] crate-type = ["lib"] diff --git a/entry/benches/entry_sigverify.rs b/entry/benches/entry_sigverify.rs index 7df8eb017ff8b5..a4488af586f71e 100644 --- a/entry/benches/entry_sigverify.rs +++ b/entry/benches/entry_sigverify.rs @@ -2,16 +2,17 @@ extern crate test; use { solana_entry::entry::{self, VerifyRecyclers}, + solana_hash::Hash, + solana_message::SimpleAddressLoader, solana_perf::test_tx::test_tx, + solana_reserved_account_keys::ReservedAccountKeys, solana_runtime_transaction::runtime_transaction::RuntimeTransaction, - solana_sdk::{ - hash::Hash, - reserved_account_keys::ReservedAccountKeys, - transaction::{ - MessageHash, Result, SanitizedTransaction, SimpleAddressLoader, - TransactionVerificationMode, VersionedTransaction, - }, + solana_transaction::{ + sanitized::{MessageHash, SanitizedTransaction}, + versioned::VersionedTransaction, + TransactionVerificationMode, }, + solana_transaction_error::TransactionResult as Result, std::sync::Arc, test::Bencher, }; diff --git a/entry/src/entry.rs b/entry/src/entry.rs index 456a7f793413e5..ee1e7eb2c706b4 100644 --- a/entry/src/entry.rs +++ b/entry/src/entry.rs @@ -10,9 +10,11 @@ use { rand::{thread_rng, Rng}, rayon::{prelude::*, ThreadPool}, serde::{Deserialize, Serialize}, + solana_hash::Hash, solana_measure::measure::Measure, solana_merkle_tree::MerkleTree, solana_metrics::*, + solana_packet::Meta, solana_perf::{ cuda_runtime::PinnedVec, packet::{Packet, PacketBatch, PacketBatchRecycler, PACKETS_PER_BATCH}, @@ -22,14 +24,10 @@ use { }, solana_rayon_threadlimit::get_max_thread_count, solana_runtime_transaction::transaction_with_meta::TransactionWithMeta, - solana_sdk::{ - hash::Hash, - packet::Meta, - transaction::{ - Result, Transaction, TransactionError, TransactionVerificationMode, - VersionedTransaction, - }, + solana_transaction::{ + versioned::VersionedTransaction, Transaction, TransactionVerificationMode, }, + solana_transaction_error::{TransactionError, TransactionResult as Result}, std::{ cmp, ffi::OsStr, @@ -684,7 +682,7 @@ impl EntrySlice for [Entry] { simd_len: usize, thread_pool: &ThreadPool, ) -> EntryVerificationState { - use solana_sdk::hash::HASH_BYTES; + use solana_hash::HASH_BYTES; let now = Instant::now(); let genesis = [Entry { num_hashes: 0, @@ -976,19 +974,21 @@ pub fn thread_pool_for_benches() -> ThreadPool { mod tests { use { super::*, + solana_hash::Hash, + solana_keypair::Keypair, + solana_message::SimpleAddressLoader, solana_perf::test_tx::{test_invalid_tx, test_tx}, + solana_pubkey::Pubkey, + solana_reserved_account_keys::ReservedAccountKeys, solana_runtime_transaction::runtime_transaction::RuntimeTransaction, - solana_sdk::{ - hash::{hash, Hash}, - pubkey::Pubkey, - reserved_account_keys::ReservedAccountKeys, - signature::{Keypair, Signer}, - system_transaction, - transaction::{ - MessageHash, Result, SanitizedTransaction, SimpleAddressLoader, - VersionedTransaction, - }, + solana_sha256_hasher::hash, + solana_signer::Signer, + solana_system_transaction as system_transaction, + solana_transaction::{ + sanitized::{MessageHash, SanitizedTransaction}, + versioned::VersionedTransaction, }, + solana_transaction_error::TransactionResult as Result, }; #[test] @@ -1142,7 +1142,7 @@ mod tests { fn test_transaction_signing() { let thread_pool = thread_pool_for_tests(); - use solana_sdk::signature::Signature; + use solana_signature::Signature; let zero = Hash::default(); let keypair = Keypair::new(); diff --git a/entry/src/poh.rs b/entry/src/poh.rs index 9bf6be66a0594f..2573c596053b86 100644 --- a/entry/src/poh.rs +++ b/entry/src/poh.rs @@ -1,7 +1,8 @@ //! The `Poh` module provides an object for generating a Proof of History. use { log::*, - solana_sdk::hash::{hash, hashv, Hash}, + solana_hash::Hash, + solana_sha256_hasher::{hash, hashv}, std::time::{Duration, Instant}, }; @@ -129,7 +130,8 @@ mod tests { use { crate::poh::{Poh, PohEntry}, assert_matches::assert_matches, - solana_sdk::hash::{hash, hashv, Hash}, + solana_hash::Hash, + solana_sha256_hasher::{hash, hashv}, std::time::Duration, }; diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index f6ab700baf11cb..1d1e9e12d604a9 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -5578,13 +5578,17 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", + "solana-hash", "solana-measure", "solana-merkle-tree", "solana-metrics", + "solana-packet", "solana-perf", "solana-rayon-threadlimit", "solana-runtime-transaction", - "solana-sdk", + "solana-sha256-hasher", + "solana-transaction", + "solana-transaction-error", ] [[package]] diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index da0a88726d3872..960e7477fbbfef 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -5419,13 +5419,17 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", + "solana-hash", "solana-measure", "solana-merkle-tree", "solana-metrics", + "solana-packet", "solana-perf", "solana-rayon-threadlimit", "solana-runtime-transaction", - "solana-sdk", + "solana-sha256-hasher", + "solana-transaction", + "solana-transaction-error", ] [[package]]