diff --git a/Cargo.lock b/Cargo.lock index ed5d9746..47146aaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,7 +234,7 @@ dependencies = [ [[package]] name = "bls-dash-sys" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?rev=3ffa7fa2b62aecf3943c142508de4b7ec6005bb5#3ffa7fa2b62aecf3943c142508de4b7ec6005bb5" +source = "git+https://github.com/dashpay/bls-signatures?rev=4e070243aed142bc458472f8807ab77527dd879a#4e070243aed142bc458472f8807ab77527dd879a" dependencies = [ "bindgen", "cc", @@ -244,7 +244,7 @@ dependencies = [ [[package]] name = "bls-signatures" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?rev=3ffa7fa2b62aecf3943c142508de4b7ec6005bb5#3ffa7fa2b62aecf3943c142508de4b7ec6005bb5" +source = "git+https://github.com/dashpay/bls-signatures?rev=4e070243aed142bc458472f8807ab77527dd879a#4e070243aed142bc458472f8807ab77527dd879a" dependencies = [ "bls-dash-sys", "hex", @@ -515,7 +515,7 @@ version = "0.1.0" [[package]] name = "dash-spv-masternode-processor" -version = "0.4.16" +version = "0.4.18" dependencies = [ "base64", "bincode", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "dash_spv_apple_bindings" -version = "0.4.16" +version = "0.4.18" dependencies = [ "cbindgen 0.24.5", "dash-spv-masternode-processor", diff --git a/DashSharedCore.podspec b/DashSharedCore.podspec index 78b8f5e6..220df8fb 100644 --- a/DashSharedCore.podspec +++ b/DashSharedCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DashSharedCore' - s.version = '0.4.17' + s.version = '0.4.18' s.summary = 'Dash Core SPV written in Rust' s.author = 'Dash' s.description = "C-bindings for Dash Core SPV that can be used in projects for Apple platform" diff --git a/dash-spv-apple-bindings/Cargo.toml b/dash-spv-apple-bindings/Cargo.toml index 282445f9..e1abec2e 100644 --- a/dash-spv-apple-bindings/Cargo.toml +++ b/dash-spv-apple-bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dash_spv_apple_bindings" -version = "0.4.17" +version = "0.4.18" description = "C-bindings for using and interoperating with Dash SPV" readme = "README.md" edition = "2021" diff --git a/dash-spv-masternode-processor/Cargo.toml b/dash-spv-masternode-processor/Cargo.toml index 25e3fa18..46a5b2e8 100644 --- a/dash-spv-masternode-processor/Cargo.toml +++ b/dash-spv-masternode-processor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dash-spv-masternode-processor" -version = "0.4.16" +version = "0.4.18" description = "Library for processing masternodes and quorums (SPV)" edition = "2021" @@ -29,7 +29,7 @@ bip38 = { git = "https://github.com/pankcuf/bip38", rev = "87abd21" } bitcoin_hashes = { version = "0.11.0", default-features = false } bitcoinconsensus = { version = "0.19.0-3", optional = true } blake3 = "1.3.2" -bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "3ffa7fa2b62aecf3943c142508de4b7ec6005bb5", features = ["legacy", "bip32", "apple", "use_serde" ] } +bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "4e070243aed142bc458472f8807ab77527dd879a", features = ["legacy", "bip32", "apple", "use_serde" ] } byte = "0.2" core2 = { version = "0.4.0", optional = true, default-features = false } dirs-next = "2.0.0" diff --git a/dash-spv-masternode-processor/src/bindings/keys.rs b/dash-spv-masternode-processor/src/bindings/keys.rs index 361dd279..9041b547 100644 --- a/dash-spv-masternode-processor/src/bindings/keys.rs +++ b/dash-spv-masternode-processor/src/bindings/keys.rs @@ -21,8 +21,6 @@ use crate::processing::keys_cache::KeysCache; use crate::types::opaque_key::{AsCStringPtr, AsOpaqueKey, OpaqueKey, KeyWithUniqueId, OpaqueKeys, OpaqueSerializedKeys}; use crate::util::address::address; use crate::util::sec_vec::SecVec; -#[cfg(feature = "use_serde")] -use serde::{Deserialize, Deserializer, Serialize, Serializer}; /// Destroys /// # Safety diff --git a/dash-spv-masternode-processor/src/keys/bls_key.rs b/dash-spv-masternode-processor/src/keys/bls_key.rs index 940819c1..937c8903 100644 --- a/dash-spv-masternode-processor/src/keys/bls_key.rs +++ b/dash-spv-masternode-processor/src/keys/bls_key.rs @@ -1,7 +1,6 @@ use bls_signatures::bip32::{ChainCode, ExtendedPrivateKey, ExtendedPublicKey}; use bls_signatures::{BasicSchemeMPL, BlsError, G1Element, G2Element, LegacySchemeMPL, PrivateKey, Scheme}; -use hashes::{Hash, hex::FromHex, sha256, sha256d, hex}; -use hashes::hex::ToHex; +use hashes::{Hash, hex::FromHex, sha256, sha256d}; use crate::chain::{derivation::IIndexPath, ScriptMap}; use crate::consensus::Encodable; use crate::crypto::{UInt256, UInt384, UInt768, byte_util::{AsBytes, BytesDecodable, Zeroable}, UInt160}; @@ -9,8 +8,6 @@ use crate::keys::{IKey, KeyKind, dip14::{IChildKeyDerivation, SignKey}}; use crate::keys::crypto_data::{CryptoData, DHKey}; use crate::models::OperatorPublicKey; use crate::util::{base58, data_ops::hex_with_data, sec_vec::SecVec}; -#[cfg(feature = "use_serde")] -use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[derive(Clone, Debug, Default)] pub struct BLSKey { diff --git a/dash-spv-masternode-processor/src/keys/key.rs b/dash-spv-masternode-processor/src/keys/key.rs index a8e100cf..a115f7ec 100644 --- a/dash-spv-masternode-processor/src/keys/key.rs +++ b/dash-spv-masternode-processor/src/keys/key.rs @@ -5,8 +5,6 @@ use crate::crypto::{UInt256, UInt384, UInt768}; use crate::keys::{BLSKey, ECDSAKey, ED25519Key, IKey}; use crate::types::opaque_key::{AsOpaqueKey, OpaqueKey}; use crate::util::sec_vec::SecVec; -#[cfg(feature = "use_serde")] -use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[repr(C)] #[derive(Clone, Copy, Debug, PartialEq)] diff --git a/dash-spv-masternode-processor/src/tests/bindings/keys.rs b/dash-spv-masternode-processor/src/tests/bindings/keys.rs index 7c0fb1da..2710eeb6 100644 --- a/dash-spv-masternode-processor/src/tests/bindings/keys.rs +++ b/dash-spv-masternode-processor/src/tests/bindings/keys.rs @@ -8,8 +8,6 @@ use crate::crypto::{UInt256, UInt384}; use crate::ffi::IndexPathData; use crate::keys::KeyKind; use crate::types::opaque_key::OpaqueKey; -#[cfg(feature = "use_serde")] -use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[test] fn test_keys() {