Merge pull request #3522 from dusk-network/upgrade-rust-toolchain

Upgrade rust toolchain

Author: d-sonuga

Cargo.lock

@@ -72,8 +72,8 @@ jubjub-schnorr = { version = "0.6", default-features = false }
 kadcast = "0.7"
 phoenix-circuits = { version = "0.6", default-features = false }
 phoenix-core = { version = "0.34.0", default-features = false }
-piecrust = "0.28.1"
-piecrust-uplink = "0.18.0"
+piecrust = "0.29.0-rc.0"
+piecrust-uplink = "0.19.0-rc.0"
 poseidon-merkle = "0.8"
 
 # External dependencies

Cargo.toml

@@ -97,7 +97,7 @@ rusk-wallet: ## build the rusk wallet binary
 web-wallet: ## build the static files of the web wallet
 	$(MAKE) -C ./web-wallet all 
 
-COMPILER_VERSION=v0.2.0
+COMPILER_VERSION=v0.3.0-rc
 setup-compiler: ## Setup the Dusk Contract Compiler
 	@./scripts/setup-compiler.sh $(COMPILER_VERSION)
 

Makefile

@@ -75,7 +75,7 @@ impl<V: StepVote> Aggregator<V> {
 
         self.votes
             .get(&(msg_step, *vote))
-            .map_or(false, |(_, cluster)| cluster.contains_key(signer))
+            .is_some_and(|(_, cluster)| cluster.contains_key(signer))
     }
 
     pub fn collect_vote(

consensus/src/aggregator.rs

@@ -6,7 +6,6 @@
 
 #![deny(unused_crate_dependencies)]
 #![deny(unused_extern_crates)]
-#![feature(lazy_cell)]
 
 pub mod commons;
 pub mod consensus;

consensus/src/lib.rs

@@ -43,7 +43,7 @@ pub async fn verify_step_votes(
 
     // Verify the aggregated signature is valid and reach the quorum threshold
     let voters = verify_quorum_votes(ch, step, vote, step_votes, &committee)
-        .map_err(|e| {
+        .inspect_err(|e| {
             error!(
                 event = "Invalid StepVotes",
                 reason = %e,
@@ -54,8 +54,6 @@ pub async fn verify_step_votes(
                 seed = to_str(seed.inner()),
                 ?step_votes
             );
-
-            e
         })?;
 
     Ok(voters)

consensus/src/quorum/verifiers.rs

@@ -277,7 +277,7 @@ impl<'a> CommitteeGenerator<'a> {
     fn new(
         provisioners: &'a Provisioners,
         round: u64,
-        exclusion_list: &Vec<PublicKeyBytes>,
+        exclusion_list: &[PublicKeyBytes],
     ) -> Self {
         // Get provisioners eligible at round `round`
         let eligible_set: Vec<_> = provisioners

consensus/src/user/provisioners.rs

@@ -25,8 +25,8 @@ wasm: ## Generate the optimized WASM for the contract given
     		--target wasm32-unknown-unknown
 
 clippy: ## Run clippy
-	@cargo clippy --all-features --release -- -D warnings
-	@cargo clippy -Z build-std=core,alloc --release --target wasm32-unknown-unknown -- -D warnings
+	@cargo +dusk clippy --all-features --release -- -D warnings
+	@cargo +dusk clippy -Z build-std=core,alloc --release --target wasm32-unknown-unknown -- -D warnings
 
 doc: ## Run doc gen
 	@cargo doc --release

contracts/stake/Makefile

@@ -25,8 +25,8 @@ wasm: ## Build the WASM files
 		--target wasm64-unknown-unknown
 
 clippy: ## Run clippy
-	@cargo clippy --all-features --release -- -D warnings
-	@cargo clippy -Z build-std=core,alloc --release --target wasm32-unknown-unknown -- -D warnings
+	@cargo +dusk clippy --all-features --release -- -D warnings
+	@cargo +dusk clippy -Z build-std=core,alloc --release --target wasm32-unknown-unknown -- -D warnings
 
 doc: ## Run doc gen
 	@cargo doc --release

contracts/transfer/Makefile

@@ -9,6 +9,7 @@ use dusk_core::Error as ExecutionError;
 
 #[derive(Debug, Clone)]
 pub enum Error {
+    #[allow(dead_code)]
     /// Wrapper of dusk-core error type.
     Execution(ExecutionError),
     /// A contract balance is not sufficient for the requested withdrawal