Skip to content

chore: Upstream 0a2ad00 merge and compile and tests#961

Merged
Jrigada merged 13 commits intoupstream-0a2ad00from
upstream-0a2ad00-merge
Mar 12, 2025
Merged

chore: Upstream 0a2ad00 merge and compile and tests#961
Jrigada merged 13 commits intoupstream-0a2ad00from
upstream-0a2ad00-merge

Conversation

@Jrigada
Copy link
Copy Markdown
Contributor

@Jrigada Jrigada commented Mar 10, 2025

What 💻

  • Introduced commits from latest point in Foundry upstream
  • Fix compilation errors and point to updated alloy-zksync branch.

Why ✋

  • Upstream merge efforts

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 Jrigada requested a review from a team as a code owner March 10, 2025 18:35
@Jrigada Jrigada changed the base branch from main to upstream-0a2ad00 March 10, 2025 18:37
Comment thread Cargo.toml
Comment thread crates/cheatcodes/src/evm/prank.rs
Comment thread crates/zksync/compilers/src/compilers/zksolc/mod.rs Outdated
@Jrigada Jrigada requested a review from Karrq March 11, 2025 22:23
@tomimor tomimor moved this from Todo to In Progress in DevEx squad Mar 12, 2025
@Jrigada Jrigada changed the title chore: Upstream 0a2ad00 merge and compile chore: Upstream 0a2ad00 merge and compile and tests Mar 12, 2025
@Jrigada Jrigada merged commit 1a2382c into upstream-0a2ad00 Mar 12, 2025
51 checks passed
@Jrigada Jrigada deleted the upstream-0a2ad00-merge branch March 12, 2025 15:30
@github-project-automation github-project-automation bot moved this from In Progress to Done in DevEx squad Mar 12, 2025
Jrigada added a commit that referenced this pull request Mar 12, 2025
* chore: Upstream 0a2ad00 merge and compile and tests (#961)

* 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>

* Fix comment

---------

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

6 participants