Skip to content

Commit 91de517

Browse files
grandizzyrplusq
authored andcommitted
feat(config): set default evm version to cancun (foundry-rs#9131)
* chore: Update to Cancun * cancun to TEST_DATA_DEFAULT, add TEST_DATA_PARIS * Shanghai compat test * Redact gaswaster address
1 parent 7e5635d commit 91de517

28 files changed

+555
-341
lines changed

crates/config/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@ impl Default for Config {
21492149
allow_paths: vec![],
21502150
include_paths: vec![],
21512151
force: false,
2152-
evm_version: EvmVersion::Paris,
2152+
evm_version: EvmVersion::Cancun,
21532153
gas_reports: vec!["*".to_string()],
21542154
gas_reports_ignore: vec![],
21552155
gas_reports_include_tests: false,

crates/forge/src/multi_runner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ impl MultiContractRunnerBuilder {
449449
contracts: deployable_contracts,
450450
evm_opts,
451451
env,
452-
evm_spec: self.evm_spec.unwrap_or(SpecId::MERGE),
452+
evm_spec: self.evm_spec.unwrap_or(SpecId::CANCUN),
453453
sender: self.sender,
454454
revert_decoder,
455455
fork: self.fork,

crates/forge/tests/cli/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ forgetest!(initcode_size_exceeds_limit, |prj, cmd| {
7878
...
7979
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
8080
|--------------|------------------|-------------------|--------------------|---------------------|
81-
| HugeContract | 202 | 49,359 | 24,374 | -207 |
81+
| HugeContract | 194 | 49,344 | 24,382 | -192 |
8282
...
8383
"#
8484
]);
@@ -105,7 +105,7 @@ forgetest!(initcode_size_limit_can_be_ignored, |prj, cmd| {
105105
...
106106
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
107107
|--------------|------------------|-------------------|--------------------|---------------------|
108-
| HugeContract | 202 | 49,359 | 24,374 | -207 |
108+
| HugeContract | 194 | 49,344 | 24,382 | -192 |
109109
...
110110
"#
111111
]);
@@ -145,7 +145,7 @@ forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
145145
...
146146
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
147147
|----------|------------------|-------------------|--------------------|---------------------|
148-
| Counter | 247 | 277 | 24,329 | 48,875 |
148+
| Counter | 236 | 263 | 24,340 | 48,889 |
149149
...
150150
"#
151151
]);

0 commit comments

Comments
 (0)