Skip to content

Commit 39f13df

Browse files
grandizzygrandizzy
authored
fix(config): disable optimizer by default (#9657)
* fix: disable optimizer by default * Set default optimizer runs to 200
1 parent 6cbf390 commit 39f13df

File tree

13 files changed

+81
-38
lines changed

13 files changed

+81
-38
lines changed

‎crates/cast/tests/cli/main.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@ Nothing to compile
18321832
.stdout_eq(str![[r#"
18331833
Executing previous transactions from the block.
18341834
Traces:
1835-
[13520] → new <unknown>@0x5FbDB2315678afecb367f032d93F642f64180aa3
1835+
[..] → new <unknown>@0x5FbDB2315678afecb367f032d93F642f64180aa3
18361836
├─ emit topic 0: 0xa7263295d3a687d750d1fd377b5df47de69d7db8decc745aaa4bbee44dc1688d
18371837
│ data: 0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266
18381838
└─ ← [Return] 62 bytes of code
@@ -1852,7 +1852,7 @@ Executing previous transactions from the block.
18521852
Compiling project to generate artifacts
18531853
No files changed, compilation skipped
18541854
Traces:
1855-
[13520] → new LocalProjectContract@0x5FbDB2315678afecb367f032d93F642f64180aa3
1855+
[..] → new LocalProjectContract@0x5FbDB2315678afecb367f032d93F642f64180aa3
18561856
├─ emit LocalProjectContractCreated(owner: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266)
18571857
└─ ← [Return] 62 bytes of code
18581858
@@ -1914,7 +1914,7 @@ forgetest_async!(show_state_changes_in_traces, |prj, cmd| {
19141914
.stdout_eq(str![[r#"
19151915
Executing previous transactions from the block.
19161916
Traces:
1917-
[22287] 0x5FbDB2315678afecb367f032d93F642f64180aa3::setNumber(111)
1917+
[..] 0x5FbDB2315678afecb367f032d93F642f64180aa3::setNumber(111)
19181918
├─ storage changes:
19191919
│ @ 0: 0 → 111
19201920
└─ ← [Stop]
@@ -2005,8 +2005,8 @@ contract CounterInExternalLibScript is Script {
20052005
.stdout_eq(str![[r#"
20062006
...
20072007
Traces:
2008-
[37739] → new <unknown>@0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
2009-
├─ [22411] 0xfAb06527117d29EA121998AC4fAB9Fc88bF5f979::updateCounterInExternalLib(0, 100) [delegatecall]
2008+
[..] → new <unknown>@0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
2009+
├─ [..] 0x52F3e85EC3F0f9D0a2200D646482fcD134D5adc9::updateCounterInExternalLib(0, 100) [delegatecall]
20102010
│ └─ ← [Stop]
20112011
└─ ← [Return] 62 bytes of code
20122012

‎crates/config/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ gas_reports_ignore = []
8686
# solc = '0.8.10'
8787
auto_detect_solc = true
8888
offline = false
89-
optimizer = true
89+
optimizer = false
9090
optimizer_runs = 200
9191
model_checker = { contracts = { 'a.sol' = [
9292
'A1',

‎crates/config/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2298,7 +2298,7 @@ impl Default for Config {
22982298
vyper: Default::default(),
22992299
auto_detect_solc: true,
23002300
offline: false,
2301-
optimizer: true,
2301+
optimizer: false,
23022302
optimizer_runs: 200,
23032303
optimizer_details: None,
23042304
model_checker: None,

‎crates/forge/tests/cli/build.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ contract Dummy {
7272
});
7373

7474
forgetest!(initcode_size_exceeds_limit, |prj, cmd| {
75+
prj.write_config(Config { optimizer: true, ..Default::default() });
7576
prj.add_source("LargeContract", generate_large_contract(5450).as_str()).unwrap();
7677
cmd.args(["build", "--sizes"]).assert_failure().stdout_eq(str![[r#"
7778
[COMPILING_FILES] with [SOLC_VERSION]
@@ -103,6 +104,7 @@ Compiler run successful!
103104
});
104105

105106
forgetest!(initcode_size_limit_can_be_ignored, |prj, cmd| {
107+
prj.write_config(Config { optimizer: true, ..Default::default() });
106108
prj.add_source("LargeContract", generate_large_contract(5450).as_str()).unwrap();
107109
cmd.args(["build", "--sizes", "--ignore-eip-3860"]).assert_success().stdout_eq(str![[r#"
108110
[COMPILING_FILES] with [SOLC_VERSION]
@@ -149,6 +151,7 @@ Compiler run successful!
149151
// tests build output is as expected
150152
forgetest_init!(build_sizes_no_forge_std, |prj, cmd| {
151153
prj.write_config(Config {
154+
optimizer: true,
152155
solc: Some(foundry_config::SolcReq::Version(semver::Version::new(0, 8, 27))),
153156
..Default::default()
154157
});

‎crates/forge/tests/cli/cmd.rs‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,7 @@ forgetest!(gas_report_all_contracts, |prj, cmd| {
15731573

15741574
// report for all
15751575
prj.write_config(Config {
1576+
optimizer: true,
15761577
gas_reports: (vec!["*".to_string()]),
15771578
gas_reports_ignore: (vec![]),
15781579
..Default::default()
@@ -1682,7 +1683,7 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
16821683
.is_json(),
16831684
);
16841685

1685-
prj.write_config(Config { gas_reports: (vec![]), ..Default::default() });
1686+
prj.write_config(Config { optimizer: true, gas_reports: (vec![]), ..Default::default() });
16861687
cmd.forge_fuse().arg("test").arg("--gas-report").assert_success().stdout_eq(str![[r#"
16871688
...
16881689
╭----------------------------------------+-----------------+-------+--------+-------+---------╮
@@ -1787,7 +1788,11 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
17871788
.is_json(),
17881789
);
17891790

1790-
prj.write_config(Config { gas_reports: (vec!["*".to_string()]), ..Default::default() });
1791+
prj.write_config(Config {
1792+
optimizer: true,
1793+
gas_reports: (vec!["*".to_string()]),
1794+
..Default::default()
1795+
});
17911796
cmd.forge_fuse().arg("test").arg("--gas-report").assert_success().stdout_eq(str![[r#"
17921797
...
17931798
╭----------------------------------------+-----------------+-------+--------+-------+---------╮
@@ -1893,6 +1898,7 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
18931898
);
18941899

18951900
prj.write_config(Config {
1901+
optimizer: true,
18961902
gas_reports: (vec![
18971903
"ContractOne".to_string(),
18981904
"ContractTwo".to_string(),
@@ -2010,7 +2016,11 @@ forgetest!(gas_report_some_contracts, |prj, cmd| {
20102016
prj.add_source("Contracts.sol", GAS_REPORT_CONTRACTS).unwrap();
20112017

20122018
// report for One
2013-
prj.write_config(Config { gas_reports: vec!["ContractOne".to_string()], ..Default::default() });
2019+
prj.write_config(Config {
2020+
optimizer: true,
2021+
gas_reports: vec!["ContractOne".to_string()],
2022+
..Default::default()
2023+
});
20142024
cmd.forge_fuse();
20152025
cmd.arg("test").arg("--gas-report").assert_success().stdout_eq(str![[r#"
20162026
...
@@ -2057,7 +2067,11 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
20572067
);
20582068

20592069
// report for Two
2060-
prj.write_config(Config { gas_reports: vec!["ContractTwo".to_string()], ..Default::default() });
2070+
prj.write_config(Config {
2071+
optimizer: true,
2072+
gas_reports: vec!["ContractTwo".to_string()],
2073+
..Default::default()
2074+
});
20612075
cmd.forge_fuse();
20622076
cmd.arg("test").arg("--gas-report").assert_success().stdout_eq(str![[r#"
20632077
...
@@ -2105,6 +2119,7 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
21052119

21062120
// report for Three
21072121
prj.write_config(Config {
2122+
optimizer: true,
21082123
gas_reports: vec!["ContractThree".to_string()],
21092124
..Default::default()
21102125
});
@@ -2160,6 +2175,7 @@ forgetest!(gas_report_ignore_some_contracts, |prj, cmd| {
21602175

21612176
// ignore ContractOne
21622177
prj.write_config(Config {
2178+
optimizer: true,
21632179
gas_reports: (vec!["*".to_string()]),
21642180
gas_reports_ignore: (vec!["ContractOne".to_string()]),
21652181
..Default::default()
@@ -2242,6 +2258,7 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
22422258
// ignore ContractTwo
22432259
cmd.forge_fuse();
22442260
prj.write_config(Config {
2261+
optimizer: true,
22452262
gas_reports: (vec![]),
22462263
gas_reports_ignore: (vec!["ContractTwo".to_string()]),
22472264
..Default::default()
@@ -2328,6 +2345,7 @@ Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)
23282345
// indicating the "double listing".
23292346
cmd.forge_fuse();
23302347
prj.write_config(Config {
2348+
optimizer: true,
23312349
gas_reports: (vec![
23322350
"ContractOne".to_string(),
23332351
"ContractTwo".to_string(),
@@ -2461,6 +2479,7 @@ Warning: ContractThree is listed in both 'gas_reports' and 'gas_reports_ignore'.
24612479
});
24622480

24632481
forgetest!(gas_report_flatten_multiple_selectors, |prj, cmd| {
2482+
prj.write_config(Config { optimizer: true, ..Default::default() });
24642483
prj.insert_ds_test();
24652484
prj.add_source(
24662485
"Counter.sol",
@@ -2579,6 +2598,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
25792598

25802599
// <https://github.com/foundry-rs/foundry/issues/9115>
25812600
forgetest_init!(gas_report_with_fallback, |prj, cmd| {
2601+
prj.write_config(Config { optimizer: true, ..Default::default() });
25822602
prj.add_test(
25832603
"DelegateProxyTest.sol",
25842604
r#"
@@ -2722,6 +2742,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
27222742

27232743
// <https://github.com/foundry-rs/foundry/issues/9300>
27242744
forgetest_init!(gas_report_size_for_nested_create, |prj, cmd| {
2745+
prj.write_config(Config { optimizer: true, ..Default::default() });
27252746
prj.add_test(
27262747
"NestedDeployTest.sol",
27272748
r#"
@@ -3160,6 +3181,7 @@ Error: No source files found in specified build paths.
31603181

31613182
// checks that build --sizes includes all contracts even if unchanged
31623183
forgetest_init!(can_build_sizes_repeatedly, |prj, cmd| {
3184+
prj.write_config(Config { optimizer: true, ..Default::default() });
31633185
prj.clear_cache();
31643186

31653187
cmd.args(["build", "--sizes"]).assert_success().stdout_eq(str![[r#"
@@ -3226,6 +3248,7 @@ interface Counter {
32263248
// checks that `clean` also works with the "out" value set in Config
32273249
forgetest_init!(gas_report_include_tests, |prj, cmd| {
32283250
prj.write_config(Config {
3251+
optimizer: true,
32293252
gas_reports_include_tests: true,
32303253
fuzz: FuzzConfig { runs: 1, ..Default::default() },
32313254
..Default::default()

‎crates/forge/tests/cli/config.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ Compiler run successful!
426426

427427
// test to ensure yul optimizer can be set as intended
428428
forgetest!(can_set_yul_optimizer, |prj, cmd| {
429+
prj.write_config(Config { optimizer: true, ..Default::default() });
429430
prj.add_source(
430431
"foo.sol",
431432
r"

‎crates/forge/tests/cli/create.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Transaction: {
168168
"to": null,
169169
"maxFeePerGas": "0x77359401",
170170
"maxPriorityFeePerGas": "0x1",
171-
"gas": "0x17575",
171+
"gas": "0x241e7",
172172
"input": "[..]",
173173
"nonce": "0x0",
174174
"chainId": "0x7a69"
@@ -222,7 +222,7 @@ ABI: [
222222
"to": null,
223223
"maxFeePerGas": "0x77359401",
224224
"maxPriorityFeePerGas": "0x1",
225-
"gas": "0x17575",
225+
"gas": "0x241e7",
226226
"input": "[..]",
227227
"nonce": "0x0",
228228
"chainId": "0x7a69"

‎crates/forge/tests/cli/script.rs‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use crate::constants::TEMPLATE_CONTRACT;
44
use alloy_primitives::{address, hex, Address, Bytes};
55
use anvil::{spawn, NodeConfig};
66
use forge_script_sequence::ScriptSequence;
7+
use foundry_config::Config;
78
use foundry_test_utils::{
89
rpc,
910
snapbox::IntoData,
@@ -230,7 +231,7 @@ Traces:
230231
├─ [0] VM::startBroadcast()
231232
│ └─ ← [Return]
232233
├─ [..] → new GasWaster@[..]
233-
│ └─ ← [Return] 221 bytes of code
234+
│ └─ ← [Return] 415 bytes of code
234235
├─ [..] GasWaster::wasteGas(200000 [2e5])
235236
│ └─ ← [Stop]
236237
└─ ← [Stop]
@@ -242,10 +243,10 @@ Script ran successfully.
242243
==========================
243244
Simulated On-chain Traces:
244245
245-
[44291] → new GasWaster@[..]
246-
└─ ← [Return] 221 bytes of code
246+
[..] → new GasWaster@[..]
247+
└─ ← [Return] 415 bytes of code
247248
248-
[224] GasWaster::wasteGas(200000 [2e5])
249+
[..] GasWaster::wasteGas(200000 [2e5])
249250
└─ ← [Stop]
250251
251252
@@ -336,7 +337,7 @@ Traces:
336337
├─ [0] VM::startBroadcast()
337338
│ └─ ← [Return]
338339
├─ [..] → new GasWaster@[..]
339-
│ └─ ← [Return] 221 bytes of code
340+
│ └─ ← [Return] 415 bytes of code
340341
├─ [..] GasWaster::wasteGas(200000 [2e5])
341342
│ └─ ← [Stop]
342343
└─ ← [Stop]
@@ -348,10 +349,10 @@ Script ran successfully.
348349
==========================
349350
Simulated On-chain Traces:
350351
351-
[44291] → new GasWaster@[..]
352-
└─ ← [Return] 221 bytes of code
352+
[..] → new GasWaster@[..]
353+
└─ ← [Return] 415 bytes of code
353354
354-
[224] GasWaster::wasteGas(200000 [2e5])
355+
[..] GasWaster::wasteGas(200000 [2e5])
355356
└─ ← [Stop]
356357
357358
@@ -520,7 +521,7 @@ Traces:
520521
├─ [0] VM::startBroadcast()
521522
│ └─ ← [Return]
522523
├─ [..] → new HashChecker@[..]
523-
│ └─ ← [Return] 368 bytes of code
524+
│ └─ ← [Return] 718 bytes of code
524525
└─ ← [Stop]
525526
526527
@@ -1925,6 +1926,7 @@ forgetest_async!(adheres_to_json_flag, |prj, cmd| {
19251926
}
19261927

19271928
foundry_test_utils::util::initialize(prj.root());
1929+
prj.write_config(Config { optimizer: true, ..Default::default() });
19281930
prj.add_script(
19291931
"Foo",
19301932
r#"
@@ -2372,9 +2374,9 @@ Traces:
23722374
├─ [0] VM::startBroadcast()
23732375
│ └─ ← [Return]
23742376
├─ [..] → new A@0x5b73C5498c1E3b4dbA84de0F1833c4a029d90519
2375-
│ └─ ← [Return] 116 bytes of code
2377+
│ └─ ← [Return] 175 bytes of code
23762378
├─ [..] → new B@0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496
2377-
│ ├─ [145] A::getValue() [staticcall]
2379+
│ ├─ [..] A::getValue() [staticcall]
23782380
│ │ └─ ← [Return] 100
23792381
│ └─ ← [Return] 62 bytes of code
23802382
└─ ← [Stop]
@@ -2386,11 +2388,11 @@ Script ran successfully.
23862388
==========================
23872389
Simulated On-chain Traces:
23882390
2389-
[23273] → new A@0x5b73C5498c1E3b4dbA84de0F1833c4a029d90519
2390-
└─ ← [Return] 116 bytes of code
2391+
[..] → new A@0x5b73C5498c1E3b4dbA84de0F1833c4a029d90519
2392+
└─ ← [Return] 175 bytes of code
23912393
2392-
[15662] → new B@0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496
2393-
├─ [145] A::getValue() [staticcall]
2394+
[..] → new B@0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496
2395+
├─ [..] A::getValue() [staticcall]
23942396
│ └─ ← [Return] 100
23952397
└─ ← [Return] 62 bytes of code
23962398
...

0 commit comments

Comments
 (0)