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.

Sign up for GitHub

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

Jump to bottom

feat(foundry): update from upstream #187

Merged
merged 239 commits into from
Dec 12, 2023
Merged

feat(foundry): update from upstream #187

merged 239 commits into from
Dec 12, 2023

Conversation

Deniallugo
Copy link
Collaborator

@Deniallugo Deniallugo commented Dec 8, 2023 •
edited by nbaztec
Loading

What 💻

  • Updates foundry-zksync with upstream changes
  • Support zkforge test

Why ✋

  • Work in progress to support tests

Evidence 📷

Tests pass

ZePedroResende and others added 30 commits October 20, 2023 00:21
@ZePedroResende
feat(anvil): Fix ots_getInternalOperations (#6068)
619f3c5 
* feat(anvil): Fix `ots_getInternalOperations`

* Motivation

The otterscan `ots_getInternalOperations` was given incorrect values and
fully crashing when `SELFDESTRUCTS` where present.
The `type` field in the response for this endpoint is incorrectly serialized.

* Solution

Use the `MinedTransaction` instead of a parity traces to have more
granular controll on the specific transactions that we want to filter
out in the internal operations and the specific parameters that we want
to have access to.

Fix the serialization for the`type` field in the response.

* feat(anvil): fix create2 handling in `ots_getInternalOperations`
@leovct
chore(cast): update from-bin command description (#6077)
2937e4f
@Evalir
chore: new clippy (#6080)
0409342
@tsite
fix(forge): fix verify-contract etherscan cloudflare bug (#6079)
ba6c851 
* fix `forge verify-contract` etherscan cloudflare bug

Etherscan verification for non-mainnet chains requires a question
mark at the end of the verifier url in order to prevent a forward slash
from being added to the url which trips a cloudflare rule on requests
from ec2 boxes.

Verification on both Goerli and Sepolia both fails without this
character present.

Hardhat-verify does not add the extra forward slash to the verifier url
and has no issues verifying contracts on etherscan.

Fixes #4865, #5251, #5741

* run cargo +nightly fmt -- --check

* check if the api url already ends with ?

Also apply the fix to --verifier-url urls
@DJViau
Update README.md (#6083)
602460e 
Adds documentation of `disable-start` and `disable-end`. See foundry-rs/foundry#4998
@ckoopmann
Update evm-disassembler dependency to support new cancun opcodes (#6089)
843e135 
Co-authored-by: test <[email protected]>
@mattsse
chore: bump ethers (#6091)
3f6f16a
@mattsse
chore(clippy): make clippy happy (#6092)
e82f5bd
@mattsse
fix: wrong subtract timestamp (#6097)
6ac22df
@Evalir
feat(deps): Move to Alloy ABI encoding/decoding & alloy types (#5986)
251ef74 
* feat: find and replace all ethers_solc mentions outside anvil

* chore: keep resolving errors as fuzz is getting migrated

* feat: fuzz/trace changes

* feat: partial trace migration

* chore: use temporal sol! macro in diff file for decode migration

* feat: use proptest traits instead of custom impl

* chore: address comments

* chore: remove alloy console bindings

* feat: introduce foundry-block-explorers

* chore: partial common abi helpers migration

* feat: partial decode migration

* feat: re-introduce block-explorers

* feat: fix compiler errors

* chore

* chore: tentative inspector migration

* feat: switch to using static decoder to decode errors

* chore: clippy

* feat: migrate trace types temporarily

* chore: replace ethers tracing types for local tracing types

* fix: handle decoding with static decoder, tests

* chore: use JsonAbi for console/hardhat/hevm abis

* chore: add todo

* chore: replace types downstream and remove glue

* feat: fix last evm issues, start fixing downstream type issues

* chore: cargo

* chore: more downstream error fixes

* chore: fix test files

* chore: more downstream fixes

* chore: fmt

* feat: migrate unit utils, replace

* chore: fix tests, fmt

* compiles

* clippy

* chore: clippy

* chore: last fixes

* chore: update block explorers

* chore: actually coerce values correctly

* chore: fix broken test

* chore: fix estimation test, parse values as alloy nums

* chore: fix abi parsing

* chore: selector tests

* chore: fix more tests, remove more glue

* chore: properly decode logs

* chore: use selector_type to handle tuples correctly

* chore: clippy and fix another test

* chore: fix remaining abi tests

* chore: use proptest traits for fuzzer

* more test fixes ongod

* clippy

* chore: use abigen for console logs for now

* fix: generate valid values in fuzzer

* chore: clippy

* chore: readd settings

* chore: various fixes

* chore: fix script arguments decoding

* chore: fix more tests

* chore: last ots fixes

* fix: decoding

* chore: clippy

* chore: fmt

* chore: fix deny check

* chore: deny fixes

* chore: force default features off

* chore: update block-explorers

* chore: doc fixes

* chore: ignore invariant storage test due to flakyness

* chore: update foundry-block-explorers

* chore: cleanup, config migration

* chore: resolve comments, more cleanup, remove unwraps

* chore: remove last mentions of ethers::etherscan

* chore: remove ethers-solc feat

* chore: use alloy master again

* chore: readd NameOrAddress

* chore: clippy/fmt

* chore: readd support on storage

* fix: add remappings on settings

* chore: address comments (remove create2, noop map, remove eyre from decode.rs)

* chore: use NameOrAddress
@mattsse
fix: function returns formatting (#6086)
3fe2392
@ngotchac
anvil: Fix snapshot revert block-env (#6107)
950d863
@Evalir
feat: format DynSolValues for printing on anvil errors (#6111)
546c96f
@github-actions @DaniPopes
chore(deps): weekly cargo update (#6112)
000f38c 
Updating git repository `https://github.com/alloy-rs/core/`
    Updating git repository `https://github.com/gakonst/ethers-rs`
    Updating git repository `https://github.com/foundry-rs/block-explorers`
    Updating git repository `https://github.com/foundry-rs/compilers`
    Updating ahash v0.8.5 -> v0.8.6
    Updating alloy-dyn-abi v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating alloy-json-abi v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating alloy-primitives v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating alloy-sol-macro v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating alloy-sol-type-parser v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating alloy-sol-types v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating clap v4.4.6 -> v4.4.7
    Updating clap_builder v4.4.6 -> v4.4.7
    Updating clap_complete v4.4.3 -> v4.4.4
    Updating clap_complete_fig v4.4.1 -> v4.4.2
    Updating clap_derive v4.4.2 -> v4.4.7
    Updating clap_lex v0.5.1 -> v0.6.0
    Removing ethers-solc v2.0.4
    Removing lalrpop v0.19.12
    Removing lalrpop-util v0.19.12
    Updating sct v0.7.0 -> v0.7.1
    Removing solang-parser v0.2.4
    Removing svm-rs v0.2.23
    Removing svm-rs-builds v0.1.15
    Updating syn-solidity v0.4.2 (https://github.com/alloy-rs/core/#d10ab51a) -> #343f799b
    Updating tokio-util v0.7.9 -> v0.7.10
    Updating zerocopy v0.7.11 -> v0.7.15
    Updating zerocopy-derive v0.7.11 -> v0.7.15

Co-authored-by: DaniPopes <[email protected]>
@github-actions @DaniPopes
chore(deps): weekly cargo update (#6114)
9fd44a7 
Updating git repository `https://github.com/alloy-rs/core/`
    Updating git repository `https://github.com/gakonst/ethers-rs`
    Updating git repository `https://github.com/foundry-rs/block-explorers`
    Updating git repository `https://github.com/foundry-rs/compilers`
    Updating alloy-dyn-abi v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating alloy-json-abi v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating alloy-primitives v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating alloy-sol-macro v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating alloy-sol-type-parser v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating alloy-sol-types v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068
    Updating syn-solidity v0.4.2 (https://github.com/alloy-rs/core/#343f799b) -> #393f8068

Co-authored-by: DaniPopes <[email protected]>
@Evalir
fix(evm): properly generate bytesX values with `arbitrary_from_ty…
a839414 
…pe` (#6116)

* fix: generate value from arbitrary_from_type and use v as backup

* chore: add test case
@robriks @mattsse
Document BTreeMap lexicographical order (#6100)
7d12927 
* Document BTreeMap lexicographical order

Added short blurbs on Rust's BTreeMap crate ordering system, specifying the caveat that Solidity structs must be declared alphabetically *except that uppercase and lowercase strings are treated differently where uppercase characters precede lowercase ones.

This should add clarity for developers using Foundry's nifty json parsing :)

++Typo/grammar fixes

* Update crates/evm/src/executor/inspector/cheatcodes/ext.rs

* Update crates/evm/src/executor/inspector/cheatcodes/ext.rs

* rustfmt

---------

Co-authored-by: Matthias Seitz <[email protected]>
@mattsse
perf: clear all transactions if exceeds configured keeper (#6127)
f345556
@DaniPopes
refactor: modularize foundry-evm (#6128)
6893e38 
* refactor: modularize foundry-evm

* sync deps

* chore: clippy

* chore: flatten executor submodules into root

* chore: `foundry-evm-executors` -> `foundry-evm-core`

* docs: touch up descriptions

* chore: nest evm crates into evm/
@janbro @alejandro-immunefi
Modified git fetch command to method to use correct root folder. (#6119)
93f64c7 
* Modified git fetch command to method to use correct root folder.

* Added directory test for template initialization

* Updated test comment

* Cargo fmt

---------

Co-authored-by: Alejandro Muñoz-McDonald <[email protected]>
@Evalir
fix(create): concat bytecode and constructor call to match old etha…
aa257c2 
…bi behavior (#6134)

* fix: concat bytecode and constructor call to match old ethabi behavior

* fmt/clippy
@mattsse
test: add forge create test (#6137)
cc760aa
@Evalir
fix(common): properly parse functions in their usual form (#6136)
57ffd4a 
* fix: properly parse functions in their usual form

* chore: fmt

* chore: add test

* chore: only fallback to human-readable abi if necessary

* chore: add another function for test
@mattsse
fix: print decoded output value (#6141)
62e3a84
@mattsse
fix: use selector not signature (#6146)
70d0022
@mattsse
fix: trest invalid opcode as revert (#6140)
dcdceda
@DaniPopes
fix: stop erroring on failing to install hooks (#6148)
ce1b943
@mattsse
fix: always install error hook first (#6150)
4422d67
@mattsse
fix: resolve constructor args (#6153)
f5b9c02 
* test: add constructor args test

* clippy

* use resolve

* fix input resolve
@clabby
Fix foundryup (#6155)
459da57
dutterbutter and others added 12 commits December 8, 2023 18:29
@dutterbutter @Deniallugo
fix: resolves import paths issue (#133)
f07620e
@dutterbutter @Deniallugo
chore: adds latest zksolc compiler (#135)
2378501
@nbaztec @dutterbutter @Deniallugo
fix: fix zkforge zkbuild on ubuntu (#137)
e96cf29 
Co-authored-by: Dustin Brickwood <[email protected]>
@dutterbutter @Deniallugo
chore: moves zk_solc.rs and zksolc_manager.rs to common crate (#…
cb8777f 
…136)
@nbaztec @Deniallugo
fix: update revm, fix env update for deployed contracts and era-test-…
a5d74cc 
…node (#139)
@dutterbutter @Deniallugo
chore: update runner for forge fmt (#140)
ce362d0
@nbaztec @Deniallugo
feat: run smoke test on PRs (#141)
36dadfc
@caffeinum @Deniallugo
fix: skip contracts with empty bytecode hash to avoid runtime error (#…
fb08e69 
…143)
@nbaztec @dutterbutter @Deniallugo
chore: update era-revm (#183)
087ea2a 
Co-authored-by: Dustin Brickwood <[email protected]>
@nbaztec @Deniallugo
fix: fail tests on assert failure (#184)
d507122
@dutterbutter @Deniallugo
fix: makes use of zksolc_manager during test cmd to download compil…
cf104db 
…er if not present (#185)
@Deniallugo
Update from upstream
23c9a53 
Signed-off-by: Danil <[email protected]>
@Deniallugo Deniallugo force-pushed the deniallugo-update-from-upstream branch from 739ec8b to 23c9a53 Compare December 8, 2023 19:34
@Deniallugo Deniallugo changed the title Deniallugo update from upstream feat(foundry): update from upstream Dec 11, 2023
@Deniallugo Deniallugo force-pushed the deniallugo-update-from-upstream branch from efa0b2a to 35e4245 Compare December 11, 2023 15:13
@Deniallugo Deniallugo force-pushed the deniallugo-update-from-upstream branch from 66ae96b to 1acdf45 Compare December 12, 2023 08:08
@Deniallugo
fmt
59e7ea9 
Signed-off-by: Danil <[email protected]>
@Deniallugo Deniallugo force-pushed the deniallugo-update-from-upstream branch from 1acdf45 to 59e7ea9 Compare December 12, 2023 09:07
@nbaztec nbaztec merged commit 31f2f02 into main Dec 12, 2023
11 checks passed
@nbaztec nbaztec deleted the deniallugo-update-from-upstream branch December 12, 2023 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nbaztec nbaztec nbaztec approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.