Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[merlin, zk-sdk] Turn default-features for merlin crate to false #4469

Merged
merged 1 commit into from
Jan 16, 2025
Merged

[merlin, zk-sdk] Turn default-features for merlin crate to false #4469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
inherits = "release"
debug = true
split-debuginfo = "packed"
lto = false # Preserve the 'thin local LTO' for this build.
lto = false # Preserve the 'thin local LTO' for this build.

[profile.release]
split-debuginfo = "unpacked"
Expand Down Expand Up @@ -374,7 +374,7 @@ lru = "0.7.7"
lz4 = "1.28.1"
memmap2 = "0.5.10"
memoffset = "0.9"
merlin = "3"
merlin = { version = "3", default-features = false }
min-max-heap = "1.3.0"
mockall = "0.11.4"
modular-bitfield = "0.11.2"
Expand Down
1 change: 1 addition & 0 deletions zk-sdk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub mod errors;
pub mod pod;
mod range_proof;
mod sigma_proofs;
#[cfg(not(target_os = "solana"))]
mod transcript;
pub mod zk_elgamal_proof_program;

Expand Down
3 changes: 1 addition & 2 deletions zk-sdk/src/transcript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use merlin::Transcript;
#[cfg(not(target_os = "solana"))]
use {
crate::errors::TranscriptError,
curve25519_dalek::{ristretto::CompressedRistretto, scalar::Scalar, traits::IsIdentity},
merlin::Transcript,
};

pub trait TranscriptProtocol {
Expand Down
Loading