matter-labs / foundry-zksync

Fork of Foundry tailored for zkSync environment
Apache License 2.0
299 stars 130 forks source link

chore: initial merge conflict resolution for update up to f5aa05e #614

Closed elfedy closed 2 weeks ago

elfedy commented 1 month ago

Initial merge conflic resolution for upstream update to f5aa05e Compilation errors are not solved yet.

Updated forked dependencies:

Conflicting files:

Conflicting commits

New cheatcodes:

https://github.com/foundry-rs/foundry/pull/8571: record traces https://github.com/foundry-rs/foundry/pull/9024: mockCalls https://github.com/foundry-rs/foundry/pull/8952: gasSnapshots over arbitrary sections https://github.com/foundry-rs/foundry/pull/9087: cheatcodes to derive and save multiple wallets https://github.com/foundry-rs/foundry/pull/9106: mv script wallets into Cheatcode https://github.com/foundry-rs/foundry/pull/8883: Warnings for deprecated cheatcodes:

Fixes:

https://github.com/foundry-rs/foundry/pull/9050: Identify artifacts using both deployed and creation code. https://github.com/foundry-rs/foundry/pull/9096: running script with --broadcast for a transaction sequence can error out due to nonce desync from rpc latency 

Refactors:

https://github.com/foundry-rs/foundry/pull/8924 dyn DatabaseExt vs generic refactor https://github.com/foundry-rs/foundry/pull/9011 Reduce dynamic dispatch from inspectors https://github.com/foundry-rs/foundry/pull/8969 Remove unreachable decoding of expect revert https://github.com/foundry-rs/foundry/pull/9098 move ScriptSequence to new crate https://github.com/foundry-rs/foundry/pull/8945 renaming of snapshot to be more specific

CI

https://github.com/foundry-rs/foundry/pull/8948: Add makefile and codespell https://github.com/foundry-rs/foundry/pull/8964: use multiarchitecture images in Dockerfile https://github.com/foundry-rs/foundry/commit/7a9ebf9ccbce2957762ef1b3f4623efb76ef0306: Bump alpine to 3.20

Deps

Bump alloy core to 0.8.26: https://github.com/foundry-rs/foundry/pull/9045

tomimor commented 4 weeks ago

For more visibility on the update process @dutterbutter @popzxc