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.

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

fix: adapt for the new version of EVM emulator #116

Draft
wants to merge 33 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
27e6221
Adapt for optional evm emulation
0xVolosnikov Oct 22, 2024
b55cb60
Update contracts
0xVolosnikov Oct 29, 2024
5c26c47
feat: tweak LLVM options for the latest version of EvmEmulator
vladimirradosavljevic Oct 29, 2024
72a598d
try starting EVM nonce from 0
hedgar2017 Oct 31, 2024
d684cb2
Revert "try starting EVM nonce from 0"
0xVolosnikov Nov 15, 2024
4c6cd86
Pin contracts
0xVolosnikov Nov 18, 2024
4d1b61f
Pin modified zk_evm version
0xVolosnikov Nov 18, 2024
f0ef5c5
Update contracts
0xVolosnikov Nov 19, 2024
a05dcac
Skip broken test
0xVolosnikov Nov 19, 2024
385d478
Disable test failing due to out-of-ergs
0xVolosnikov Nov 20, 2024
00de505
Fix issue with deployment nonce
0xVolosnikov Nov 20, 2024
945475e
Update contracts
0xVolosnikov Nov 20, 2024
f4877ed
Cargo fmt
0xVolosnikov Nov 20, 2024
06e5031
Increment deployment nonce for all callers
0xVolosnikov Nov 20, 2024
1d0fbe4
Increment initial deployment nonce only for EVM target
0xVolosnikov Nov 20, 2024
d7c0207
Change zk_evm version
0xVolosnikov Nov 21, 2024
eb5630f
Update contracts
0xVolosnikov Nov 27, 2024
70c3b96
Update contracts
0xVolosnikov Dec 3, 2024
85f574b
Rebase artifact
0xVolosnikov Dec 3, 2024
03d2739
Update LLVM.lock
0xVolosnikov Dec 3, 2024
fffac4c
Update contracts and adapt EVM deploy flow
0xVolosnikov Dec 9, 2024
bacd5b8
Update contracts
0xVolosnikov Dec 16, 2024
f2503b4
fix: remove repeats for RETURN-like EVM instructions
hedgar2017 Dec 19, 2024
ef03e6e
merge main
hedgar2017 Dec 19, 2024
a82a330
update system-contracts-stable-build
hedgar2017 Dec 19, 2024
93f7e3b
Update contracts
0xVolosnikov Jan 2, 2025
e4389de
Use Identity precompile
0xVolosnikov Jan 2, 2025
45de85f
Merge branch 'main' into vv-optional-evm-emulation
0xVolosnikov Jan 2, 2025
7c722d6
Temporary pin different contracts branch
0xVolosnikov Jan 2, 2025
427707b
Update contracts
0xVolosnikov Jan 3, 2025
2aa9120
Update contracts
0xVolosnikov Jan 3, 2025
504012c
Merge branch 'main' into vv-optional-evm-emulation
0xVolosnikov Jan 10, 2025
cb5502e
Merge branch 'main' into vv-optional-evm-emulation
hedgar2017 Jan 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pin modified zk_evm version
0xVolosnikov authored and hedgar2017 committed Dec 4, 2024
commit 4d1b61f1c872e9deb63330e14ea184dfa260839d
97 changes: 87 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion compiler_tester/Cargo.toml
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ evm = { git = "https://github.com/rust-ethereum/evm", rev = "f7a23df6c478ca6a151
revm = { git = "https://github.com/bluealloy/revm", rev = "fa5650ee8a4d802f4f3557014dd157adfb074460" }

zkevm_opcode_defs = "=0.150.6"
zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" }
zkevm_tester = { git = "https://github.com/0xVolosnikov/era-zkevm_tester", branch = "remove-evm-stipend" }
vm2 = { git = "https://github.com/matter-labs/vm2", optional = true, package = "zksync_vm2" }

era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }