chore: rm extra --celo arg (#12038)

* chore: rm extra `--celo` arg

* Fix - add support for network configs

---------

Co-authored-by: grandizzy <grandizzy.the.egg@gmail.com>

Author: onbjerg

Cargo.lock

@@ -136,11 +136,6 @@ pub struct EvmArgs {
     #[arg(long)]
     #[serde(skip)]
     pub isolate: bool,
-
-    /// Whether to enable Celo precompiles.
-    #[arg(long)]
-    #[serde(skip)]
-    pub celo: bool,
 }
 
 // Make this set of options a `figment::Provider` so that it can be merged into the `Config`
@@ -167,10 +162,6 @@ impl Provider for EvmArgs {
             dict.insert("isolate".to_string(), self.isolate.into());
         }
 
-        if self.celo {
-            dict.insert("celo".to_string(), self.celo.into());
-        }
-
         if self.always_use_create_2_factory {
             dict.insert(
                 "always_use_create_2_factory".to_string(),

crates/cli/src/opts/evm.rs

@@ -20,6 +20,8 @@ foundry-compilers = { workspace = true, features = ["svm-solc"] }
 alloy-chains = { workspace = true, features = ["serde"] }
 alloy-primitives = { workspace = true, features = ["serde"] }
 
+foundry-evm-networks.workspace = true
+
 revm.workspace = true
 
 solar.workspace = true

crates/config/Cargo.toml

@@ -128,6 +128,7 @@ pub use compilation::{CompilationRestrictions, SettingsOverrides};
 pub mod extend;
 use extend::Extends;
 
+use foundry_evm_networks::NetworkConfigs;
 pub use semver;
 
 /// Foundry configuration
@@ -530,9 +531,9 @@ pub struct Config {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub extra_args: Vec<String>,
 
-    /// Whether to enable Celo precompiles.
-    #[serde(default)]
-    pub celo: bool,
+    /// Networks with enabled features.
+    #[serde(flatten)]
+    pub networks: NetworkConfigs,
 
     /// Timeout for transactions in seconds.
     pub transaction_timeout: u64,
@@ -2568,7 +2569,7 @@ impl Default for Config {
             legacy_assertions: false,
             warnings: vec![],
             extra_args: vec![],
-            celo: false,
+            networks: Default::default(),
             transaction_timeout: 120,
             additional_compiler_profiles: Default::default(),
             compilation_restrictions: Default::default(),

crates/config/src/lib.rs

@@ -14,7 +14,7 @@ use std::collections::BTreeMap;
 
 pub mod celo;
 
-#[derive(Clone, Debug, Default, Parser, Copy, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Parser, Copy, Serialize, Deserialize, PartialEq)]
 pub struct NetworkConfigs {
     /// Enable Optimism network features.
     #[arg(help_heading = "Networks", long, visible_alias = "optimism", conflicts_with = "celo")]
@@ -23,6 +23,7 @@ pub struct NetworkConfigs {
     optimism: bool,
     /// Enable Celo network features.
     #[arg(help_heading = "Networks", long, conflicts_with = "optimism")]
+    #[serde(default)]
     celo: bool,
 }
 

crates/evm/networks/src/lib.rs

@@ -319,9 +319,7 @@ impl TestRunnerConfig {
 
         self.spec_id = config.evm_spec_id();
         self.sender = config.sender;
-        if config.celo {
-            self.networks = NetworkConfigs::with_celo();
-        }
+        self.networks = config.networks;
         self.isolation = config.isolate;
 
         // Specific to Forge, not present in config.

crates/forge/src/multi_runner.rs

@@ -348,7 +348,7 @@ forgetest!(can_extract_config_values, |prj, cmd| {
         assertions_revert: true,
         legacy_assertions: false,
         extra_args: vec![],
-        celo: false,
+        networks: Default::default(),
         transaction_timeout: 120,
         additional_compiler_profiles: Default::default(),
         compilation_restrictions: Default::default(),

crates/forge/tests/cli/config.rs

@@ -1,10 +1,15 @@
 //! Contains various tests for `forge test` with precompiles.
 
+use foundry_evm_networks::NetworkConfigs;
 use foundry_test_utils::str;
 
 // tests transfer using celo precompile.
 // <https://github.com/foundry-rs/foundry/issues/11622>
 forgetest_init!(celo_transfer, |prj, cmd| {
+    prj.update_config(|config| {
+        config.networks = NetworkConfigs::with_celo();
+    });
+
     prj.add_test(
         "CeloTransfer.t.sol",
         r#"
@@ -38,8 +43,7 @@ contract CeloTransferTest is Test {
    "#,
     );
 
-    cmd.args(["test", "--mt", "testCeloBalance", "--celo", "-vvv"]).assert_success().stdout_eq(
-        str![[r#"
+    cmd.args(["test", "--mt", "testCeloBalance", "-vvv"]).assert_success().stdout_eq(str![[r#"
 [COMPILING_FILES] with [SOLC_VERSION]
 [SOLC_VERSION] [ELAPSED]
 Compiler run successful!
@@ -54,6 +58,5 @@ Suite result: ok. 1 passed; 0 failed; 0 skipped; [ELAPSED]
 
 Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 
-"#]],
-    );
+"#]]);
 });