remove solana-sdk from transaction-status-client-types (#3831)

* remove solana-sdk from transaction-status-client-types * activate feature was being indirectly activated * missing feature activation in dev deps * remove solana-program * activate feature that was previously activated indirectly
anza-xyz · Dec 5, 2024 · 4bfb187 · 4bfb187
1 parent e28c4df
commit 4bfb187
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/rpc-client-api/Cargo.toml b/rpc-client-api/Cargo.toml
@@ -23,8 +23,8 @@ 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-fee-calculator = { workspace = true }
+solana-commitment-config = { workspace = true, features = ["serde"] }
+solana-fee-calculator = { workspace = true, features = ["serde"] }
 solana-inflation = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-pubkey = { workspace = true }
@@ -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"]
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git 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-message = { workspace = true }
+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
@@ -6,20 +6,17 @@ use {
     serde_derive::{Deserialize, Serialize},
     serde_json::Value,
     solana_account_decoder_client_types::token::UiTokenAmount,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        instruction::CompiledInstruction,
-        message::{
-            v0::{LoadedAddresses, MessageAddressTableLookup},
-            MessageHeader,
-        },
-        reward_type::RewardType,
-        transaction::{
-            Result as TransactionResult, TransactionError, TransactionVersion, VersionedTransaction,
-        },
-        transaction_context::TransactionReturnData,
+    solana_commitment_config::CommitmentConfig,
+    solana_message::{
+        compiled_instruction::CompiledInstruction,
+        v0::{LoadedAddresses, MessageAddressTableLookup},
+        MessageHeader,
     },
+    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;