zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update ed25519-zebra to 0.3

This commit is contained in:
Henry de Valence 2020-06-15 21:20:01 -07:00 committed by Deirdre Connolly
parent a023ba9b16
commit 9ddcccdcb4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -428,9 +428,9 @@ checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
[[package]] [[package]]
name = "ed25519-zebra" name = "ed25519-zebra"
version = "0.2.3" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1a8b1ce4012933385e8a820355e972bcfb8ee55993cd63e70d47a085298020b" checksum = "802a065ae2171664a2bf607c0571d21c267a0ad2c6c8dad4a5668f09bf34f661"
dependencies = [ dependencies = [
"curve25519-dalek", "curve25519-dalek",
"hex", "hex",

6
zebra-chain/Cargo.toml
View File

@ -25,10 +25,10 @@ serde = { version = "1", features = ["serde_derive", "rc"] }
sha2 = { version = "0.8.2", features=["compress"] } sha2 = { version = "0.8.2", features=["compress"] }
thiserror = "1" thiserror = "1"
x25519-dalek = { version = "0.6", features = ["serde"] } x25519-dalek = { version = "0.6", features = ["serde"] }
# ZF deps
ed25519-zebra = "0.2"
redjubjub = "0.1"
serde-big-array = "0.3.0" serde-big-array = "0.3.0"
# ZF deps
ed25519-zebra = "0.3"
redjubjub = "0.1"
[dev-dependencies] [dev-dependencies]
proptest = "0.10" proptest = "0.10"

4
zebra-chain/src/transaction/joinsplit.rs
View File

@ -146,7 +146,7 @@ pub struct JoinSplitData<P: ZkSnarkProof> {
))] ))]
pub rest: Vec<JoinSplit<P>>, pub rest: Vec<JoinSplit<P>>,
/// The public key for the JoinSplit signature. /// The public key for the JoinSplit signature.
pub pub_key: ed25519_zebra::PublicKeyBytes, pub pub_key: ed25519_zebra::VerificationKeyBytes,
/// The JoinSplit signature. /// The JoinSplit signature.
pub sig: ed25519_zebra::Signature, pub sig: ed25519_zebra::Signature,
} }
@ -172,7 +172,7 @@ impl<P: ZkSnarkProof + Arbitrary + 'static> Arbitrary for JoinSplitData<P> {
.prop_map(|(first, rest, pub_key_bytes, sig_bytes)| Self { .prop_map(|(first, rest, pub_key_bytes, sig_bytes)| Self {
first, first,
rest, rest,
pub_key: ed25519_zebra::PublicKeyBytes::from(pub_key_bytes), pub_key: ed25519_zebra::VerificationKeyBytes::from(pub_key_bytes),
sig: ed25519_zebra::Signature::from({ sig: ed25519_zebra::Signature::from({
let mut b = [0u8; 64]; let mut b = [0u8; 64];
b.copy_from_slice(sig_bytes.as_slice()); b.copy_from_slice(sig_bytes.as_slice());