Merge pull request #17 from dusk-network/update_poseidon

Add gate-featured Canon usage/derivation.

.github/workflows/dusk_ci.yml

@@ -48,7 +48,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --release
+          args: --release --features canon
 
   fmt:
     name: Rustfmt

Cargo.toml

@@ -1,12 +1,14 @@
 [package]
 name = "dusk-pki"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["zer0 <[email protected]>", "Victor Lopez <[email protected]"]
 edition = "2018"
 
 [dependencies]
-poseidon252 = { git = "https://github.com/dusk-network/Poseidon252", tag = "v0.8.0"}
-dusk-jubjub = "0.3.8"
+poseidon252 = { git = "https://github.com/dusk-network/Poseidon252", tag = "v0.12.0"}
+dusk-jubjub = "0.4"
+canonical = {version = "0.4", optional = true}
+canonical_derive = {version = "0.4", optional = true}
 hex = "^0.4"
 rand = "^0.7"
 sha2 = "0.8"
@@ -16,3 +18,6 @@ thiserror = "1.0"
 [dependencies.subtle]
 version = "^2.2.1"
 default-features = false
+
+[features]
+canon = ["canonical", "canonical_derive", "dusk-jubjub/canon", "poseidon252/canon"]

rust-toolchain

@@ -1 +1 @@
-stable
+nightly

src/spend/public.rs

@@ -12,13 +12,18 @@ use crate::{
     decode::decode, Error, JubJubAffine, JubJubExtended, JubJubScalar,
 };
 
+#[cfg(feature = "canon")]
+use canonical::Canon;
+#[cfg(feature = "canon")]
+use canonical_derive::Canon;
 use dusk_jubjub::GENERATOR_EXTENDED;
 use std::convert::TryFrom;
 use std::fmt;
 use subtle::{Choice, ConstantTimeEq};
 
 /// Public pair of `a·G` and `b·G`
 #[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "canon", derive(Canon))]
 pub struct PublicKey {
     A: JubJubExtended,
     B: JubJubExtended,

src/spend/secret.rs

@@ -14,13 +14,18 @@ use dusk_jubjub::GENERATOR_EXTENDED;
 
 use std::fmt;
 
+#[cfg(feature = "canon")]
+use canonical::Canon;
+#[cfg(feature = "canon")]
+use canonical_derive::Canon;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use rand::{CryptoRng, RngCore};
 use sha2::{Digest, Sha256};
 
 /// Secret pair of `a` and `b`
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(feature = "canon", derive(Canon))]
 pub struct SecretKey {
     a: JubJubScalar,
     b: JubJubScalar,

src/spend/stealth.rs

@@ -6,6 +6,10 @@
 
 use crate::{decode::decode, Error, JubJubAffine, JubJubExtended};
 
+#[cfg(feature = "canon")]
+use canonical::Canon;
+#[cfg(feature = "canon")]
+use canonical_derive::Canon;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use subtle::{Choice, ConstantTimeEq};
@@ -22,6 +26,7 @@ pub trait Ownable {
 /// A `StealthAddress` is composed by a one-time public key (`pk_r`, the actual
 // address) and a random point `R`.
 #[derive(Debug, Clone, Copy)]
+#[cfg_attr(feature = "canon", derive(Canon))]
 pub struct StealthAddress {
     pub(crate) R: JubJubExtended,
     pub(crate) pk_r: JubJubExtended,