chore: move BLS Sigs import to Rust Dash Core

dashpay · Oct 17, 2024 · 572623d · 572623d
1 parent 1c81d68
commit 572623d
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml
@@ -15,7 +15,6 @@ authors = [
 anyhow = { version = "1.0.81" }
 async-trait = { version = "0.1.79" }
 base64 = "0.22.1"
-bls-signatures = { git = "https://github.com/dashpay/bls-signatures", tag = "v1.3.1", optional = true }
 bs58 = "0.5"
 byteorder = { version = "1.4" }
 chrono = { version = "0.4.35", default-features = false, features = [
@@ -29,7 +28,9 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [
   "rand",
   "signer",
   "serde",
-], default-features = false, tag = "0.31.0" }
+  "bls",
+  "eddsa"
+], default-features = false, tag = "0.32.0" }
 env_logger = { version = "0.11" }
 getrandom = { version = "0.2", features = ["js"] }
 hex = { version = "0.4" }
@@ -56,7 +57,6 @@ platform-versioning = { path = "../rs-platform-versioning" }
 platform-serialization = { path = "../rs-platform-serialization" }
 platform-serialization-derive = { path = "../rs-platform-serialization-derive" }
 derive_more = { version = "1.0", features = ["from", "display"] }
-ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
 nohash-hasher = "0.2.0"
 rust_decimal = "1.29.1"
 rust_decimal_macros = "1.29.1"
@@ -75,6 +75,8 @@ once_cell = "1.7"
 
 [features]
 default = ["platform-value", "state-transitions"]
+bls-signatures = ["dashcore/bls"]
+ed25519-dalek = ["dashcore/eddsa"]
 all_features = [
   "json-object",
   "platform-value",

diff --git a/packages/rs-dpp/src/bls/native_bls.rs b/packages/rs-dpp/src/bls/native_bls.rs
@@ -1,6 +1,6 @@
 use crate::{BlsModule, ProtocolError, PublicKeyValidationError};
 use anyhow::anyhow;
-use bls_signatures::{PrivateKey, PublicKey};
+use dashcore::bls_signatures::{self, PrivateKey, PublicKey};
 
 #[derive(Default)]
 pub struct NativeBlsModule;

diff --git a/packages/rs-dpp/src/identity/identity_public_key/key_type.rs b/packages/rs-dpp/src/identity/identity_public_key/key_type.rs
@@ -8,7 +8,7 @@ use dashcore::secp256k1::rand::rngs::StdRng as EcdsaRng;
 #[cfg(feature = "random-public-keys")]
 use dashcore::secp256k1::rand::SeedableRng;
 use dashcore::secp256k1::Secp256k1;
-use dashcore::Network;
+use dashcore::{bls_signatures, ed25519_dalek, Network};
 use itertools::Itertools;
 use lazy_static::lazy_static;
 

diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs
@@ -7,7 +7,7 @@ use anyhow::anyhow;
 use dashcore::hashes::Hash;
 use dashcore::key::Secp256k1;
 use dashcore::secp256k1::SecretKey;
-use dashcore::{Network, PublicKey as ECDSAPublicKey};
+use dashcore::{bls_signatures, ed25519_dalek, Network, PublicKey as ECDSAPublicKey};
 use platform_value::Bytes20;
 
 impl IdentityPublicKeyHashMethodsV0 for IdentityPublicKeyV0 {

diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs
@@ -90,11 +90,11 @@ pub mod prelude {
 
 pub use bincode;
 #[cfg(all(not(target_arch = "wasm32"), feature = "bls-signatures"))]
-pub use bls_signatures;
+pub use dashcore::bls_signatures;
+#[cfg(feature = "ed25519-dalek")]
+pub use dashcore::ed25519_dalek;
 #[cfg(feature = "system_contracts")]
 pub use data_contracts;
-#[cfg(feature = "ed25519-dalek")]
-pub use ed25519_dalek;
 #[cfg(feature = "jsonschema")]
 pub use jsonschema;
 pub use platform_serialization;

diff --git a/packages/rs-dpp/src/signing.rs b/packages/rs-dpp/src/signing.rs
@@ -8,7 +8,7 @@ use crate::serialization::PlatformMessageSignable;
 use crate::validation::SimpleConsensusValidationResult;
 #[cfg(feature = "message-signing")]
 use crate::{BlsModule, ProtocolError};
-use dashcore::signer;
+use dashcore::{bls_signatures, signer};
 
 impl PlatformMessageSignable for &[u8] {
     #[cfg(feature = "message-signature-verification")]

diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml
@@ -28,7 +28,7 @@ rand = "0.8.5"
 tempfile = "3.3.0"
 hex = "0.4.3"
 indexmap = { version = "2.2.6", features = ["serde"] }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.7" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.8" }
 dpp = { path = "../rs-dpp", features = ["abci"] }
 simple-signer = { path = "../simple-signer" }
 rust_decimal = "1.2.5"

diff --git a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs
@@ -213,7 +213,7 @@ mod tests {
 
     use dpp::consensus::ConsensusError;
     use dpp::dashcore::secp256k1::Secp256k1;
-    use dpp::dashcore::{key::KeyPair, signer, Network, PrivateKey};
+    use dpp::dashcore::{key::Keypair, signer, Network, PrivateKey};
 
     use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters};
     use dpp::data_contract::document_type::random_document::{
@@ -2659,7 +2659,7 @@ mod tests {
 
         let secp = Secp256k1::new();
 
-        let new_key_pair = KeyPair::new(&secp, &mut rng);
+        let new_key_pair = Keypair::new(&secp, &mut rng);
 
         let mut new_key = IdentityPublicKeyInCreationV0 {
             id: 2,
@@ -2760,7 +2760,7 @@ mod tests {
 
         let platform_state = platform.state.load();
 
-        let new_key_pair = KeyPair::new(&secp, &mut rng);
+        let new_key_pair = Keypair::new(&secp, &mut rng);
 
         let new_key = IdentityPublicKeyInCreationV0 {
             id: 2,

diff --git a/...e-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs b/...e-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs
@@ -122,7 +122,7 @@ mod tests {
     use dpp::block::block_info::BlockInfo;
     use dpp::consensus::ConsensusError;
     use dpp::dash_to_credits;
-    use dpp::dashcore::key::{KeyPair, Secp256k1};
+    use dpp::dashcore::key::{Keypair, Secp256k1};
     use dpp::data_contract::accessors::v0::DataContractV0Getters;
     use dpp::identity::accessors::IdentityGettersV0;
     use dpp::identity::contract_bounds::ContractBounds;
@@ -371,7 +371,7 @@ mod tests {
 
         let mut rng = StdRng::seed_from_u64(1292);
 
-        let new_key_pair = KeyPair::new(&secp, &mut rng);
+        let new_key_pair = Keypair::new(&secp, &mut rng);
 
         let new_key = IdentityPublicKeyInCreationV0 {
             id: 2,

diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml
@@ -33,7 +33,7 @@ envy = { version = "0.4.2", optional = true }
 futures = { version = "0.3.30" }
 derive_more = { version = "1.0", features = ["from"] }
 # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.7" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.8" }
 lru = { version = "0.12.3", optional = true }
 bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" }
 zeroize = { version = "1.8", features = ["derive"] }

diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml
@@ -8,6 +8,6 @@ rust-version.workspace = true
 
 [dependencies]
 bincode = { version = "2.0.0-rc.3", features = ["serde"] }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.7" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.8" }
 dpp = { path = "../rs-dpp", features = ["abci"] }
 base64 = { version = "0.22.1" }