fix

Author: pgherveou

Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 
 [workspace.package]
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/paritytech/cargo-pvm-contract"
 

crates/cargo-pvm-contract-builder/src/lib.rs

@@ -138,14 +138,13 @@ fn get_bin_targets(cargo_toml: &Path) -> Result<Vec<String>> {
         }
     }
 
-    if bins.is_empty() {
-        if let Some(name) = doc
+    if bins.is_empty()
+        && let Some(name) = doc
             .get("package")
             .and_then(|p| p.get("name"))
             .and_then(|n| n.as_str())
-        {
-            bins.push(name.to_string());
-        }
+    {
+        bins.push(name.to_string());
     }
 
     Ok(bins)

crates/cargo-pvm-contract/src/main.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand, ValueEnum};
-use include_dir::{include_dir, Dir};
+use include_dir::{Dir, include_dir};
 use inquire::{Select, Text};
 use log::debug;
 use std::{fs, path::PathBuf};
@@ -115,10 +115,10 @@ fn init_command(args: PvmContractArgs) -> Result<()> {
         .filter(|value| !value.trim().is_empty())
         .map(PathBuf::from);
 
-    if let Some(path) = builder_path.as_deref() {
-        if !path.exists() {
-            anyhow::bail!("Builder path does not exist: {}", path.display());
-        }
+    if let Some(path) = builder_path.as_deref()
+        && !path.exists()
+    {
+        anyhow::bail!("Builder path does not exist: {}", path.display());
     }
 
     if args.non_interactive {
@@ -338,7 +338,11 @@ fn init_from_example(
         .duration_since(std::time::UNIX_EPOCH)
         .context("Failed to read system time")?
         .as_nanos();
-    let temp_sol_path = temp_dir.join(format!("{timestamp}-{}", example.sol_filename()));
+    let example_temp_dir = temp_dir.join(format!("cargo-pvm-contract-{timestamp}"));
+    fs::create_dir_all(&example_temp_dir).with_context(|| {
+        format!("Failed to create temporary directory for example: {example_temp_dir:?}",)
+    })?;
+    let temp_sol_path = example_temp_dir.join(example.sol_filename());
     fs::write(&temp_sol_path, example_file.contents())
         .with_context(|| format!("Failed to write temporary .sol file: {:?}", temp_sol_path))?;
 
@@ -353,7 +357,7 @@ fn init_from_example(
     );
 
     // Clean up temp file
-    let _ = fs::remove_file(&temp_sol_path);
+    let _ = fs::remove_dir_all(&example_temp_dir);
 
     result
 }

crates/cargo-pvm-contract/templates/examples/Fibonacci.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.0;
+
+interface Fibonacci {
+    function fibonacci(uint32) external pure returns (uint32);
+}
+

crates/cargo-pvm-contract/templates/scaffold/cargo_toml.txt

@@ -1,7 +1,7 @@
 [package]
 name = "{{ contract_name }}"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 build = "build.rs"
 
 [[bin]]