chore: use workspace dependencies & rename crypto-shared to mpc-crypto (

#172) * Renamed crypto-shared to mpc-crypto * fmt
sig-net · Feb 7, 2025 · 11fc78c · 11fc78c
1 parent a7f8532
commit 11fc78c
Show file tree

Hide file tree

Showing 33 changed files with 157 additions and 142 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ COPY chain-signatures/node/Cargo.toml Cargo.toml
 RUN sed -i 's#src/main.rs#dummy.rs#' Cargo.toml
 RUN sed -i 's#mpc-keys = { path = "../keys" }##' Cargo.toml
 RUN sed -i 's#mpc-contract = { path = "../contract" }##' Cargo.toml
-RUN sed -i 's#crypto-shared = { path = "../crypto-shared" }##' Cargo.toml
+RUN sed -i 's#mpc-crypto = { path = "../mpc-crypto" }##' Cargo.toml
 RUN sed -i 's#version.workspace = true##' Cargo.toml
 RUN cargo build --release
 # Now build the actual node

diff --git a/chain-signatures/Cargo.lock b/chain-signatures/Cargo.lock
diff --git a/chain-signatures/Cargo.toml b/chain-signatures/Cargo.toml
@@ -9,6 +9,31 @@ resolver = "2"
 [workspace.package]
 version = "1.0.0"
 
+[workspace.dependencies]
+anyhow = { version = "1.0.95", features = ["backtrace"] }
+borsh = "1.5.3"
+cait-sith = { git = "https://github.com/sig-net/cait-sith", rev = "9f34e8c", features = ["k256"] }
+hex = "0.4.3"
+k256 = { version = "0.13.1", features = [
+    "sha256",
+    "ecdsa",
+    "serde",
+    "arithmetic",
+    "expose-field",
+] }
+rand = "0.8.5"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+sha3 = "0.10.8"
+thiserror = "1"
+
+near-account-id = "1.0.0"
+near-sdk = { version = "5.6.0", features = ["legacy", "unit-testing", "unstable"] }
+
+mpc-contract = { path = "./contract" }
+mpc-crypto = { path = "./crypto" }
+mpc-keys = { path = "./keys" }
+
 [patch.crates-io]
 # TODO: trigger Cargo.lock update for x25519-dalek once they release.
 # This fixes https://rustsec.org/advisories/RUSTSEC-2024-0344 by pointing to a commit that includes the fix.

diff --git a/chain-signatures/contract/Cargo.toml b/chain-signatures/contract/Cargo.toml
@@ -7,17 +7,17 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-borsh = "1.5.3"
-near-sdk = { version = "5.6.0", features = ["legacy", "unit-testing"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-k256 = { version = "0.13.1", features = ["sha256", "ecdsa", "serde", "arithmetic", "expose-field"] }
-crypto-shared = { path = "../crypto-shared" }
-thiserror = "1"
+borsh.workspace = true
+k256.workspace = true
+mpc-crypto.workspace = true
+near-sdk.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+thiserror.workspace = true
 
 [dev-dependencies]
-anyhow = "1"
-rand = "0.8"
+anyhow.workspace = true
+rand.workspace = true
 tokio = { version = "1", features = ["full"] }
 
 # crypto dependencies

diff --git a/chain-signatures/contract/src/lib.rs b/chain-signatures/contract/src/lib.rs
@@ -4,16 +4,16 @@ pub mod primitives;
 pub mod state;
 pub mod update;
 
-use crypto_shared::{
-    derive_epsilon, derive_key, kdf::check_ec_signature, near_public_key_to_affine_point,
-    types::SignatureResponse, ScalarExt as _,
-};
 use errors::{
     ConversionError, InitError, InvalidParameters, InvalidState, JoinError, PublicKeyError,
     RespondError, SignError, VoteError,
 };
 use k256::elliptic_curve::sec1::ToEncodedPoint;
 use k256::Scalar;
+use mpc_crypto::{
+    derive_epsilon, derive_key, kdf::check_ec_signature, near_public_key_to_affine_point,
+    types::SignatureResponse, ScalarExt as _,
+};
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::collections::LookupMap;
 use near_sdk::json_types::U128;

diff --git a/chain-signatures/contract/src/primitives.rs b/chain-signatures/contract/src/primitives.rs
@@ -1,5 +1,5 @@
-use crypto_shared::{derive_epsilon, SerializableScalar};
 use k256::Scalar;
+use mpc_crypto::{derive_epsilon, SerializableScalar};
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::serde::{Deserialize, Serialize};
 use near_sdk::{AccountId, BorshStorageKey, CryptoHash, NearToken, PublicKey};

diff --git a/chain-signatures/contract/tests/common.rs b/chain-signatures/contract/tests/common.rs
@@ -1,11 +1,6 @@
 use std::collections::{BTreeMap, HashMap};
 use std::str::FromStr;
 
-use crypto_shared::kdf::{check_ec_signature, derive_secret_key};
-use crypto_shared::{
-    derive_epsilon, derive_key, ScalarExt as _, SerializableAffinePoint, SerializableScalar,
-    SignatureResponse,
-};
 use digest::{Digest, FixedOutput};
 use ecdsa::signature::Verifier;
 use k256::elliptic_curve::ops::Reduce;
@@ -16,6 +11,11 @@ use mpc_contract::primitives::{
     CandidateInfo, ParticipantInfo, Participants, SignRequest, SignatureRequest,
 };
 use mpc_contract::update::UpdateId;
+use mpc_crypto::kdf::{check_ec_signature, derive_secret_key};
+use mpc_crypto::{
+    derive_epsilon, derive_key, ScalarExt as _, SerializableAffinePoint, SerializableScalar,
+    SignatureResponse,
+};
 use near_workspaces::network::Sandbox;
 use near_workspaces::types::{AccountId, NearToken};
 use near_workspaces::{Account, Contract, Worker};

diff --git a/chain-signatures/contract/tests/sign.rs b/chain-signatures/contract/tests/sign.rs
@@ -5,7 +5,7 @@ use mpc_contract::errors;
 use mpc_contract::primitives::{CandidateInfo, SignRequest};
 use near_workspaces::types::{AccountId, NearToken};
 
-use crypto_shared::SignatureResponse;
+use mpc_crypto::SignatureResponse;
 use std::collections::HashMap;
 
 #[tokio::test]

diff --git a/chain-signatures/crypto-shared/Cargo.toml b/chain-signatures/crypto-shared/Cargo.toml
diff --git a/chain-signatures/crypto/Cargo.toml b/chain-signatures/crypto/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "mpc-crypto"
+version.workspace = true
+edition = "2021"
+
+[dependencies]
+k256.workspace = true
+anyhow.workspace = true
+serde.workspace = true
+borsh.workspace = true
+near-account-id.workspace = true
+serde_json.workspace = true
+near-sdk.workspace = true
+sha3.workspace = true
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.2.12", features = ["custom"] }
+
+[dev-dependencies]
diff --git a/chain-signatures/crypto-shared/src/kdf.rs → chain-signatures/crypto/src/kdf.rs b/chain-signatures/crypto-shared/src/kdf.rs → chain-signatures/crypto/src/kdf.rs
diff --git a/chain-signatures/crypto-shared/src/lib.rs → chain-signatures/crypto/src/lib.rs b/chain-signatures/crypto-shared/src/lib.rs → chain-signatures/crypto/src/lib.rs
diff --git a/chain-signatures/crypto-shared/src/types.rs → chain-signatures/crypto/src/types.rs b/chain-signatures/crypto-shared/src/types.rs → chain-signatures/crypto/src/types.rs
diff --git a/chain-signatures/keys/Cargo.toml b/chain-signatures/keys/Cargo.toml
@@ -7,11 +7,8 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-borsh = "1.5.3"
-hex = "0.4.3"
+borsh.workspace = true
+hex.workspace = true
 hpke = { version = "0.11", features = ["serde_impls", "std"] }
-serde = { version = "1", features = ["derive"] }
-rand = { version = "0.8" }
-
-[dev-dependencies]
-hex = "*"
+serde.workspace = true
+rand.workspace = true
diff --git a/chain-signatures/node/Cargo.toml b/chain-signatures/node/Cargo.toml
@@ -8,34 +8,24 @@ name = "mpc-node"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = { version = "1", features = ["backtrace"] }
 async-trait = "0.1"
 aws-config = "1.4"
 aws-sdk-s3 = "1.29"
 axum = { version = "0.6.19" }
 axum-extra = "0.7"
-borsh = "1.5.3"
-cait-sith = { git = "https://github.com/sig-net/cait-sith", rev = "9f34e8c", features = ["k256"] }
 ciborium = "0.2.2"
 clap = { version = "4.2", features = ["derive", "env"] }
 chrono = "0.4.24"
 google-datastore1 = "=5.0.4"
 google-secretmanager1 = "5"
-hex = "0.4.3"
 hkdf = "0.12.4"
 highway = "1.1.0"
 hyper = { version = "0.14", features = ["full"] }
 hyper-rustls = { version = "=0.24", features = ["http2"] }
-k256 = { version = "0.13.1", features = ["sha256", "ecdsa", "serde"] }
 local-ip-address = "0.5.4"
-rand = "0.8"
 reqwest = { version = "0.11.16", features = ["blocking", "json"] }
 semver = "1.0.23"
-sha3 = "0.10.8"
-serde = { version = "1", features = ["derive"] }
 serde_bytes = "0.11.15"
-serde_json = "1"
-thiserror = "1"
 tokio = { version = "1.28", features = ["full"] }
 tokio-retry = "0.3"
 tracing = "0.1"
@@ -44,17 +34,29 @@ tracing-stackdriver = "0.10.0"
 web3 = "0.19.0"
 url = { version = "2.4.0", features = ["serde"] }
 
-near-account-id = "1.0.0"
+# workspace dependencies
+anyhow.workspace = true
+borsh.workspace = true
+cait-sith.workspace = true
+hex.workspace = true
+k256.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha3.workspace = true
+thiserror.workspace = true
+
+near-account-id.workspace = true
 near-crypto = "0.26.0"
 near-fetch = "0.6.0"
 near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs", branch = "node/2.3.0" }
 near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs", branch = "node/2.3.0" }
 near-primitives = "0.26.0"
-near-sdk = { version = "5.2.1", features = ["legacy", "unit-testing"] }
+near-sdk.workspace = true
 
-mpc-contract = { path = "../contract" }
-mpc-keys = { path = "../keys" }
-crypto-shared = { path = "../crypto-shared" }
+mpc-contract.workspace = true
+mpc-keys.workspace = true
+mpc-crypto.workspace = true
 
 http = "1.1.0"
 prometheus = { version = "0.13.3" }

diff --git a/chain-signatures/node/src/indexer.rs b/chain-signatures/node/src/indexer.rs
@@ -1,8 +1,8 @@
 use crate::protocol::Chain::NEAR;
 use crate::protocol::{Chain, SignRequest};
 use crate::storage::app_data_storage::AppDataStorage;
-use crypto_shared::{derive_epsilon, ScalarExt};
 use k256::Scalar;
+use mpc_crypto::{derive_epsilon, ScalarExt};
 use near_account_id::AccountId;
 use near_lake_framework::{Lake, LakeBuilder, LakeContext};
 use near_lake_primitives::actions::ActionMetaDataExt;