Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c254fb7
bump zkevm 1220
Lawliet-Chan Feb 3, 2023
f5f15a2
merge staging
Lawliet-Chan Feb 3, 2023
d55dcaf
modify rust-toolchain
Lawliet-Chan Feb 3, 2023
f135a49
Merge branch 'staging' into zkevm_1220
Lawliet-Chan Feb 6, 2023
cd477d3
Merge branch 'staging' into zkevm_1220
Lawliet-Chan Feb 6, 2023
586493b
add zktrie.so
Lawliet-Chan Feb 6, 2023
338f341
fix path
Lawliet-Chan Feb 6, 2023
970be44
fix path
Lawliet-Chan Feb 6, 2023
40e3000
add test_zkp tool
Lawliet-Chan Feb 6, 2023
1645a22
fix
Lawliet-Chan Feb 6, 2023
824ab1a
fix
Lawliet-Chan Feb 6, 2023
ed8540e
fix params
Lawliet-Chan Feb 6, 2023
b0342bb
mv agg_proof
Lawliet-Chan Feb 6, 2023
4cf3666
fix aggProof
Lawliet-Chan Feb 6, 2023
59fe682
fix path
Lawliet-Chan Feb 6, 2023
8175831
Revert "fix path"
Lawliet-Chan Feb 6, 2023
de542e2
update agg_proof
Lawliet-Chan Feb 7, 2023
58a69ba
update coordinator dockerfile
Lawliet-Chan Feb 7, 2023
eaecf54
fix makefile
Lawliet-Chan Feb 7, 2023
830348d
fix makefile
Lawliet-Chan Feb 7, 2023
335818b
fix env
Lawliet-Chan Feb 7, 2023
0f690c5
fix makefile env
Lawliet-Chan Feb 7, 2023
27ecd54
fix
Lawliet-Chan Feb 7, 2023
51df758
jenkinsfile
Lawliet-Chan Feb 7, 2023
e934c5d
fix
Lawliet-Chan Feb 7, 2023
8d1036c
export makefile
Lawliet-Chan Feb 7, 2023
4ed1b70
to staticlib
Lawliet-Chan Feb 8, 2023
8228477
to staticlib
Lawliet-Chan Feb 8, 2023
7b7d2da
comment
Lawliet-Chan Feb 8, 2023
1f3e2e2
fix
Lawliet-Chan Feb 8, 2023
e15897e
Merge branch 'staging' into zkevm_1220
Lawliet-Chan Feb 8, 2023
ba7cd44
update agg_proof
Lawliet-Chan Feb 8, 2023
e9e080d
update docker
Lawliet-Chan Feb 8, 2023
db47bef
clean
Lawliet-Chan Feb 8, 2023
e356828
env docker LD_LIBRARY
Lawliet-Chan Feb 8, 2023
21403e7
trigger jenkins
Lawliet-Chan Feb 8, 2023
1c0d305
Merge branch 'staging' into zkevm_1220
Lawliet-Chan Feb 12, 2023
37dcb5b
Merge branch 'staging' into zkevm_1220
Lawliet-Chan Feb 12, 2023
97edcdb
bump version
Lawliet-Chan Feb 12, 2023
63675dd
update contract
0xmountaintop Feb 13, 2023
1841055
Merge branch 'staging' into zkevm_1220
0xmountaintop Feb 13, 2023
f0e3185
update readme
Lawliet-Chan Feb 13, 2023
2f0edba
Zkevm 0215 (#300)
0xmountaintop Feb 18, 2023
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/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-08-23
toolchain: nightly-2022-12-10
override: true
components: rustfmt, clippy
- name: Install Go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coordinator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-08-23
toolchain: nightly-2022-12-10
override: true
components: rustfmt, clippy
- name: Install Go
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/roller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-08-23
toolchain: nightly-2022-12-10
override: true
components: rustfmt, clippy
- name: Install Go
Expand All @@ -42,6 +42,8 @@ jobs:
- name: Test
run: |
make roller
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./prover/lib
export CHAIN_ID=534353
go test -v ./...
check:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ pipeline {
environment {
GO111MODULE = 'on'
PATH="/home/ubuntu/.cargo/bin:$PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./coordinator/verifier/lib"
CHAIN_ID='534353'
// LOG_DOCKER = 'true'
}
stages {
Expand Down
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.PHONY: check update dev_docker clean

ZKP_VERSION=release-1220

help: ## Display this help message
@grep -h \
-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
Expand Down Expand Up @@ -29,5 +31,15 @@ dev_docker: ## build docker images for development/testing usages
docker build -t scroll_l1geth ./common/docker/l1geth/
docker build -t scroll_l2geth ./common/docker/l2geth/

test_zkp: ## Test zkp prove and verify, roller/prover generates the proof and coordinator/verifier verifies it
mkdir -p test_params
wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params19 -O ./test_params/params19
wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params26 -O ./test_params/params26
wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_seed -O test_seed
rm -rf ./roller/assets/test_params && mv test_params ./roller/assets/ && mv test_seed ./roller/assets/
cd ./roller && make test-gpu-prover
rm -rf ./coordinator/assets/test_params && mv ./roller/assets/test_params ./coordinator/assets/ && mv ./roller/assets/agg_proof ./coordinator/assets/
cd ./coordinator && make test-gpu-verifier

clean: ## Empty out the bin folder
@rm -rf build/bin
11 changes: 7 additions & 4 deletions build/dockerfiles/coordinator.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build libzkp dependency
FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as chef
FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as chef
WORKDIR app

FROM chef as planner
Expand All @@ -13,10 +13,11 @@ RUN cargo chef cook --release --recipe-path recipe.json

COPY ./common/libzkp/impl .
RUN cargo build --release
RUN find ./ | grep libzktrie.so | xargs -i cp {} /app/target/release/


# Download Go dependencies
FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as base
FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as base
WORKDIR /src
COPY go.work* ./
COPY ./bridge/go.* ./bridge/
Expand All @@ -32,12 +33,14 @@ RUN go mod download -x
FROM base as builder
COPY . .
RUN cp -r ./common/libzkp/interface ./coordinator/verifier/lib
COPY --from=zkp-builder /app/target/release/libzkp.so ./coordinator/verifier/lib/
COPY --from=zkp-builder /app/target/release/libzkp.a ./coordinator/verifier/lib/
COPY --from=zkp-builder /app/target/release/libzktrie.so ./coordinator/verifier/lib/
RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd && mv verifier/lib /bin/

# Pull coordinator into a second stage deploy alpine container
FROM ubuntu:20.04

ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/coordinator/verifier/lib
# ENV CHAIN_ID=534353
RUN mkdir -p /src/coordinator/verifier/lib
COPY --from=builder /bin/lib /src/coordinator/verifier/lib
COPY --from=builder /bin/coordinator /bin/
Expand Down
Loading