split RingMLSAG out of transaction core (mobilecoinfoundation#2026)

* WIP split RingMLSAG out of transaction core * Update crypto/ring-signature/src/domain_separators.rs Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/signer/src/no_keys_ring_signer.rs Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/signer/Cargo.toml Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/Cargo.toml Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/src/amount/commitment.rs Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/src/lib.rs Co-authored-by: Remoun Metyas <[email protected]> * Update transaction/core/src/proptest_fixtures.rs Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/signer/src/traits.rs Co-authored-by: Remoun Metyas <[email protected]> * Update crypto/ring-signature/src/amount/commitment.rs Co-authored-by: Remoun Metyas <[email protected]> * rename MLSAGError to RingSignatureError everywhere * remove unnecesary dependencies in ring-signature crate * fix a remoun nit * fix previous, move `Amount` and `TokenId` to `mc-transaction-types` * fix tests * Update transaction/core/tests/validation.rs Co-authored-by: Remoun Metyas <[email protected]> * Update transaction/core/src/signed_contingent_input.rs Co-authored-by: Remoun Metyas <[email protected]> * remove some undesired re-exports * small reorg * review comments, fixups * fix missing README * fix unused imports, fix review comments * add missing README * add more text to crypto-ring-signature readme Co-authored-by: Remoun Metyas <[email protected]>
cbeck88 · May 26, 2022 · 5a0be43 · 5a0be43
1 parent 7d91cac
commit 5a0be43
Show file tree

Hide file tree

Showing 81 changed files with 1,187 additions and 582 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,8 @@ members = [
     "crypto/multisig",
     "crypto/noise",
     "crypto/rand",
+    "crypto/ring-signature",
+    "crypto/ring-signature/signer",
     "crypto/x509/test-vectors",
     "crypto/x509/utils",
     "enclave-boundary",
@@ -121,6 +123,7 @@ members = [
     "transaction/core",
     "transaction/core/test-utils",
     "transaction/std",
+    "transaction/types",
     "util/b58-decoder",
     "util/build/enclave",
     "util/build/grpc",

diff --git a/android-bindings/Cargo.toml b/android-bindings/Cargo.toml
@@ -25,6 +25,7 @@ mc-crypto-box = { path = "../crypto/box" }
 mc-crypto-keys = { path = "../crypto/keys" }
 mc-crypto-noise = { path = "../crypto/noise" }
 mc-crypto-rand = { path = "../crypto/rand", features = ["std"] }
+mc-crypto-ring-signature-signer = { path = "../crypto/ring-signature/signer", default-features = false }
 mc-fog-report-types = { path = "../fog/report/types" }
 mc-fog-report-validation = { path = "../fog/report/validation" }
 mc-transaction-core = { path = "../transaction/core" }

diff --git a/android-bindings/src/bindings.rs b/android-bindings/src/bindings.rs
@@ -37,6 +37,7 @@ use mc_common::ResponderId;
 use mc_crypto_box::{CryptoBox, VersionedCryptoBox};
 use mc_crypto_keys::{CompressedRistrettoPublic, RistrettoPrivate, RistrettoPublic, X25519};
 use mc_crypto_rand::McRng;
+use mc_crypto_ring_signature_signer::NoKeysRingSigner;
 use mc_fog_kex_rng::{BufferedRng, KexRngPubkey, NewFromKex, StoredRng, VersionedKexRng};
 use mc_fog_report_types::{Report, ReportResponse};
 use mc_fog_report_validation::{FogReportResponses, FogResolver};
@@ -46,12 +47,10 @@ use mc_transaction_core::{
         create_shared_secret, recover_onetime_private_key, recover_public_subaddress_spend_key,
     },
     ring_signature::KeyImage,
-    signer::NoKeysRingSigner,
     tokens::Mob,
     tx::{Tx, TxOut, TxOutConfirmationNumber, TxOutMembershipProof},
     Amount, BlockVersion, CompressedCommitment, MaskedAmount, Token,
 };
-
 use mc_transaction_std::{
     AuthenticatedSenderMemo, AuthenticatedSenderWithPaymentRequestIdMemo, DestinationMemo,
     InputCredentials, MemoBuilder, MemoPayload, RTHMemoBuilder, ReservedSubaddresses,

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -34,6 +34,7 @@ mc-util-build-script = { path = "../util/build/script" }
 cargo-emit = "0.2.1"
 
 [dev-dependencies]
+mc-crypto-ring-signature-signer = { path = "../crypto/ring-signature/signer" }
 mc-crypto-x509-test-vectors = { path = "../crypto/x509/test-vectors" }
 mc-fog-report-validation-test-utils = { path = "../fog/report/validation/test-utils" }
 mc-test-vectors-b58-encodings = { path = "../test-vectors/b58-encodings" }

diff --git a/api/src/convert/signature_rct_bulletproofs.rs b/api/src/convert/signature_rct_bulletproofs.rs
@@ -1,9 +1,10 @@
+// Copyright (c) 2018-2022 The MobileCoin Foundation
+
 //! Convert to/from external::SignatureRctBulletproofs
 
 use crate::{convert::ConversionError, external};
 use mc_transaction_core::{
-    ring_signature::{RingMLSAG, SignatureRctBulletproofs},
-    CompressedCommitment,
+    ring_ct::SignatureRctBulletproofs, ring_signature::RingMLSAG, CompressedCommitment,
 };
 use protobuf::RepeatedField;
 use std::convert::TryFrom;

diff --git a/api/src/convert/tx.rs b/api/src/convert/tx.rs
@@ -1,7 +1,9 @@
+// Copyright (c) 2018-2022 The MobileCoin Foundation
+
 //! Convert to/from external::Tx.
 
 use crate::{convert::ConversionError, external};
-use mc_transaction_core::{ring_signature::SignatureRctBulletproofs, tx};
+use mc_transaction_core::{ring_ct::SignatureRctBulletproofs, tx};
 use std::convert::TryFrom;
 
 /// Convert mc_transaction_core::tx::Tx --> external::Tx.
@@ -29,10 +31,10 @@ impl TryFrom<&external::Tx> for tx::Tx {
 mod tests {
     use super::*;
     use mc_account_keys::AccountKey;
+    use mc_crypto_ring_signature_signer::NoKeysRingSigner;
     use mc_fog_report_validation_test_utils::MockFogResolver;
     use mc_transaction_core::{
-        constants::MILLIMOB_TO_PICOMOB, signer::NoKeysRingSigner, tokens::Mob, tx::Tx, Amount,
-        BlockVersion, Token, TokenId,
+        constants::MILLIMOB_TO_PICOMOB, tokens::Mob, tx::Tx, Amount, BlockVersion, Token, TokenId,
     };
     use mc_transaction_std::{
         test_utils::get_input_credentials, EmptyMemoBuilder, ReservedSubaddresses,

diff --git a/api/tests/prost.rs b/api/tests/prost.rs
@@ -1,11 +1,14 @@
+// Copyright (c) 2018-2022 The MobileCoin Foundation
+
 //! Tests that prost-versions of structures round-trip with the versions
 //! generated from external.proto
 
 use maplit::btreemap;
 use mc_account_keys::{AccountKey, PublicAddress, RootIdentity};
 use mc_api::external;
+use mc_crypto_ring_signature_signer::NoKeysRingSigner;
 use mc_fog_report_validation_test_utils::{FullyValidatedFogPubkey, MockFogResolver};
-use mc_transaction_core::{signer::NoKeysRingSigner, Amount, BlockVersion, SignedContingentInput};
+use mc_transaction_core::{Amount, BlockVersion, SignedContingentInput};
 use mc_transaction_std::{
     test_utils::get_input_credentials, EmptyMemoBuilder, ReservedSubaddresses,
     SignedContingentInputBuilder,

diff --git a/consensus/api/src/conversions.rs b/consensus/api/src/conversions.rs
@@ -15,7 +15,7 @@ use crate::{
 };
 use mc_api::ConversionError;
 use mc_transaction_core::{
-    mint::MintValidationError, ring_signature, ring_signature::MLSAGError,
+    mint::MintValidationError, ring_ct, ring_signature::Error as RingSignatureError,
     validation::TransactionValidationError as Error, BlockVersion, InputRuleError, TokenId,
 };
 use std::convert::{From, TryFrom, TryInto};
@@ -84,7 +84,7 @@ impl TryInto<Error> for ProposeTxResult {
             Self::InsufficientInputSignatures => Ok(Error::InsufficientInputSignatures),
             Self::InvalidInputSignature => Ok(Error::InvalidInputSignature),
             Self::InvalidTransactionSignature => Ok(Error::InvalidTransactionSignature(
-                ring_signature::Error::MLSAG(MLSAGError::InvalidSignature),
+                ring_ct::Error::RingSignature(RingSignatureError::InvalidSignature),
             )),
             Self::InvalidRangeProof => Ok(Error::InvalidRangeProof),
             Self::InsufficientRingSize => Ok(Error::InsufficientRingSize),

diff --git a/consensus/enclave/trusted/Cargo.lock b/consensus/enclave/trusted/Cargo.lock
diff --git a/consensus/service/Cargo.toml b/consensus/service/Cargo.toml
@@ -64,6 +64,7 @@ mc-sgx-build = { path = "../../sgx/build" }
 mc-account-keys = { path = "../../account-keys" }
 mc-common = { path = "../../common", features = ["loggers"] }
 mc-consensus-enclave-mock = { path = "../../consensus/enclave/mock" }
+mc-crypto-ring-signature-signer = { path = "../../crypto/ring-signature/signer" }
 mc-ledger-db = { path = "../../ledger/db", features = ["test_utils"] }
 mc-peers-test-utils = { path = "../../peers/test-utils" }
 mc-transaction-core-test-utils = { path = "../../transaction/core/test-utils" }

diff --git a/consensus/service/src/validators.rs b/consensus/service/src/validators.rs
@@ -491,10 +491,10 @@ mod is_valid_tests {
 mod combine_tests {
     use super::*;
     use mc_crypto_keys::{RistrettoPrivate, RistrettoPublic};
+    use mc_crypto_ring_signature_signer::NoKeysRingSigner;
     use mc_ledger_db::test_utils::get_mock_ledger;
     use mc_transaction_core::{
         onetime_keys::recover_onetime_private_key,
-        signer::NoKeysRingSigner,
         tokens::Mob,
         tx::{TxOut, TxOutMembershipProof},
         Amount, BlockVersion, Token,