diff --git a/Cargo.lock b/Cargo.lock index 64b589ab0b0f6e..2294f0aac31bb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,9 +145,16 @@ dependencies = [ "serde_yaml 0.9.34+deprecated", "solana-clap-utils", "solana-config-program", + "solana-hash", + "solana-keypair", "solana-logger", + "solana-message", + "solana-pubkey", "solana-rpc-client", - "solana-sdk", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", + "solana-transaction", "solana-version", "tar", "tempfile", diff --git a/install/Cargo.toml b/install/Cargo.toml index 39a039a0b0600f..4eb195884afc92 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -31,9 +31,16 @@ serde_yaml = { workspace = true } serde_yaml_08 = { package = "serde_yaml", version = "0.8.26" } solana-clap-utils = { workspace = true } solana-config-program = { workspace = true } +solana-hash = { workspace = true } +solana-keypair = { workspace = true } solana-logger = { workspace = true } +solana-message = { workspace = true } +solana-pubkey = { workspace = true } solana-rpc-client = { workspace = true } -solana-sdk = { workspace = true } +solana-sha256-hasher = { workspace = true } +solana-signature = { workspace = true } +solana-signer = { workspace = true } +solana-transaction = { workspace = true } solana-version = { workspace = true } tar = { workspace = true } tempfile = { workspace = true } diff --git a/install/src/command.rs b/install/src/command.rs index 014753128fcec6..f2e682bb5e2f35 100644 --- a/install/src/command.rs +++ b/install/src/command.rs @@ -10,14 +10,14 @@ use { indicatif::{ProgressBar, ProgressStyle}, serde_derive::{Deserialize, Serialize}, solana_config_program::{config_instruction, get_config_data, ConfigState}, + solana_hash::Hash, + solana_keypair::{read_keypair_file, signable::Signable, Keypair}, + solana_message::Message, + solana_pubkey::Pubkey, solana_rpc_client::rpc_client::RpcClient, - solana_sdk::{ - hash::{Hash, Hasher}, - message::Message, - pubkey::Pubkey, - signature::{read_keypair_file, Keypair, Signable, Signer}, - transaction::Transaction, - }, + solana_sha256_hasher::Hasher, + solana_signer::Signer, + solana_transaction::Transaction, std::{ fs::{self, File}, io::{self, BufReader, Read}, diff --git a/install/src/config.rs b/install/src/config.rs index 07fc52c122afd0..68263d29898af4 100644 --- a/install/src/config.rs +++ b/install/src/config.rs @@ -1,7 +1,7 @@ use { crate::update_manifest::UpdateManifest, serde_derive::{Deserialize, Serialize}, - solana_sdk::pubkey::Pubkey, + solana_pubkey::Pubkey, std::{ fs::{create_dir_all, File}, io::{self, Write}, diff --git a/install/src/update_manifest.rs b/install/src/update_manifest.rs index e8d468d4540f26..32d1cab6eb64e6 100644 --- a/install/src/update_manifest.rs +++ b/install/src/update_manifest.rs @@ -1,11 +1,10 @@ use { serde_derive::{Deserialize, Serialize}, solana_config_program::ConfigState, - solana_sdk::{ - hash::Hash, - pubkey::Pubkey, - signature::{Signable, Signature}, - }, + solana_hash::Hash, + solana_keypair::signable::Signable, + solana_pubkey::Pubkey, + solana_signature::Signature, std::{borrow::Cow, error, io}, };