chore: initial merge conflict resolution for update up to f5aa05e #614
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
* feat(cheatcode): disaply message for cheatcodes marked as deprecated * Deprecated cheatcodes as hashset, displayed once per test suite * Add deprecated cheatcode replacement attr * Add support for fuzz and invariant tests * Changes after review: add Deprecated(replacement) * Update crates/cheatcodes/src/inspector.rs Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> * chore: touchups * Fix CI --------- Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
* refactor: rewrite the console.log format string parser * chore: clippy
* feat: implement `parseTomlType` cheats * chore: `forge fmt` * revert: use json naming to indicate to users that they are operating on json data * chore: nit * chore: nit
Co-authored-by: jenpaff <jepaff0@gmail.com>
improve description of --flamechart and --flamegraph, explaining the difference
improve doc
chore(evm): use dyn DatabaseExt in inspect
Update testcode path
chore: use serde_json::from_str when possible
* chore: deprecate --debug regex argument * fix: enable full internal decoding if exactly one test matched
…ansaction` conversion (#8942) * fix(`anvil`): handle OP deposit tx in TypeTransaction conversion. * nits * clippy * test Co-authored-by: grandizzy <38490174+grandizzy@users.noreply.github.com> * nits --------- Co-authored-by: grandizzy <38490174+grandizzy@users.noreply.github.com>
…m gas_limit on forks (#8933) * fix: #8759, do not set low gas price on block if disabled, use custom gas price in forks * test(fix): default block gas limit for large mine test * fix fmt * fix: optional gas_limit in as_json * fix: use option not serde_json::Value::Null * tests: base tests + config tests * fix: nits * fix: comment
add @grandizzy @yash-atreya @zerosnacks as codeowners too
* add makefile + codespell * update makefile * fix typos found by codespell * add codespell CI task * fix outdated spec * ignore testdata * switch default profile to dev, add strat to ignored words list
* chore: improve fuzz scrape bytecode test * Remove duped comments, Trigger CI
* chore: add anvil NodeHandle.fire_shutdown_signal * Remove DAPP remappings from env vars from cli tests. * Unwrap fire shutdown * Fix clippy * track_caller on fire shutdown * fire shutdown signal on drop
…loyedCode` (#8938) * feat(`cheatcodes`): vm.getArtifactPath * cargo cheats * nit * nit * fix * test: vm.getArtifactPath * feat: vm.getArtifactPath(creationCode) * cheats * nit * change seed * rm vm.getArtifactPath(contractName) * fmt * nit * fix * nit * rename * nit * fix --------- Co-authored-by: grandizzy <grandizzy.the.egg@gmail.com>
… error out due to nonce desync from rpc latency (#9096) * fix for issue #9095 * changed 'if' statement into 'match' * fmt fix * repeat ask for provider nonce on desync * loop break and tokio::time use instead of std::thread
… (#9050) * Identify by creation code * Compute score for both creation and runtime code * Fallback to deployed bytecode only if min creation bytecode score is under threshold * reuse check closure, add basic test
* refac(`script`): extract script sequence and related types to new crate * replace MultiChainSequence in script crate * replace TransactionWithMetadata and AdditionalContract * replace ScriptSequence * replace all underlying ScriptSequence and related types * doc nits * add `ScriptTransactionBuilder` * remove `TxWithMetadata` * mv verify fns and use `ScriptSequence` directly * clippy
|
For more visibility on the update process @dutterbutter @popzxc |
chore: update .github templates
* Add integration for vm.getCode in zkcontext * Format cheatcode contract * fix test and clippy * fix comparing with wrong bytecode * improve tests * forge fmt * change test name * refactor(test:zk): simplify getCode * cargo fmt * panic if can't find contract by type --------- Co-authored-by: Francesco Dainese <franci.dainese@gmail.com>
* Add paymaster support to cast send * remove reference * Add zksync flag to cast send and handle missing zk paymaster parameters * Clap zksync flag when paymaster parameters present, better handling paymaster parameters * put cast send logic for zksync in it's own function * Add cast paymaster tests * Remove unnecesary paymaster settings in test
deps: remove unused dep
fix(zk): create with either bytecode
nbaztec
reviewed
Oct 28, 2024
nbaztec
approved these changes
Oct 28, 2024
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.
Initial merge conflic resolution for upstream update to f5aa05e
Compilation errors are not solved yet.
Updated forked dependencies:
alloyto0.4.2: https://github.com/Karrq/alloy/tree/zksync-v0.4.2compilersto0.11.4: https://github.com/Moonsong-Labs/compilers/tree/zksync-v0.11.4foundry-fork-dbto0.4.0: https://github.com/Moonsong-Labs/foundry-zksync-fork-db/tree/zksync-v0.4.0 (Added a fix due to a deprecated method)block-explorersstill at0.7.3but points to newcompilersConflicting files:
Conflicting commits
New cheatcodes:
foundry-rs/foundry#8571: record traces
foundry-rs/foundry#9024: mockCalls
foundry-rs/foundry#8952: gasSnapshots over arbitrary sections
foundry-rs/foundry#9087: cheatcodes to derive and save multiple wallets
foundry-rs/foundry#9106: mv script wallets into Cheatcode
foundry-rs/foundry#8883: Warnings for deprecated cheatcodes:
Fixes:
foundry-rs/foundry#9050: Identify artifacts using both deployed and creation code.
foundry-rs/foundry#9096: running script with
--broadcastfor a transaction sequence can error out due to nonce desync from rpc latencyRefactors:
foundry-rs/foundry#8924 dyn DatabaseExt vs generic refactor
foundry-rs/foundry#9011 Reduce dynamic dispatch from inspectors
foundry-rs/foundry#8969 Remove unreachable decoding of expect revert
foundry-rs/foundry#9098 move
ScriptSequenceto new cratefoundry-rs/foundry#8945 renaming of snapshot to be more specific
CI
foundry-rs/foundry#8948: Add makefile and codespell
foundry-rs/foundry#8964: use multiarchitecture images in Dockerfile
foundry-rs/foundry@7a9ebf9: Bump alpine to 3.20
Deps
Bump alloy core to 0.8.26: foundry-rs/foundry#9045