Feat: new circuits part 1

CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
+- [#276](https://github.com/Manta-Network/manta-rs/pull/276) New circuits part 1: manta-crypto abstractions
 
 ### Changed
 

manta-accounting/src/key.rs

@@ -30,7 +30,7 @@ use core::{
     marker::PhantomData,
 };
 use manta_crypto::{
-    key::kdf::KeyDerivationFunction,
+    key::agreement::Derive,
     rand::{RngCore, Sample},
 };
 use manta_util::collections::btree_map::{self, BTreeMap};
@@ -168,7 +168,7 @@ pub trait HierarchicalKeyDerivationScheme {
     fn map<F>(self, key_derivation_function: F) -> Map<Self, F>
     where
         Self: Sized,
-        F: KeyDerivationFunction<Key = Self::SecretKey>,
+        F: Derive<SecretKey = Self::SecretKey>,
     {
         Map::new(self, key_derivation_function)
     }
@@ -209,7 +209,7 @@ where
 pub struct Map<H, F>
 where
     H: HierarchicalKeyDerivationScheme,
-    F: KeyDerivationFunction<Key = H::SecretKey>,
+    F: Derive<SecretKey = H::SecretKey>,
 {
     /// Base Derivation Scheme
     base: H,
@@ -221,7 +221,7 @@ where
 impl<H, F> Map<H, F>
 where
     H: HierarchicalKeyDerivationScheme,
-    F: KeyDerivationFunction<Key = H::SecretKey>,
+    F: Derive<SecretKey = H::SecretKey>,
 {
     /// Builds a new [`Map`] from `base` and `key_derivation_function`.
     #[inline]
@@ -236,11 +236,11 @@ where
 impl<H, F> HierarchicalKeyDerivationScheme for Map<H, F>
 where
     H: HierarchicalKeyDerivationScheme,
-    F: KeyDerivationFunction<Key = H::SecretKey>,
+    F: Derive<SecretKey = H::SecretKey>,
 {
     const GAP_LIMIT: IndexType = H::GAP_LIMIT;
 
-    type SecretKey = F::Output;
+    type SecretKey = F::PublicKey;
 
     #[inline]
     fn derive(&self, account: AccountIndex, kind: Kind, index: KeyIndex) -> Self::SecretKey {
@@ -264,7 +264,7 @@ where
 impl<H, F, D> Sample<(D, F)> for Map<H, F>
 where
     H: HierarchicalKeyDerivationScheme + Sample<D>,
-    F: KeyDerivationFunction<Key = H::SecretKey>,
+    F: Derive<SecretKey = H::SecretKey>,
 {
     #[inline]
     fn sample<R>(distribution: (D, F), rng: &mut R) -> Self

manta-accounting/src/transfer/mod.rs

@@ -126,9 +126,15 @@ pub trait Configuration {
     type PublicKey: Clone;
 
     /// Key Agreement Scheme Type
-    type KeyAgreementScheme: key::agreement::Types<SecretKey = SecretKey<Self>, PublicKey = PublicKey<Self>>
+    type KeyAgreementScheme: key::agreement::SecretKeyType<SecretKey = SecretKey<Self>>
+        + key::agreement::PublicKeyType<PublicKey = PublicKey<Self>>
+        + key::agreement::EphemeralPublicKeyType<EphemeralPublicKey = PublicKey<Self>>
+        + key::agreement::EphemeralSecretKeyType<EphemeralSecretKey = SecretKey<Self>>
+        + key::agreement::ReconstructSecret
         + key::agreement::Agree
-        + key::agreement::Derive;
+        + key::agreement::Derive
+        + key::agreement::DeriveEphemeral
+        + key::agreement::GenerateSecret;
 
     /// Secret Key Variable Type
     type SecretKeyVar: Variable<Secret, Self::Compiler, Type = SecretKey<Self>>;
@@ -139,7 +145,8 @@ pub trait Configuration {
 
     /// Key Agreement Scheme Variable Type
     type KeyAgreementSchemeVar: Constant<Self::Compiler, Type = Self::KeyAgreementScheme>
-        + key::agreement::Types<SecretKey = SecretKeyVar<Self>, PublicKey = PublicKeyVar<Self>>
+        + key::agreement::SecretKeyType<SecretKey = SecretKeyVar<Self>>
+        + key::agreement::PublicKeyType<PublicKey = PublicKeyVar<Self>>
         + key::agreement::Agree<Self::Compiler>
         + key::agreement::Derive<Self::Compiler>;
 

manta-crypto/Cargo.toml

@@ -60,6 +60,7 @@ std = [
     "ark-relations?/std",
     "ark-serialize?/std",
     "manta-util/std",
+    "rand?/std",
     "rand_chacha?/std",
 ]
 

manta-crypto/src/accumulator.rs

@@ -22,7 +22,7 @@ use core::{fmt::Debug, hash::Hash};
 /// Accumulator Membership Model Types
 pub trait Types {
     /// Item Type
-    type Item: ?Sized;
+    type Item;
 
     /// Secret Witness Type
     type Witness;