rusk: Update dependencies

rusk/Cargo.toml

@@ -37,17 +37,17 @@ bs58 = "0.4"
 hex = "0.4"
 tempfile = "3.2"
 
-dusk-schnorr = "0.12"
-dusk-poseidon = "0.29.1-rc.0"
-dusk-merkle = { version = "0.4.1-rc.0", features = ["poseidon"] }
-dusk-plonk = "0.13"
+dusk-schnorr = "0.13"
+dusk-poseidon = "0.30"
+poseidon-merkle = { version = "0.2.1-rc.0", features = ["rkyv-impl", "size_32"] }
+dusk-plonk = "0.14"
 dusk-bls12_381 = "0.11"
 dusk-bls12_381-sign = "0.4"
 dusk-jubjub = "0.12"
-dusk-pki = "0.11"
+dusk-pki = "0.12"
 dusk-bytes = "0.1"
-dusk-wallet-core = "0.17.1-piecrust.0.5"
-phoenix-core = "0.18"
+dusk-wallet-core = "0.18.0-piecrust.0.5"
+phoenix-core = "0.20.0-rc.0"
 piecrust = "0.5"
 kadcast = "0.5.0-rc"
 parking_lot = "0.12"

rusk/src/lib/lib.rs

@@ -20,14 +20,14 @@ pub mod transaction;
 use bytecheck::CheckBytes;
 use dusk_bls12_381::BlsScalar;
 use dusk_bls12_381_sign::PublicKey as BlsPublicKey;
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::PublicKey;
 use dusk_plonk::prelude::PublicParameters;
 use once_cell::sync::Lazy;
 use parking_lot::{Mutex, MutexGuard};
 use phoenix_core::transaction::*;
 use phoenix_core::Message;
 use piecrust::{Error as PiecrustError, Session, VM};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rkyv::validation::validators::DefaultValidator;
 use rkyv::{Archive, Deserialize, Infallible, Serialize};
 use rusk_abi::dusk::{dusk, Dusk};

rusk/src/lib/services/prover/stco.rs

@@ -22,13 +22,12 @@ const STCO_INPUT_LEN: usize = u64::SIZE
     + BlsScalar::SIZE
     + Signature::SIZE;
 
-pub static STCO_PROVER: Lazy<Prover<SendToContractObfuscatedCircuit>> =
-    Lazy::new(|| {
-        let keys = keys_for(SendToContractObfuscatedCircuit::circuit_id())
-            .expect("keys to be available");
-        let pk = keys.get_prover().expect("prover to be available");
-        Prover::try_from_bytes(pk).expect("prover key to be valid")
-    });
+pub static STCO_PROVER: Lazy<Prover> = Lazy::new(|| {
+    let keys = keys_for(SendToContractObfuscatedCircuit::circuit_id())
+        .expect("keys to be available");
+    let pk = keys.get_prover().expect("prover to be available");
+    Prover::try_from_bytes(pk).expect("prover key to be valid")
+});
 
 impl RuskProver {
     pub(crate) fn prove_stco(

rusk/src/lib/services/prover/stct.rs

@@ -16,13 +16,12 @@ const STCT_INPUT_LEN: usize = Fee::SIZE
     + BlsScalar::SIZE
     + Signature::SIZE;
 
-pub static STCT_PROVER: Lazy<Prover<SendToContractTransparentCircuit>> =
-    Lazy::new(|| {
-        let keys = keys_for(SendToContractTransparentCircuit::circuit_id())
-            .expect("keys to be available");
-        let pk = keys.get_prover().expect("prover to be available");
-        Prover::try_from_bytes(pk).expect("prover key to be valid")
-    });
+pub static STCT_PROVER: Lazy<Prover> = Lazy::new(|| {
+    let keys = keys_for(SendToContractTransparentCircuit::circuit_id())
+        .expect("keys to be available");
+    let pk = keys.get_prover().expect("prover to be available");
+    Prover::try_from_bytes(pk).expect("prover key to be valid")
+});
 
 impl RuskProver {
     pub(crate) fn prove_stct(

rusk/src/lib/services/prover/wfco.rs

@@ -23,13 +23,12 @@ const WFCO_INPUT_LEN: usize = u64::SIZE
     + JubJubScalar::SIZE
     + JubJubAffine::SIZE;
 
-pub static WFCO_PROVER: Lazy<Prover<WithdrawFromObfuscatedCircuit>> =
-    Lazy::new(|| {
-        let keys = keys_for(WithdrawFromObfuscatedCircuit::circuit_id())
-            .expect("keys to be available");
-        let pk = keys.get_prover().expect("prover to be available");
-        Prover::try_from_bytes(pk).expect("prover key to be valid")
-    });
+pub static WFCO_PROVER: Lazy<Prover> = Lazy::new(|| {
+    let keys = keys_for(WithdrawFromObfuscatedCircuit::circuit_id())
+        .expect("keys to be available");
+    let pk = keys.get_prover().expect("prover to be available");
+    Prover::try_from_bytes(pk).expect("prover key to be valid")
+});
 
 impl RuskProver {
     pub(crate) fn prove_wfco(

rusk/src/lib/services/prover/wfct.rs

@@ -12,13 +12,12 @@ use rand::rngs::OsRng;
 const WFCT_INPUT_LEN: usize =
     JubJubAffine::SIZE + u64::SIZE + JubJubScalar::SIZE;
 
-pub static WFCT_PROVER: Lazy<Prover<WithdrawFromTransparentCircuit>> =
-    Lazy::new(|| {
-        let keys = keys_for(WithdrawFromTransparentCircuit::circuit_id())
-            .expect("keys to be available");
-        let pk = keys.get_prover().expect("prover to be available");
-        Prover::try_from_bytes(pk).expect("prover key to be valid")
-    });
+pub static WFCT_PROVER: Lazy<Prover> = Lazy::new(|| {
+    let keys = keys_for(WithdrawFromTransparentCircuit::circuit_id())
+        .expect("keys to be available");
+    let pk = keys.get_prover().expect("prover to be available");
+    Prover::try_from_bytes(pk).expect("prover key to be valid")
+});
 
 impl RuskProver {
     pub(crate) fn prove_wfct(

rusk/tests/services/gas_behavior.rs

@@ -11,7 +11,6 @@ use dusk_bls12_381_sign::PublicKey;
 use dusk_bytes::Error::InvalidData;
 use dusk_bytes::{DeserializableSlice, Serializable};
 use dusk_jubjub::{JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::ViewKey;
 use dusk_plonk::proof_system::Proof;
 use dusk_schnorr::Signature;
@@ -20,6 +19,7 @@ use dusk_wallet_core::{
 };
 use futures::StreamExt;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand::prelude::*;
 use rand::rngs::StdRng;
 use rusk::error::Error;

rusk/tests/services/multi_transfer.rs

@@ -11,7 +11,6 @@ use dusk_bls12_381_sign::PublicKey;
 use dusk_bytes::Error::InvalidData;
 use dusk_bytes::{DeserializableSlice, Serializable};
 use dusk_jubjub::{JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{SecretSpendKey, ViewKey};
 use dusk_plonk::proof_system::Proof;
 use dusk_schnorr::Signature;
@@ -21,6 +20,7 @@ use dusk_wallet_core::{
 use futures::StreamExt;
 use once_cell::sync::Lazy;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand::prelude::*;
 use rand::rngs::StdRng;
 use rusk::error::Error;

rusk/tests/services/prover_service.rs

@@ -8,7 +8,6 @@ use crate::common::*;
 use dusk_bls12_381::BlsScalar;
 use dusk_bls12_381_sign::PublicKey;
 use dusk_bytes::DeserializableSlice;
-use dusk_merkle::poseidon::{Item, Opening as PoseidonOpening, Tree};
 use dusk_pki::{PublicSpendKey, ViewKey};
 use dusk_plonk::prelude::*;
 use dusk_schnorr::Signature;
@@ -19,6 +18,7 @@ use dusk_wallet_core::{
 use parking_lot::Mutex;
 use phoenix_core::{Crossover, Fee};
 use phoenix_core::{Note, NoteType};
+use poseidon_merkle::{Item, Opening as PoseidonOpening, Tree};
 use rand::{CryptoRng, RngCore};
 use rusk::services::prover::{ProverServer, RuskProver};
 use rusk_schema::prover_client::ProverClient;

rusk/tests/services/stake.rs

@@ -11,7 +11,6 @@ use dusk_bls12_381_sign::{PublicKey, SecretKey};
 use dusk_bytes::Error::InvalidData;
 use dusk_bytes::{DeserializableSlice, Serializable, Write};
 use dusk_jubjub::{JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{SecretSpendKey, ViewKey};
 use dusk_plonk::proof_system::Proof;
 use dusk_schnorr::Signature;
@@ -21,6 +20,7 @@ use dusk_wallet_core::{
 use futures::StreamExt;
 use once_cell::sync::Lazy;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand::prelude::*;
 use rand::rngs::StdRng;
 use rusk::error::Error;

rusk/tests/services/transfer.rs

@@ -13,7 +13,6 @@ use dusk_bls12_381_sign::PublicKey;
 use dusk_bytes::Error::InvalidData;
 use dusk_bytes::{DeserializableSlice, Serializable};
 use dusk_jubjub::{JubJubAffine, JubJubScalar};
-use dusk_merkle::poseidon::Opening as PoseidonOpening;
 use dusk_pki::{SecretSpendKey, ViewKey};
 use dusk_plonk::proof_system::Proof;
 use dusk_schnorr::Signature;
@@ -24,6 +23,7 @@ use futures::StreamExt;
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use phoenix_core::{Crossover, Fee, Note};
+use poseidon_merkle::Opening as PoseidonOpening;
 use rand::prelude::*;
 use rand::rngs::StdRng;
 use rusk::error::Error;