From 9db86a21d25c331f82f4de9c0d817c79c0b2f26b Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Mon, 27 Jan 2025 00:15:47 +0400 Subject: [PATCH] remove reqwest dep from some crates --- Cargo.lock | 512 +----------------- Cargo.toml | 13 +- crates/account-decoder/Cargo.toml | 2 +- crates/account-decoder/src/lib.rs | 6 +- crates/account/Cargo.toml | 2 +- crates/account/src/lib.rs | 2 +- crates/rpc-account-info-config/Cargo.toml | 2 +- crates/rpc-common/Cargo.toml | 4 +- crates/rpc-common/src/lib.rs | 4 +- crates/rpc-config-no-filter/Cargo.toml | 2 +- crates/rpc-responses-common/Cargo.toml | 2 +- crates/rpc-responses-common/src/lib.rs | 2 +- crates/rpc-responses/Cargo.toml | 4 +- crates/rpc-responses/src/lib.rs | 4 +- crates/rpc-send-transaction-config/Cargo.toml | 2 +- crates/rpc-send-transaction-config/src/lib.rs | 2 +- crates/rpc-sim-transaction-config/Cargo.toml | 2 +- crates/rpc-sim-transaction-config/src/lib.rs | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 2 +- crates/transaction-return-data/Cargo.toml | 2 +- crates/transaction-return-data/src/lib.rs | 2 +- crates/transaction-status-enums/Cargo.toml | 2 +- crates/transaction-status-enums/src/lib.rs | 2 +- crates/transaction-status-struct/Cargo.toml | 2 +- crates/transaction-status-struct/src/lib.rs | 2 +- crates/transaction-status/Cargo.toml | 4 +- crates/transaction-status/src/lib.rs | 10 +- python/solders/__init__.py | 10 +- 29 files changed, 69 insertions(+), 540 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ec42303..71247d43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addr2line" version = "0.24.2" @@ -27,42 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm-siv" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "polyval", - "subtle", - "zeroize", -] - [[package]] name = "agave-transaction-view" version = "2.1.10" @@ -86,15 +40,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -266,12 +211,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - [[package]] name = "async-compression" version = "0.4.15" @@ -606,16 +545,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "combine" version = "3.8.1" @@ -723,7 +652,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -737,15 +665,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -1459,15 +1378,6 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "ipnet" version = "2.10.1" @@ -1694,18 +1604,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - [[package]] name = "mime" version = "0.3.17" @@ -2040,18 +1938,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "portable-atomic" version = "1.9.0" @@ -2299,35 +2185,6 @@ dependencies = [ "bitflags 2.6.0", ] -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - [[package]] name = "reqwest" version = "0.11.27" @@ -2700,32 +2557,6 @@ dependencies = [ "solana-program", ] -[[package]] -name = "solana-account-decoder" -version = "2.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2353887223851d07071e790a6508d8df61032a5e01bb6f990d7abe7f58dde3aa" -dependencies = [ - "Inflector", - "base64 0.22.1", - "bincode", - "bs58 0.5.1", - "bv", - "lazy_static", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder-client-types", - "solana-config-program", - "solana-sdk", - "spl-token 6.0.0", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror 1.0.68", - "zstd 0.13.2", -] - [[package]] name = "solana-account-decoder-client-types" version = "2.1.10" @@ -2739,7 +2570,6 @@ dependencies = [ "serde_json", "solana-account", "solana-pubkey", - "zstd 0.13.2", ] [[package]] @@ -3551,12 +3381,6 @@ dependencies = [ "solana-pubkey", ] -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - [[package]] name = "solana-serde-varint" version = "2.1.10" @@ -3759,34 +3583,6 @@ dependencies = [ "solana-sanitize", ] -[[package]] -name = "solana-transaction-status" -version = "2.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73cd35a23e9d6e289a9bf7bf32c1e972bb88bbb5ec434f43b445286b6ea3079" -dependencies = [ - "Inflector", - "base64 0.22.1", - "bincode", - "borsh 1.5.1", - "bs58 0.5.1", - "lazy_static", - "log", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status-client-types", - "spl-associated-token-account", - "spl-memo", - "spl-token 6.0.0", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror 1.0.68", -] - [[package]] name = "solana-transaction-status-client-types" version = "2.1.10" @@ -3863,38 +3659,6 @@ dependencies = [ "thiserror 1.0.68", ] -[[package]] -name = "solana-zk-token-sdk" -version = "2.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b8cc94d7eddf6606c22504889b6528734db56ed3c2f651641453d13c9b233d7" -dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "byteorder", - "curve25519-dalek 4.1.3", - "itertools 0.12.1", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.8.5", - "serde", - "serde_derive", - "serde_json", - "sha3", - "solana-curve25519", - "solana-derivation-path", - "solana-program", - "solana-sdk", - "subtle", - "thiserror 1.0.68", - "zeroize", -] - [[package]] name = "solana_rbpf" version = "0.8.5" @@ -3958,7 +3722,7 @@ dependencies = [ "serde", "serde_bytes", "serde_with 1.14.0", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-sdk", "solders-account-decoder", "solders-macros", @@ -3977,11 +3741,11 @@ dependencies = [ "pythonize", "serde", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-sdk", "solders-macros", "solders-traits-core", - "zstd 0.11.2+zstd.1.5.2", + "zstd", ] [[package]] @@ -4172,7 +3936,7 @@ version = "0.23.0" dependencies = [ "pyo3", "serde", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", "solders-account-decoder", "solders-commitment-config", @@ -4189,9 +3953,9 @@ dependencies = [ "pyo3", "serde", "serde_with 1.14.0", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-account", "solders-macros", "solders-rpc-response-data-boilerplate", @@ -4229,7 +3993,7 @@ version = "0.23.0" dependencies = [ "pyo3", "serde", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", "solana-sdk", "solders-commitment-config", @@ -4419,10 +4183,10 @@ dependencies = [ "serde", "serde_json", "serde_with 1.14.0", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-account", "solders-account-decoder", "solders-epoch-info", @@ -4455,7 +4219,7 @@ dependencies = [ "pyo3", "serde", "serde_with 1.14.0", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", "solana-sdk", "solders-account", @@ -4493,7 +4257,7 @@ dependencies = [ "serde", "solana-rpc-client-api", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-commitment-config", "solders-macros", "solders-rpc-config-macros", @@ -4534,7 +4298,7 @@ dependencies = [ "pyo3", "serde", "solana-rpc-client-api", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-commitment-config", "solders-macros", "solders-rpc-config-macros", @@ -4607,7 +4371,7 @@ dependencies = [ "solders-pubkey", "solders-traits-core", "spl-associated-token-account-client", - "spl-token 7.0.0", + "spl-token", ] [[package]] @@ -4660,7 +4424,7 @@ version = "0.23.0" dependencies = [ "pyo3", "serde", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-macros", ] @@ -4685,7 +4449,7 @@ dependencies = [ "pyo3", "serde", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -4703,9 +4467,9 @@ dependencies = [ "pythonize", "serde", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-account-decoder", "solders-hash", "solders-macros", @@ -4727,7 +4491,7 @@ version = "0.23.0" dependencies = [ "pyo3", "serde", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-macros", ] @@ -4738,7 +4502,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-transaction-status", + "solana-transaction-status-client-types", "solders-commitment-config", "solders-macros", "solders-traits-core", @@ -4752,22 +4516,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spl-associated-token-account" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" -dependencies = [ - "assert_matches", - "borsh 1.5.1", - "num-derive", - "num-traits", - "solana-program", - "spl-token 6.0.0", - "spl-token-2022", - "thiserror 1.0.68", -] - [[package]] name = "spl-associated-token-account-client" version = "2.0.0" @@ -4778,118 +4526,6 @@ dependencies = [ "solana-pubkey", ] -[[package]] -name = "spl-discriminator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", -] - -[[package]] -name = "spl-discriminator-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" -dependencies = [ - "quote", - "spl-discriminator-syn", - "syn 2.0.87", -] - -[[package]] -name = "spl-discriminator-syn" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.87", - "thiserror 1.0.68", -] - -[[package]] -name = "spl-memo" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" -dependencies = [ - "solana-program", -] - -[[package]] -name = "spl-pod" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" -dependencies = [ - "borsh 1.5.1", - "bytemuck", - "bytemuck_derive", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", -] - -[[package]] -name = "spl-program-error" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" -dependencies = [ - "num-derive", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror 1.0.68", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.87", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-token" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-program", - "thiserror 1.0.68", -] - [[package]] name = "spl-token" version = "7.0.0" @@ -4905,86 +4541,6 @@ dependencies = [ "thiserror 1.0.68", ] -[[package]] -name = "spl-token-2022" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token 6.0.0", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror 1.0.68", -] - -[[package]] -name = "spl-token-group-interface" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" -dependencies = [ - "borsh 1.5.1", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-transfer-hook-interface" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", -] - -[[package]] -name = "spl-type-length-value" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -5405,16 +4961,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "unreachable" version = "1.0.0" @@ -5815,16 +5361,7 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" -dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe", ] [[package]] @@ -5837,15 +5374,6 @@ dependencies = [ "zstd-sys", ] -[[package]] -name = "zstd-safe" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" -dependencies = [ - "zstd-sys", -] - [[package]] name = "zstd-sys" version = "2.0.13+zstd.1.5.6" diff --git a/Cargo.toml b/Cargo.toml index 94bd5e8f..9ce5b397 100644 --- 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 index 7d71b76c..e9c4ef98 100644 --- 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 index 33aa4708..fa1d8063 100644 --- 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 index 44479daf..eb60b01b 100644 --- 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 index fe037900..6e56b0a2 100644 --- 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 index 8cb7f5f4..f0236ed5 100644 --- 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 index d54bfe41..a93cf849 100644 --- 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 index a27bd896..06b9aacf 100644 --- 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 index 65041f3b..4fec50eb 100644 --- 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 index a1f44f46..abeabf86 100644 --- 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 index e1993dc1..bf506509 100644 --- 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 index f6c61bba..ea5858e6 100644 --- 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 index a1df5e4c..7c765fae 100644 --- 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 index 9a5dbd39..cec156cd 100644 --- 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 index d5c356fd..245be173 100644 --- 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 index b5e57d18..ed336999 100644 --- 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 index 4bc60832..1045a0c0 100644 --- 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 index 0b14dafc..f6bc5945 100644 --- 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 index b8f14408..db003aeb 100644 --- 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 index 80cff225..bd9fb952 100644 --- 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 index 0b6ae958..ffac5bb8 100644 --- 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 index 082ca6fb..be93afbc 100644 --- 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 index f4ed1ac0..21689621 100644 --- 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 index c73c1d4f..2d8156d5 100644 --- 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 index 084f0ded..8105e8c7 100644 --- 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 index 3ec0410e..58b33913 100644 --- 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 index 18e8975c..97129d1a 100644 --- 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 index 3a412a9f..9e7a5743 100644 --- 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", ]