chore: upstream 59f354c merge #782

elfedy · 2024-12-12T17:09:10Z

What 💻

Merge conflict resolution for upstream sync up to foundry-rs/foundry@59f354c.

Conflicting files

.github/workflows/deny.yml
.github/workflows/test.yml
Cargo.toml
Cargo.lock
crates/anvil/core/src/eth/transaction/mod.rs
crates/anvil/src/config.rs
crates/anvil/src/eth/backend/mem/mod.rs
crates/cast/bin/cmd/run.rs
crates/cast/bin/cmd/storage.rs
crates/cast/bin/main.rs
crates/cast/tests/cli/main.rs
crates/cheatcodes/assets/cheatcodes.json
crates/cheatcodes/spec/src/vm.rs
crates/cheatcodes/src/evm.rs
crates/cheatcodes/src/inspector.rs
crates/cli/src/opts/global.rs
crates/cli/src/utils/cmd.rs
crates/common/Cargo.toml
crates/common/fmt/src/ui.rs
crates/common/src/compile.rs
crates/common/src/evm.rs
crates/common/src/reports.rs
crates/common/src/retry.rs
crates/config/src/fuzz.rs
crates/config/src/invariant.rs
crates/common/src/transactions.rs
crates/config/src/lib.rs
crates/config/src/providers/remappings.rs
crates/evm/core/src/backend/mod.rs
crates/evm/core/src/lib.rs
crates/evm/core/src/opts.rs
crates/evm/core/src/utils.rs
crates/evm/coverage/src/analysis.rs
crates/evm/coverage/src/lib.rs
crates/evm/evm/src/executors/fuzz/mod.rs
crates/evm/evm/src/executors/invariant/mod.rs
crates/evm/evm/src/executors/mod.rs
crates/evm/evm/src/inspectors/stack.rs
crates/evm/fuzz/src/strategies/param.rs
crates/evm/fuzz/src/strategies/state.rs
crates/forge/bin/cmd/build.rs
crates/forge/bin/cmd/coverage.rs
crates/forge/bin/cmd/create.rs
crates/forge/bin/cmd/test/mod.rs
crates/forge/src/gas_report.rs
crates/forge/src/multi_runner.rs
crates/forge/src/result.rs
crates/forge/src/runner.rs
crates/forge/tests/cli/build.rs
crates/forge/tests/cli/cmd.rs
crates/forge/tests/cli/config.rs
crates/forge/tests/cli/coverage.rs
crates/forge/tests/cli/script.rs
crates/forge/tests/cli/test_cmd.rs
crates/forge/tests/it/fork.rs
crates/forge/tests/it/spec.rs
crates/forge/tests/it/test_helpers.rs
crates/script/src/broadcast.rs
crates/script/src/receipts.rs
crates/script/src/runner.rs
crates/script/src/simulate.rs
crates/script/src/transaction.rs
crates/script/src/verify.rs
crates/test-utils/Cargo.toml
crates/test-utils/src/rpc.rs
crates/test-utils/src/util.rs
crates/verify/src/etherscan/mod.rs
crates/verify/src/provider.rs
crates/verify/src/verify.rs
deny.toml
testdata/cheats/Vm.sol

Conflicting commits
feats

Support EIP-7702 Delegation in forge: Support EIP-7702 Delegations in Forge foundry-rs/foundry#9236
Allow any config to be defined inline: feat: allow any config to be defined inline foundry-rs/foundry#9430

fixes

Exculde external libraries from fuzz inputs: fix(fuzz): exclude exernal libraries addresses from fuzz inputs foundry-rs/foundry#9527

ci

Move deny to tests: ci: move deny to test foundry-rs/foundry#9524

Updated rust to 1.83 nightly

fix: vm.broadcastRawTransaction

…t` (#9379) * fix(forge test): install missing dependencies before instantiating the project * optimization

… cache` to trace with local artifacts (#7359) * add RunArgs generate_local_signatures to enable trace with local contracts functions and events * make generate_local_signatures as a helper function * rename generate_local_signatures to cache_local_signatures merge project signatures with exists cached local signatures instead of just override them * extract duplicate method for CachedSignatures * fix cache load path * fix for lint * fix fot lint * remove unnecessary `let` binding * fix for format check * fix for clippy check * fix for clippy check * Move cache in forge selectors, use local artifacts for cast run and send traces * Add test * Review changes: - compile without quiet, fix test - merge local sources with etherscan * Update crates/evm/traces/src/debug/sources.rs Co-authored-by: Arsenii Kulikov <[email protected]> --------- Co-authored-by: grandizzy <[email protected]> Co-authored-by: grandizzy <[email protected]> Co-authored-by: Arsenii Kulikov <[email protected]>

Locking 36 packages to latest compatible versions Updating async-compression v0.4.17 -> v0.4.18 Updating bytemuck v1.19.0 -> v1.20.0 Updating const-hex v1.13.1 -> v1.13.2 Adding core-foundation v0.10.0 Updating cpufeatures v0.2.15 -> v0.2.16 Updating h2 v0.4.6 -> v0.4.7 Updating hyper v1.5.0 -> v1.5.1 Updating impl-trait-for-tuples v0.2.2 -> v0.2.3 Updating interprocess v2.2.1 -> v2.2.2 Updating itoa v1.0.11 -> v1.0.13 Updating litemap v0.7.3 -> v0.7.4 Updating op-alloy-consensus v0.6.5 -> v0.6.8 Updating op-alloy-rpc-types v0.6.5 -> v0.6.8 Updating portable-atomic v1.9.0 -> v1.10.0 Updating proc-macro2 v1.0.89 -> v1.0.92 Updating quick-junit v0.5.0 -> v0.5.1 Updating quick-xml v0.36.2 -> v0.37.1 Updating rustix v0.38.40 -> v0.38.41 Updating rustls v0.23.17 -> v0.23.18 Updating rustls-native-certs v0.8.0 -> v0.8.1 Updating scale-info v2.11.5 -> v2.11.6 Updating scale-info-derive v2.11.5 -> v2.11.6 Updating schannel v0.1.26 -> v0.1.27 Adding security-framework v3.0.1 Updating semver-parser v0.10.2 -> v0.10.3 Updating syn v2.0.87 -> v2.0.89 Updating sync_wrapper v1.0.1 -> v1.0.2 Updating unicode-ident v1.0.13 -> v1.0.14 Updating url v2.5.3 -> v2.5.4 Updating wasmtimer v0.4.0 -> v0.4.1 Updating webpki-roots v0.26.6 -> v0.26.7 Updating yoke v0.7.4 -> v0.7.5 Updating yoke-derive v0.7.4 -> v0.7.5 Updating zerofrom v0.1.4 -> v0.1.5 Updating zerofrom-derive v0.1.4 -> v0.1.5 Updating zip v2.2.0 -> v2.2.1 note: pass `--verbose` to see 18 unchanged dependencies behind latest Co-authored-by: mattsse <[email protected]>

…as alias (#9406) remove duplicate gas_limit field, declare as alias

Co-authored-by: grandizzy <[email protected]>

Revert "feat: remove ethers (#8826)" This reverts commit d739704.

* adhere to --quiet flag * revert case-specific handling of writing to progress, redundant * handle writing to multiprogress, previously panic * make verification process compatible with --json flag * revert verifaction --json flow, too messy * clean up * revert * handle json correctly for script deployment logs, incl. receipts * avoid incompatible lines with json output * revert unnecessary change * add json and quiet test * address feedback * fix incorrect ordering

Signed-off-by: wangjingcun <[email protected]>

… (#9420) * add --broadcast flag to forge create, default to dry run * nits * fix tests * add dry run tests incl --json * minor fixes, failing test due to minor bytecode difference

…`-vvvvv` (#9013) * Add options for state changes output and json output in cast run command * fix test * add back serde_json in Cargo.lock * format using nightly * rename parameter * update revm-inspectors * supress clippy warning and merge master * add serde_json * disable some stdout print when --json option is used * remove unnecessary check * replace with sh_println * replace with shell::is_json * Show storage for verbosity > 1, add test * Change verbosity to > 4 for both cast and forge test, add test, fix ci --------- Co-authored-by: grandizzy <[email protected]>

* feat: rewrite inline config using figment * wip * wip * fix: use same GasLimit type * wip * fixes * tests * test fixes * fmt * test update

* script: evm_opts -> evm_args Signed-off-by: jsvisa <[email protected]> * forge: evm_opts -> evm_args Signed-off-by: jsvisa <[email protected]> * chisel: evm_opts -> evm_args Signed-off-by: jsvisa <[email protected]> * forge: evm_opts -> evm_args Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

This pull request addresses a minor but important syntax issue in the conditional statement used to check for the presence of libusb on macOS.

* feat: add timeouts to fuzz testing Adds --fuzz-timeout-secs to fuzz tests which will cause a property test to timeout after a certain number of seconds. Also adds --fuzz-allow-timeouts so that timeouts are optionally not considered to be failures. * simplify timeout implementation * use u32 for timeout * switch back to failing for timeouts * clippy * Nits: - move logic to interrupt invariant test in depth loop - add and reuse start_timer fn and TEST_TIMEOUT constant - add fuzz and invariant tests - fix failing test * Fix fmt * Changes after review: introduce FuzzTestTimer --------- Co-authored-by: grandizzy <[email protected]>

…(#9428) * feat(cast): Add custom error decoding support * Review changes * Changes after review: decode with Openchain too, add test * Review changes: nit, handle incomplete selectors

Native async recursion was stabilized in 1.77.

* expectRevert count overload boilerplate * introduce `count` variable * populate `ExpectedRevert` for count overloads * intro `actual_count` and make ExpectedRevert mut * increment `actual_account` on success and tests * handle non-zero count reverts separately * handle count for specific reverts * nit * more tests * fix: handle count > 1 with reverter specified * test: ExpectRevertCountWithReverter * expectRevert with reverter and count 0 * nit * reverter count with data * nit * cleanup * nit * nit * clippy * nit * cargo cheats

…(#9435) * feat(cheatcodes): add vm.getStateDiff() to get state diffs as string * Nit arrow * Add json output * Better json format * Rename to original and dirty * Changes after review: split in 2 cheatcodes, rename to prev/newValues * Slots as hex strings, add balance diffs, cleanup * Record balance diffs only if changed. Add nonce diff placeholder * Backoff nonce placeholder

* fix(verify): cached artifacts by version * Comments

* chore: bump alloy * chore: bump alloy 0.8 * use prim sig

…race stop (#9529) fix(cheatcodes): empty ordering and step logs too

* enforce stricter command compatibility mode for forge test * add conflicting cases for anvil * revert anvil changes, derivation_path is not exclusive to mnemonics

Locking 36 packages to latest compatible versions Updating alloy-chains v0.1.47 -> v0.1.48 Updating alloy-rlp v0.3.9 -> v0.3.10 Updating alloy-rlp-derive v0.3.9 -> v0.3.10 Updating annotate-snippets v0.11.4 -> v0.11.5 Updating bon v3.2.0 -> v3.3.0 Updating bon-macros v3.2.0 -> v3.3.0 Updating cc v1.2.2 -> v1.2.3 Updating chrono v0.4.38 -> v0.4.39 Updating clap v4.5.22 -> v4.5.23 Updating clap_builder v4.5.22 -> v4.5.23 Updating clap_lex v0.7.3 -> v0.7.4 Updating evmole v0.6.1 -> v0.6.2 Updating fastrand v2.2.0 -> v2.3.0 Updating js-sys v0.3.74 -> v0.3.76 Updating libc v0.2.167 -> v0.2.168 Updating pest v2.7.14 -> v2.7.15 Updating pest_derive v2.7.14 -> v2.7.15 Updating pest_generator v2.7.14 -> v2.7.15 Updating pest_meta v2.7.14 -> v2.7.15 Updating prost v0.13.3 -> v0.13.4 Updating prost-derive v0.13.3 -> v0.13.4 Updating prost-types v0.13.3 -> v0.13.4 Updating quinn-udp v0.5.7 -> v0.5.8 Updating rustix v0.38.41 -> v0.38.42 Updating thiserror v2.0.4 -> v2.0.6 Updating thiserror-impl v2.0.4 -> v2.0.6 Updating tokio-rustls v0.26.0 -> v0.26.1 Updating tokio-stream v0.1.16 -> v0.1.17 Updating tracy-client v0.17.4 -> v0.17.5 Updating wasm-bindgen v0.2.97 -> v0.2.99 Updating wasm-bindgen-backend v0.2.97 -> v0.2.99 Updating wasm-bindgen-futures v0.4.47 -> v0.4.49 Updating wasm-bindgen-macro v0.2.97 -> v0.2.99 Updating wasm-bindgen-macro-support v0.2.97 -> v0.2.99 Updating wasm-bindgen-shared v0.2.97 -> v0.2.99 Updating web-sys v0.3.74 -> v0.3.76 note: pass `--verbose` to see 10 unchanged dependencies behind latest Co-authored-by: DaniPopes <[email protected]>

…:foundry-rs/foundry into upstream-59f354c-merge

* fix: linux install * ci: add workflow to check anvil-zksync installation * fix: remove unneeded mv

Add tx type to zk tx in create

* fix: add retry logic to prevent race condition failure * fix: remove macos due to rate limits

* Add zkout to gitignore template when in zksync forge init mode * Add test for forge init --zksync * Move zk test to a different file to avoid merge conflicts * Move aave test outside the file

* fix default TransactionRequest * add unit test

mario-eth and others added 30 commits November 21, 2024 15:55

feat: Update to soldeer 0.5.2 (#9373)

41b4359

fix: vm.broadcastRawTransaction (#9378)

2bc7125

fix: vm.broadcastRawTransaction

fix(forge test): install missing dependencies before creating `Projec…

76a2cb0

…t` (#9379) * fix(forge test): install missing dependencies before instantiating the project * optimization

chore(chisel): replace solang with solar in SolidityHelper (#9376)

1332b6d

fix(chisel): uint/int full word print (#9381)

cf66dea

fix: flaky test_broadcast_raw_create2_deployer (#9383)

37cc284

refactor(forge): rewrite geiger with Solar (#9382)

8b7d5df

chore: use has_library_ancestor (#9387)

e5412ad

chore(evm/traces): replace solang with Solar (#9386)

d14a7b4

fix: bail incomplete bytecode sequence disassemble (#9390)

cca72ab

fix(forge create): install missing deps if any (#9401)

66228e4

feat(forge): show additional details of contract to verify (#9403)

eae5fb4

fix: remove duplicate gas_limit / block_gas_limit field, declare …

de5e89c

…as alias (#9406) remove duplicate gas_limit field, declare as alias

fix(cheatcodes): use calldata in attachDelegation (#9407)

672bdf6

chore(cheatcodes): enforce calldata in declaration (#9408)

995fd9e

feat: remove ethers (#8826)

d739704

Co-authored-by: grandizzy <[email protected]>

Revert "feat: remove ethers" (#9411)

958c713

Revert "feat: remove ethers (#8826)" This reverts commit d739704.

feat(cast): add decode-event sig data (#9413)

31dd1f7

chore: fix 404 status URL (#9417)

735b5eb

Signed-off-by: wangjingcun <[email protected]>

feat: add --broadcast flag to forge create, default to dry run mode…

2c3114c

… (#9420) * add --broadcast flag to forge create, default to dry run * nits * fix tests * add dry run tests incl --json * minor fixes, failing test due to minor bytecode difference

feat(cast): decode external lib sigs from cached selectors (#9399)

16a013f

feat: rewrite inline config using figment (#9414)

56d0dd8

* feat: rewrite inline config using figment * wip * wip * fix: use same GasLimit type * wip * fixes * tests * test fixes * fmt * test update

Fix conditional syntax issue in macOS libusb check (#9384)

27cabbd

This pull request addresses a minor but important syntax issue in the conditional statement used to check for the presence of libusb on macOS.

feat(cast): decode-error with sig, local cache and openchain api …

0d76df5

…(#9428) * feat(cast): Add custom error decoding support * Review changes * Changes after review: decode with Openchain too, add test * Review changes: nit, handle incomplete selectors

cdump and others added 18 commits December 5, 2024 11:16

chore(cast): upgrade evmole to 0.6.1, use new style API (#9493)

8c03318

chore: bump compilers 0.12.7 (#9498)

e264381

chore(deps): bump breaking deps (#9502)

4f9f904

chore: improve Retry usage and warning (#9503)

43a033d

fix: restore lock version 3 (#9501)

92cd165

chore(deps): remove async_recursion (#9500)

e520767

Native async recursion was stabilized in 1.77.

fix(verify): cached artifacts by version (#9520)

2e56b8f

* fix(verify): cached artifacts by version * Comments

ci: move deny to test (#9524)

aa69ed1

chore: bump alloy (#9496)

fd9ee16

* chore: bump alloy * chore: bump alloy 0.8 * use prim sig

fix(cheatcodes): clear orderings together with trace steps on debug t…

b090638

…race stop (#9529) fix(cheatcodes): empty ordering and step logs too

feat(cheatcodes): skip test suite in setup (#9532)

0eff1ef

fix: mark flag incompatibility (#9530)

91030da

* enforce stricter command compatibility mode for forge test * add conflicting cases for anvil * revert anvil changes, derivation_path is not exclusive to mnemonics

fix(fuzz): exclude exernal libraries addresses from fuzz inputs (#9527)

59f354c

Merge commit '59f354c179f4e7f6d7292acb3d068815c79286d1' of github.com…

ff8f1a2

…:foundry-rs/foundry into upstream-59f354c-merge

Merge branch 'main' into upstream-59f354c-merge

4721908

elfedy requested a review from a team as a code owner December 12, 2024 17:09

dutterbutter and others added 5 commits December 12, 2024 11:39

fix: linux installation of anvil-zksync and add ci check (#780)

e899df9

* fix: linux install * ci: add workflow to check anvil-zksync installation * fix: remove unneeded mv

fix: Prepare tx transaction with right type (#783)

699f8e8

Add tx type to zk tx in create

fix: remove macos from ci-install-anvil-zksync-check (#786)

4a81422

* fix: add retry logic to prevent race condition failure * fix: remove macos due to rate limits

chore: Move zk tests to different files (#775)

e7390e0

* Add zkout to gitignore template when in zksync forge init mode * Add test for forge init --zksync * Move zk test to a different file to avoid merge conflicts * Move aave test outside the file

fix: default TransactionRequest (#787)

68fcb7d

* fix default TransactionRequest * add unit test

elfedy changed the title ~~Upstream 59f354c merge~~ chore: upstream 59f354c merge Dec 13, 2024

Merge branch 'main' into upstream-59f354c-merge

b8ee6fe

Jrigada approved these changes Dec 18, 2024

View reviewed changes

elfedy merged commit 60cac1f into upstream-59f354c Dec 18, 2024
14 of 50 checks passed

elfedy deleted the upstream-59f354c-merge branch December 18, 2024 13:51

elfedy mentioned this pull request Dec 20, 2024

feat: sync with upstream 59f354c #792

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: upstream 59f354c merge #782

chore: upstream 59f354c merge #782

elfedy commented Dec 12, 2024

chore: upstream 59f354c merge #782

chore: upstream 59f354c merge #782

Conversation

elfedy commented Dec 12, 2024

What 💻