workspace: move forge to edition 2024 and bump published Dusk deps

Author: HDauven

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Make local forge path overrides opt-in for release builds and harden CLI template/path handling across platforms.
+- Move the forge workspace and template project to Rust edition 2024 and bump published Dusk dependencies to their latest released versions.
 
 ## [0.2.2] - 2026-02-02
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dusk-forge"
 version = "0.2.2"
-edition = "2021"
+edition = "2024"
 description = "A smart contract development framework for Dusk"
 license = "MPL-2.0"
 repository = "https://github.com/dusk-network/forge"
@@ -24,13 +24,13 @@ members = ["contract-macro", "tests/types", "tests/test-bridge", "cli"]
 exclude = ["contract-template"]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [workspace.dependencies]
 # Workspace internal dependencies
 dusk-forge-contract = { version = "0.1.1", path = "./contract-macro/" }
 
-dusk-core = "1.4"
+dusk-core = "1.4.1"
 bytecheck = { version = "0.6.12", default-features = false }
 dusk-bytes = "0.1.7"
 rkyv = { version = "0.7", default-features = false, features = [
@@ -50,20 +50,15 @@ cargo_metadata = "0.19"
 clap = { version = "4", features = ["derive"] }
 clap_complete = "4"
 colored = "3"
+blake3 = "=1.5.4"
 predicates = "3"
 tempfile = "=3.10.1"
 thiserror = "2"
 toml = "0.8"
 wasmtime = "25"
 
-# Pin to match L1Contracts versions
-dusk-vm = { version = "=1.4.0", default-features = false }
-# Pin to avoid edition2024 issues
-blake2b_simd = "=1.0.2"
-blake3 = "=1.5.4"
-constant_time_eq = "=0.3.1"
-time-core = "=0.1.6"
-uuid = "=1.20.0"
+# Pin to match the latest published Dusk runtime crates used by generated contracts.
+dusk-vm = { version = "=1.4.3", default-features = false }
 
 # Enable overflow checks in release builds for contract safety
 [profile.release]

README.md

@@ -258,13 +258,13 @@ All runtime dependencies go in the WASM-only section because contracts are gated
 
 ```toml
 [target.'cfg(target_family = "wasm")'.dependencies]
-dusk-core = "1.4"
-dusk-data-driver = { version = "0.3", optional = true }  # Only for data-driver
-dusk-forge = "0.1"
+dusk-core = "1.4.1"
+dusk-data-driver = { version = "0.3.1", optional = true }  # Only for data-driver
+dusk-forge = "0.2.2"
 
 [dev-dependencies]
-dusk-core = "1.4"   # Same types, but for host-side tests
-dusk-vm = "0.1"     # To run contract in tests
+dusk-core = "1.4.1"   # Same types, but for host-side tests
+dusk-vm = "1.4.3"     # To run contract in tests
 ```
 
 ### Features

cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dusk-forge-cli"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 description = "CLI for scaffolding and building Dusk Forge contracts"
 license = "MPL-2.0"
 repository = "https://github.com/dusk-network/forge"

cli/src/template/engine.rs

@@ -1,6 +1,6 @@
 use crate::error::{CliError, Result};
 
-use super::embedded::{files, TemplateKind};
+use super::embedded::{TemplateKind, files};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ContractName {

cli/tests/new_command.rs

@@ -38,7 +38,7 @@ fn new_scaffolds_counter_template() {
     assert!(test.contains("release/my_test.wasm"));
     assert!(!test.contains("YOUR_CONTRACT_NAME"));
     assert!(!test.contains("TODO"));
-    assert!(rust_toolchain.contains("channel = \"nightly-2024-07-30\""));
+    assert!(rust_toolchain.contains("channel = \"nightly-2026-02-27\""));
 }
 
 #[test]

contract-macro/src/data_driver.rs

@@ -293,7 +293,7 @@ fn generate_decode_event_arms(events: &[EventInfo], type_map: &TypeMap) -> Vec<T
                 // Skip variable references (single lowercase identifier)
                 if topic_path.segments.len() == 1 {
                     let name = topic_path.segments[0].ident.to_string();
-                    if name.chars().next().map_or(false, char::is_lowercase) {
+                    if name.chars().next().is_some_and(char::is_lowercase) {
                         return None;
                     }
                 }

contract-macro/src/extract.rs

@@ -14,10 +14,10 @@ use syn::{
 };
 
 use crate::{
-    extract_doc_comment, extract_feeds_attribute, extract_receiver, get_feed_exprs,
-    has_custom_attribute, has_empty_body, parse, validate, validate_feed_type_match, ContractData,
-    CustomDataDriverHandler, DataDriverRole, EmitVisitor, EventInfo, FunctionInfo, ImportInfo,
-    ParameterInfo, TraitImplInfo,
+    ContractData, CustomDataDriverHandler, DataDriverRole, EmitVisitor, EventInfo, FunctionInfo,
+    ImportInfo, ParameterInfo, TraitImplInfo, extract_doc_comment, extract_feeds_attribute,
+    extract_receiver, get_feed_exprs, has_custom_attribute, has_empty_body, parse, validate,
+    validate_feed_type_match,
 };
 
 /// Validate feed-related attributes for a method.
@@ -31,7 +31,7 @@ use crate::{
 fn validate_feeds(
     method: &ImplItemFn,
     name: &Ident,
-    feed_type: &Option<TokenStream2>,
+    feed_type: Option<&TokenStream2>,
 ) -> Result<(), syn::Error> {
     let feed_exprs = get_feed_exprs(method);
 
@@ -52,7 +52,7 @@ fn validate_feeds(
         ));
     }
 
-    if let Some(ref ft) = feed_type {
+    if let Some(ft) = feed_type {
         // Has feeds attribute - validate it matches the expressions
         if let Some(mismatch_msg) = validate_feed_type_match(&ft.to_string(), &feed_exprs) {
             return Err(syn::Error::new_spanned(&method.sig, mismatch_msg));
@@ -156,7 +156,7 @@ pub(crate) fn trait_methods(trait_impl: &TraitImplInfo) -> Result<Vec<FunctionIn
             // Validate feed-related attributes
             // (only check non-empty bodies since empty bodies delegate to trait defaults)
             if !is_default_impl {
-                validate_feeds(method, &name, &feed_type)?;
+                validate_feeds(method, &name, feed_type.as_ref())?;
             }
 
             // Extract parameters (name and type)
@@ -236,7 +236,7 @@ pub(crate) fn public_methods(impl_block: &ItemImpl) -> Result<Vec<FunctionInfo>,
             let receiver = extract_receiver(method);
 
             // Validate feed-related attributes
-            validate_feeds(method, &name, &feed_type)?;
+            validate_feeds(method, &name, feed_type.as_ref())?;
 
             // Extract parameters (name and type)
             let params = parameters(method);
@@ -884,7 +884,7 @@ mod tests {
             }
         };
         let name = format_ident!("stream_data");
-        let result = validate_feeds(&method, &name, &None);
+        let result = validate_feeds(&method, &name, None);
 
         let Err(err) = result else {
             panic!("expected error for missing feeds attribute");
@@ -911,7 +911,7 @@ mod tests {
         };
         let name = format_ident!("stream_multiple");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for multiple feed calls");
@@ -936,7 +936,7 @@ mod tests {
         };
         let name = format_ident!("stream_mismatch");
         let feed_type: TokenStream2 = quote! { (u64, u64) };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for tuple mismatch");
@@ -958,7 +958,7 @@ mod tests {
         };
         let name = format_ident!("stream_valid");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         assert!(result.is_ok(), "valid feeds usage should not error");
     }
@@ -971,7 +971,7 @@ mod tests {
             }
         };
         let name = format_ident!("regular_method");
-        let result = validate_feeds(&method, &name, &None);
+        let result = validate_feeds(&method, &name, None);
 
         assert!(
             result.is_ok(),
@@ -991,7 +991,7 @@ mod tests {
         };
         let name = format_ident!("stream_in_loop");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         // A single feed call inside a loop is valid
         assert!(result.is_ok(), "single feed call in loop should be valid");
@@ -1010,7 +1010,7 @@ mod tests {
         };
         let name = format_ident!("stream_multiple_in_loop");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for multiple feed calls in loop");
@@ -1034,7 +1034,7 @@ mod tests {
         };
         let name = format_ident!("stream_conditional");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         assert!(
             result.is_ok(),
@@ -1056,7 +1056,7 @@ mod tests {
         };
         let name = format_ident!("stream_branches");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for feed calls in multiple branches");
@@ -1078,7 +1078,7 @@ mod tests {
         };
         let name = format_ident!("stream_wants_tuple");
         let feed_type: TokenStream2 = quote! { (u64, String) };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for tuple mismatch");
@@ -1097,7 +1097,7 @@ mod tests {
         };
         let name = format_ident!("stream_sends_tuple");
         let feed_type: TokenStream2 = quote! { u64 };
-        let result = validate_feeds(&method, &name, &Some(feed_type));
+        let result = validate_feeds(&method, &name, Some(&feed_type));
 
         let Err(err) = result else {
             panic!("expected error for tuple mismatch");

contract-macro/src/generate.rs

@@ -10,7 +10,7 @@ use proc_macro2::{Ident, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
 use syn::{ImplItem, ItemImpl};
 
-use crate::{generate_arg_expr, EventInfo, FunctionInfo, ImportInfo, Receiver};
+use crate::{EventInfo, FunctionInfo, ImportInfo, Receiver, generate_arg_expr};
 
 /// Generate the schema constant.
 pub(crate) fn schema(

contract-macro/src/lib.rs

@@ -4,8 +4,6 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-#![feature(let_chains)]
-
 //! Procedural macro for the `#[contract]` attribute.
 //!
 //! This macro is applied to a module containing a contract struct and its
@@ -50,8 +48,8 @@ use proc_macro::TokenStream;
 use proc_macro2::{Ident, TokenStream as TokenStream2};
 use quote::quote;
 use syn::{
-    parse_macro_input, visit::Visit, Attribute, Expr, ExprCall, ExprLit, ExprPath, FnArg,
-    ImplItemFn, Item, ItemImpl, ItemMod, Lit, Type,
+    Attribute, Expr, ExprCall, ExprLit, ExprPath, FnArg, ImplItemFn, Item, ItemImpl, ItemMod, Lit,
+    Type, parse_macro_input, visit::Visit,
 };
 
 // ============================================================================