Skip to content

Commit

Permalink
MVP Integration (#23)
Browse files Browse the repository at this point in the history
* Integrate prover with bridge

* Add integration script

* Remove prover JSON files

* Remove SRS file and change public input gen output paths

* Fix prover test

* Add default SRS

* Add opam env cmd

* Add opam installation step with caching

* Reorder cache step and add Rust installation for Mina

* Cache Mina monorepo

* Add mina monorepo commit env var

* Add components to rust toolchain

* Reorder cache steps and add monorepo cache step

* Fix monorepo cache path

* Fix monorepo commit env var

* Reorder monorepo commit env var

* Put cacher step before installing deps

* Fix clippy

* Move commit env var step before caching

* Fix env var setting

* Fix monorepo caching path

* Point o1js to foreign field remote branch

* Revert "Point o1js to foreign field remote branch"

This reverts commit 90e45f0.

* add o1js as submodule (#26)

Co-authored-by: Pablo Deymonnaz <[email protected]>

* Remove cs generation

* Fix integration flow

* Remove Mina monorepo steps

* Fix verifier circuit tests name

* Remove KZG prover

* Add init O1JS step

* Fix o1js step

* Ignore o1js tests

* Add integration job

* Fix workflow file

* Add checkout step

* Add o1js setup in integration test

---------

Co-authored-by: Florian <[email protected]>
Co-authored-by: Pablo Deymonnaz <[email protected]>
  • Loading branch information
3 people authored Oct 4, 2023
1 parent f1c3e19 commit 4afa259
Show file tree
Hide file tree
Showing 26 changed files with 2,924 additions and 2,094 deletions.
28 changes: 17 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,24 @@ on:
branches: ["*"]

jobs:
kzg_prover:
name: KZG Prover
uses: ./.github/workflows/rust_ci.yaml
with:
directory: kzg_prover
skip_run: true

public_input_gen:
name: Public input generation
uses: ./.github/workflows/rust_ci.yaml
with:
directory: public_input_gen

verify_circuit_tests:
verifier_circuit_tests:
name: Verifying circuit Rust tests
uses: ./.github/workflows/rust_ci.yaml
with:
directory: verify_circuit_tests
directory: verifier_circuit_tests

evm_bridge:
verifier_circuit:
name: Build and test EVM bridge
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./evm_bridge
working-directory: ./verifier_circuit
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -40,6 +33,9 @@ jobs:
with:
node-version: latest

- name: Setup o1js submodule
run: git submodule update --init --recursive

- name: Set up dependencies
run: npm ci

Expand All @@ -48,3 +44,13 @@ jobs:

- name: Run npm test
run: npm run test

integration:
name: Integration test
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Run integration test
run: make
3 changes: 0 additions & 3 deletions .github/workflows/rust_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ jobs:

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2

- name: Clone Mina monorepo
run: cd .. && sh setup.sh

- name: Run cargo check
run: cargo check --workspace
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Generated on EVM Bridge preinstall
mina_monorepo

/proof.json
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "verifier_circuit/o1js"]
path = verifier_circuit/o1js
url = https://github.com/o1-labs/o1js.git
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.PHONY: run

run:
@echo "Setting up o1js..."
@git submodule update --init --recursive
@echo "Generating public input for verifier circuit..."
@cd public_input_gen && cargo r --release
@echo "Done!"
@echo "Proving verifier circuit..."
@cd verifier_circuit && npm i && make
@echo "Done!"
2 changes: 0 additions & 2 deletions kzg_prover/.gitignore

This file was deleted.

Loading

0 comments on commit 4afa259

Please sign in to comment.