From 67b7a8276529fa7e56205c8b676d4d33ea49a707 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Thu, 5 Jun 2025 14:07:24 +0200 Subject: [PATCH 1/2] remove eof version field --- crates/artifacts/solc/src/lib.rs | 11 ----------- crates/compilers/src/compilers/solc/mod.rs | 2 -- 2 files changed, 13 deletions(-) diff --git a/crates/artifacts/solc/src/lib.rs b/crates/artifacts/solc/src/lib.rs index 83f9c4b04..ca613f2ba 100644 --- a/crates/artifacts/solc/src/lib.rs +++ b/crates/artifacts/solc/src/lib.rs @@ -272,16 +272,6 @@ pub struct Settings { /// If this key is an empty string, that refers to a global level. #[serde(default)] pub libraries: Libraries, - /// Specify EOF version to produce. - #[serde(default, skip_serializing_if = "Option::is_none")] - pub eof_version: Option, -} - -/// Available EOF versions. -#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize_repr, Deserialize_repr)] -#[repr(u8)] -pub enum EofVersion { - V1 = 1, } impl Settings { @@ -562,7 +552,6 @@ impl Default for Settings { libraries: Default::default(), remappings: Default::default(), model_checker: None, - eof_version: None, } .with_ast() } diff --git a/crates/compilers/src/compilers/solc/mod.rs b/crates/compilers/src/compilers/solc/mod.rs index e4381aa8c..7a2f166a3 100644 --- a/crates/compilers/src/compilers/solc/mod.rs +++ b/crates/compilers/src/compilers/solc/mod.rs @@ -297,7 +297,6 @@ impl CompilerSettings for SolcSettings { via_ir, debug, libraries, - eof_version, }, .. } = self; @@ -311,7 +310,6 @@ impl CompilerSettings for SolcSettings { && *via_ir == other.settings.via_ir && *debug == other.settings.debug && *libraries == other.settings.libraries - && *eof_version == other.settings.eof_version && output_selection.is_subset_of(&other.settings.output_selection) } From 70780bb1ff9a6734927c51efb340b3a8affe5fd2 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Thu, 5 Jun 2025 14:16:05 +0200 Subject: [PATCH 2/2] remove unused serde_repr --- crates/artifacts/solc/Cargo.toml | 1 - crates/artifacts/solc/src/lib.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/crates/artifacts/solc/Cargo.toml b/crates/artifacts/solc/Cargo.toml index d4e1b954f..807b2f798 100644 --- a/crates/artifacts/solc/Cargo.toml +++ b/crates/artifacts/solc/Cargo.toml @@ -21,7 +21,6 @@ alloy-json-abi.workspace = true alloy-primitives.workspace = true semver.workspace = true serde_json.workspace = true -serde_repr = "0.1" serde.workspace = true thiserror.workspace = true tracing.workspace = true diff --git a/crates/artifacts/solc/src/lib.rs b/crates/artifacts/solc/src/lib.rs index ca613f2ba..a5e2b2706 100644 --- a/crates/artifacts/solc/src/lib.rs +++ b/crates/artifacts/solc/src/lib.rs @@ -9,7 +9,6 @@ extern crate tracing; use semver::Version; use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer}; -use serde_repr::{Deserialize_repr, Serialize_repr}; use std::{ collections::{BTreeMap, HashSet}, fmt,