Merge branch 'ref/crypto-via-common' into 'dev'

[ref] neon: use dup-crypto via dubp-common

See merge request !1325

Cargo.lock

@@ -129,6 +129,17 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40"
 
+[[package]]
+name = "dubp-common"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef0856c14d0ebd70bd577f3a85ab0bb08be080ee646a4c43d3e9c332bef9cac"
+dependencies = [
+ "dup-crypto",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "dubp-wot"
 version = "0.11.0"
@@ -146,8 +157,8 @@ version = "0.2.9"
 dependencies = [
  "bincode",
  "bs58",
+ "dubp-common",
  "dubp-wot",
- "dup-crypto",
  "flate2",
  "neon",
  "neon-build",
@@ -155,14 +166,15 @@ dependencies = [
 
 [[package]]
 name = "dup-crypto"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88f75f5b59cb0030d3443880c7c5889e1a25f14549677b5ffdcd770de464a97f"
+checksum = "f7315898eda74bf7c9e825f9afae1c9f16debb401fdb7d658fb851fb00a6260c"
 dependencies = [
  "base64",
  "bs58",
  "byteorder",
  "ring",
+ "serde",
  "thiserror",
  "unwrap",
  "zeroize",
@@ -309,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.10"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
  "unicode-xid",
 ]
@@ -405,18 +417,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.106"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.106"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -431,9 +443,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "syn"
-version = "1.0.18"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
+checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -454,18 +466,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.15"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b3d3d2ff68104100ab257bb6bb0cb26c901abe4bd4ba15961f3bf867924012"
+checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.15"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca972988113b7715266f91250ddb98070d033c62a011fa0fcc57434a649310dd"
+checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

 [workspace]
 members = ["neon/native"]
+
+[patch.crates-io]
+#dubp-common = { path = "../dubp-rs-libs/common" }

neon/native/Cargo.toml

@@ -17,7 +17,7 @@ neon-build = "0.4.0"
 [dependencies]
 bincode = "1.2.1"
 bs58 = "0.3.0"
-dup-crypto = { version = "0.17", default-features = false, features = ["rand", "scrypt"] }
+dubp-common = { version = "0.1.1", features = ["rand", "scrypt"] }
 dubp-wot = "0.11.0"
 flate2 = "1.0.16"
 neon = "0.4.0"

neon/native/src/crypto.rs

@@ -14,16 +14,16 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::into_neon_res;
-use dup_crypto::bases::b58::ToBase58;
-use dup_crypto::hashs::Hash;
-use dup_crypto::keys::{
+use dubp_common::crypto::bases::b58::ToBase58;
+use dubp_common::crypto::hashs::Hash;
+use dubp_common::crypto::keys::{
     ed25519::{
         Ed25519KeyPair, KeyPairFromSeed32Generator, PublicKey as Ed25519PublicKey,
         Signator as Ed25519Signator, Signature as Ed25519Signature,
     },
     KeyPair, PublicKey, Signator, Signature,
 };
-use dup_crypto::seeds::Seed32;
+use dubp_common::crypto::seeds::Seed32;
 use neon::declare_types;
 use neon::prelude::*;
 use std::ops::Deref;