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
33 changes: 0 additions & 33 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,9 @@ rustls = { version = "0.23.32", features = ["std"], default-features = false }
scopeguard = "1.2.0"
semver = "1.0.27"
seqlock = "0.2.0"
serde = "1.0.228" # must match the serde_derive version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251
serde = { version = "1.0.228", features = ["derive"] }
serde-big-array = "0.5.1"
serde_bytes = "0.11.19"
serde_derive = "1.0.228" # must match the serde version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251
serde_json = "1.0.145"
serde_with = { version = "3.15.0", default-features = false }
serde_yaml = "0.9.34"
Expand Down
1 change: 0 additions & 1 deletion account-decoder-client-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ zstd = ["dep:zstd"]
base64 = { workspace = true }
bs58 = { workspace = true, features = ["std"] }
serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }
solana-account = { workspace = true }
solana-pubkey = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion account-decoder-client-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::io::Read;
use {
base64::{prelude::BASE64_STANDARD, Engine},
core::str::FromStr,
serde_derive::{Deserialize, Serialize},
serde::{Deserialize, Serialize},
serde_json::Value,
solana_account::WritableAccount,
solana_pubkey::Pubkey,
Expand Down
2 changes: 1 addition & 1 deletion account-decoder-client-types/src/token.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use {
core::str::FromStr,
serde_derive::{Deserialize, Serialize},
serde::{Deserialize, Serialize},
};

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
Expand Down
1 change: 0 additions & 1 deletion account-decoder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bincode = { workspace = true }
bs58 = { workspace = true }
bv = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }
solana-account = { workspace = true }
solana-account-decoder-client-types = { workspace = true, features = ["zstd"] }
Expand Down
4 changes: 1 addition & 3 deletions account-decoder/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#![allow(clippy::arithmetic_side_effects)]

#[macro_use]
extern crate serde_derive;

pub mod parse_account_data;
pub mod parse_address_lookup_table;
pub mod parse_bpf_loader;
Expand All @@ -22,6 +19,7 @@ pub use solana_account_decoder_client_types::{
use {
crate::parse_account_data::{parse_account_data_v3, AccountAdditionalDataV3},
base64::{prelude::BASE64_STANDARD, Engine},
serde::{Deserialize, Serialize},
solana_account::ReadableAccount,
solana_fee_calculator::FeeCalculator,
solana_pubkey::Pubkey,
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_account_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use {
parse_token::parse_token_v3, parse_vote::parse_vote,
},
inflector::Inflector,
serde::{Deserialize, Serialize},
solana_clock::UnixTimestamp,
solana_instruction::error::InstructionError,
solana_pubkey::Pubkey,
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_address_lookup_table.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use {
crate::parse_account_data::{ParsableAccount, ParseAccountError},
serde::{Deserialize, Serialize},
solana_address_lookup_table_interface::state::AddressLookupTable,
solana_instruction::error::InstructionError,
};
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_bpf_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use {
},
base64::{prelude::BASE64_STANDARD, Engine},
bincode::{deserialize, serialized_size},
serde::{Deserialize, Serialize},
solana_loader_v3_interface::state::UpgradeableLoaderState,
solana_pubkey::Pubkey,
};
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use {
validator_info,
},
bincode::deserialize,
serde::{Deserialize, Serialize},
serde_json::Value,
solana_config_interface::state::{get_config_data, ConfigKeys},
solana_pubkey::Pubkey,
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_nonce.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use {
crate::{parse_account_data::ParseAccountError, UiFeeCalculator},
serde::{Deserialize, Serialize},
solana_instruction::error::InstructionError,
solana_nonce::{state::State, versions::Versions},
};
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_stake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use {
StringAmount,
},
bincode::deserialize,
serde::{Deserialize, Serialize},
solana_clock::{Epoch, UnixTimestamp},
solana_stake_interface::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeStateV2},
};
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_sysvar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use {
},
bincode::deserialize,
bv::BitVec,
serde::{Deserialize, Serialize},
solana_clock::{Clock, Epoch, Slot, UnixTimestamp},
solana_epoch_schedule::EpochSchedule,
solana_pubkey::Pubkey,
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/parse_vote.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use {
crate::{parse_account_data::ParseAccountError, StringAmount},
serde::{Deserialize, Serialize},
solana_clock::{Epoch, Slot},
solana_pubkey::Pubkey,
solana_vote_interface::state::{BlockTimestamp, Lockout, VoteStateV3},
Expand Down
1 change: 1 addition & 0 deletions account-decoder/src/validator_info.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use serde::{Deserialize, Serialize};
pub const MAX_SHORT_FIELD_LENGTH: usize = 80;
pub const MAX_LONG_FIELD_LENGTH: usize = 300;
/// Maximum size of validator configuration data (`ValidatorInfo`).
Expand Down
1 change: 0 additions & 1 deletion accounts-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ rand = { workspace = true }
rayon = { workspace = true }
seqlock = { workspace = true }
serde = { workspace = true, features = ["rc"] }
serde_derive = { workspace = true }
slab = { workspace = true }
smallvec = { workspace = true, features = ["const_generics"] }
solana-account = { workspace = true, features = ["serde"] }
Expand Down
Loading
Loading