Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync with upstream fef2098 #769

Merged
merged 71 commits into from
Dec 9, 2024
Merged

chore: sync with upstream fef2098 #769

merged 71 commits into from
Dec 9, 2024

Conversation

Karrq
Copy link
Contributor

@Karrq Karrq commented Dec 4, 2024

l1nxy and others added 30 commits November 7, 2024 13:55
* fix(forge): fix stack overflow when the lib path is absolute.

* format

* add test for setting absolute lib path.

* remove useless code:
…258)

* fix(remappings): ignore remappings of root proj dir when merging

* Remove unused code

* Add test

* Update

* Load project paths from figment

---------

Co-authored-by: zerosnacks <[email protected]>
* feat(`cheatcodes`): mockCall with bytes4

* fix

* fix
…receive` (#9288)

fix(coverage): do not report empty constructors, enable reports for receive fn
* feat: add anvil_get_interval_mine method

* refactor: keep consistent naming

---------

Co-authored-by: Your Name <[email protected]>
Co-authored-by: grandizzy <[email protected]>
…#9268)

* enforce for script and verify crates

* complete and enforce common shell

* permit eprintln! due to circular dependency outside of common path

* avoid code duplication
Locking 61 packages to latest compatible versions
    Updating allocator-api2 v0.2.18 -> v0.2.19
    Updating alloy-chains v0.1.46 -> v0.1.47
    Updating anyhow v1.0.92 -> v1.0.93
    Updating arbitrary v1.3.2 -> v1.4.1
    Updating aws-config v1.5.9 -> v1.5.10
    Updating aws-sdk-kms v1.49.0 -> v1.50.0
    Updating aws-sdk-sso v1.48.0 -> v1.49.0
    Updating aws-sdk-ssooidc v1.49.0 -> v1.50.0
    Updating aws-sdk-sts v1.48.0 -> v1.49.0
    Updating aws-smithy-runtime-api v1.7.2 -> v1.7.3
    Updating aws-smithy-types v1.2.8 -> v1.2.9
    Updating cc v1.1.36 -> v1.1.37
    Updating clap_complete v4.5.36 -> v4.5.37
    Updating derive_arbitrary v1.3.2 -> v1.4.1
    Updating fastrand v2.1.1 -> v2.2.0
 Downgrading fs4 v0.10.0 -> v0.9.1
    Updating gcloud-sdk v0.25.7 -> v0.25.8
    Updating handlebars v5.1.2 -> v6.2.0
    Updating hyper-timeout v0.5.1 -> v0.5.2
      Adding icu_collections v1.5.0
      Adding icu_locid v1.5.0
      Adding icu_locid_transform v1.5.0
      Adding icu_locid_transform_data v1.5.0
      Adding icu_normalizer v1.5.0
      Adding icu_normalizer_data v1.5.0
      Adding icu_properties v1.5.1
      Adding icu_properties_data v1.5.0
      Adding icu_provider v1.5.0
      Adding icu_provider_macros v1.5.0
    Updating idna v0.5.0 -> v1.0.3
      Adding idna_adapter v1.2.0
    Updating libc v0.2.161 -> v0.2.162
      Adding litemap v0.7.3
    Updating mdbook v0.4.40 -> v0.4.42
    Updating newtype-uuid v1.1.2 -> v1.1.3
      Adding num-modular v0.6.1
      Adding num-order v1.2.0
    Updating quinn-udp v0.5.6 -> v0.5.7
    Updating security-framework-sys v2.12.0 -> v2.12.1
    Updating serial_test v3.1.1 -> v3.2.0
    Updating serial_test_derive v3.1.1 -> v3.2.0
    Updating snapbox v0.6.19 -> v0.6.20
      Adding stable_deref_trait v1.2.0
 Downgrading svm-rs v0.5.8 -> v0.5.7 (available: v0.5.8)
 Downgrading svm-rs-builds v0.5.8 -> v0.5.7 (available: v0.5.8)
      Adding synstructure v0.13.1
    Updating tempfile v3.13.0 -> v3.14.0
      Adding tinystr v0.7.6
    Updating tokio v1.41.0 -> v1.41.1
    Updating tracy-client-sys v0.24.1 -> v0.24.2
    Removing unicode-bidi v0.3.17
    Updating url v2.5.2 -> v2.5.3
      Adding utf16_iter v1.0.5
      Adding utf8_iter v1.0.4
      Adding write16 v1.0.0
      Adding writeable v0.5.5
      Adding yoke v0.7.4
      Adding yoke-derive v0.7.4
      Adding zerofrom v0.1.4
      Adding zerofrom-derive v0.1.4
      Adding zerovec v0.10.4
      Adding zerovec-derive v0.10.3
note: pass `--verbose` to see 42 unchanged dependencies behind latest

Co-authored-by: mattsse <[email protected]>
* fix(trace): check fn sigs for contract with fallbacks

* Add Json test

* Execute test with traces

* Simplify, check only for decoded function
…g with `cargo test` runner (#9296)

* use regular println to avoid interfering with cargo test runner

* revert test change
…s (#9295)

* fix(cast run): decode traces for non mainnet

* Add test

* Changes after review: use EtherscanOpts, remove short -e from evm_version
Simplify test to avoid rate limiting.
* feat(cast): add artifact method

* Remove unneeded clone

* Get chain info from provider

* Rebase fix
…as header` is Some (#9298)

fix(fork): set block blob_excess_gas_and_price only if excess_blob_gas header is Some
…cing `--verbose` (#9273)

* remove --verbose, prefer output mode, introduce verbosity level (-vvv)

* remove leftover

* fix arg

* add ability to set verbosity level

* fix tests

* remove evm args specific verbosity arg in favor of global arg due to Clap limitation

* revert test modifications from foundry-rs/foundry#9244 for TestArgs, simply pass + flatten ShellOpts in args

* in lieu of a context specific help document the verbosity levels of the EVM as an example

* format comment, update tests

* fix clippy
chore: do not trim generic custom error trace
Update to soldeer 0.5.1

Co-authored-by: zerosnacks <[email protected]>
fix(forge eip712): handle recursive types
* feat(forge): allow `--verifier custom` option

* Changes after review: add description of custom verifier, reorg err message, add custom verifier api key

* Fix descriptions

* Update crates/verify/src/provider.rs

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

---------

Co-authored-by: zerosnacks <[email protected]>
* begin api and rough comments

* impl cheatcode

* add check for eoa

* fix eoa check on each prank call

* add to assets

* prank compiling

* delegate call working, storage not upating

* delegate call working, some tidy up

* add prank2 calls

* impl remaining tests

* formatting

* forge fmt

* add pranks to cheatcodes.json

* run cargo cheats

* If verbosity level is 1 or higher, it shows dirty files.

* Fix, add EOA prank test

* Revert "If verbosity level is 1 or higher, it shows dirty files."

This reverts commit d03ac1d59acb8096b12f46dfb5a397bcc4d28ce9.

* Fix test

* apply on extdelegatecall

---------

Co-authored-by: mgiagante <[email protected]>
Co-authored-by: grandizzy <[email protected]>
…#9321)

* add --sizes and --names JSON compatibility + generalize report kind

* add additional json output tests

* fix feedback nit
* test: enhance tests

* update ws url

* Assert json unordered

* Update crates/test-utils/src/util.rs

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

* Changes after review

* Fix rpc url test

---------

Co-authored-by: grandizzy <[email protected]>
Co-authored-by: grandizzy <[email protected]>
Co-authored-by: DaniPopes <[email protected]>
DaniPopes and others added 9 commits November 21, 2024 12:12
* feat: add global -j, --threads

* Update crates/cli/src/opts/global.rs

* fix tests after comment update

---------

Co-authored-by: zerosnacks <[email protected]>
Co-authored-by: zerosnacks <[email protected]>
…icts

chore: resolve merge conflicts for upstream-fef2098
* deps: update zksync forks

chore: remove obsolete alloy patches

* fix: missing closing delimiter

* fix(eip712): implement missing `Transaction` fns

* fix: outdated import

* fix: respect borrowing rules

* fix(verify): specify "default" as comp profile

* refactor(eip712): use `PrimitiveSignature`

deps: remove unused `alloy_signer`

* fix(script): swapped `simulate` args

* chore: note over clippy lint

* fix(create:zk): pass `ArtifactId`

refactor(create:zk): `remove_zk_contract` more similar to upstream

* fix(eip712): retrieve proper v value

* fix(create:zk): use source path

* feat(ci): run ci on upstream merge PRs

* chore: fmt

* chore: switch to `sh_println`

* chore: fmt

* fix(test:zk): avoid initializing empty project

* feat(ci): switch to hosted runner

* fix(ci:zk): setup git config

* fix(ci): run test on all "upstream" branches

* fix(build): move empty files check in paths ext

* fix(ci): pin to ubuntu-22.04

* chore: revert inconsistent change

* chore: comment why `ecx_inner`
fix(cast:send): use ETH wallet for eth provider
@Karrq Karrq self-assigned this Dec 4, 2024
@Karrq Karrq marked this pull request as ready for review December 5, 2024 11:52
@Karrq Karrq requested a review from a team as a code owner December 5, 2024 11:52
@tomimor tomimor self-requested a review December 5, 2024 13:27
@tomimor tomimor requested review from nbaztec and elfedy December 5, 2024 13:42
@Karrq
Copy link
Contributor Author

Karrq commented Dec 5, 2024

Status: testing with ZK stack

@Jrigada
Copy link
Contributor

Jrigada commented Dec 5, 2024

Hey! I just tested it with zkstack through the ecosystem initialization and the chain also to test the L2 and L1 deployment scripts. Everything green on my end. Any more tests that would be beneficial to run @dutterbutter ? Great work Francesco!

@Karrq
Copy link
Contributor Author

Karrq commented Dec 6, 2024

Waiting to merge this on monday

@Karrq Karrq merged commit 85f68fd into main Dec 9, 2024
47 checks passed
@Karrq Karrq deleted the upstream-fef2098 branch December 9, 2024 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.