DO NOT MERGE: feat: upgrade to new crypto primitives

manta-accounting/src/asset.rs

@@ -38,8 +38,8 @@ use core::{
 };
 use derive_more::{Add, AddAssign, Display, From, Sub, SubAssign, Sum};
 use manta_crypto::{
-    constraint::{Allocator, Secret, ValueSource, Variable},
-    rand::{CryptoRng, Rand, RngCore, Sample},
+    constraint::{Allocate, Allocator, Secret, Variable},
+    rand::{Rand, RngCore, Sample},
 };
 use manta_util::{into_array_unchecked, Array, SizeLimit};
 
@@ -105,7 +105,7 @@ impl AssetId {
     #[inline]
     pub fn sample_up_to<R>(self, maximum: AssetValue, rng: &mut R) -> Asset
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         self.value(rng.gen_range(0..maximum.0))
     }
@@ -132,7 +132,7 @@ where
     #[inline]
     fn sample<R>(distribution: D, rng: &mut R) -> Self
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         Self(rng.sample(distribution))
     }
@@ -263,7 +263,7 @@ where
     #[inline]
     fn sample<R>(distribution: D, rng: &mut R) -> Self
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         Self(rng.sample(distribution))
     }
@@ -473,7 +473,7 @@ impl Sample for Asset {
     #[inline]
     fn sample<R>(_: (), rng: &mut R) -> Self
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         Self::new(rng.gen(), rng.gen())
     }

manta-accounting/src/key.rs

@@ -32,8 +32,8 @@ use core::{
     marker::PhantomData,
 };
 use manta_crypto::{
-    key::KeyDerivationFunction,
-    rand::{CryptoRng, RngCore, Sample},
+    key::kdf::KeyDerivationFunction,
+    rand::{RngCore, Sample},
 };
 
 #[cfg(feature = "serde")]
@@ -246,19 +246,19 @@ where
     #[inline]
     fn derive(&self, account: AccountIndex, kind: Kind, index: KeyIndex) -> Self::SecretKey {
         self.key_derivation_function
-            .derive(&self.base.derive(account, kind, index))
+            .derive(&self.base.derive(account, kind, index), &mut ())
     }
 
     #[inline]
     fn derive_spend(&self, account: AccountIndex, index: KeyIndex) -> Self::SecretKey {
         self.key_derivation_function
-            .derive(&self.base.derive_spend(account, index))
+            .derive(&self.base.derive_spend(account, index), &mut ())
     }
 
     #[inline]
     fn derive_view(&self, account: AccountIndex, index: KeyIndex) -> Self::SecretKey {
         self.key_derivation_function
-            .derive(&self.base.derive_view(account, index))
+            .derive(&self.base.derive_view(account, index), &mut ())
     }
 }
 
@@ -270,7 +270,7 @@ where
     #[inline]
     fn sample<R>(distribution: (D, F), rng: &mut R) -> Self
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         Self::new(H::sample(distribution.0, rng), distribution.1)
     }

manta-accounting/src/transfer/batch.rs

@@ -25,7 +25,7 @@ use crate::{
 use alloc::vec::Vec;
 use manta_crypto::{
     accumulator::Accumulator,
-    rand::{CryptoRng, Rand, RngCore},
+    rand::{Rand, RngCore},
 };
 use manta_util::into_array_unchecked;
 
@@ -54,7 +54,7 @@ where
         rng: &mut R,
     ) -> ([Receiver<C>; RECEIVERS], Self)
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         let mut receivers = Vec::with_capacity(RECEIVERS);
         let mut zeroes = Vec::with_capacity(RECEIVERS - 1);

manta-accounting/src/transfer/canonical.rs

@@ -114,7 +114,7 @@ where
         rng: &mut R,
     ) -> Self
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         Self::build(asset, spending_key.receiver(parameters, rng.gen(), asset))
     }
@@ -129,7 +129,7 @@ where
         rng: &mut R,
     ) -> (Self, PreSender<C>)
     where
-        R: CryptoRng + RngCore + ?Sized,
+        R: RngCore + ?Sized,
     {
         let (receiver, pre_sender) = spending_key.internal_pair(parameters, rng.gen(), asset);
         (Self::build(asset, receiver), pre_sender)