chore: resolve merge conflicts for upstream-57bb12e #693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix: respect --auth in cast call and cast estimate * access list parser
…(#9117) * fix(cheatcodes): convert fixed bytes to bytes in vm.rpc tuple result * Changes after review: recursive convert_to_bytes fn
* feat(forge): add solc subcommand and utilities * style: improve formatting in solc.rs file * fix: merge * add json compatible output * add basic tests * add basic tests * clean up * finish tests * add skip flag * add vyper for unit tests * move tests, pin compiler version, use forgetest! * update CI test location for target Python / Vyper * update foundry-compilers crate * Update crates/forge/bin/cmd/compiler.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> * `compiler` command is sync, remove conditions on CI for Vyper / Python installs * is_jsonlines -> is_json --------- Co-authored-by: zerosnacks <zerosnacks@protonmail.com> Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
* feat(forge): add max supported EVM version in compiler -v * shorter message, displayed on -vv verbosity * match on verbosity * Respect verbosity in json, nicer json output * Redact default EVM version in tests * make --json output not output paths in verbosity mode 0, equivalent of non-verbose text mode --------- Co-authored-by: zerosnacks <zerosnacks@protonmail.com>
bump foundry-compilers to include Vyper fix: foundry-rs/compilers#213
…g (#9130) * fix(cast): do not strip 0x / hex decode message before encoding * Pass message directly to eip191_hash_message
…cutor (#9110) * feat(anvil-rpc): wallet_ namespace * feat: init sponsor and delegation contract in backend * wallet_sendTransaction * wallet_sendTransaction * update p256 runtime code * nit P256_DELEGATION_CONTRACT addr * use correct runtime codes * fix * doc nits * fix * feat: anvil_addCapability * nit * feat: anvil_setExecutor * tests
chore: alias wallet_sendTransaction
* Adds init code size limit check & column to table. * Adds option to ignore init code size check during --size output. * Updates tests with new column for --sizes table. * Adds test helpers for forge CLI. * Implements test for init code size limit as per EIP-3860 * Adds test for --ignore-eip-3860 * Fixes for Cargo +nightly fmt warnings. * Refactors both contract size functions into one with a boolean arg. * Adds alias for --ignore-eip-3860 to --ignore-initcode-size. * Brings back the original comments. * Update compile.rs * Changes --ignore-eip-3860 to be a boolean field. * Fixes ranges in table display code and comment punctuation. * Moves testing helper to existing utils module. * Improve ranges in table display code. * Adds output assertions to initcode size check tests. * Minor change to ranges in display logic for sizes table. --------- Co-authored-by: mgiagante <251503-mgiagante@users.noreply.gitlab.com> Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
Locking 8 packages to latest compatible versions
Updating alloy-chains v0.1.38 -> v0.1.40
Updating anyhow v1.0.89 -> v1.0.90
Updating cc v1.1.30 -> v1.1.31
Updating libc v0.2.160 -> v0.2.161
Updating prettyplease v0.2.22 -> v0.2.23
Updating serde_json v1.0.128 -> v1.0.132
Updating syn v2.0.79 -> v2.0.80
Updating unicase v2.7.0 -> v2.8.0
note: pass `--verbose` to see 39 unchanged dependencies behind latest
Co-authored-by: mattsse <19890894+mattsse@users.noreply.github.com>
…… (#9148) feat(`forge build`): `--watch` flag now watches `foundry.toml` config changes
* add test * fix: ensure correct sender nonce when dry-running script in fork * fix test * Fix test --------- Co-authored-by: grandizzy <grandizzy.the.egg@gmail.com>
* feat(cast): add `json` flag in `cast wallet new-mnemonic` * Update crates/cast/bin/cmd/wallet/mod.rs Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> * Update crates/cast/tests/cli/main.rs Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> * chore: adjust `wallet_mnemonic_from_entropy` to generate three accounts instead of one * Update crates/cast/bin/cmd/wallet/mod.rs Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> * fix: preserve check-summed format for addresses * chore: simplify code * fix: rustfmt --------- Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
* fix(`anvil`): use header.number not best_number * test * ignore test_arbitrum_fork_block_number
* fix(`anvil`): use header.number not best_number * test * ignore test_arbitrum_fork_block_number * fix(`anvil`): miner logic for arb-like chains * clippy * test
fix(cheatcodes): chain report source errors
* feat(`anvil`): support mining with same block.timestamp * fix timestamp tests * fix
* Refactored debugger to extract TUI abstraction. Added option to dump debugger context to file as json. * Update crates/forge/bin/cmd/test/mod.rs Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> * Update crates/script/src/lib.rs Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com> * Cleanup code. * Added test. * Reformat code. * Reformat code. --------- Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
* chore(deps): bump alloy, revm, fork-db * fix: chain_id u64 * use SpecId::Osaka in place of PragueEOF * fix(`anvil`): test state files - tackle alloy breaking change alloy-rs/alloy#1486 * fix test * minify state json
* replace existing shell::println, add macros * finish replacing shell::println * remove p_println * remove redundant quiet or silent variables * install global shells in binaries * CastArgs -> Cast, Cast -> CastInstance * fix tests, always initialize Mutex::new(Shell::new()) on initial access, for some reason cfg!(test) path is not handled when running with tokio tests * revert .quiet(true) * add back quiet * undo CastInstance -> Cast, Cast -> CastArgs * add global --json format * use global --json flag * revert sequence / multisequence save silent mode * fix failing tests * fix tests * fix tests * replace cli_warn with sh_warn * use shell json directly instead of passing in * clean up, document print modes in respect to --quiet flag * group shell options under display options * revert global --json flag * remove redundant import * fix: quiet * remove faulty argument conflict test as there is no way to currently assert a conflict between global and local args without custom reject at runtime * add back conflicts_with quiet flag, global args w/ conflicts_with works fine * remove yellow() * Apply suggestions from code review - update dependencies - use default Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> * fix deprecated terminal_size method * revert quiet flag, fix os:fd import for windows * add replacing tests, add back quiet conflicting flag * make output windows compatible * to avoid visual regression, style warning message content in yellow, error message content in red - both not bold * fix docs links * fix junit throwing mixed content on warnings, avoid modifying global verbosity * remove set_verbosity shell helper, redundant * revert default .expect on printing, prefer passing. revert message style formatting - no longer style the message * fix doc test, fix formatting * fix merge issues --------- Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
chore: refactor debugger code
* fix(anvil): Apply state overrides in debug_traceCall Co-authored-by: mixy1 <michael_debono@hotmail.com> * chore(anvil): fix formatting --------- Co-authored-by: mixy1 <michael_debono@hotmail.com>
…aram too (#9176) fet(fmt): add all_params config - smae as all but split single param too
* feat(invariant): add basic metrics report * Put metrics behind show-metrics invariant config
* feat(`anvil`): persist accounts in `ForkedStorage` * load accounts * test * fix(`anvil`): override storage.best_number with fork_block_num if loading state on a fork url * Revert "load accounts" This reverts commit b650f56fe52f79be3eb7c8ab4d2ad1aaca08a32f. * Revert "feat(`anvil`): persist accounts in `ForkedStorage`" This reverts commit 456da156e07b1ede01c08c4f48ef36eed4094f17. * nit --------- Co-authored-by: grandizzy <grandizzy.the.egg@gmail.com> * nit --------- Co-authored-by: grandizzy <grandizzy.the.egg@gmail.com>
feat(`--gas-report`): add option to show gas for tests
* fix: rename flag as_int -> as-int * Update crates/cast/bin/args.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --------- Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
* feat(cast): add error-decode to decode error string Signed-off-by: jsvisa <delweng@gmail.com> * feat(cast): error-decode -> string-decode Signed-off-by: jsvisa <delweng@gmail.com> * add test case for string-decode Signed-off-by: jsvisa <delweng@gmail.com> * Apply suggestions from code review --------- Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
…k (#9241) * fix(anvil): on anvil_mine jump to next timestamp before mine new block * Fix unrelated clippy, simplify test
chore(deps): weekly `cargo update`
Locking 32 packages to latest compatible versions
Updating alloy-chains v0.1.42 -> v0.1.45
Updating alloy-dyn-abi v0.8.9 -> v0.8.10
Updating alloy-json-abi v0.8.9 -> v0.8.10
Updating alloy-primitives v0.8.9 -> v0.8.10
Updating alloy-sol-macro v0.8.9 -> v0.8.10
Updating alloy-sol-macro-expander v0.8.9 -> v0.8.10
Updating alloy-sol-macro-input v0.8.9 -> v0.8.10
Updating alloy-sol-type-parser v0.8.9 -> v0.8.10
Updating alloy-sol-types v0.8.9 -> v0.8.10
Updating anyhow v1.0.91 -> v1.0.92
Updating aws-sdk-kms v1.48.0 -> v1.49.0
Updating aws-sdk-sso v1.47.0 -> v1.48.0
Updating aws-sdk-ssooidc v1.48.0 -> v1.49.0
Updating aws-sdk-sts v1.47.0 -> v1.48.0
Updating clap_complete v4.5.35 -> v4.5.36
Updating divan v0.1.14 -> v0.1.15
Updating divan-macros v0.1.14 -> v0.1.15
Updating hyper-util v0.1.9 -> v0.1.10
Updating libm v0.2.9 -> v0.2.11
Updating op-alloy-consensus v0.5.1 -> v0.5.2
Updating op-alloy-rpc-types v0.5.1 -> v0.5.2
Updating quinn-udp v0.5.5 -> v0.5.6
Updating reqwest v0.12.8 -> v0.12.9
Updating rustix v0.38.37 -> v0.38.38
Updating rustls v0.23.15 -> v0.23.16
Updating serde v1.0.213 -> v1.0.214
Updating serde_derive v1.0.213 -> v1.0.214
Updating snapbox v0.6.18 -> v0.6.19
Updating syn v2.0.85 -> v2.0.86
Updating syn-solidity v0.8.9 -> v0.8.10
Updating thiserror v1.0.65 -> v1.0.66
Updating thiserror-impl v1.0.65 -> v1.0.66
note: pass `--verbose` to see 14 unchanged dependencies behind latest
Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
* fix: avoid deadlock in nested shell calls * cleanup
Some fields were missing for some HF, leading to an invalid Genesis block hash.
* fix: better error handling when waiting for receipt * fmt
* fix: use Debug when formatting errors * sh_err * rm newline in handler
Locking 5 packages to latest compatible versions
Updating alloy-chains v0.1.45 -> v0.1.46
Updating anstyle v1.0.9 -> v1.0.10
Updating cc v1.1.31 -> v1.1.34
Updating jiff v0.1.13 -> v0.1.14
Updating syn v2.0.86 -> v2.0.87
note: pass `--verbose` to see 14 unchanged dependencies behind latest
Co-authored-by: mattsse <19890894+mattsse@users.noreply.github.com>
fix(forge doc): display custom natspec tag
chore: do not print anvil port if silent
* add global json --flag * finish port to shell::is_json * fix test * update message * very strange stalling bug, fixed by assignment? * remove jobs -j shorthand clashing with global json flag * fix test after -j change * fix doctests * temporarily disable junit conflict, revert -j as --json shorthand * tag --color, --quiet as conflicting with --json * update tests to be aware of global args to avoid `Argument or group quiet specified in conflicts_with* for junit does not exist` error * fix missed test * make sure tests throw on non-matching command * use --format-json in command to show alias works
* enforce common shell for forge crate * revert clippy.toml * fix tests * avoid empty printlns * fix missed eprint / print * avoid style regression
…ping name (#9246) * fix(remappings): check if remapping to add starts with existing remapping name * Push remapping fn doesn't have to be pub, proper test remappings
* fix(anvil): alias --auto-unlock of auto-impersonate Signed-off-by: jsvisa <delweng@gmail.com> * feat(anvil): add more clear help messge for auto-impersonate Signed-off-by: jsvisa <delweng@gmail.com> --------- Signed-off-by: jsvisa <delweng@gmail.com>
Jrigada
approved these changes
Nov 5, 2024
Karrq
approved these changes
Nov 5, 2024
|
|
||
| /// CLI arguments for `forge compiler`. | ||
| #[derive(Debug, Parser)] | ||
| pub struct CompilerArgs { |
There was a problem hiding this comment.
What support do we have here?
There was a problem hiding this comment.
Currently, none. This was added as part of foundry-rs/foundry#7909 and needs to be supported. Probably plays with our existing task to do a better resolution/detection of zksolc-solc compiler. I'll create an issue for this one.
There was a problem hiding this comment.
Actually on second thought, we merely use the underlying zksolc's solc version so the output remains consistent in our context as well
nbaztec
added a commit
that referenced
this pull request
Nov 6, 2024
* chore: resolve merge conflicts for upstream-57bb12e (#693) * chore: fix build for upstream merge 57bb12e (#696) * fix wasmtimer dep * fix build sizes test * fix: update zksync deps for upstream merge 57bb12e (#701) * feat: integrate compiler suppressed warnings/errors feature for upstream merge 57bb12e (#704) * integrate compilers suppressed warnings/errors functionality
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What 💻
Resolves merge conflicts for https://github.com/matter-labs/foundry-zksync/tree/upstream-57bb12e
Build failing