Merge pull request #78 from dusk-network/update-deps

Update dependencies to make use of `[email protected]`
dusk-network · Jul 6, 2023 · 3c02311 · 3c02311
2 parents de60174 + 8b6b94d
commit 3c02311
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update `dusk-poseidon` to `0.26`
 - Update `dusk-plonk` to `0.12`
 - Update `dusk-bls12_381-sign` to `0.4`
+- Update dependencies
+- Update `phoenix-core` `0.18` -> `0.20.0-rc.0`
+- Update `dusk-pki` `0.11` -> `0.12`
+- Update `dusk-schnorr` `0.12` -> `0.13`
+- Update `dusk-poseidon` `0.29.1-rc.0` -> `0.30`
+- Update `dusk-plonk` `0.13` -> `0.14`
+- Change `dusk-merkle` dependency to `poseidon-merkle` after merkle crate separation
 
 ### Fixed
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dusk-wallet-core"
-version = "0.19.0-piecrust.0.6"
+version = "0.20.0-piecrust.0.6"
 edition = "2021"
 description = "The core functionality of the Dusk wallet"
 license = "MPL-2.0"
@@ -9,15 +9,15 @@ license = "MPL-2.0"
 rand_core = "^0.6"
 rand_chacha = { version = "^0.3", default-features = false }
 sha2 = { version = "^0.10", default-features = false }
-phoenix-core = { version = "0.18", default-features = false, features = ["alloc", "rkyv-impl"] }
-dusk-pki = { version = "0.11", default-features = false }
+phoenix-core = { version = "0.20.0-rc.0", default-features = false, features = ["alloc", "rkyv-impl"] }
+dusk-pki = { version = "0.12", default-features = false }
 dusk-bytes = "^0.1"
-dusk-schnorr = { version = "0.12", default-features = false }
+dusk-schnorr = { version = "0.13", default-features = false }
 dusk-jubjub = { version = "0.12", default-features = false }
-dusk-poseidon = { version = "0.29.1-rc.0", default-features = false }
-dusk-merkle = { version = "0.4.1-rc.0", features = ["poseidon", "rkyv-impl"] }
-dusk-plonk = { version = "0.13", default-features = false }
-rusk-abi = { version = "0.9.0-piecrust.0.6", default-features = false }
+dusk-poseidon = { version = "0.30", default-features = false }
+poseidon-merkle = { version = "0.2.1-rc.0", features = ["rkyv-impl"] }
+dusk-plonk = { version = "0.14", default-features = false }
+rusk-abi = { version = "0.10.0-piecrust.0.6", default-features = false }
 dusk-bls12_381-sign = { version = "0.4", default-features = false }
 rkyv = { version = "0.7", default-features = false }
 

diff --git a/src/ffi.rs b/src/ffi.rs
@@ -17,11 +17,11 @@ use dusk_bls12_381_sign::PublicKey;
 use dusk_bytes::Write;
 use dusk_bytes::{DeserializableSlice, Serializable};
 use dusk_jubjub::{BlsScalar, JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{PublicSpendKey, ViewKey};
 use dusk_plonk::prelude::Proof;
 use dusk_schnorr::Signature;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand_core::{
     impls::{next_u32_via_fill, next_u64_via_fill},
     CryptoRng, RngCore,

diff --git a/src/lib.rs b/src/lib.rs
@@ -24,11 +24,11 @@ use alloc::vec::Vec;
 use dusk_bls12_381_sign::{PublicKey, SecretKey};
 use dusk_bytes::{DeserializableSlice, Serializable, Write};
 use dusk_jubjub::{BlsScalar, JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{SecretSpendKey, ViewKey};
 use dusk_plonk::proof_system::Proof;
 use dusk_schnorr::Signature;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand_chacha::ChaCha12Rng;
 use rand_core::SeedableRng;
 use sha2::{Digest, Sha256};

diff --git a/src/tx.rs b/src/tx.rs
@@ -13,12 +13,12 @@ use dusk_bytes::{
     DeserializableSlice, Error as BytesError, Serializable, Write,
 };
 use dusk_jubjub::{BlsScalar, JubJubAffine, JubJubExtended};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{Ownable, SecretSpendKey};
 use dusk_plonk::prelude::{JubJubScalar, Proof};
 use dusk_schnorr::Proof as SchnorrSig;
 use phoenix_core::transaction::Transaction;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand_core::{CryptoRng, RngCore};
 use rusk_abi::hash::Hasher;
 use rusk_abi::{ContractId, CONTRACT_ID_BYTES, POSEIDON_TREE_DEPTH};

diff --git a/tests/mock.rs b/tests/mock.rs
@@ -8,7 +8,6 @@
 
 use dusk_bls12_381_sign::PublicKey;
 use dusk_jubjub::{BlsScalar, JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::{Item, Opening as PoseidonOpening, Tree};
 use dusk_pki::{PublicSpendKey, ViewKey};
 use dusk_plonk::prelude::Proof;
 use dusk_schnorr::Signature;
@@ -17,6 +16,7 @@ use dusk_wallet_core::{
     UnprovenTransaction, Wallet, POSEIDON_TREE_DEPTH,
 };
 use phoenix_core::{Crossover, Fee, Note, NoteType};
+use poseidon_merkle::{Item, Opening as PoseidonOpening, Tree};
 use rand_core::{CryptoRng, RngCore};
 
 fn default_opening() -> PoseidonOpening<(), POSEIDON_TREE_DEPTH, 4> {