diff --git a/Cargo.lock b/Cargo.lock index c96708a42..6ee41c8dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,9 +428,9 @@ checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" [[package]] name = "ed25519-zebra" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a8b1ce4012933385e8a820355e972bcfb8ee55993cd63e70d47a085298020b" +checksum = "802a065ae2171664a2bf607c0571d21c267a0ad2c6c8dad4a5668f09bf34f661" dependencies = [ "curve25519-dalek", "hex", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 2edd9711e..93d3c1a57 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -25,10 +25,10 @@ serde = { version = "1", features = ["serde_derive", "rc"] } sha2 = { version = "0.8.2", features=["compress"] } thiserror = "1" x25519-dalek = { version = "0.6", features = ["serde"] } -# ZF deps -ed25519-zebra = "0.2" -redjubjub = "0.1" serde-big-array = "0.3.0" +# ZF deps +ed25519-zebra = "0.3" +redjubjub = "0.1" [dev-dependencies] proptest = "0.10" diff --git a/zebra-chain/src/transaction/joinsplit.rs b/zebra-chain/src/transaction/joinsplit.rs index 0963cb363..1eb5be1e2 100644 --- a/zebra-chain/src/transaction/joinsplit.rs +++ b/zebra-chain/src/transaction/joinsplit.rs @@ -146,7 +146,7 @@ pub struct JoinSplitData { ))] pub rest: Vec>, /// The public key for the JoinSplit signature. - pub pub_key: ed25519_zebra::PublicKeyBytes, + pub pub_key: ed25519_zebra::VerificationKeyBytes, /// The JoinSplit signature. pub sig: ed25519_zebra::Signature, } @@ -172,7 +172,7 @@ impl Arbitrary for JoinSplitData

{ .prop_map(|(first, rest, pub_key_bytes, sig_bytes)| Self { first, rest, - pub_key: ed25519_zebra::PublicKeyBytes::from(pub_key_bytes), + pub_key: ed25519_zebra::VerificationKeyBytes::from(pub_key_bytes), sig: ed25519_zebra::Signature::from({ let mut b = [0u8; 64]; b.copy_from_slice(sig_bytes.as_slice());