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

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

5 changes: 3 additions & 2 deletions sdk/pubkey/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ unexpected_cfgs = { level = "warn", check-cfg = [

[features]
default = ["const"]
const = ["dep:const-crypto"]
const = ["dep:five8_const", "dep:sha2-const-stable"]

[dependencies]
const-crypto = { version = "0.3.0", optional = true }
five8_const = { workspace = true, optional = true }
sha2-const-stable = { version = "0.1.0", optional = true }
pinocchio = { workspace = true }
8 changes: 5 additions & 3 deletions sdk/pubkey/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ pub mod reexport {
pub use pinocchio::pubkey::Pubkey;
}

#[cfg(feature = "const")]
use const_crypto::{bs58::decode_pubkey, sha2::Sha256};
use core::mem::MaybeUninit;
#[cfg(feature = "const")]
pub use five8_const::decode_32_const;
use pinocchio::pubkey::{Pubkey, MAX_SEEDS, PDA_MARKER};
#[cfg(target_os = "solana")]
use pinocchio::syscalls::sol_sha256;
#[cfg(feature = "const")]
use sha2_const_stable::Sha256;

/// Derive a [program address][pda] from the given seeds, optional bump and
/// program id.
Expand Down Expand Up @@ -191,5 +193,5 @@ macro_rules! declare_id {
#[cfg(feature = "const")]
#[inline(always)]
pub const fn from_str(value: &str) -> Pubkey {
decode_pubkey(value)
decode_32_const(value)
}