From 403b9b5127b9e7e60e0c2f6560e31d48d47ffc94 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Thu, 28 Nov 2024 16:32:29 +0400 Subject: [PATCH 1/5] remove solana-sdk from transaction-status-client-types --- Cargo.lock | 7 ++++++- programs/sbf/Cargo.lock | 7 ++++++- svm/examples/Cargo.lock | 7 ++++++- transaction-status-client-types/Cargo.toml | 7 ++++++- transaction-status-client-types/src/lib.rs | 13 ++++++------- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f05f5b814697ff..a6f2e0cdd3fe02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9431,8 +9431,13 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder-client-types", - "solana-sdk", + "solana-commitment-config", + "solana-program", + "solana-reward-info", "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", "thiserror 2.0.4", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index b4c81f1ffc7d59..9cd28864bf2d47 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7889,8 +7889,13 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder-client-types", - "solana-sdk", + "solana-commitment-config", + "solana-program", + "solana-reward-info", "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", "thiserror 2.0.4", ] diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index c84b71398d81a5..852953078fc2ef 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7234,8 +7234,13 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder-client-types", - "solana-sdk", + "solana-commitment-config", + "solana-program", + "solana-reward-info", "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", "thiserror 2.0.4", ] diff --git a/transaction-status-client-types/Cargo.toml b/transaction-status-client-types/Cargo.toml index cdf4d29a4ab94e..11e5195a81945f 100644 --- a/transaction-status-client-types/Cargo.toml +++ b/transaction-status-client-types/Cargo.toml @@ -17,8 +17,13 @@ serde = { workspace = true } serde_derive = { workspace = true } serde_json = { workspace = true } solana-account-decoder-client-types = { workspace = true } -solana-sdk = { workspace = true } +solana-commitment-config = { workspace = true } +solana-program = { workspace = true, default-features = false } +solana-reward-info = { workspace = true, features = ["serde"] } solana-signature = { workspace = true, default-features = false } +solana-transaction = { workspace = true, features = ["serde"] } +solana-transaction-context = { workspace = true } +solana-transaction-error = { workspace = true, features = ["serde"] } thiserror = { workspace = true } [package.metadata.docs.rs] diff --git a/transaction-status-client-types/src/lib.rs b/transaction-status-client-types/src/lib.rs index a1284efb07b0de..ad37f57150f477 100644 --- a/transaction-status-client-types/src/lib.rs +++ b/transaction-status-client-types/src/lib.rs @@ -6,20 +6,19 @@ use { serde_derive::{Deserialize, Serialize}, serde_json::Value, solana_account_decoder_client_types::token::UiTokenAmount, - solana_sdk::{ - commitment_config::CommitmentConfig, + solana_commitment_config::CommitmentConfig, + solana_program::{ instruction::CompiledInstruction, message::{ v0::{LoadedAddresses, MessageAddressTableLookup}, MessageHeader, }, - reward_type::RewardType, - transaction::{ - Result as TransactionResult, TransactionError, TransactionVersion, VersionedTransaction, - }, - transaction_context::TransactionReturnData, }, + solana_reward_info::RewardType, solana_signature::Signature, + solana_transaction::versioned::{TransactionVersion, VersionedTransaction}, + solana_transaction_context::TransactionReturnData, + solana_transaction_error::{TransactionError, TransactionResult}, thiserror::Error, }; pub mod option_serializer; From 8bd5d5c951e205b58902f94b47ef1932b9fa10bb Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Wed, 4 Dec 2024 13:35:04 +0400 Subject: [PATCH 2/5] activate feature was being indirectly activated --- rpc-client-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpc-client-api/Cargo.toml b/rpc-client-api/Cargo.toml index 47b6ef5788e97f..65284b2588129c 100644 --- a/rpc-client-api/Cargo.toml +++ b/rpc-client-api/Cargo.toml @@ -23,7 +23,7 @@ serde_json = { workspace = true } solana-account = { workspace = true } solana-account-decoder-client-types = { workspace = true } solana-clock = { workspace = true } -solana-commitment-config = { workspace = true } +solana-commitment-config = { workspace = true, features = ["serde"] } solana-fee-calculator = { workspace = true } solana-inflation = { workspace = true } solana-inline-spl = { workspace = true } From dc78f88a62b1452d2b6318546457a5333fac8716 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Wed, 4 Dec 2024 13:47:16 +0400 Subject: [PATCH 3/5] missing feature activation in dev deps --- rpc-client-api/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rpc-client-api/Cargo.toml b/rpc-client-api/Cargo.toml index 65284b2588129c..56e21a06545f6c 100644 --- a/rpc-client-api/Cargo.toml +++ b/rpc-client-api/Cargo.toml @@ -36,6 +36,7 @@ thiserror = { workspace = true } [dev-dependencies] const_format = { workspace = true } +solana-pubkey = { workspace = true, features = ["rand"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From 3acf7ba89405271eae07e1602a91b4f0c1bb77ff Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Wed, 4 Dec 2024 14:25:42 +0400 Subject: [PATCH 4/5] remove solana-program --- Cargo.lock | 2 +- programs/sbf/Cargo.lock | 2 +- svm/examples/Cargo.lock | 2 +- transaction-status-client-types/Cargo.toml | 2 +- transaction-status-client-types/src/lib.rs | 10 ++++------ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6f2e0cdd3fe02..fb42024bf62bb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9432,7 +9432,7 @@ dependencies = [ "serde_json", "solana-account-decoder-client-types", "solana-commitment-config", - "solana-program", + "solana-message", "solana-reward-info", "solana-signature", "solana-transaction", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 9cd28864bf2d47..4d26fc0b5f46ec 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7890,7 +7890,7 @@ dependencies = [ "serde_json", "solana-account-decoder-client-types", "solana-commitment-config", - "solana-program", + "solana-message", "solana-reward-info", "solana-signature", "solana-transaction", diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 852953078fc2ef..2e29298a90efbe 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7235,7 +7235,7 @@ dependencies = [ "serde_json", "solana-account-decoder-client-types", "solana-commitment-config", - "solana-program", + "solana-message", "solana-reward-info", "solana-signature", "solana-transaction", diff --git a/transaction-status-client-types/Cargo.toml b/transaction-status-client-types/Cargo.toml index 11e5195a81945f..7c1fec2a45b2b9 100644 --- a/transaction-status-client-types/Cargo.toml +++ b/transaction-status-client-types/Cargo.toml @@ -18,7 +18,7 @@ serde_derive = { workspace = true } serde_json = { workspace = true } solana-account-decoder-client-types = { workspace = true } solana-commitment-config = { workspace = true } -solana-program = { workspace = true, default-features = false } +solana-message = { workspace = true } solana-reward-info = { workspace = true, features = ["serde"] } solana-signature = { workspace = true, default-features = false } solana-transaction = { workspace = true, features = ["serde"] } diff --git a/transaction-status-client-types/src/lib.rs b/transaction-status-client-types/src/lib.rs index ad37f57150f477..638f1e9b6fbc3a 100644 --- a/transaction-status-client-types/src/lib.rs +++ b/transaction-status-client-types/src/lib.rs @@ -7,12 +7,10 @@ use { serde_json::Value, solana_account_decoder_client_types::token::UiTokenAmount, solana_commitment_config::CommitmentConfig, - solana_program::{ - instruction::CompiledInstruction, - message::{ - v0::{LoadedAddresses, MessageAddressTableLookup}, - MessageHeader, - }, + solana_message::{ + compiled_instruction::CompiledInstruction, + v0::{LoadedAddresses, MessageAddressTableLookup}, + MessageHeader, }, solana_reward_info::RewardType, solana_signature::Signature, From c1962f609218788a23985493e35c21a832a3c331 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Wed, 4 Dec 2024 20:02:28 +0400 Subject: [PATCH 5/5] activate feature that was previously activated indirectly --- rpc-client-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpc-client-api/Cargo.toml b/rpc-client-api/Cargo.toml index 56e21a06545f6c..dc7f9d9ebd5b7e 100644 --- a/rpc-client-api/Cargo.toml +++ b/rpc-client-api/Cargo.toml @@ -24,7 +24,7 @@ solana-account = { workspace = true } solana-account-decoder-client-types = { workspace = true } solana-clock = { workspace = true } solana-commitment-config = { workspace = true, features = ["serde"] } -solana-fee-calculator = { workspace = true } +solana-fee-calculator = { workspace = true, features = ["serde"] } solana-inflation = { workspace = true } solana-inline-spl = { workspace = true } solana-pubkey = { workspace = true }