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 nonce starting at 0 #1

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2614ad0
docs: fix documentation links after update (#56)
antonbaliasnikov Jun 25, 2024
e80d380
feat: support vyper v0.4.0 (#51)
hedgar2017 Jun 27, 2024
0e1ac17
chore: add linux arm64 platform dir for vyper bins (#57)
antonbaliasnikov Jun 27, 2024
5c4eb01
fix: remove redundant Ethereum artifacts from Vyper tests (#58)
hedgar2017 Jun 29, 2024
7a04d47
docs: add info about special tags in other repos (#59)
antonbaliasnikov Jul 1, 2024
25c32e2
fix: the Vyper Cancun version check
hedgar2017 Jul 1, 2024
c85aa46
Update pull_request_template.md
hedgar2017 Jul 1, 2024
cdd1534
Fix nonce starting at 0
gianbelinche Jul 4, 2024
84f5005
Add EVMAddressIterator false to matterlabstest
gianbelinche Jul 4, 2024
5f92263
chore: update the EVMInterpreter
hedgar2017 Jul 5, 2024
2e1e179
ci: fix default llvm versions for benchmarks (#63)
antonbaliasnikov Jul 10, 2024
e5bbfa3
chore: Pull the latest changes of the EVMInterpreter (#64)
vladimirradosavljevic Jul 10, 2024
c51d34e
Merge branch 'fix-semantic-tests' into nonce-address-fix
jrchatruc Jul 11, 2024
f52ca6c
chore: update deps
hedgar2017 Jul 11, 2024
2baad11
fuzzer: fix readme and targets after renaming; simple ⇒ demo (#65)
FlashSheridan Jul 12, 2024
43864aa
fix: upstream semantic tests for EVM (#60)
jorbush Jul 12, 2024
9047a09
Merge branch 'main' into az-cpr-1741-add-the-target-filter-to-tests
hedgar2017 Jul 12, 2024
493710c
Merge branch 'main' into az-cpr-1741-add-the-target-filter-to-tests
hedgar2017 Jul 12, 2024
9ac4deb
fix: names of some Yul tests
hedgar2017 Jul 14, 2024
4a0b978
chore: refactor system context
hedgar2017 Jul 14, 2024
3ab1f17
feat: rename EVM to EVMEmulator
hedgar2017 Jul 14, 2024
48bc70d
Merge branch 'az-cpr-1741-add-the-target-filter-to-tests' into nonce-…
IAvecilla Jul 15, 2024
4728c20
Remove unused imports
IAvecilla Jul 15, 2024
2b5242a
Fix target check when converting expected from ethereum
IAvecilla Jul 16, 2024
603c8cb
fix: upstream balance for `ecrecover` address (#69)
IAvecilla Jul 16, 2024
c70aee0
fix: upstream evm contract nonces starting at 0 instead of 1 (#68)
IAvecilla Jul 16, 2024
d9704ef
fix: burn all gas with assert unreachable (#70)
hedgar2017 Jul 16, 2024
1dcad9d
feat: integrate REVM instead of SputnikEVM (#67)
gianbelinche Jul 17, 2024
47b611e
Merge branch 'main' into az-cpr-1741-add-the-target-filter-to-tests
hedgar2017 Jul 17, 2024
6df1e19
fix: some warnings
hedgar2017 Jul 17, 2024
2f4be98
feat: Move REVM logic to new vm module (#71)
IAvecilla Jul 22, 2024
65dd1f6
feat: vyper combined JSON I/O overhaul (#72)
hedgar2017 Jul 23, 2024
d10fbaa
Use consistent importing
jrchatruc Jul 29, 2024
986bac4
fix: ignored loop range bounds (#76)
hedgar2017 Jul 30, 2024
3a374a3
Change the evm address iterator to receive the starting nonce by para…
jrchatruc Jul 30, 2024
f5c9221
ci: make integration tests and benchmarks skippable (#77)
antonbaliasnikov Jul 31, 2024
62cde03
chore: Update EVMInterpreter (#78)
vladimirradosavljevic Jul 31, 2024
3cf0de4
Merge branch 'az-cpr-1741-add-the-target-filter-to-tests' into nonce-…
jrchatruc Jul 31, 2024
9b55249
Fix inconsistent import
jrchatruc Jul 31, 2024
64c37d4
Update tests submodule
jrchatruc Jul 31, 2024
5183698
Merge remote-tracking branch 'origin/main' into nonce-address-fix
jrchatruc Jul 31, 2024
4352eac
cargo update compiler-vyper
jrchatruc Jul 31, 2024
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs).
- [ ] PR title corresponds to the body of PR.
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `cargo fmt` and checked with `cargo clippy`.
42 changes: 0 additions & 42 deletions .github/workflows/benchmarks.yml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/ccache-regen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ concurrency:
jobs:

ccache-regen:
runs-on: ci-runner-compiler
runs-on: [ci-runner-compiler, Linux]
container:
image: matterlabs/llvm_runner:ubuntu22-llvm17-latest
image: ghcr.io/matter-labs/llvm_runner/ubuntu22-llvm17:latest
options: -m 110g
steps:

Expand All @@ -24,7 +24,6 @@ jobs:
- name: Build LLVM
uses: matter-labs/era-compiler-ci/.github/actions/build-llvm@v1
with:
extra-args: "\\-DLLVM_ENABLE_WERROR=On \\-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
enable-tests: true
enable-assertions: true
ccache-key-type: static
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ on:

jobs:
run-with-sanitizers:
runs-on: ci-runner-compiler
runs-on: [ci-runner-compiler, Linux]
container:
image: matterlabs/llvm_runner:ubuntu22-llvm17-latest
image: ghcr.io/matter-labs/llvm_runner/ubuntu22-llvm17:latest
options: -m 110g
env:
TARGET: x86_64-unknown-linux-gnu
Expand Down
67 changes: 63 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,39 @@
name: Integration tests
name: Tests

on:
pull_request:
workflow_dispatch:
inputs:
compiler_tester_reference_branch:
description: "compiler-tester branch to use as a benchmark reference"
required: true
default: "main"
compiler_tester_candidate_branch:
description: "compiler-tester branch to use as a benchmark candidate"
required: true
default: "main"
compiler_llvm_reference_branch:
description: "compiler-llvm branch to use as a benchmark reference"
required: false
default: "main"
compiler_llvm_candidate_branch:
description: "compiler-llvm branch to use as a benchmark candidate"
required: false
default: ""
compiler_llvm_benchmark_mode:
description: "Mode filter for compiler-llvm benchmarks"
required: false
default: "^M^B3"
compiler_llvm_benchmark_path:
description: "Path filter for compiler-llvm benchmarks"
required: false
default: ""

concurrency:
group: ${{ github.repository_id }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true


jobs:

# Check for secrets leak in the repository
Expand All @@ -16,16 +43,15 @@ jobs:

# Check for cargo issues
cargo-check:
runs-on: ci-runner-compiler
runs-on: [ci-runner-compiler, Linux]
container:
image: matterlabs/llvm_runner:ubuntu22-llvm17-latest
image: ghcr.io/matter-labs/llvm_runner/ubuntu22-llvm17:latest
steps:
- uses: actions/checkout@v4

- name: Build LLVM
uses: matter-labs/era-compiler-ci/.github/actions/build-llvm@v1
with:
extra-args: "\\-DLLVM_ENABLE_WERROR=On \\-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
enable-tests: true
enable-assertions: true
ccache-key-type: static
Expand All @@ -44,3 +70,36 @@ jobs:
with:
compiler-tester-repo: ${{ github.event.pull_request.head.repo.full_name }} # required to properly test forks
ccache-key-type: static

# Benchmarks workflow call from the era-compiler-ci repository
# This is a common part of the benchmarks workflow for all repositories
# If you would like to make a change to the benchmarks workflow, please do it in the era-compiler-ci repository
benchmarks:
uses: matter-labs/era-compiler-ci/.github/workflows/benchmarks.yml@v1
secrets: inherit
with:
compiler_tester_reference_branch: ${{ github.event.inputs.compiler_tester_reference_branch || 'main' }}
compiler_tester_candidate_branch: ${{ github.event.inputs.compiler_tester_candidate_branch || '' }}
compiler_llvm_candidate_branch: ${{ github.event.inputs.compiler_llvm_candidate_branch || '' }}
compiler_llvm_reference_branch: ${{ github.event.inputs.compiler_llvm_reference_branch || 'main' }}
compiler_llvm_benchmark_mode: ${{ github.event.inputs.compiler_llvm_benchmark_mode || '^M^B3' }}
compiler_llvm_benchmark_path: ${{ github.event.inputs.compiler_llvm_benchmark_path || '' }}
compiler-tester-repo: ${{ github.event.pull_request.head.repo.full_name }}
ccache-key-type: static

# Special job that allows some of the jobs to be skipped or failed
# requiring others to be successful
pr-checks:
runs-on: ubuntu-latest
if: always()
needs:
- secrets-scanner
- cargo-check
- integration-tests
- benchmarks
steps:
- name: Decide on PR checks
uses: re-actors/alls-green@release/v1
with:
allowed-failures: integration-tests, benchmarks
jobs: ${{ toJSON(needs) }}
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ There are many ways to contribute to the ZK Stack:
issues.
3. Resolve issues: either by showing an issue isn't a problem and the current state is ok as is or by fixing the problem
and opening a PR.
4. Report security issues, see [our security policy](./github/SECURITY.md).
4. Report security issues, see [our security policy](./SECURITY.md).
5. [Join the team!](https://matterlabs.notion.site/Shape-the-future-of-Ethereum-at-Matter-Labs-dfb3b5a037044bb3a8006af2eb0575e0)

## Fixing issues
Expand All @@ -33,7 +33,7 @@ license.
We aim to make it as easy as possible to contribute to the mission. This is still WIP, and we're happy for contributions
and suggestions here too. Some resources to help:

1. [ZKsync Era docs!](https://era.zksync.io/docs/)
1. [ZKsync Era docs!](https://docs.zksync.io/)
2. Company links can be found in the [repo's readme](README.md)

## Code of Conduct
Expand Down
Loading