Skip to content

chore: Upstream 0a2ad00#969

Merged
Jrigada merged 2 commits intomainfrom
upstream-0a2ad00
Mar 12, 2025
Merged

chore: Upstream 0a2ad00#969
Jrigada merged 2 commits intomainfrom
upstream-0a2ad00

Conversation

@Jrigada
Copy link
Copy Markdown
Contributor

@Jrigada Jrigada commented Mar 12, 2025 •
edited
Loading

What 💻

Conflicts solved

  • CONFLICT (content): Merge conflict in Cargo.lock
  • CONFLICT (content): Merge conflict in Cargo.toml
  • CONFLICT (content): Merge conflict in crates/cast/bin/cmd/estimate.rs
  • CONFLICT (content): Merge conflict in crates/cheatcodes/src/inspector.rs
  • CONFLICT (content): Merge conflict in crates/script/src/broadcast.rs
  • CONFLICT (content): Merge conflict in deny.toml

Why ✋

  • Sync with upstream changes

Evidence 📷

Include screenshots, screen recordings, or console output here demonstrating that your changes work as intended

Documentation 📚

Please ensure the following before submitting your PR:

  • Check if these changes affect any documented features or workflows.
  • Update the book if these changes affect any documented features or workflows.

@Jrigada @yash-atreya
@grandizzy @github-actions
chore: Upstream 0a2ad00 merge and compile and tests (#961)
1a2382c 
* chore(deps): bump alloy 0.12 (#10028)

* fix(forge): stack pranks, restore pranks at earlier call depths (#10018)

* chore: fix isolate tests (#10034)

* fix(docker): use cross main, build docker only on release (#10035)

fix(docker): use cross main instead 0.2.5

* chore(deps): weekly `cargo update` (#10039)

* fix(forge): base url for verification providers other than etherscan (#10045)

fix(forge): base url for custom verification providers type

* Allow fork of alloy zksync

* remove extra debug lines

* Remove fork of alloy-zksync

* Pin alloy-consensus

---------

Co-authored-by: Yash Atreya <44857776+yash-atreya@users.noreply.github.com>
Co-authored-by: grandizzy <38490174+grandizzy@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Jrigada Jrigada requested a review from a team as a code owner March 12, 2025 15:31
MBerguer
MBerguer previously approved these changes Mar 12, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@MBerguer MBerguer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code changes LGTM.

Just don't forget about the book changes so we can tick these checkboxes
image

elfedy
elfedy previously approved these changes Mar 12, 2025
View reviewed changes
Karrq
Karrq reviewed Mar 12, 2025
View reviewed changes
Karrq
Karrq previously approved these changes Mar 12, 2025
View reviewed changes
@Jrigada Jrigada dismissed stale reviews from Karrq, elfedy, and MBerguer via 01ee9ea March 12, 2025 18:07
@Jrigada Jrigada requested review from Karrq, MBerguer and elfedy March 12, 2025 18:07
@Jrigada Jrigada merged commit 02f8c9a into main Mar 12, 2025
53 checks passed
@Jrigada Jrigada deleted the upstream-0a2ad00 branch March 12, 2025 18:44
@github-project-automation github-project-automation bot moved this from Todo to Done in DevEx squad Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Karrq Karrq Karrq approved these changes

@elfedy elfedy elfedy approved these changes

@MBerguer MBerguer Awaiting requested review from MBerguer

Assignees

No one assigned

Labels

None yet

Projects

DevEx squad
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Jrigada @Karrq @MBerguer @elfedy