Skip to content

Commit 1aac24c

Browse files
roynalnarutoroynalnaruto
committed
test
1 parent 5d36998 commit 1aac24c

File tree

5 files changed

+108
-15
lines changed

5 files changed

+108
-15
lines changed

‎.github/workflows/build-guest.yml‎

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,85 @@ jobs:
3030
steps:
3131
- uses: actions/checkout@v4
3232

33+
- name: chunk commitments (prover)
34+
id: commitments-chunk-prover
35+
run: echo "commitments=$(cat crates/prover/src/commitments/chunk.rs)" >> $GITHUB_OUTPUT
36+
37+
- name: batch commitments (prover)
38+
id: commitments-batch-prover
39+
run: echo "commitments=$(cat crates/prover/src/commitments/batch.rs)" >> $GITHUB_OUTPUT
40+
41+
- name: bundle commitments (prover)
42+
id: commitments-bundle-prover
43+
run: echo "commitments=$(cat crates/prover/src/commitments/bundle.rs)" >> $GITHUB_OUTPUT
44+
45+
- name: chunk commitments (verifier)
46+
id: commitments-chunk-verifier
47+
run: echo "commitments=$(cat crates/verifier/src/commitments/chunk.rs)" >> $GITHUB_OUTPUT
48+
49+
- name: batch commitments (verifier)
50+
id: commitments-batch-verifier
51+
run: echo "commitments=$(cat crates/verifier/src/commitments/batch.rs)" >> $GITHUB_OUTPUT
52+
53+
- name: bundle commitments (verifier)
54+
id: commitments-bundle-verifier
55+
run: echo "commitments=$(cat crates/verifier/src/commitments/bundle.rs)" >> $GITHUB_OUTPUT
56+
57+
- name: chunk commitments (circuits)
58+
id: commitments-chunk-circuits
59+
run: echo "commitments=$(cat crates/circuits/batch-circuit/src/child_commitments.rs)" >> $GITHUB_OUTPUT
60+
61+
- name: batch commitments (circuits)
62+
id: commitments-batch-circuits
63+
run: echo "commitments=$(cat crates/circuits/bundle-circuit/src/child_commitments.rs)" >> $GITHUB_OUTPUT
64+
65+
- name: Sanity check for chunk-commitments (prover vs verifier)
66+
uses: nick-fields/assert-action@v1
67+
with:
68+
expected: ${{ steps.commitments-chunk-prover.outputs.commitments }}
69+
actual: ${{ steps.commitments-chunk-verifier.outputs.commitments }}
70+
71+
- name: Sanity check for chunk-commitments (prover vs circuits)
72+
uses: nick-fields/assert-action@v1
73+
with:
74+
expected: ${{ steps.commitments-chunk-prover.outputs.commitments }}
75+
actual: ${{ steps.commitments-chunk-circuits.outputs.commitments }}
76+
77+
- name: Sanity check for batch-commitments (prover vs verifier)
78+
uses: nick-fields/assert-action@v1
79+
with:
80+
expected: ${{ steps.commitments-batch-prover.outputs.commitments }}
81+
actual: ${{ steps.commitments-batch-verifier.outputs.commitments }}
82+
83+
- name: Sanity check for batch-commitments (prover vs circuits)
84+
uses: nick-fields/assert-action@v1
85+
with:
86+
expected: ${{ steps.commitments-batch-prover.outputs.commitments }}
87+
actual: ${{ steps.commitments-batch-circuits.outputs.commitments }}
88+
89+
- name: Sanity check for bundle-commitments (prover vs verifier)
90+
uses: nick-fields/assert-action@v1
91+
with:
92+
expected: ${{ steps.commitments-bundle-prover.outputs.commitments }}
93+
actual: ${{ steps.commitments-bundle-verifier.outputs.commitments }}
94+
3395
- id: docker-build-guest
3496
uses: ./
3597

36-
- name: Print chunk-circuit commitments
37-
run: echo "chunk-circuit=${{ steps.docker-build-guest.outputs.commitments-chunk }}"
98+
- name: Compare chunk-circuit commitments
99+
uses: nick-fields/assert-action@v1
100+
with:
101+
expected: ${{ steps.docker-build-guest.outputs.commitments-chunk }}
102+
actual: ${{ steps.commitments-chunk-prover.commitments }}
38103

39-
- name: Print batch-circuit commitments
40-
run: echo "batch-circuit=${{ steps.docker-build-guest.outputs.commitments-batch }}"
104+
- name: Compare batch-circuit commitments
105+
uses: nick-fields/assert-action@v1
106+
with:
107+
expected: ${{ steps.docker-build-guest.outputs.commitments-batch }}
108+
actual: ${{ steps.commitments-batch-prover.commitments }}
41109

42-
- name: Print bundle-circuit commitments
43-
run: echo "bundle-circuit=${{ steps.docker-build-guest.outputs.commitments-bundle }}"
110+
- name: Compare bundle-circuit commitments
111+
uses: nick-fields/assert-action@v1
112+
with:
113+
expected: ${{ steps.docker-build-guest.outputs.commitments-bundle }}
114+
actual: ${{ steps.commitments-bundle-prover.commitments }}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ WORKDIR /app
88

99
COPY . .
1010

11-
CMD [ "sh", "build-guest.sh" ]
11+
CMD [ "sh", "build-guest-actions-entrypoint.sh" ]

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ clippy:
1818
@cargo clippy --tests --all-features --manifest-path crates/prover/Cargo.toml -- -D warnings
1919
@cargo clippy --tests --all-features --manifest-path crates/integration/Cargo.toml -- -D warnings
2020

21+
build-guest:
22+
sh build-guest.sh
23+
2124
test-execute-chunk:
2225
@cargo test --release -p scroll-zkvm-integration --features scroll --test chunk_circuit test_execute -- --exact --nocapture
2326

‎build-guest-actions-entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
git config --global --add safe.directory $PWD
2+
3+
cargo run --release -p scroll-zkvm-build-guest
4+
5+
commitments_chunk=$(cat crates/prover/src/commitments/chunk.rs)
6+
commitments_batch=$(cat crates/prover/src/commitments/batch.rs)
7+
commitments_bundle=$(cat crates/prover/src/commitments/bundle.rs)
8+
9+
echo "commitments-chunk=$commitments_chunk" >> $GITHUB_OUTPUT
10+
echo "commitments-batch=$commitments_batch" >> $GITHUB_OUTPUT
11+
echo "commitments-bundle=$commitments_bundle" >> $GITHUB_OUTPUT

‎build-guest.sh‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
git config --global --add safe.directory $PWD
1+
# build docker image
2+
docker build --platform linux/amd64 -t build-guest:local .
23

3-
cargo run --release -p scroll-zkvm-build-guest
4+
# run docker image
5+
docker run --platform linux/amd64 --name build-guest build-guest:local
46

5-
commitments_chunk=$(cat crates/prover/src/commitments/chunk.rs)
6-
commitments_batch=$(cat crates/prover/src/commitments/batch.rs)
7-
commitments_bundle=$(cat crates/prover/src/commitments/bundle.rs)
7+
# copy commitments from container to local (prover)
8+
docker cp build-guest:/app/crates/prover/src/commitments/chunk.rs crates/prover/src/commitments/chunk.rs
9+
docker cp build-guest:/app/crates/prover/src/commitments/batch.rs crates/prover/src/commitments/batch.rs
10+
docker cp build-guest:/app/crates/prover/src/commitments/bundle.rs crates/prover/src/commitments/bundle.rs
811

9-
echo "commitments-chunk=$commitments_chunk" >> $GITHUB_OUTPUT
10-
echo "commitments-batch=$commitments_batch" >> $GITHUB_OUTPUT
11-
echo "commitments-bundle=$commitments_bundle" >> $GITHUB_OUTPUT
12+
# copy commitments to local (verifier)
13+
cp crates/prover/src/commitments/chunk.rs crates/verifier/src/commitments/chunk.rs
14+
cp crates/prover/src/commitments/batch.rs crates/verifier/src/commitments/batch.rs
15+
cp crates/prover/src/commitments/bundle.rs crates/verifier/src/commitments/bundle.rs
16+
17+
# copy commitments to local (circuits)
18+
cp crates/prover/src/commitments/chunk.rs crates/circuits/batch-circuit/src/child_commitments.rs
19+
cp crates/prover/src/commitments/batch.rs crates/circuits/bundle-circuit/src/child_commitments.rs

0 commit comments

Comments
 (0)