WEB3-499: chore: upgrade alloy-evm (#643)

- Update all alloy crates to the latest version
- Update Rust toolchain to v1.88 (Rust 1.86 is now required by alloy)
- Fix warnings for updated clippy

Author: Wollac

.github/workflows/e2e.yml

@@ -17,7 +17,7 @@ permissions:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  RISC0_TOOLCHAIN_VERSION: 1.85.0
+  RISC0_TOOLCHAIN_VERSION: 1.88.0
   FOUNDRY_VERSION: v1.0.0
   RISC0_MONOREPO_REF: "release-2.3"
 

.github/workflows/main.yml

@@ -16,7 +16,7 @@ permissions:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  RISC0_TOOLCHAIN_VERSION: 1.85.0
+  RISC0_TOOLCHAIN_VERSION: 1.88.0
   FOUNDRY_VERSION: v1.0.0
   RISC0_MONOREPO_REF: "release-2.3"
   # CARGO_LOCKED is defined as the string '--locked' in PRs targeting release branches and '' elsewhere.

.github/workflows/steel-documentation.yml

@@ -17,8 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  RISC0_TOOLCHAIN_VERSION: 1.85.0
-  RISC0_MONOREPO_REF: "release-2.3"
+  RISC0_TOOLCHAIN_VERSION: 1.88.0
+  RISC0_MONOREPO_REF: "main"
 
 jobs:
   build:

Cargo.toml

@@ -26,17 +26,15 @@ risc0-zkvm = { version = "2.3", default-features = false }
 # Alloy guest dependencies
 alloy-consensus = { version = "1.0" }
 alloy-eips = { version = "1.0" }
-alloy-evm = { version = "0.8" }
+alloy-evm = { version = "0.15" }
 alloy-rlp = { version = "0.3.8" }
-alloy-primitives = { version = "1.0" }
+alloy-primitives = { version = "1.3" }
 alloy-rpc-types = { version = "1.0" }
-alloy-sol-types = { version = "1.0" }
-# TODO: Update op-alloy-network to 0.18 to remove this requirement.
-alloy-network = { version = "<1.0.14,>=1.0.0" }
+alloy-sol-types = { version = "1.3" }
 
 # OP Steel
-alloy-op-evm = { version = "0.8" }
-op-alloy-network = { version = "0.16" }
+alloy-op-evm = { version = "0.15" }
+op-alloy-network = { version = "0.18" }
 
 # Alloy host dependencies
 alloy = { version = "1.0" }

contracts/src/groth16.rs

@@ -117,7 +117,7 @@ mod tests {
 
     fn parse_digest(file_path: &str, name: &str) -> Result<String, anyhow::Error> {
         let content = fs::read_to_string(file_path)?;
-        let re_digest = Regex::new(&format!(r#"{}\s*=\s*hex"([0-9a-fA-F]+)""#, name))?;
+        let re_digest = Regex::new(&format!(r#"{name}\s*=\s*hex"([0-9a-fA-F]+)""#))?;
         re_digest
             .captures(&content)
             .and_then(|caps| caps.get(1).map(|m| m.as_str().to_string()))

crates/aggregation/guest/build.rs

@@ -46,6 +46,6 @@ fn main() {
         .with_elf_sol_path(SOLIDITY_ELF_PATH);
 
     if let Err(e) = generate_solidity_files(guests.as_slice(), &solidity_opts) {
-        println!("cargo:warning=Failed to generate Solidity files: {}", e);
+        println!("cargo:warning=Failed to generate Solidity files: {e}");
     }
 }

crates/ffi/tests/basic.rs

@@ -24,7 +24,7 @@ use risc0_zkvm::{FakeReceipt, InnerReceipt, Receipt, ReceiptClaim};
 fn basic_usage() {
     let exe_path = env!("CARGO_BIN_EXE_risc0-forge-ffi");
     let args = ["prove", ECHO_PATH, "0xdeadbeef"];
-    println!("{} {:?}", exe_path, args);
+    println!("{exe_path} {args:?}");
     let output = Command::new(exe_path)
         .env_clear()
         // PATH is required so r0vm can be found.
@@ -59,7 +59,7 @@ fn basic_usage() {
 fn basic_usage_with_rust_log() {
     let exe_path = env!("CARGO_BIN_EXE_risc0-forge-ffi");
     let args = ["prove", ECHO_PATH, "0xdeadbeef"];
-    println!("{} {:?}", exe_path, args);
+    println!("{exe_path} {args:?}");
     let output = Command::new(exe_path)
         .env_clear()
         // PATH is required so r0vm can be found.

crates/op-steel/Cargo.toml

@@ -14,9 +14,8 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 alloy = { workspace = true, optional = true, features = ["contract", "providers"] }
+alloy-eips = { workspace = true }
 alloy-evm = { workspace = true }
-# TODO: Update op-alloy-network to 0.18 to remove this requirement.
-alloy-network = { workspace = true }
 alloy-op-evm = { workspace = true }
 alloy-primitives = { workspace = true, features = ["rlp", "serde"] }
 alloy-sol-types = { workspace = true }

crates/op-steel/src/game.rs

@@ -185,7 +185,7 @@ pub mod host {
                 .await
                 .context("eth_getBlockByNumber failed")?;
             let block =
-                block_response.with_context(|| format!("block not found: {}", block_number))?;
+                block_response.with_context(|| format!("block not found: {block_number}"))?;
             let header = block.header;
 
             let proof = provider

crates/op-steel/src/l1.rs

@@ -89,7 +89,7 @@ where
         .await?;
     let timestamp = block_response.unwrap().header.timestamp;
 
-    log::debug!("OP timestamp of beacon commit: {}", timestamp);
+    log::debug!("OP timestamp of beacon commit: {timestamp}");
 
     Ok(EthEvmInput::Beacon(BeaconInput::new(
         input,