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

Add zkevm-proverjs as a submodule #88

Merged
merged 3 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-node@v3
with:
node-version: '20.8.0'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line below can remove the --install-zkwasm argument.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, done!

- run: ./ci/test-zkasm.sh --install-zkwasm --all
- run: ./ci/test-zkasm.sh --all

rustfmt:
name: Rustfmt
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@
path = tests/wasi_testsuite/wasi-common
url = https://github.com/WebAssembly/wasi-testsuite.git
branch = prod/testsuite-base
[submodule "deps/zkevm-proverjs"]
path = deps/zkevm-proverjs
url = https://github.com/0xPolygonHermez/zkevm-proverjs/
branch = feature/64bits
19 changes: 3 additions & 16 deletions ci/test-zkasm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,16 @@ set -o pipefail
set -eux

# Flags and default modes
PREINSTALLED=true
ALL_FILES=false

# Parse flags
while [[ "$#" -gt 0 ]]; do
case $1 in
--all) ALL_FILES=true; shift ;;
--install-zkwasm) PREINSTALLED=false; shift ;;
--help)
echo "Usage: $0 [OPTIONS] [filename.zkasm]"
echo "Options:"
echo " --all Test all zkasm files"
echo " --install-zkwasm Temporarily install and use zkevm-rom"
echo " --help Show this message"
exit 0
;;
Expand All @@ -34,19 +31,9 @@ if [ "$ALL_FILES" = false ] && [ -z "$1" ]; then
exit 1
fi

BASE_DIR="../wasmtime"

if [ "$PREINSTALLED" = false ]; then
echo "Cloning zkevm-proverjs into /tmp directory..."
git clone https://github.com/0xPolygonHermez/zkevm-proverjs/ ./tmp/zkevm-proverjs > /dev/null 2>&1
cd ./tmp/zkevm-proverjs
npm install
BASE_DIR="../.."
else
cd ../zkevm-proverjs
fi

git checkout feature/64bits
BASE_DIR="./../../"
cd deps/zkevm-proverjs
npm i

NODE_CMD="node test/zkasmtest.js --rows 2**18"

Expand Down
1 change: 1 addition & 0 deletions deps/zkevm-proverjs
Submodule zkevm-proverjs added at 54b300