feat(forge): add --evm-version to verify-contract (foundry-rs#7178)

klkvr · Feb 20, 2024 · d0a40f7 · d0a40f7
1 parent f1ff391
commit d0a40f7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/crates/cast/bin/cmd/run.rs b/crates/cast/bin/cmd/run.rs
@@ -51,11 +51,12 @@ pub struct RunArgs {
     #[clap(flatten)]
     rpc: RpcOpts,
 
-    /// The evm version to use.
+    /// The EVM version to use.
     ///
     /// Overrides the version specified in the config.
     #[clap(long, short)]
     evm_version: Option<EvmVersion>,
+
     /// Sets the number of assumed available compute units per second for this provider
     ///
     /// default value: 330

diff --git a/crates/forge/bin/cmd/create.rs b/crates/forge/bin/cmd/create.rs
@@ -186,6 +186,7 @@ impl CreateArgs {
             root: None,
             verifier: self.verifier.clone(),
             via_ir: self.opts.via_ir,
+            evm_version: self.opts.compiler.evm_version,
             show_standard_json_input: self.show_standard_json_input,
         };
 
@@ -334,6 +335,7 @@ impl CreateArgs {
             root: None,
             verifier: self.verifier,
             via_ir: self.opts.via_ir,
+            evm_version: self.opts.compiler.evm_version,
             show_standard_json_input: self.show_standard_json_input,
         };
         println!("Waiting for {} to detect contract deployment...", verify.verifier.verifier);

diff --git a/crates/forge/bin/cmd/script/verify.rs b/crates/forge/bin/cmd/script/verify.rs
@@ -114,6 +114,7 @@ impl VerifyBundle {
                     root: None,
                     verifier: self.verifier.clone(),
                     via_ir: self.via_ir,
+                    evm_version: None,
                     show_standard_json_input: false,
                 };
 

diff --git a/crates/forge/bin/cmd/verify/mod.rs b/crates/forge/bin/cmd/verify/mod.rs
@@ -3,7 +3,7 @@ use alloy_primitives::Address;
 use clap::{Parser, ValueHint};
 use eyre::Result;
 use foundry_cli::{opts::EtherscanOpts, utils::LoadConfig};
-use foundry_compilers::info::ContractInfo;
+use foundry_compilers::{info::ContractInfo, EvmVersion};
 use foundry_config::{figment, impl_figment_convert, impl_figment_convert_cast, Config};
 use provider::VerificationProviderType;
 use reqwest::Url;
@@ -103,6 +103,12 @@ pub struct VerifyArgs {
     #[clap(long)]
     pub via_ir: bool,
 
+    /// The EVM version to use.
+    ///
+    /// Overrides the version specified in the config.
+    #[clap(long)]
+    pub evm_version: Option<EvmVersion>,
+
     #[clap(flatten)]
     pub etherscan: EtherscanOpts,
 
@@ -134,6 +140,9 @@ impl figment::Provider for VerifyArgs {
                 figment::value::Value::serialize(optimizer_runs)?,
             );
         }
+        if let Some(evm_version) = self.evm_version {
+            dict.insert("evm_version".to_string(), figment::value::Value::serialize(evm_version)?);
+        }
         if self.via_ir {
             dict.insert("via_ir".to_string(), figment::value::Value::serialize(self.via_ir)?);
         }