feat: upstream 5e72c69 merge #811

MBerguer · 2025-01-07T00:12:15Z

What 💻

Merge conflict resolution for upstream sync up to foundry-rs/foundry@5e72c69.

Conflicting files

CONFLICT (content): Merge conflict in .github/workflows/release.yml
CONFLICT (content): Merge conflict in Cargo.lock
CONFLICT (content): Merge conflict in Cargo.toml
CONFLICT (content): Merge conflict in README.md
CONFLICT (content): Merge conflict in crates/cheatcodes/src/inspector.rs
CONFLICT (content): Merge conflict in crates/cheatcodes/src/test/expect.rs
CONFLICT (content): Merge conflict in crates/forge/bin/cmd/create.rs
CONFLICT (content): Merge conflict in crates/forge/bin/cmd/init.rs
CONFLICT (content): Merge conflict in crates/forge/tests/it/test_helpers.rs
CONFLICT (content): Merge conflict in crates/script/src/lib.rs
CONFLICT (content): Merge conflict in foundryup-zksync/README.md
CONFLICT (content): Merge conflict in foundryup-zksync/foundryup-zksync

Update README.md

…9543) fix(`anvil`): set `best_number` correctly while loading state with fork activated

* fix(`cast`): reset `env.tx.caller` for impersonated txs * test

Add GH attestation

…release created (#9550) fix(release): allow contents write permission, run attestation after release published

* chore: bump compilers * clippy

* chore: account for impersonated tx in configure_tx_env * nit

* read rpc config when using fork cheatcodes * attempt to resolve failed environment variables again * nit: refactor * nit: refactor * fix clippy errors * fix rustfmt errors * run cargofmt * set auth header for fork * remove redundant clone() * Update crates/cheatcodes/src/config.rs --------- Co-authored-by: Matthias Seitz <[email protected]>

* feat(cast): add support for beacon proxies in cast impl * test: pin test to current block

* introduce ExpectEmitTracker * cheats * account for emit accounts + simple testNoEmit * tests: expectCountEmits from specific address * fix * failure tests * fix * fix: account for log data * LogCountMap * fix * nit * test * fix * fix * fix: instantiate log count map in tracker only if log satisfies the checks * nit * nit * nits * doc nits * helper fn * nit * nits * fix * fix * nit * refactor count tests * fix * fix * fix

fix(release): check IS_NIGHTLY as string

- feat / fixes category per binaries - breaking changes and perf category - restrict summary to max 60 days / max 100 PRs, add full diff and contributors

* feat(foundryup): allow multiple installed versions * Changes after review: new line after version, -v renamed as -i, create version dir on untar * Update foundryup link repo and contribute URL * Fix --one-top-level not avail in bsd tar * Fix --one-top-level not avail in bsd tar * update docs * Err if no version provided to use --------- Co-authored-by: zerosnacks <[email protected]>

bump to 0.3.0

…ng on `foundry-toolchain` default (#9573) * default CI workflow template to stable as opposed to nightly, related: foundry-rs/foundry-toolchain#60 * remove pinning to stable in workflow file, rely on default in foundry-toolchain - now being nightly, becoming stable

* chore: testFail* deprecation warning * test * fix

* chore: bump forge-std version used for tests * run CI * fix tests * fix gas --------- Co-authored-by: DaniPopes <[email protected]> Co-authored-by: zerosnacks <[email protected]>

…d in (#9585) * default to stable if no specific version is passed in * update mention, defaults to stable now

* fix(cast): pretty print other receipt fields Signed-off-by: jsvisa <[email protected]> * feat(cast): add other receipt fields pretty test Signed-off-by: jsvisa <[email protected]> * fix(ui): receipt column length 20 Signed-off-by: jsvisa <[email protected]> * fmt Signed-off-by: jsvisa <[email protected]> * fix receipt indent test Signed-off-by: jsvisa <[email protected]> * fix test case /2 Signed-off-by: jsvisa <[email protected]> * fix revert reason indent Signed-off-by: jsvisa <[email protected]> --------- Signed-off-by: jsvisa <[email protected]>

Locking 29 packages to latest compatible versions Updating alloy-chains v0.1.49 -> v0.1.51 Updating alloy-trie v0.7.6 -> v0.7.7 Updating anyhow v1.0.94 -> v1.0.95 Updating aws-config v1.5.11 -> v1.5.12 Updating aws-runtime v1.5.1 -> v1.5.2 Updating aws-sdk-kms v1.52.0 -> v1.53.0 Updating aws-sdk-sso v1.51.0 -> v1.52.0 Updating aws-sdk-ssooidc v1.52.0 -> v1.53.0 Updating aws-sdk-sts v1.52.0 -> v1.53.0 Updating aws-smithy-async v1.2.2 -> v1.2.3 Updating aws-smithy-runtime v1.7.5 -> v1.7.6 Updating aws-smithy-types v1.2.10 -> v1.2.11 Updating bon v3.3.0 -> v3.3.2 Updating bon-macros v3.3.0 -> v3.3.2 Updating cc v1.2.5 -> v1.2.6 Updating gix-date v0.9.2 -> v0.9.3 Updating glob v0.3.1 -> v0.3.2 Updating jiff v0.1.15 -> v0.1.16 Updating nybbles v0.2.1 -> v0.3.0 Updating quote v1.0.37 -> v1.0.38 Updating reqwest v0.12.9 -> v0.12.11 Updating rustversion v1.0.18 -> v1.0.19 Updating scc v2.2.6 -> v2.3.0 Updating serde v1.0.216 -> v1.0.217 Updating serde_derive v1.0.216 -> v1.0.217 Updating syn v2.0.90 -> v2.0.93 Updating tracing-tracy v0.11.3 -> v0.11.4 Updating tracy-client v0.17.6 -> v0.18.0 Updating unicase v2.8.0 -> v2.8.1 note: pass `--verbose` to see 13 unchanged dependencies behind latest Co-authored-by: mattsse <[email protected]>

* chore: make clippy happy * allow literals tring with formatting args global

chore(fmt): follow the same indent rules of other fields Signed-off-by: jsvisa <[email protected]>

* feat: update revm 19 alloy 09 * clippy * updata test * add back max data gas check

add comment to -r option about default value

* fix(anvil): ipc append a newline Signed-off-by: 9547 <[email protected]> * use put_u8 instead of extend from slice Signed-off-by: 9547 <[email protected]> --------- Signed-off-by: 9547 <[email protected]>

Signed-off-by: 9547 <[email protected]> Co-authored-by: Matthias Seitz <[email protected]>

This has to be explicitly enabled for git to utilize its enhanced rust diffing, evidently. ref: rust-lang/rust#78882 Co-authored-by: zerosnacks <[email protected]>

Locking 56 packages to latest compatible versions Updating alloy-chains v0.1.51 -> v0.1.52 Updating alloy-consensus v0.9.1 -> v0.9.2 Updating alloy-consensus-any v0.9.1 -> v0.9.2 Updating alloy-contract v0.9.1 -> v0.9.2 Updating alloy-dyn-abi v0.8.16 -> v0.8.18 Updating alloy-eips v0.9.1 -> v0.9.2 Updating alloy-genesis v0.9.1 -> v0.9.2 Updating alloy-json-abi v0.8.16 -> v0.8.18 Updating alloy-json-rpc v0.9.1 -> v0.9.2 Updating alloy-network v0.9.1 -> v0.9.2 Updating alloy-network-primitives v0.9.1 -> v0.9.2 Updating alloy-node-bindings v0.9.1 -> v0.9.2 Updating alloy-primitives v0.8.16 -> v0.8.18 Updating alloy-provider v0.9.1 -> v0.9.2 Updating alloy-pubsub v0.9.1 -> v0.9.2 Updating alloy-rpc-client v0.9.1 -> v0.9.2 Updating alloy-rpc-types v0.9.1 -> v0.9.2 Updating alloy-rpc-types-anvil v0.9.1 -> v0.9.2 Updating alloy-rpc-types-any v0.9.1 -> v0.9.2 Updating alloy-rpc-types-debug v0.9.1 -> v0.9.2 Updating alloy-rpc-types-engine v0.9.1 -> v0.9.2 Updating alloy-rpc-types-eth v0.9.1 -> v0.9.2 Updating alloy-rpc-types-trace v0.9.1 -> v0.9.2 Updating alloy-rpc-types-txpool v0.9.1 -> v0.9.2 Updating alloy-serde v0.9.1 -> v0.9.2 Updating alloy-signer v0.9.1 -> v0.9.2 Updating alloy-signer-aws v0.9.1 -> v0.9.2 Updating alloy-signer-gcp v0.9.1 -> v0.9.2 Updating alloy-signer-ledger v0.9.1 -> v0.9.2 Updating alloy-signer-local v0.9.1 -> v0.9.2 Updating alloy-signer-trezor v0.9.1 -> v0.9.2 Updating alloy-sol-macro v0.8.16 -> v0.8.18 Updating alloy-sol-macro-expander v0.8.16 -> v0.8.18 Updating alloy-sol-macro-input v0.8.16 -> v0.8.18 Updating alloy-sol-type-parser v0.8.16 -> v0.8.18 Updating alloy-sol-types v0.8.16 -> v0.8.18 Updating alloy-transport v0.9.1 -> v0.9.2 Updating alloy-transport-http v0.9.1 -> v0.9.2 Updating alloy-transport-ipc v0.9.1 -> v0.9.2 Updating alloy-transport-ws v0.9.1 -> v0.9.2 Updating async-trait v0.1.83 -> v0.1.84 Updating aws-config v1.5.12 -> v1.5.13 Updating aws-runtime v1.5.2 -> v1.5.3 Updating aws-sdk-kms v1.53.0 -> v1.54.0 Updating aws-sdk-sso v1.52.0 -> v1.53.0 Updating aws-sdk-ssooidc v1.53.0 -> v1.54.0 Updating aws-sdk-sts v1.53.0 -> v1.54.0 Updating bstr v1.11.1 -> v1.11.3 Updating cc v1.2.6 -> v1.2.7 Removing diff v0.1.13 Removing hex-literal v0.4.1 Updating instability v0.3.5 -> v0.3.6 Updating jiff v0.1.18 -> v0.1.21 Removing pretty_assertions v1.4.1 Updating schnellru v0.2.3 -> v0.2.4 Updating syn v2.0.93 -> v2.0.94 Updating syn-solidity v0.8.16 -> v0.8.18 Updating tempfile v3.14.0 -> v3.15.0 Updating winnow v0.6.21 -> v0.6.22 note: pass `--verbose` to see 12 unchanged dependencies behind latest Co-authored-by: mattsse <[email protected]>

forge: rm subcommand debug Co-authored-by: 9547 <[email protected]> Co-authored-by: zerosnacks <[email protected]>

* feat(test): add Issue8566 testcase Signed-off-by: 9547 <[email protected]> * bump alloy to 0.8.18 Signed-off-by: 9547 <[email protected]> --------- Signed-off-by: 9547 <[email protected]>

* globalopts -> globalargs * consistently use opts for configurations, args for command line arguments

fix re-remove debug file

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

elfedy · 2025-01-07T11:54:55Z

crates/forge/bin/cmd/create.rs

@@ -21,6 +21,8 @@ use forge_verify::{zk_provider::CompilerVerificationContext, RetryArgs, Verifier
 use foundry_cli::{
    opts::{CoreBuildArgs, EthereumOpts, EtherscanOpts, TransactionOpts},
    utils::{self, read_constructor_args_file, remove_contract, remove_zk_contract, LoadConfig},
+    opts::{BuildOpts, EthereumOpts, EtherscanOpts, TransactionOpts},


There are a couple of repeated imports here, this conflict happens because there are somethings we import (e.g remove_zk_contract ) that upstream does not. Maybe check the specific imports added on upstream and add them to the two above.

crates/forge/tests/it/test_helpers.rs

crates/script/src/lib.rs

elfedy · 2025-01-07T12:02:00Z

CONFLICT (content): Merge conflict in foundryup-zksync/README.md
CONFLICT (content): Merge conflict in foundryup-zksync/foundryup-zksync

These two files are not in upstream so if you got a conflict here something weird is going on

MBerguer · 2025-01-09T21:01:11Z

I did quite a few things to update this:

First, regarding your question @elfedy, yes, these files are not upstream, but those are under a rename of the folder foundryup to foundryup-zksync, and my git can recognize the rename back in the file history, so it is tracking the changes as if they were the same file.

But don't worry, I accepted our changes because they made more sense for us.

CONFLICT (content): Merge conflict in foundryup-zksync/README.md
CONFLICT (content): Merge conflict in foundryup-zksync/foundryup-zksync

Until we merge the alloy-zksync update and publish the new version (cc: @popzxc), I'm pointing our toml to that specific commit. Otherwise, this is not able to compile because of a change in how alloy handles the Network crate.

Tests are still failing; I'm working on this now in a separate PR

popzxc · 2025-01-10T06:24:10Z

@MBerguer the fix in anvil-zksync is merged, so I guess alloy-zksync update would be unblocked as soon as we release a new version (should happen soon).

elfedy · 2025-01-10T11:56:20Z

@MBerguer sounds good. Updated the title to reflect this PR is to solve merge conflict and it's not the final sync

jtfirek and others added 30 commits December 11, 2024 19:18

Update incorrect documentation in the READ.me (#9538)

c4fcf12

Update README.md

fix(anvil): set best_number to state.block.number if greater (#…

539760c

…9543) fix(`anvil`): set `best_number` correctly while loading state with fork activated

fix(cast): reset env.tx.caller for impersonated txs (#9544)

2eec098

* fix(`cast`): reset `env.tx.caller` for impersonated txs * test

chore: Add GH attestation for foundry binaries (#9546)

e22a9ec

Add GH attestation

fix(release): allow contents write permission, run attestation after …

2f698e4

…release created (#9550) fix(release): allow contents write permission, run attestation after release published

chore: bump compilers (#9554)

1276f58

* chore: bump compilers * clippy

fix: account for impersonated tx in configure_tx_env (#9553)

dabacec

* chore: account for impersonated tx in configure_tx_env * nit

chore(deps): weekly cargo update (#9560)

206dab2

feat(cast): add support for beacon proxies in cast impl (#9567)

681bddd

* feat(cast): add support for beacon proxies in cast impl * test: pin test to current block

fix(release): check env.IS_NIGHTLY as string (#9568)

0086d04

fix(release): check IS_NIGHTLY as string

Run release workflow on stable tag push (#9575)

8a08a3a

chore: update release notes template (#9577)

6c4af1d

- feat / fixes category per binaries - breaking changes and perf category - restrict summary to max 60 days / max 100 PRs, add full diff and contributors

chore: add contributors in release changelog (#9578)

a263a92

chore: bump workspace version to 0.3.0 (#9580)

f3b5ac7

bump to 0.3.0

chore: testFail* deprecation warning (#9581)

5a8bd89

* chore: testFail* deprecation warning * test * fix

chore(tests): bump forge-std version (#9584)

6091f25

* chore: bump forge-std version used for tests * run CI * fix tests * fix gas --------- Co-authored-by: DaniPopes <[email protected]> Co-authored-by: zerosnacks <[email protected]>

chore(foundryup): default to stable if no specific version is passe…

0d5ad75

…d in (#9585) * default to stable if no specific version is passed in * update mention, defaults to stable now

chore(deps): weekly cargo update (#9588)

f922a34

chore: make clippy happy (#9601)

ffaa68f

* chore: make clippy happy * allow literals tring with formatting args global

chore(fmt): tx fields indent with the same whitespaces (#9603)

4f22a38

chore(fmt): follow the same indent rules of other fields Signed-off-by: jsvisa <[email protected]>

chore: fix flaky inline config test (#9591)

e618b2c

feat: update revm 19 alloy 09 (#9605)

68aff72

* feat: update revm 19 alloy 09 * clippy * updata test * add back max data gas check

chore(deps): bump alloys (#9613)

03ec595

add comment to -r option about default value (#9571)

6cb41fe

add comment to -r option about default value

9547 and others added 14 commits January 3, 2025 11:07

fix(anvil): ipc append a newline (#9608)

8555f16

* fix(anvil): ipc append a newline Signed-off-by: 9547 <[email protected]> * use put_u8 instead of extend from slice Signed-off-by: 9547 <[email protected]> --------- Signed-off-by: 9547 <[email protected]>

chore: dedup errors in eyre handler (#9612)

caf8455

fix(evm): P256Verify address (#9618)

f7bb427

typo: EtherScan -> Etherscan (#9607)

15940fc

Signed-off-by: 9547 <[email protected]> Co-authored-by: Matthias Seitz <[email protected]>

chore(git): enhance rust diffing (#9596)

8cc2079

This has to be explicitly enabled for git to utilize its enhanced rust diffing, evidently. ref: rust-lang/rust#78882 Co-authored-by: zerosnacks <[email protected]>

chore(config): use solar for inline config parsing (#9615)

2e9d849

chore(bind-json): replace solang with solar (#9616)

a5c5be5

chore(deps): bump solar 0.1.1 (#9627)

15a9f17

chore(forge): remove forge debug subcommand (#9606)

dc8d980

forge: rm subcommand debug Co-authored-by: 9547 <[email protected]> Co-authored-by: zerosnacks <[email protected]>

feat(test): add repro issue8566 testcase (#9617)

782787b

* feat(test): add Issue8566 testcase Signed-off-by: 9547 <[email protected]> * bump alloy to 0.8.18 Signed-off-by: 9547 <[email protected]> --------- Signed-off-by: 9547 <[email protected]>

chore: standardize use of opts / args (#9629)

e4fdc45

* globalopts -> globalargs * consistently use opts for configurations, args for command line arguments

fix: re-remove forge debug file (#9631)

e3ff6cb

fix re-remove debug file

feat: remove ethers (#9412)

5e72c69

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

MBerguer requested a review from a team as a code owner January 7, 2025 00:12

elfedy reviewed Jan 7, 2025

View reviewed changes

crates/forge/tests/it/test_helpers.rs Outdated Show resolved Hide resolved

elfedy reviewed Jan 7, 2025

View reviewed changes

crates/script/src/lib.rs Show resolved Hide resolved

MBerguer added 3 commits January 9, 2025 17:08

Merge branch 'upstream-version-target=enero' into upstream-5e72c69

63401f9

cargo updated iself

39d31c4

compiles

e797f06

MBerguer force-pushed the upstream-5e72c69-merge branch from bdf9df8 to e797f06 Compare January 9, 2025 20:35

MBerguer merged commit e797f06 into upstream-5e72c69 Jan 9, 2025
24 of 77 checks passed

MBerguer deleted the upstream-5e72c69-merge branch January 9, 2025 20:58

elfedy changed the title ~~feat: sync with upstream 5e72c69~~ feat: supstream 5e72c69 merge Jan 10, 2025

elfedy changed the title ~~feat: supstream 5e72c69 merge~~ feat: upstream 5e72c69 merge Jan 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upstream 5e72c69 merge #811

feat: upstream 5e72c69 merge #811

MBerguer commented Jan 7, 2025

elfedy Jan 7, 2025

elfedy commented Jan 7, 2025 •

edited

Loading

MBerguer commented Jan 9, 2025

popzxc commented Jan 10, 2025

elfedy commented Jan 10, 2025

feat: upstream 5e72c69 merge #811

feat: upstream 5e72c69 merge #811

Conversation

MBerguer commented Jan 7, 2025

What 💻

elfedy Jan 7, 2025

Choose a reason for hiding this comment

elfedy commented Jan 7, 2025 • edited Loading

MBerguer commented Jan 9, 2025

popzxc commented Jan 10, 2025

elfedy commented Jan 10, 2025

elfedy commented Jan 7, 2025 •

edited

Loading