feat(config): set default evm version to cancun (#9131)

* chore: Update to Cancun * cancun to TEST_DATA_DEFAULT, add TEST_DATA_PARIS * Shanghai compat test * Redact gaswaster address
foundry-rs · Nov 18, 2024 · 60dd1d7 · 60dd1d7
1 parent d275a49
commit 60dd1d7
Show file tree

Hide file tree

Showing 28 changed files with 555 additions and 341 deletions.
diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs
@@ -2149,7 +2149,7 @@ impl Default for Config {
             allow_paths: vec![],
             include_paths: vec![],
             force: false,
-            evm_version: EvmVersion::Paris,
+            evm_version: EvmVersion::Cancun,
             gas_reports: vec!["*".to_string()],
             gas_reports_ignore: vec![],
             gas_reports_include_tests: false,

diff --git a/crates/forge/src/multi_runner.rs b/crates/forge/src/multi_runner.rs
@@ -449,7 +449,7 @@ impl MultiContractRunnerBuilder {
             contracts: deployable_contracts,
             evm_opts,
             env,
-            evm_spec: self.evm_spec.unwrap_or(SpecId::MERGE),
+            evm_spec: self.evm_spec.unwrap_or(SpecId::CANCUN),
             sender: self.sender,
             revert_decoder,
             fork: self.fork,

diff --git a/crates/forge/tests/cli/build.rs b/crates/forge/tests/cli/build.rs
@@ -78,7 +78,7 @@ forgetest!(initcode_size_exceeds_limit, |prj, cmd| {
 ...
 | Contract     | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
 |--------------|------------------|-------------------|--------------------|---------------------|
-| HugeContract |              202 |            49,359 |             24,374 |                -207 |
+| HugeContract |              194 |            49,344 |             24,382 |                -192 |
 ...
 "#
     ]);
@@ -105,7 +105,7 @@ forgetest!(initcode_size_limit_can_be_ignored, |prj, cmd| {
 ...
 | Contract     | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
 |--------------|------------------|-------------------|--------------------|---------------------|
-| HugeContract |              202 |            49,359 |             24,374 |                -207 |
+| HugeContract |              194 |            49,344 |             24,382 |                -192 |
 ...
 "#
     ]);
@@ -145,7 +145,7 @@ forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
 ...
 | Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
 |----------|------------------|-------------------|--------------------|---------------------|
-| Counter  |              247 |               277 |             24,329 |              48,875 |
+| Counter  |              236 |               263 |             24,340 |              48,889 |
 ...
 "#
     ]);