Mc crypto ring signature no alloc improvements (#2297)

* move generator cache back to transaction core this is just code movement, no functional change * Create mc-account-keys-types, break dep alloc in mc-crypto-ring-signature This adds a trait for a subset of the functionality of `PublicAddress` to a trait called `RingCtAddress`. This is then used in `mc-crypto-ring-signature` which allows us to break the dependency of that crate on `mc-account-keys`. This is helpful because `mc-account-keys` depends on `alloc`, but we want `mc-crypto-ring-signature` not to depend on `alloc`. * cargo fmt * Update account-keys/types/src/traits.rs Co-authored-by: sugargoat <sugargoat@mobilecoin.com> Co-authored-by: sugargoat <sugargoat@mobilecoin.com>
mobilecoinfoundation · Jul 24, 2022 · 302bf9f · 302bf9f
1 parent 281353e
commit 302bf9f
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,6 +4,7 @@ cargo-features = ["named-profiles"]
 members = [
     "account-keys",
     "account-keys/slip10",
+    "account-keys/types",
     "admin-http-gateway",
     "android-bindings",
     "api",

diff --git a/account-keys/Cargo.toml b/account-keys/Cargo.toml
@@ -15,6 +15,7 @@ subtle = { version = "2", default-features = false }
 zeroize = { version = "1", default-features = false }
 
 # MobileCoin dependencies
+mc-account-keys-types = { path = "types" }
 mc-crypto-digestible = { path = "../crypto/digestible" }
 mc-crypto-hashes = { path = "../crypto/hashes" }
 mc-crypto-keys = { path = "../crypto/keys", default-features = false }

diff --git a/account-keys/src/account_keys.rs b/account-keys/src/account_keys.rs
@@ -23,6 +23,7 @@ use core::{
     hash::{Hash, Hasher},
 };
 use curve25519_dalek::{ristretto::RistrettoPoint, scalar::Scalar};
+use mc_account_keys_types::RingCtAddress;
 use mc_crypto_digestible::Digestible;
 use mc_crypto_hashes::{Blake2b512, Digest};
 use mc_crypto_keys::{RistrettoPrivate, RistrettoPublic};
@@ -187,6 +188,16 @@ impl PublicAddress {
     }
 }
 
+impl RingCtAddress for PublicAddress {
+    fn view_public_key(&self) -> &RistrettoPublic {
+        &self.view_public_key
+    }
+
+    fn spend_public_key(&self) -> &RistrettoPublic {
+        &self.spend_public_key
+    }
+}
+
 impl AuthorityVerifier for PublicAddress {
     type Sig = <RistrettoPublic as AuthorityVerifier>::Sig;
     type Error = <RistrettoPublic as AuthorityVerifier>::Error;

diff --git a/account-keys/types/Cargo.toml b/account-keys/types/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "mc-account-keys-types"
+version = "1.3.0-pre0"
+authors = ["MobileCoin"]
+edition = "2021"
+readme = "README.md"
+
+[dependencies]
+# MobileCoin dependencies
+mc-crypto-keys = { path = "../../crypto/keys", default-features = false }
diff --git a/account-keys/types/src/lib.rs b/account-keys/types/src/lib.rs
@@ -0,0 +1,12 @@
+// Copyright (c) 2018-2022 The MobileCoin Foundation
+
+//! Traits and wrapper types connected to MobileCoin account keys.
+//! This crate is intended to have a small footprint and be maximally portable.
+
+#![no_std]
+#![deny(missing_docs)]
+#![deny(unsafe_code)]
+
+mod traits;
+
+pub use traits::RingCtAddress;
diff --git a/account-keys/types/src/traits.rs b/account-keys/types/src/traits.rs
@@ -0,0 +1,10 @@
+use mc_crypto_keys::RistrettoPublic;
+
+/// An object which represents a subaddress, and has RingCT-style
+/// view and spend public keys.
+pub trait RingCtAddress {
+    /// Get the subaddress' view public key
+    fn view_public_key(&self) -> &RistrettoPublic;
+    /// Get the subaddress' spend public key
+    fn spend_public_key(&self) -> &RistrettoPublic;
+}
diff --git a/consensus/enclave/trusted/Cargo.lock b/consensus/enclave/trusted/Cargo.lock
diff --git a/crypto/ring-signature/Cargo.toml b/crypto/ring-signature/Cargo.toml
@@ -18,7 +18,7 @@ subtle = { version = "2.4.1", default-features = false, features = ["i128"] }
 zeroize = { version = "1", default-features = false }
 
 # MobileCoin dependencies
-mc-account-keys = { path = "../../account-keys", default-features = false }
+mc-account-keys-types = { path = "../../account-keys/types", default-features = false }
 mc-crypto-digestible = { path = "../../crypto/digestible", features = ["dalek", "derive"] }
 mc-crypto-hashes = { path = "../../crypto/hashes" }
 mc-crypto-keys = { path = "../../crypto/keys", default-features = false }
@@ -36,6 +36,7 @@ curve25519-dalek = { version = "4.0.0-pre.2", default-features = false, features
 proptest = { version = "1.0", default-features = false, features = ["default-code-coverage"] }
 tempdir = "0.3"
 
+mc-account-keys = { path = "../../account-keys", default-features = false }
 mc-crypto-digestible-test-utils = { path = "../../crypto/digestible/test-utils" }
 mc-util-serial = { path = "../../util/serial", features = ["std"] }
 mc-util-test-helper = { path = "../../util/test-helper" }
diff --git a/crypto/ring-signature/src/lib.rs b/crypto/ring-signature/src/lib.rs
@@ -21,8 +21,8 @@ pub mod proptest_fixtures;
 
 pub use amount::{Commitment, CompressedCommitment};
 pub use ring_signature::{
-    generators, CryptoRngCore, CurveScalar, Error, GeneratorCache, KeyImage, PedersenGens,
-    ReducedTxOut, RingMLSAG, Scalar,
+    generators, CryptoRngCore, CurveScalar, Error, KeyImage, PedersenGens, ReducedTxOut, RingMLSAG,
+    Scalar,
 };
 
 /// Get the shared secret for a transaction output.

diff --git a/crypto/ring-signature/src/onetime_keys.rs b/crypto/ring-signature/src/onetime_keys.rs
@@ -75,7 +75,7 @@ use crate::domain_separators::HASH_TO_SCALAR_DOMAIN_TAG;
 use curve25519_dalek::{
     constants::RISTRETTO_BASEPOINT_POINT, ristretto::RistrettoPoint, scalar::Scalar,
 };
-use mc_account_keys::PublicAddress;
+use mc_account_keys_types::RingCtAddress;
 use mc_crypto_hashes::{Blake2b512, Digest};
 use mc_crypto_keys::{RistrettoPrivate, RistrettoPublic};
 
@@ -98,7 +98,7 @@ fn hash_to_scalar(point: RistrettoPoint) -> Scalar {
 /// * `recipient` - The recipient subaddress `(C,D)`.
 pub fn create_tx_out_target_key(
     tx_private_key: &RistrettoPrivate,
-    recipient: &PublicAddress,
+    recipient: &impl RingCtAddress,
 ) -> RistrettoPublic {
     // `Hs( r * C)`
     let Hs: Scalar = {
@@ -198,7 +198,7 @@ pub fn create_shared_secret(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use mc_account_keys::AccountKey;
+    use mc_account_keys::{AccountKey, PublicAddress};
     use mc_util_from_random::FromRandom;
     use mc_util_test_helper::run_with_several_seeds;
 

diff --git a/crypto/ring-signature/src/ring_signature/mod.rs b/crypto/ring-signature/src/ring_signature/mod.rs
@@ -8,14 +8,12 @@ pub use curve25519_dalek::{ristretto::RistrettoPoint, scalar::Scalar};
 
 mod curve_scalar;
 mod error;
-mod generator_cache;
 mod key_image;
 mod mlsag;
 
 pub use self::{
     curve_scalar::CurveScalar,
     error::Error,
-    generator_cache::GeneratorCache,
     key_image::KeyImage,
     mlsag::{CryptoRngCore, ReducedTxOut, RingMLSAG},
 };

diff --git a/fog/ingest/enclave/trusted/Cargo.lock b/fog/ingest/enclave/trusted/Cargo.lock
diff --git a/fog/ledger/enclave/trusted/Cargo.lock b/fog/ledger/enclave/trusted/Cargo.lock
diff --git a/fog/view/enclave/trusted/Cargo.lock b/fog/view/enclave/trusted/Cargo.lock
diff --git a/...ure/src/ring_signature/generator_cache.rs → ...ction/core/src/ring_ct/generator_cache.rs b/...ure/src/ring_signature/generator_cache.rs → ...ction/core/src/ring_ct/generator_cache.rs
@@ -2,8 +2,8 @@
 
 //! A simple generator cache
 
-use super::{generators, PedersenGens};
 use alloc::collections::BTreeMap;
+use mc_crypto_ring_signature::{generators, PedersenGens};
 use mc_transaction_types::TokenId;
 
 /// GeneratorCache is a simple object which caches computations of

diff --git a/transaction/core/src/ring_ct/mod.rs b/transaction/core/src/ring_ct/mod.rs
@@ -3,10 +3,12 @@
 //! MobileCoin RingCT implementation
 
 mod error;
+mod generator_cache;
 mod rct_bulletproofs;
 
 pub use self::{
     error::Error,
+    generator_cache::GeneratorCache,
     rct_bulletproofs::{
         InputRing, OutputSecret, PresignedInputRing, SignatureRctBulletproofs, SignedInputRing,
     },

diff --git a/transaction/core/src/ring_ct/rct_bulletproofs.rs b/transaction/core/src/ring_ct/rct_bulletproofs.rs
@@ -18,7 +18,7 @@ use curve25519_dalek::{
 use mc_common::HashSet;
 use mc_crypto_digestible::{DigestTranscript, Digestible, MerlinTranscript};
 use mc_crypto_ring_signature::{
-    Commitment, CompressedCommitment, GeneratorCache, KeyImage, ReducedTxOut, RingMLSAG, Scalar,
+    Commitment, CompressedCommitment, KeyImage, ReducedTxOut, RingMLSAG, Scalar,
 };
 use mc_crypto_ring_signature_signer::{RingSigner, SignableInputRing};
 use mc_util_serial::prost::Message;
@@ -31,7 +31,7 @@ use crate::{
     constants::FEE_BLINDING,
     domain_separators::EXTENDED_MESSAGE_DOMAIN_TAG,
     range_proofs::{check_range_proofs, generate_range_proofs},
-    ring_ct::Error,
+    ring_ct::{Error, GeneratorCache},
     Amount, BlockVersion,
 };
 

diff --git a/transaction/core/src/signed_contingent_input.rs b/transaction/core/src/signed_contingent_input.rs
@@ -3,15 +3,14 @@
 //! A signed contingent input as described in MCIP #31
 
 use crate::{
-    ring_ct::{OutputSecret, PresignedInputRing, SignedInputRing},
+    ring_ct::{GeneratorCache, OutputSecret, PresignedInputRing, SignedInputRing},
     tx::TxIn,
     Amount, TokenId,
 };
 use alloc::vec::Vec;
 use displaydoc::Display;
 use mc_crypto_ring_signature::{
-    Commitment, CompressedCommitment, CurveScalar, Error as RingSignatureError, GeneratorCache,
-    KeyImage, RingMLSAG,
+    Commitment, CompressedCommitment, CurveScalar, Error as RingSignatureError, KeyImage, RingMLSAG,
 };
 use prost::Message;