feat: sync with upstream 59f354c #792

elfedy · 2024-12-18T19:10:08Z

What 💻

Sync with upstream up to foundry-rs/foundry@59f354c

bumps alloy-zksync to 0.8.0
Given inclusion of refactor: make Contract generic for Compiler and add metadata to CompilerOutput foundry-rs/compilers#224 foundry-compilers fork is removed and compilers trait implementations moved to the foundry-zksync-compilers package.
foundry-config overrides in foundry-zksync-compilers were moved to the zksync module of foundry-config to prevent circular dependency issues. Seems also semantically more correct to have overrides for a package in the package itself.

merge conflict details: #782

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

…t change

…ync into upstream-59f354c

nbaztec · 2024-12-25T18:49:17Z

crates/evm/core/src/utils.rs

            if call_inputs.target_address == DEFAULT_CREATE2_DEPLOYER_ZKSYNC {
                code_hash = ctx.evm.load_account(call_inputs.target_address)?.info.code_hash;
-            };
-
+                zk_is_create2_deployer = true;


Maybe it makes sense to assign code_hash to DEFAULT_CREATE2_DEPLOYER_CODEHASH. But also good to have a clear zksync context.

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

elfedy added 21 commits December 18, 2024 09:44

some warnings and some test compilation errors

4a006a7

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

5075fc1

adapt to zk_env

c259f15

testing wip

72f1520

make tests compile

9e37759

fix most clippy warnings

94d263f

use released alloy-zksync

b6fc372

Add compilers integration tests

bde4b63

adapt gas test to new table layout

419506b

bring back zk methods in testdata

ededd23

update ci rust version

d94c52b

fix: use verbosity 5 in tracing tests

7f3aadb

Merge branch 'main' into upstream-59f354c

824e42d

fix some typos

a3c08f7

do not check against create2 deployer evm hash for zk

d2311c2

cargo cheats

01da3d4

update transact/inspect evm failure prompt

c012874

Try bigger nextest timeout

980b02d

comment out invariant test

bc75c6d

comment out bis

3b14a35

Use lower default depth for zksync test config and revert slow-timeou…

0e5ad05

…t change

elfedy marked this pull request as ready for review December 20, 2024 21:06

elfedy requested a review from a team as a code owner December 20, 2024 21:06

nbaztec and others added 6 commits December 23, 2024 22:45

Merge branch 'main' into upstream-59f354c

d3cb0fc

Merge branch 'upstream-59f354c' of github.com:matter-labs/foundry-zks…

e81fcec

…ync into upstream-59f354c

make test_helpers compile

f54949d

fix EVM error

6d12151

bring back latest linking fixes

c557dc8

honey I deleted the wrong file

778786c

nbaztec approved these changes Dec 25, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: sync with upstream 59f354c #792

feat: sync with upstream 59f354c #792

elfedy commented Dec 18, 2024 •

edited

Loading

nbaztec Dec 25, 2024

feat: sync with upstream 59f354c #792

Are you sure you want to change the base?

feat: sync with upstream 59f354c #792

Conversation

elfedy commented Dec 18, 2024 • edited Loading

What 💻

nbaztec Dec 25, 2024

Choose a reason for hiding this comment

elfedy commented Dec 18, 2024 •

edited

Loading