Remove usages of mc-crypto-dalek

mobilecoinfoundation · Mar 24, 2023 · 1b4aa1d · 1b4aa1d
1 parent d790e3e
commit 1b4aa1d
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 80 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -14,7 +14,6 @@ mc-account-keys = { path = "../account-keys" }
 mc-attest-verifier-types = { path = "../attest/verifier/types" }
 mc-blockchain-types = { path = "../blockchain/types" }
 mc-common = { path = "../common", default-features = false }
-mc-crypto-dalek = { path = "../crypto/dalek" }
 mc-crypto-keys = { path = "../crypto/keys" }
 mc-crypto-multisig = { path = "../crypto/multisig" }
 mc-crypto-ring-signature-signer = { path = "../crypto/ring-signature/signer" }

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -7,9 +7,6 @@ license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [features]
-default = [
-    "mc-crypto-dalek/default"
-]
 std = [
     "displaydoc/std",
     "mc-util-serial/std",
@@ -40,7 +37,6 @@ loggers = [
 ]
 
 [dependencies]
-mc-crypto-dalek = { path = "../crypto/dalek", default_features = false, features = [ "serde", "alloc"] }
 mc-crypto-digestible = { path = "../crypto/digestible" }
 mc-crypto-keys = { path = "../crypto/keys", default-features = false, features = [ "serde", "alloc", "prost" ] }
 mc-crypto-rand = { path = "../crypto/rand" }

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
@@ -69,7 +69,6 @@ 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-dalek = { path = "../../crypto/dalek" }
 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" }
@@ -84,5 +83,4 @@ rand_hc = "0.3"
 serial_test = "1.0"
 tempfile = "3.4"
 
-# TODO: Consider using mc-crypto-dalek instead...
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false }
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,7 +13,7 @@ bip39 = ["dep:tiny-bip39", "dep:slip10_ed25519"]
 internals = [ ]
 serde = ["dep:serde", "mc-core-types/serde"]
 
-default = ["bip39", "mc-crypto-dalek/default"]
+default = ["bip39"]
 
 [dependencies]
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false }
@@ -27,7 +27,6 @@ tiny-bip39 = { version = "1.0", optional = true }
 zeroize = { version = "1.5", default-features = false }
 
 mc-core-types = { path = "./types" }
-mc-crypto-dalek = { path = "../crypto/dalek", default-features = false }
 mc-crypto-hashes = { path = "../crypto/hashes", default-features = false }
 mc-crypto-keys = { path = "../crypto/keys", default-features = false }
 

diff --git a/core/types/Cargo.toml b/core/types/Cargo.toml
@@ -14,7 +14,6 @@ prost = ["dep:prost", "mc-crypto-keys/prost"]
 
 [dependencies]
 # External dependencies
-# TODO: Consider using mc-crypto-dalek instead...
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false }
 prost = { version = "0.11", optional = true, default-features = false }
 serde = { version = "1.0.154", optional = true, default-features = false, features = [ "derive" ] }

diff --git a/crypto/digestible/Cargo.toml b/crypto/digestible/Cargo.toml
@@ -11,24 +11,20 @@ rust-version = { workspace = true }
 cfg-if = "1.0"
 
 # Built-in support for dalek primitives
-# TODO: Consider using mc-crypto-dalek instead...
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false, optional = true }
-# TODO: Consider using mc-crypto-dalek instead...
 ed25519-dalek = { version = "2.0.0-pre.0", default-features = false, optional = true }
 generic-array = "0.14"
 
 # For derive support
-mc-crypto-dalek = { path = "../dalek", optional = true, default-features = false }
 mc-crypto-digestible-derive = { path = "./derive", optional = true, default-features = false }
 merlin = { version = "3.0", default-features = false }
-# TODO: Consider using mc-crypto-dalek instead...
 x25519-dalek = { version = "2.0.0-pre.2", default-features = false, optional = true }
 
 [features]
-default = ["alloc", "derive", "dalek", "mc-crypto-dalek/default"]
+default = ["alloc", "derive", "dalek", "curve25519-dalek/default"]
 # Enables support for types in alloc crate
-alloc = ["mc-crypto-dalek/alloc"]
+alloc = ["curve25519-dalek/alloc", "ed25519-dalek/alloc"]
 # Enables re-export of derive(Digestible) macro
 derive = ["mc-crypto-digestible-derive"]
 # Enables support for some crypto primitives in dalek crates
-dalek = ["mc-crypto-dalek", "curve25519-dalek", "ed25519-dalek", "x25519-dalek"]
+dalek = ["curve25519-dalek", "ed25519-dalek", "x25519-dalek"]
diff --git a/crypto/keys/Cargo.toml b/crypto/keys/Cargo.toml
@@ -9,10 +9,10 @@ readme = "README.md"
 rust-version = { workspace = true }
 
 [features]
-alloc = ["base64/alloc", "mc-crypto-dalek/alloc", "mc-crypto-digestible/alloc", "mc-crypto-digestible-signature/alloc", "mc-util-repr-bytes/alloc"]
-serde = ["dep:serde", "ed25519/serde", "mc-crypto-dalek/serde", "mc-util-repr-bytes/serde"]
+alloc = ["base64/alloc", "curve25519-dalek/alloc", "ed25519-dalek/alloc", "mc-crypto-digestible/alloc", "mc-crypto-digestible-signature/alloc", "mc-util-repr-bytes/alloc"]
+serde = ["dep:serde", "ed25519/serde", "curve25519-dalek/serde", "ed25519-dalek/serde", "mc-util-repr-bytes/serde"]
 prost = ["alloc", "mc-util-repr-bytes/prost"]
-default = ["alloc", "serde", "prost", "mc-util-repr-bytes/default", "mc-crypto-dalek/default", "mc-util-serial"]
+default = ["alloc", "serde", "prost", "mc-util-repr-bytes/default", "curve25519-dalek/default", "mc-util-serial"]
 
 [dependencies]
 
@@ -25,7 +25,6 @@ ed25519-dalek = { version = "2.0.0-pre.0", default-features = false, features =
 hex = { version = "0.4", default-features = false }
 hex_fmt = "0.3"
 
-mc-crypto-dalek = { path = "../../crypto/dalek", default-features = false }
 mc-crypto-digestible = { path = "../../crypto/digestible", default-features = false, features = ["dalek", "derive"] }
 mc-crypto-digestible-signature = { path = "../../crypto/digestible/signature", default-features = false }
 mc-util-from-random = { path = "../../util/from-random" }

diff --git a/crypto/ring-signature/Cargo.toml b/crypto/ring-signature/Cargo.toml
@@ -8,12 +8,12 @@ readme = "README.md"
 rust-version = { workspace = true }
 
 [features]
-alloc = ["serde?/alloc", "mc-crypto-digestible/alloc", "mc-util-repr-bytes/alloc", "mc-crypto-dalek/alloc"]
-serde = ["dep:serde", "mc-crypto-dalek/serde", "mc-crypto-keys/serde"]
+alloc = ["serde?/alloc", "mc-crypto-digestible/alloc", "mc-util-repr-bytes/alloc", "curve25519-dalek/alloc", "ed25519-dalek/alloc"]
+serde = ["dep:serde", "curve25519-dalek/serde", "ed25519-dalek/serde", "mc-crypto-keys/serde"]
 prost = ["dep:prost", "mc-crypto-keys/prost", "mc-util-serial"]
 internals = []
 
-default = ["alloc", "serde", "prost", "mc-util-repr-bytes/default", "mc-crypto-dalek/default", "mc-crypto-hashes/default"]
+default = ["alloc", "serde", "prost", "mc-util-repr-bytes/default", "curve25519-dalek/default", "mc-crypto-hashes/default"]
 
 [dependencies]
 
@@ -27,7 +27,6 @@ hex_fmt = { version = "0.3", optional = true }
 # MobileCoin dependencies
 mc-account-keys-types = { path = "../../account-keys/types", default-features = false }
 mc-core-types = { path = "../../core/types", default-features = false }
-mc-crypto-dalek = { path = "../../crypto/dalek", default-features = false }
 mc-crypto-digestible = { path = "../../crypto/digestible", default-features = false, features = ["dalek", "derive"] }
 mc-crypto-hashes = { path = "../../crypto/hashes", default-features = false }
 mc-crypto-keys = { path = "../../crypto/keys", default-features = false }

diff --git a/crypto/ring-signature/signer/Cargo.toml b/crypto/ring-signature/signer/Cargo.toml
@@ -8,13 +8,12 @@ readme = "README.md"
 rust-version = { workspace = true }
 
 [features]
-serde = ["dep:serde", "mc-crypto-ring-signature/serde", "mc-crypto-dalek/serde"]
-alloc = ["serde/alloc", "mc-crypto-ring-signature/alloc", "mc-crypto-dalek/alloc"]
+serde = ["dep:serde", "mc-crypto-ring-signature/serde", "curve25519-dalek/serde"]
+alloc = ["serde/alloc", "mc-crypto-ring-signature/alloc", "curve25519-dalek/alloc"]
 
-default = ["serde", "alloc", "mc-crypto-dalek/default"]
+default = ["serde", "alloc", "curve25519-dalek/default"]
 
 [dependencies]
-# TODO: Consider using mc-crypto-dalek instead...
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false }
 # External dependencies
 displaydoc = { version = "0.2", default-features = false }
@@ -23,7 +22,6 @@ hex_fmt = "0.3"
 
 # MobileCoin dependencies
 mc-account-keys = { path = "../../../account-keys", default-features = false }
-mc-crypto-dalek = { path = "../../dalek", default-features = false }
 mc-crypto-keys = { path = "../../keys", default-features = false }
 mc-crypto-ring-signature = { path = "..", default-features = false, features = [ "alloc", "serde", "prost" ] }
 mc-transaction-types = { path = "../../../transaction/types" }

diff --git a/fog/distribution/Cargo.toml b/fog/distribution/Cargo.toml
@@ -18,7 +18,6 @@ mc-attest-verifier = { path = "../../attest/verifier" }
 mc-common = { path = "../../common", features = ["log"] }
 mc-connection = { path = "../../connection" }
 mc-consensus-enclave-measurement = { path = "../../consensus/enclave/measurement" }
-mc-crypto-dalek = { path = "../../crypto/dalek" }
 mc-crypto-keys = { path = "../../crypto/keys" }
 mc-crypto-ring-signature-signer = { path = "../../crypto/ring-signature/signer" }
 mc-fog-ingest-enclave-measurement = { path = "../ingest/enclave/measurement" }
@@ -40,7 +39,6 @@ rayon = "1.7"
 retry = "2.0"
 tempfile = "3.4"
 
-# TODO: Consider using mc-crypto-dalek instead...
 curve25519-dalek = { version = "4.0.0-rc.1", default-features = false }
 
 [dev-dependencies]

diff --git a/fog/ingest/enclave/trusted/Cargo.lock b/fog/ingest/enclave/trusted/Cargo.lock