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
31 changes: 22 additions & 9 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ members = [
"hash",
"inflation",
"instruction",
"instruction-error",
"instructions-sysvar",
"keccak-hasher",
"keypair",
Expand Down Expand Up @@ -239,6 +240,7 @@ solana-hard-forks = { path = "hard-forks", version = "2.2.1", default-features =
solana-hash = { path = "hash", version = "2.2.1", default-features = false }
solana-inflation = { path = "inflation", version = "2.2.1" }
solana-instruction = { path = "instruction", version = "2.3.0", default-features = false }
solana-instruction-error = { path = "instruction-error", version = "1.0.0" }
solana-instructions-sysvar = { path = "instructions-sysvar", version = "2.2.1" }
solana-keccak-hasher = { path = "keccak-hasher", version = "2.2.1" }
solana-keypair = { path = "keypair", version = "2.2.1" }
Expand Down
9 changes: 2 additions & 7 deletions account/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ all-features = true
rustdoc-args = ["--cfg=docsrs"]

[features]
bincode = [
"dep:bincode",
"dep:solana-sysvar",
"solana-instruction/serde",
"serde",
]
bincode = ["dep:bincode", "dep:solana-sysvar", "serde"]
dev-context-only-utils = ["bincode", "dep:qualifier_attr"]
frozen-abi = [
"dep:solana-frozen-abi",
Expand All @@ -45,7 +40,7 @@ solana-account-info = { workspace = true }
solana-clock = { workspace = true }
solana-frozen-abi = { workspace = true, optional = true }
solana-frozen-abi-macro = { workspace = true, optional = true }
solana-instruction = { workspace = true }
solana-instruction-error = { workspace = true }
solana-logger = { workspace = true, optional = true }
solana-pubkey = { workspace = true }
solana-sdk-ids = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion account/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use solana_sysvar::Sysvar;
use {
solana_account_info::{debug_account_data::*, AccountInfo},
solana_clock::{Epoch, INITIAL_RENT_EPOCH},
solana_instruction::error::LamportsError,
solana_instruction_error::LamportsError,
solana_pubkey::Pubkey,
solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4},
std::{
Expand Down
2 changes: 1 addition & 1 deletion account/src/state_traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use {
crate::{Account, AccountSharedData},
bincode::ErrorKind,
solana_instruction::error::InstructionError,
solana_instruction_error::InstructionError,
std::cell::Ref,
};

Expand Down
2 changes: 2 additions & 0 deletions address-lookup-table-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ rustdoc-args = ["--cfg=docsrs"]
bincode = [
"dep:bincode",
"dep:solana-instruction",
"dep:solana-instruction-error",
"serde",
"solana-instruction/bincode",
]
Expand All @@ -39,6 +40,7 @@ solana-frozen-abi-macro = { workspace = true, features = [
"frozen-abi",
], optional = true }
solana-instruction = { workspace = true, features = ["std"], optional = true }
solana-instruction-error = { workspace = true, optional = true }
solana-pubkey = { workspace = true }
solana-sdk-ids = { workspace = true }
solana-slot-hashes = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion address-lookup-table-interface/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use serde_derive::{Deserialize, Serialize};
#[cfg(feature = "frozen-abi")]
use solana_frozen_abi_macro::{AbiEnumVisitor, AbiExample};
#[cfg(feature = "bincode")]
use solana_instruction::error::InstructionError;
use solana_instruction_error::InstructionError;
use {
crate::error::AddressLookupError,
solana_clock::Slot,
Expand Down
4 changes: 1 addition & 3 deletions bincode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
bincode = { workspace = true }
serde = { workspace = true }
solana-instruction = { workspace = true, default-features = false, features = [
"std",
] }
solana-instruction-error = { workspace = true }

[dev-dependencies]
solana-system-interface = { workspace = true, features = ["bincode"] }
Expand Down
2 changes: 1 addition & 1 deletion bincode/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//!
//! [bincode]: https://docs.rs/bincode

use {bincode::config::Options, solana_instruction::error::InstructionError};
use {bincode::config::Options, solana_instruction_error::InstructionError};

/// Deserialize with a limit based the maximum amount of data a program can expect to get.
/// This function should be used in place of direct deserialization to help prevent OOM errors
Expand Down
2 changes: 1 addition & 1 deletion cpi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
solana-account-info = { workspace = true }
solana-instruction = { workspace = true }
solana-instruction = { workspace = true, features = ["std"] }
solana-program-error = { workspace = true }
solana-pubkey = { workspace = true }

Expand Down
37 changes: 37 additions & 0 deletions instruction-error/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[package]
name = "solana-instruction-error"
description = "Solana InstructionError type."
documentation = "https://docs.rs/solana-instruction-error"
version = "1.0.0"
authors = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
license = { workspace = true }
edition = { workspace = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
all-features = true
rustdoc-args = ["--cfg=docsrs"]

[features]
frozen-abi = [
"dep:solana-frozen-abi",
"dep:solana-frozen-abi-macro",
"serde",
"std",
]
num-traits = ["dep:num-traits"]
serde = ["dep:serde", "dep:serde_derive"]
std = []

[dependencies]
num-traits = { workspace = true, optional = true }
serde = { workspace = true, optional = true }
serde_derive = { workspace = true, optional = true }
solana-frozen-abi = { workspace = true, optional = true }
solana-frozen-abi-macro = { workspace = true, optional = true }
solana-program-error = { workspace = true }

[lints]
workspace = true
Loading