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

test: Brush up test contracts #3035

Merged
merged 54 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
21d498a
Sketch test contracts
slowli Oct 3, 2024
e96861e
Sketch test contracts usage
slowli Oct 3, 2024
578e2e5
Sketch more adequate deployment
slowli Oct 3, 2024
a400cce
Use test contracts in `multivm` tests
slowli Oct 3, 2024
86749b2
Use test contracts in remaining `multivm` tests
slowli Oct 4, 2024
3c56b17
Remove duplicated `TestContract` in load test
slowli Oct 4, 2024
8d4c71c
Remove building test contracts from toolbox
slowli Oct 4, 2024
5dcff9b
Remove remaining test contract mentions
slowli Oct 4, 2024
f3a2091
Remove old test contracts dir
slowli Oct 4, 2024
affaf38
Move `test_account` to `lib` dir
slowli Oct 4, 2024
757ed67
Remove unused contracts
slowli Oct 4, 2024
e93f322
Document test contracts
slowli Oct 4, 2024
118a698
Restore transient store / code oracle tests
slowli Oct 4, 2024
f52bda7
Add function getter shortcut
slowli Oct 8, 2024
8b420f4
Remove obsolete contract compilation
slowli Oct 8, 2024
647a657
Add `typescript` dependency
slowli Oct 8, 2024
c7711cf
Update readmes
slowli Oct 8, 2024
2623ee8
Make test contracts dev dependency
slowli Oct 8, 2024
b4f39a0
Add `ts-node` dependency
slowli Oct 8, 2024
e6e8ea5
Build specific binaries in Docker images
slowli Oct 8, 2024
944cd0c
Fix `get_deploy_tx*()` functions
slowli Oct 8, 2024
1dfedd1
Update from upstream
slowli Oct 9, 2024
e87c049
Sketch build based on `foundry-compilers`
slowli Oct 10, 2024
900218c
Temporarily change transfer contracts
slowli Oct 10, 2024
8025544
Remove `yarn` dependency
slowli Oct 10, 2024
ccdb2da
Change `TestContract.bytecode` type
slowli Oct 10, 2024
70a4d32
Update from upstream
slowli Oct 10, 2024
4d21b49
Move mock EVM contracts
slowli Oct 10, 2024
b43da7c
Checkout git submodules
slowli Oct 10, 2024
0b0cf92
Allow Boost software license
slowli Oct 10, 2024
018509b
Update from upstream
slowli Oct 11, 2024
474bc04
Merge branch 'main' into aov-pla-1041-brush-up-test-contracts
slowli Oct 11, 2024
a624986
Update from upstream
slowli Oct 14, 2024
3db1f86
Update from upstream
slowli Oct 18, 2024
831c630
Fix multivm unit tests
slowli Oct 18, 2024
b5d9885
Fix `zkstack`
slowli Oct 18, 2024
e31e1e5
Revert transfer-related contracts
slowli Oct 18, 2024
56b4ea4
Fix link to OpenZeppelin
slowli Oct 18, 2024
fe5c0a1
Fix link to Multicall3 contract
slowli Oct 21, 2024
cd59498
Add OpenZeppelin dependency
slowli Oct 21, 2024
6337d1a
Update from upstream
slowli Nov 6, 2024
24ea88e
Update `foundry-compilers`
slowli Nov 6, 2024
c1369ee
Update `zkstack` lockfile
slowli Nov 6, 2024
54edf3f
Update from upstream (again)
slowli Nov 6, 2024
17677e1
Update autocompletion scripts
slowli Nov 6, 2024
68e12d5
Sleep after spawning external nodes
slowli Nov 6, 2024
8d42f7d
Update from upstream
slowli Nov 6, 2024
30cc68e
Fix RocksDB termination in test
slowli Nov 6, 2024
02a47d3
Update from upstream
slowli Nov 8, 2024
02ccdba
Update from upstream
slowli Nov 11, 2024
18489fe
Rename Markdown document to README
slowli Nov 11, 2024
2d286b7
Update from upstream
slowli Nov 13, 2024
5b5b4b9
Revert `contracts` module change
slowli Nov 14, 2024
a5898a8
Update from upstream
slowli Nov 14, 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
7 changes: 3 additions & 4 deletions .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Init
run: |
ci_run run_retried rustup show

- name: Install zkstack
run: |
ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup
Expand Down Expand Up @@ -150,7 +150,6 @@ jobs:
--legacy-bridge

ci_run zkstack ecosystem init --dev --verbose
ci_run zkstack dev contracts --test-contracts

# `sleep 60` because we need to wait until server added all the tokens
- name: Run server
Expand Down Expand Up @@ -201,7 +200,7 @@ jobs:
run: |
ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup || true
ci_run zkstackup -g --local

- name: Create log directories
run: |
SERVER_LOGS_DIR=logs/server
Expand Down Expand Up @@ -422,7 +421,7 @@ jobs:
run: |
ci_run ./bin/run_on_all_chains.sh "zkstack dev test recovery --no-deps --no-kill --ignore-prerequisites --verbose" ${{ env.CHAINS }} ${{ env.INTEGRATION_TESTS_LOGS_DIR }}

- name: Run external node server
- name: Run external nodes
run: |
ci_run zkstack external-node run --ignore-prerequisites --chain era &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/rollup.log &
ci_run zkstack external-node run --ignore-prerequisites --chain validium &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/validium.log &
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/protobuf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
RUSTC_WRAPPER: "sccache"
SCCACHE_GHA_ENABLED: "true"
RUST_BACKTRACE: "1"
SQLX_OFFLINE: true,
SQLX_OFFLINE: true
# github.base_ref -> github.head_ref for pull_request
BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
# github.event.before -> github.event.after for push
Expand All @@ -43,7 +43,7 @@ jobs:
fetch-depth: 0 # fetches all branches and tags, which is needed to compute the LCA.
- name: checkout LCA
run:
git checkout $(git merge-base $BASE $HEAD)
git checkout $(git merge-base $BASE $HEAD) --recurse-submodules
working-directory: ./before
- name: compile before
run: cargo check --all-targets
Expand All @@ -59,6 +59,7 @@ jobs:
with:
ref: ${{ env.HEAD }}
path: after
submodules: recursive
- name: compile after
run: cargo check --all-targets
working-directory: ./after
Expand Down
Loading
Loading