remove reqwest dep from some crates

kevinheavey · Jan 26, 2025 · 9db86a2 · 9db86a2
1 parent 9129785
commit 9db86a2
Show file tree

Hide file tree

Showing 29 changed files with 69 additions and 540 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,8 +19,8 @@ solana-sdk = { workspace = true }
 bincode = { workspace = true }
 serde = { workspace = true }
 derive_more = { workspace = true }
-solders-account = { workspace = true, optional = true }
-solders-account-decoder = { workspace = true, optional = true }
+solders-account = { workspace = true }
+solders-account-decoder = { workspace = true }
 solders-address-lookup-table-account = { workspace = true }
 solders-compute-budget = { workspace = true }
 solders-commitment-config = { workspace = true }
@@ -41,21 +41,18 @@ solders-signature = { workspace = true }
 solders-system-program = { workspace = true }
 solders-traits = { workspace = true }
 solders-transaction = { workspace = true }
-solders-transaction-status = { workspace = true, optional = true }
+solders-transaction-status = { workspace = true }
 solders-token = { workspace = true }
 
 [features]
 default = ["litesvm", "ring"]
 litesvm = ["dep:solders-litesvm"]
 ring = [
-    "dep:solders-account",
-    "dep:solders-account-decoder",
     "dep:solders-rpc-config",
     "dep:solders-rpc-errors",
     "dep:solders-rpc-filter",
     "dep:solders-rpc-requests",
     "dep:solders-rpc-responses",
-    "dep:solders-transaction-status"
 ]
 
 [workspace]
@@ -131,9 +128,9 @@ solders-account = { path = "./crates/account", version = "=0.23.0" }
 solders-hash = { path = "./crates/hash", version = "=0.23.0" }
 serde_with = { version = "^1.14.0", features = ["base64"] }
 solana-sdk = { version = "2.1.0", features = ["openssl-vendored"] }
-solana-account-decoder = "2.1.0"
+solana-account-decoder-client-types = "2.1.0"
 solana-banks-interface = "2.1.0"
-solana-transaction-status = "2.1.0"
+solana-transaction-status-client-types = "2.1.0"
 solana-rpc-client-api = "2.1.0"
 solana-program = "2.1.0"
 spl-associated-token-account-client = "2.0"

diff --git a/crates/account-decoder/Cargo.toml b/crates/account-decoder/Cargo.toml
@@ -20,4 +20,4 @@ zstd = "0.11.2"
 base64 = { workspace = true }
 bs58 = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
diff --git a/crates/account-decoder/src/lib.rs b/crates/account-decoder/src/lib.rs
@@ -9,9 +9,9 @@ use pyo3::prelude::*;
 use pythonize::{depythonize, pythonize};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use solana_account_decoder::{
-    parse_account_data::ParsedAccount as ParsedAccountOriginal,
-    parse_token::UiTokenAmount as UiTokenAmountOriginal,
+use solana_account_decoder_client_types::{
+    ParsedAccount as ParsedAccountOriginal,
+    token::UiTokenAmount as UiTokenAmountOriginal,
     UiAccountEncoding as UiAccountEncodingOriginal, UiDataSliceConfig as UiDataSliceConfigOriginal,
 };
 use solders_macros::{common_methods, enum_original_mapping, richcmp_eq_only};

diff --git a/crates/account/Cargo.toml b/crates/account/Cargo.toml
@@ -18,6 +18,6 @@ solana-sdk = { workspace = true }
 solders-macros = { workspace = true }
 solders-pubkey = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 solders-account-decoder = { workspace = true }
 base64 = { workspace = true }
diff --git a/crates/account/src/lib.rs b/crates/account/src/lib.rs
@@ -11,7 +11,7 @@ use solders_traits_core::{
     py_from_bytes_general_via_bincode, pybytes_general_via_bincode, RichcmpEqualityOnly,
 };
 
-use solana_account_decoder::{UiAccount, UiAccountData, UiAccountEncoding};
+use solana_account_decoder_client_types::{UiAccount, UiAccountData, UiAccountEncoding};
 use solders_account_decoder::ParsedAccount;
 
 // The Account from solana_sdk doesn't serialize the owner pubkey as base58,

diff --git a/crates/rpc-account-info-config/Cargo.toml b/crates/rpc-account-info-config/Cargo.toml
@@ -14,7 +14,7 @@ serde = { workspace = true }
 solders-macros = { workspace = true }
 solders-traits-core = { workspace = true }
 solders-account-decoder = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 solders-rpc-config-macros = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solders-commitment-config = { workspace = true }
diff --git a/crates/rpc-common/Cargo.toml b/crates/rpc-common/Cargo.toml
@@ -14,8 +14,8 @@ serde = { workspace = true }
 derive_more = { workspace = true }
 solders-macros = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-account-decoder = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solders-account = { workspace = true }
 solders-rpc-response-data-boilerplate = { workspace = true }

diff --git a/crates/rpc-common/src/lib.rs b/crates/rpc-common/src/lib.rs
@@ -2,9 +2,9 @@ use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 
-use solana_account_decoder::UiAccount;
+use solana_account_decoder_client_types::UiAccount;
 use solana_rpc_client_api::response::RpcSimulateTransactionResult as RpcSimulateTransactionResultOriginal;
-use solana_transaction_status::UiInnerInstructions as UiInnerInstructionsOriginal;
+use solana_transaction_status_client_types::UiInnerInstructions as UiInnerInstructionsOriginal;
 use solders_account::Account;
 use solders_macros::{common_methods, richcmp_eq_only};
 use solders_rpc_response_data_boilerplate::response_data_boilerplate;

diff --git a/crates/rpc-config-no-filter/Cargo.toml b/crates/rpc-config-no-filter/Cargo.toml
@@ -13,7 +13,7 @@ pyo3 = { workspace = true, features = ["macros"] }
 serde = { workspace = true }
 solders-macros = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 solders-pubkey = { workspace = true }
 solders-transaction-status-enums = { workspace = true }
 solana-rpc-client-api = { workspace = true }

diff --git a/crates/rpc-responses-common/Cargo.toml b/crates/rpc-responses-common/Cargo.toml
@@ -18,7 +18,7 @@ solders-hash = { workspace = true }
 solders-traits-core = { workspace = true }
 solders-account = { workspace = true }
 solders-account-decoder = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solders-transaction-error = { workspace = true }
 solders-rpc-response-data-boilerplate = { workspace = true }

diff --git a/crates/rpc-responses-common/src/lib.rs b/crates/rpc-responses-common/src/lib.rs
@@ -7,7 +7,7 @@ use derive_more::{From, Into};
 use pyo3::{prelude::*, IntoPyObject};
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr, TryFromInto};
-use solana_account_decoder::{UiAccount, UiAccountData};
+use solana_account_decoder_client_types::{UiAccount, UiAccountData};
 use solana_rpc_client_api::response::{
     RpcBlockhash as RpcBlockhashOriginal, RpcIdentity as RpcIdentityOriginal,
     RpcTokenAccountBalance as RpcTokenAccountBalanceOriginal,

diff --git a/crates/rpc-responses/Cargo.toml b/crates/rpc-responses/Cargo.toml
@@ -24,7 +24,7 @@ solders-account-decoder = { workspace = true }
 solders-epoch-info = { workspace = true }
 solders-transaction-error = { workspace = true }
 solders-transaction-status = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-transaction-status-struct = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solders-rpc-responses-common = { workspace = true }
@@ -37,6 +37,6 @@ solders-rpc-version = { workspace = true }
 solders-pubkey = { workspace = true }
 solders-signature = { workspace = true }
 solana-sdk = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 thiserror = { workspace = true }
 camelpaste = { workspace = true }
diff --git a/crates/rpc-responses/src/lib.rs b/crates/rpc-responses/src/lib.rs
@@ -11,7 +11,7 @@ use pyo3::{prelude::*, IntoPyObject, IntoPyObjectExt, PyClass};
 use serde::{de::Error, Deserialize, Serialize, Serializer};
 use serde_json::Value;
 use serde_with::{serde_as, DisplayFromStr, FromInto, OneOrMany, TryFromInto};
-use solana_account_decoder::UiAccount;
+use solana_account_decoder_client_types::UiAccount;
 use solana_rpc_client_api::{
     custom_error::{
         JSON_RPC_SCAN_ERROR, JSON_RPC_SERVER_ERROR_BLOCK_CLEANED_UP,
@@ -47,7 +47,7 @@ use solana_rpc_client_api::{
     },
 };
 use solana_sdk::clock::{Epoch, Slot, UnixTimestamp};
-use solana_transaction_status::TransactionStatus as TransactionStatusOriginal;
+use solana_transaction_status_client_types::TransactionStatus as TransactionStatusOriginal;
 use solders_account::{Account, AccountJSON};
 use solders_account_decoder::UiTokenAmount;
 use solders_epoch_info::EpochInfo;

diff --git a/crates/rpc-send-transaction-config/Cargo.toml b/crates/rpc-send-transaction-config/Cargo.toml
@@ -17,5 +17,5 @@ solana-rpc-client-api = { workspace = true }
 solders-rpc-config-macros = { workspace = true }
 solders-commitment-config = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-transaction-status-enums = { workspace = true }
diff --git a/crates/rpc-send-transaction-config/src/lib.rs b/crates/rpc-send-transaction-config/src/lib.rs
@@ -2,7 +2,7 @@ use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
 use solana_rpc_client_api::config as rpc_config;
 use solana_sdk::commitment_config::CommitmentLevel as CommitmentLevelOriginal;
-use solana_transaction_status::UiTransactionEncoding as UiTransactionEncodingOriginal;
+use solana_transaction_status_client_types::UiTransactionEncoding as UiTransactionEncodingOriginal;
 use solders_commitment_config::CommitmentLevel;
 use solders_macros::{common_methods, richcmp_eq_only};
 

diff --git a/crates/rpc-sim-transaction-config/Cargo.toml b/crates/rpc-sim-transaction-config/Cargo.toml
@@ -17,5 +17,5 @@ solders-rpc-config-macros = { workspace = true }
 solders-rpc-simulate-tx-accounts-config = { workspace = true }
 solders-commitment-config = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-transaction-status-enums = { workspace = true }
diff --git a/crates/rpc-sim-transaction-config/src/lib.rs b/crates/rpc-sim-transaction-config/src/lib.rs
@@ -1,7 +1,7 @@
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
 use solana_rpc_client_api::config as rpc_config;
-use solana_transaction_status::UiTransactionEncoding as UiTransactionEncodingOriginal;
+use solana_transaction_status_client_types::UiTransactionEncoding as UiTransactionEncodingOriginal;
 use solders_commitment_config::CommitmentLevel;
 use solders_macros::{common_methods, richcmp_eq_only};
 

diff --git a/crates/transaction-confirmation-status/Cargo.toml b/crates/transaction-confirmation-status/Cargo.toml
@@ -12,4 +12,4 @@ description = "Solders transaction confirmation status crate."
 pyo3 = { workspace = true, features = ["macros"] }
 serde = { workspace = true }
 solders-macros = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
diff --git a/crates/transaction-confirmation-status/src/lib.rs b/crates/transaction-confirmation-status/src/lib.rs
@@ -1,6 +1,6 @@
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
-use solana_transaction_status::TransactionConfirmationStatus as TransactionConfirmationStatusOriginal;
+use solana_transaction_status_client_types::TransactionConfirmationStatus as TransactionConfirmationStatusOriginal;
 use solders_macros::enum_original_mapping;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]

diff --git a/crates/transaction-return-data/Cargo.toml b/crates/transaction-return-data/Cargo.toml
@@ -17,4 +17,4 @@ solders-pubkey = { workspace = true }
 solders-macros = { workspace = true }
 base64 = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
diff --git a/crates/transaction-return-data/src/lib.rs b/crates/transaction-return-data/src/lib.rs
@@ -7,7 +7,7 @@ use solders_traits_core::transaction_status_boilerplate;
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
 use solana_sdk::transaction_context::TransactionReturnData as TransactionReturnDataOriginal;
-use solana_transaction_status::UiTransactionReturnData;
+use solana_transaction_status_client_types::UiTransactionReturnData;
 use solders_macros::{common_methods, richcmp_eq_only};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]

diff --git a/crates/transaction-status-enums/Cargo.toml b/crates/transaction-status-enums/Cargo.toml
@@ -11,5 +11,5 @@ description = "Solders transaction status enums crate."
 [dependencies]
 serde = { workspace = true }
 pyo3 = { workspace = true, features = ["macros"] }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-macros = { workspace = true }
diff --git a/crates/transaction-status-enums/src/lib.rs b/crates/transaction-status-enums/src/lib.rs
@@ -1,6 +1,6 @@
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
-use solana_transaction_status::{
+use solana_transaction_status_client_types::{
     TransactionDetails as TransactionDetailsOriginal,
     UiTransactionEncoding as UiTransactionEncodingOriginal,
 };

diff --git a/crates/transaction-status-struct/Cargo.toml b/crates/transaction-status-struct/Cargo.toml
@@ -14,7 +14,7 @@ serde = { workspace = true }
 derive_more = { workspace = true }
 solders-macros = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-transaction-error = { workspace = true }
 solders-transaction-confirmation-status = { workspace = true }
 solders-commitment-config = { workspace = true }
diff --git a/crates/transaction-status-struct/src/lib.rs b/crates/transaction-status-struct/src/lib.rs
@@ -7,7 +7,7 @@ use solders_transaction_error::TransactionErrorType;
 
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
-use solana_transaction_status::TransactionStatus as TransactionStatusOriginal;
+use solana_transaction_status_client_types::TransactionStatus as TransactionStatusOriginal;
 use solders_macros::{common_methods, richcmp_eq_only};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]

diff --git a/crates/transaction-status/Cargo.toml b/crates/transaction-status/Cargo.toml
@@ -21,12 +21,12 @@ solders-macros = { workspace = true }
 base64 = { workspace = true }
 bs58 = { workspace = true }
 solders-traits-core = { workspace = true }
-solana-account-decoder = { workspace = true }
+solana-account-decoder-client-types = { workspace = true }
 solders-account-decoder = { workspace = true }
 solders-hash = { workspace = true }
 solders-message = { workspace = true }
 solders-transaction = { workspace = true }
-solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solders-transaction-error = { workspace = true }
 solders-transaction-confirmation-status = { workspace = true }
 solders-transaction-return-data = { workspace = true }

diff --git a/crates/transaction-status/src/lib.rs b/crates/transaction-status/src/lib.rs
@@ -28,15 +28,13 @@ use std::str::FromStr;
 use pyo3::{prelude::*, pyclass::CompareOp, IntoPyObject};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use solana_sdk::{clock::UnixTimestamp, slot_history::Slot};
-use solana_transaction_status::{
-    parse_accounts::{
+use solana_sdk::{clock::UnixTimestamp, reward_type::RewardType as RewardTypeOriginal, slot_history::Slot};
+use solana_transaction_status_client_types::{
         ParsedAccount as ParsedAccountOriginal, ParsedAccountSource as ParsedAccountSourceOriginal,
-    },
-    parse_instruction::ParsedInstruction as ParsedInstructionOriginal,
+    ParsedInstruction as ParsedInstructionOriginal,
     EncodedTransaction as EncodedTransactionOriginal,
     EncodedTransactionWithStatusMeta as EncodedTransactionWithStatusMetaOriginal,
-    Reward as RewardOriginal, RewardType as RewardTypeOriginal,
+    Reward as RewardOriginal,
     TransactionBinaryEncoding as TransactionBinaryEncodingOriginal,
     UiAccountsList as UiAccountsListOriginal, UiAddressTableLookup as UiAddressTableLookupOriginal,
     UiCompiledInstruction as UiCompiledInstructionOriginal,

diff --git a/python/solders/__init__.py b/python/solders/__init__.py
@@ -1,6 +1,8 @@
 import contextlib as __ctxlib
 
 from . import (
+    account,
+    account_decoder,
     address_lookup_table_account,
     clock,
     commitment_config,
@@ -25,6 +27,7 @@
     token,
     transaction,
     transaction_metadata,
+    transaction_status,
 )
 
 __has_litesvm = False
@@ -35,14 +38,16 @@
 
 __has_ring = False
 with __ctxlib.suppress(ImportError):
-    from . import account, account_decoder, rpc, transaction_status
+    from . import rpc
 
     __has_ring = True
 
 
-__ring_modules = ["account", "account_decoder", "rpc", "transaction_status"]
+__ring_modules = ["rpc"]
 
 __all_core = [
+    "account",
+    "account_decoder",
     "address_lookup_table_account",
     "commitment_config",
     "errors",
@@ -56,6 +61,7 @@
     "signature",
     "token",
     "transaction",
+    "transaction_status",
     "system_program",
     "sysvar",
 ]