anza-xyz · kevinheavey · Jul 11, 2024 · Jul 11, 2024 · Jul 11, 2024 · Jul 11, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -94,6 +94,7 @@ members = [
     "rpc-client",
     "rpc-client-api",
     "rpc-client-nonce-utils",
+    "rpc-filter",
     "rpc-test",
     "runtime",
     "runtime-transaction",
@@ -403,6 +404,7 @@ solana-rpc = { path = "rpc", version = "=2.1.0" }
 solana-rpc-client = { path = "rpc-client", version = "=2.1.0", default-features = false }
 solana-rpc-client-api = { path = "rpc-client-api", version = "=2.1.0" }
 solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.1.0" }
+solana-rpc-filter = { path = "rpc-filter", version = "=2.1.0" }
 solana-runtime = { path = "runtime", version = "=2.1.0" }
 solana-runtime-transaction = { path = "runtime-transaction", version = "=2.1.0" }
 solana-sdk = { path = "sdk", version = "=2.1.0" }

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -47,6 +47,7 @@ solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-rpc-client = { workspace = true, features = ["default"] }
 solana-rpc-client-api = { workspace = true }
 solana-rpc-client-nonce-utils = { workspace = true, features = ["clap"] }
+solana-rpc-filter = { workspace = true }
 solana-sdk = { workspace = true }
 solana-streamer = { workspace = true }
 solana-tps-client = { workspace = true }

diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -34,10 +34,10 @@ use {
             RpcLargestAccountsConfig, RpcLargestAccountsFilter, RpcProgramAccountsConfig,
             RpcTransactionConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter,
         },
-        filter::{Memcmp, RpcFilterType},
         request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
         response::{RpcPerfSample, RpcPrioritizationFee, SlotInfo},
     },
+    solana_rpc_filter::{Memcmp, RpcFilterType},
     solana_sdk::{
         account::from_account,
         account_utils::StateMut,

diff --git a/cli/src/program.rs b/cli/src/program.rs
@@ -47,10 +47,10 @@ use {
     solana_rpc_client_api::{
         client_error::ErrorKind as ClientErrorKind,
         config::{RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig},
-        filter::{Memcmp, RpcFilterType},
         request::MAX_MULTIPLE_ACCOUNTS,
     },
     solana_rpc_client_nonce_utils::blockhash_query::BlockhashQuery,
+    solana_rpc_filter::{Memcmp, RpcFilterType},
     solana_sdk::{
         account::Account,
         account_utils::StateMut,

diff --git a/cli/src/program_v4.rs b/cli/src/program_v4.rs
@@ -28,10 +28,10 @@ use {
     solana_rbpf::{elf::Executable, verifier::RequisiteVerifier},
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_rpc_client_api::{
-        config::{RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig},
-        filter::{Memcmp, RpcFilterType},
+    solana_rpc_client_api::config::{
+        RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig,
     },
+    solana_rpc_filter::{Memcmp, RpcFilterType},
     solana_sdk::{
         account::Account,
         commitment_config::CommitmentConfig,

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -28,6 +28,7 @@ solana-quic-client = { workspace = true }
 solana-rpc-client = { workspace = true, features = ["default"] }
 solana-rpc-client-api = { workspace = true }
 solana-rpc-client-nonce-utils = { workspace = true }
+solana-rpc-filter = { workspace = true }
 solana-sdk = { workspace = true }
 solana-streamer = { workspace = true }
 solana-thin-client = { workspace = true }

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -45,7 +45,7 @@ pub mod rpc_custom_error {
     pub use solana_rpc_client_api::custom_error::*;
 }
 pub mod rpc_filter {
-    pub use solana_rpc_client_api::filter::*;
+    pub use solana_rpc_filter::*;
 }
 pub mod rpc_request {
     pub use solana_rpc_client_api::request::*;

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
@@ -11,8 +11,6 @@ edition = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
-base64 = { workspace = true }
-bs58 = { workspace = true }
 jsonrpc-core = { workspace = true }
 reqwest = { workspace = true, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] }
 reqwest-middleware = { workspace = true }
@@ -21,14 +19,11 @@ serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-account-decoder = { workspace = true }
-solana-inline-spl = { workspace = true }
+solana-rpc-filter = { workspace = true }
 solana-sdk = { workspace = true }
 solana-transaction-status = { workspace = true }
 solana-version = { workspace = true }
 thiserror = { workspace = true }
 
-[dev-dependencies]
-const_format = { workspace = true }
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-client-api/src/config.rs b/rpc-client-api/src/config.rs
@@ -1,6 +1,6 @@
 use {
-    crate::filter::RpcFilterType,
     solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig},
+    solana_rpc_filter::RpcFilterType,
     solana_sdk::{
         clock::{Epoch, Slot},
         commitment_config::{CommitmentConfig, CommitmentLevel},

diff --git a/rpc-client-api/src/lib.rs b/rpc-client-api/src/lib.rs
@@ -1,10 +1,9 @@
-#![allow(clippy::arithmetic_side_effects)]
-
 pub mod client_error;
 pub mod config;
 pub mod custom_error;
 pub mod error_object;
-pub mod filter;
+#[deprecated(since = "2.1.0", note = "Use `solana-rpc-filter` crate instead")]
+pub use solana_rpc_filter as filter;
 pub mod request;
 pub mod response;
 

diff --git a/rpc-filter/Cargo.toml b/rpc-filter/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "solana-rpc-filter"
+description = "Solana RPC filter type"
+documentation = "https://docs.rs/solana-rpc-filter"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+base64 = { workspace = true }
+bs58 = { workspace = true }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+solana-inline-spl = { workspace = true }
+solana-sdk = { workspace = true }
+thiserror = { workspace = true }
+
+[dev-dependencies]
+const_format = { workspace = true }
+serde_json = { workspace = true }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-client-api/src/filter.rs → rpc-filter/src/lib.rs b/rpc-client-api/src/filter.rs → rpc-filter/src/lib.rs
@@ -1,6 +1,6 @@
 use {
     base64::{prelude::BASE64_STANDARD, Engine},
-    serde::Deserialize,
+    serde_derive::{Deserialize, Serialize},
     solana_inline_spl::{token::GenericTokenAccount, token_2022::Account},
     solana_sdk::account::{AccountSharedData, ReadableAccount},
     std::borrow::Cow,
@@ -91,7 +91,7 @@ pub enum MemcmpEncodedBytes {
     Bytes(Vec<u8>),
 }
 
-impl<'de> Deserialize<'de> for MemcmpEncodedBytes {
+impl<'de> serde::Deserialize<'de> for MemcmpEncodedBytes {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
@@ -194,6 +194,7 @@ impl Memcmp {
         }
     }
 
+    #[allow(clippy::arithmetic_side_effects)]
     pub fn bytes_match(&self, data: &[u8]) -> bool {
         match self.bytes() {
             Some(bytes) => {

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -43,6 +43,7 @@ solana-perf = { workspace = true }
 solana-poh = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-rpc-client-api = { workspace = true }
+solana-rpc-filter = { workspace = true }
 solana-runtime = { workspace = true }
 solana-sdk = { workspace = true }
 solana-send-transaction-service = { workspace = true }

diff --git a/rpc/src/filter.rs b/rpc/src/filter.rs
@@ -1,6 +1,6 @@
 use {
     solana_inline_spl::{token::GenericTokenAccount, token_2022::Account},
-    solana_rpc_client_api::filter::RpcFilterType,
+    solana_rpc_filter::RpcFilterType,
     solana_sdk::account::{AccountSharedData, ReadableAccount},
 };
 

diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
@@ -39,7 +39,6 @@ use {
     solana_rpc_client_api::{
         config::*,
         custom_error::RpcCustomError,
-        filter::{Memcmp, RpcFilterType},
         request::{
             TokenAccountsFilter, DELINQUENT_VALIDATOR_SLOT_DISTANCE,
             MAX_GET_CONFIRMED_BLOCKS_RANGE, MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS2_LIMIT,
@@ -49,6 +48,7 @@ use {
         },
         response::{Response as RpcResponse, *},
     },
+    solana_rpc_filter::{Memcmp, RpcFilterType},
     solana_runtime::{
         bank::{Bank, TransactionSimulationResult},
         bank_forks::BankForks,
@@ -4324,14 +4324,12 @@ pub mod tests {
             blockstore_processor::fill_blockstore_slot_with_ticks,
             genesis_utils::{create_genesis_config, GenesisConfigInfo},
         },
-        solana_rpc_client_api::{
-            custom_error::{
-                JSON_RPC_SERVER_ERROR_BLOCK_NOT_AVAILABLE,
-                JSON_RPC_SERVER_ERROR_TRANSACTION_HISTORY_NOT_AVAILABLE,
-                JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION,
-            },
-            filter::MemcmpEncodedBytes,
+        solana_rpc_client_api::custom_error::{
+            JSON_RPC_SERVER_ERROR_BLOCK_NOT_AVAILABLE,
+            JSON_RPC_SERVER_ERROR_TRANSACTION_HISTORY_NOT_AVAILABLE,
+            JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION,
         },
+        solana_rpc_filter::MemcmpEncodedBytes,
         solana_runtime::{
             accounts_background_service::AbsRequestSender, bank::BankTestConfig,
             commitment::BlockCommitment, non_circulating_supply::non_circulating_accounts,

diff --git a/rpc/src/rpc_subscription_tracker.rs b/rpc/src/rpc_subscription_tracker.rs
@@ -3,7 +3,7 @@ use {
     dashmap::{mapref::entry::Entry as DashEntry, DashMap},
     solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig},
     solana_metrics::{CounterToken, TokenCounter},
-    solana_rpc_client_api::filter::RpcFilterType,
+    solana_rpc_filter::RpcFilterType,
     solana_runtime::{
         bank::{TransactionLogCollectorConfig, TransactionLogCollectorFilter},
         bank_forks::BankForks,