Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ solana-account-decoder = { path = "account-decoder", version = "=3.1.0" }
solana-account-decoder-client-types = { path = "account-decoder-client-types", version = "=3.1.0" }
solana-account-info = "3.0.0"
solana-accounts-db = { path = "accounts-db", version = "=3.1.0" }
solana-address = "1.0.0"
solana-address-lookup-table-interface = "3.0.0"
solana-atomic-u64 = "3.0.0"
solana-banks-client = { path = "banks-client", version = "=3.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc-client-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ serde_derive = { workspace = true }
serde_json = { workspace = true }
solana-account = { workspace = true }
solana-account-decoder-client-types = { workspace = true }
solana-address = { workspace = true }
solana-clock = { workspace = true }
solana-commitment-config = { workspace = true, features = ["serde"] }
solana-fee-calculator = { workspace = true, features = ["serde"] }
solana-inflation = { workspace = true }
solana-pubkey = { workspace = true }
solana-transaction-error = { workspace = true }
solana-transaction-status-client-types = { workspace = true }
solana-version = { workspace = true }
Expand Down
4 changes: 3 additions & 1 deletion rpc-client-types/src/config.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use {
crate::filter::RpcFilterType,
solana_account_decoder_client_types::{UiAccountEncoding, UiDataSliceConfig},
solana_clock::{Epoch, Slot},
};
pub use {
solana_account_decoder_client_types::{UiAccountEncoding, UiDataSliceConfig},
solana_commitment_config::{CommitmentConfig, CommitmentLevel},
solana_transaction_status_client_types::{TransactionDetails, UiTransactionEncoding},
};
Expand Down
6 changes: 3 additions & 3 deletions rpc-client-types/src/request.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pub use solana_address::Address;
use {
crate::response::RpcSimulateTransactionResult,
serde_json::{json, Value},
solana_clock::Slot,
solana_pubkey::Pubkey,
std::fmt,
thiserror::Error,
};
Expand Down Expand Up @@ -220,8 +220,8 @@ pub enum RpcError {

#[derive(Serialize, Deserialize)]
pub enum TokenAccountsFilter {
Mint(Pubkey),
ProgramId(Pubkey),
Mint(Address),
ProgramId(Address),
}

#[cfg(test)]
Expand Down
20 changes: 11 additions & 9 deletions rpc-client-types/src/response.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
use {
serde::{Deserialize, Deserializer, Serialize, Serializer},
solana_account_decoder_client_types::{token::UiTokenAmount, UiAccount},
solana_clock::{Epoch, Slot, UnixTimestamp},
solana_fee_calculator::{FeeCalculator, FeeRateGovernor},
solana_inflation::Inflation,
solana_transaction_error::TransactionResult as Result,
solana_transaction_status_client_types::{
ConfirmedTransactionStatusWithSignature, TransactionConfirmationStatus, UiConfirmedBlock,
UiInnerInstructions, UiLoadedAddresses, UiTransactionError, UiTransactionReturnData,
UiTransactionTokenBalance,
},
solana_transaction_status_client_types::ConfirmedTransactionStatusWithSignature,
std::{collections::HashMap, fmt, net::SocketAddr, str::FromStr},
thiserror::Error,
};
pub use {
solana_account_decoder_client_types::{token::UiTokenAmount, UiAccount},
solana_fee_calculator::{FeeCalculator, FeeRateGovernor},
solana_transaction_error::TransactionResult,
solana_transaction_status_client_types::{
TransactionConfirmationStatus, UiConfirmedBlock, UiInnerInstructions, UiLoadedAddresses,
UiTransactionError, UiTransactionReturnData, UiTransactionTokenBalance,
},
};

/// Wrapper for rpc return types of methods that provide responses both with and without context.
/// Main purpose of this is to fix methods that lack context information in their return type,
Expand Down Expand Up @@ -392,7 +394,7 @@ pub struct RpcVoteAccountInfo {
#[serde(rename_all = "camelCase")]
pub struct RpcSignatureConfirmation {
pub confirmations: usize,
pub status: Result<()>,
pub status: TransactionResult<()>,
}

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
Expand Down
Loading