Tidy up example

.env.template

@@ -0,0 +1,21 @@
+ETH_CHAIN=<devnet/holesky>
+MINA_RPC_URL=<url>
+SAVE_PROOF=true/false # also false if other than "true" or variable were to be not defined
+
+## These are necessary for running the Sudoku example
+#FEEPAYER_KEY=<mina_private_key>
+#SUDOKU_VALIDITY_HOLESKY_ADDRESS=<contract_addr>
+
+## These can be skipped if using devnet with Anvil.
+# BATCHER_ADDR=<optional>
+# BATCHER_ETH_ADDR=<optional>
+# ETH_RPC_URL=<optional>
+# PROOF_GENERATOR_ADDR=<optional>
+# BRIDGE_HOLESKY_ETH_ADDR=<optional>
+# BRIDGE_ACCOUNT_HOLESKY_ETH_ADDR=<optional>
+# ALIGNED_SM_HOLESKY_ETH_ADDR=<optional>
+
+## You can choose to use a keystore or private key for your signing wallet.
+## Leave empty if choosing Anvil Devnet.
+# KEYSTORE_PATH=<optional>
+# PRIVATE_KEY=<optional>

.github/workflows/ci.yaml

@@ -7,107 +7,9 @@ on:
         branches: ["*"]
 
 jobs:
-    public_input_gen:
-        name: Public input generation
-        uses: ./.github/workflows/rust_ci.yaml
-        with:
-            directory: public_input_gen
-
-    verifier_circuit_tests:
-        name: Execute o1js verifier circuit Rust tests for comparison
-        uses: ./.github/workflows/rust_ci.yaml
-        with:
-            directory: verifier_circuit_tests
-
-    verifier_circuit:
-        name: Build and test o1js verifier circuit
-        runs-on: ubuntu-selfhosted
-        defaults:
-            run:
-                working-directory: ./verifier_circuit
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v4
-
-            - name: Setup o1js submodule
-              run: git submodule update --init --recursive
-
-            - name: Set up dependencies
-              run: npm ci
-
-            - name: Run npm build
-              run: npm run build
-
-            - name: Run npm test
-              run: npm run test
-
-    integration:
-        name: Integration test
-        runs-on: ubuntu-selfhosted
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v4
-
-            - name: Install Foundry
-              uses: foundry-rs/[email protected]
-
-            - name: Run integration test
-              run: |
-                export HOME="/root/"
-                export PATH="/.foundry/bin:/root/.cargo/bin:$PATH"
-                export GOPATH="/root/go"
-                export MINA_RPC_URL="http://5.9.57.89:3085/graphql"
-                make
-
-    eth_verifier:
-        name: Test EVM verifier
-        runs-on: ubuntu-selfhosted
-        defaults:
-            run:
-                working-directory: ./eth_verifier
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v4
-
-            - name: Install Foundry
-              uses: foundry-rs/[email protected]
-
-            - name: Run tests
-              run: |
-                export HOME="/root/"
-                #export PATH="/.foundry/bin:/root/.cargo/bin:$PATH"
-                export GOPATH="/root/go"
-                make test > ../gasreport.ansi
-              env:
-                # make fuzzing semi-deterministic to avoid noisy gas cost estimation
-                # due to non-deterministic fuzzing (but still use pseudo-random fuzzing seeds)
-                FOUNDRY_FUZZ_SEED: 0x${{ github.event.pull_request.base.sha || github.sha }}
-            - name: Compare gas reports
-              uses: Rubilmax/[email protected]
-              with:
-                summaryQuantile: 0.9 # only display the 10% most significant gas diffs in the summary (defaults to 20%)
-                sortCriteria: avg,max # sort diff rows by criteria
-                sortOrders: desc,asc # and directions
-              id: gas_diff
-
-            - name: Add gas diff to sticky comment
-              if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
-              uses: marocchino/sticky-pull-request-comment@v2
-              with:
-                # delete the comment in case changes no longer impact gas costs
-                delete: ${{ !steps.gas_diff.outputs.markdown }}
-                message: ${{ steps.gas_diff.outputs.markdown }}
-
-    merkle_path:
-        name: Test Merkle Path parser
-        uses: ./.github/workflows/rust_ci.yaml
-        with:
-            skip_run: true
-            directory: state_utility/merkle_path
-
-    merkle_root_parser:
-        name: Test Merkle Root parser
+    core:
+        name: Test Core
         uses: ./.github/workflows/rust_ci.yaml
         with:
             skip_run: true
-            directory: state_utility/parser
+            directory: core

.gitignore

@@ -1,5 +1,9 @@
-/proof.json
-/proof.mpk
-monitor/priv/native/libverifier.so
 .DS_Store
 mina_3_0_0_devnet
+mina_state.pub
+mina_state.proof
+mina_account.pub
+mina_account.proof
+aligned_verification_data
+.env
+nonce_*.bin

.gitmodules

@@ -5,3 +5,15 @@
 [submodule "eth_verifier/lib/forge-std"]
 	path = eth_verifier/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "contract/lib/forge-std"]
+	path = contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "contract/lib/aligned_layer"]
+	path = contract/lib/aligned_layer
+	url = https://github.com/lambdaclass/aligned_layer
+[submodule "app/eth_contract/lib/forge-std"]
+	path = app/eth_contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "example/eth_contract/lib/forge-std"]
+	path = example/eth_contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

Makefile

@@ -1,69 +1,26 @@
-.PHONY: run check_account sepolia.wrap_and_deploy sepolia.verify
+.PHONY: submit-state submit-account gen_contract_abi deploy_contract
 
-run:
-	@echo "Setting up o1js..."
-	@git submodule update --init --recursive
-	@echo "Fetching state proof from Mina node..."
-	@cd polling_service && sh run.sh
-	@echo "Done!"
-	@echo "Fetching Merkle root..."
-	@cd state_utility && sh run.sh
-	@echo "Done!"
-	@echo "Creating circuit gates..."
-	@cd verifier_circuit && npm i && make
-	@echo "Done!"
-	@echo "Creating KZG proof..."
-	@cd kzg_prover && cargo r --release
-	@echo "Done!"
-	@echo "Deploying and verifying in Anvil..."
-	@cd eth_verifier && make setup && sh run.sh
-	@echo "Done!"
-	@echo "Save the last contract address, this is your verifier!"
-	@echo "You can use cast to interact with it. Try calling:"
-	@echo "    cast call <CONTRACT_ADDR> 'is_state_available()(bool)'"
-	@echo "to check if verification succeded. If so, then you can retrieve state data:"
-	@echo "    cast call <CONTRACT_ADDR> 'retrieve_state_creator()(string)'"
-	@echo "    cast call <CONTRACT_ADDR> 'retrieve_state_hash()(uint256)'"
-	@echo "    cast call <CONTRACT_ADDR> 'retrieve_state_height()(uint256)'"
+submit_state:
+	@cargo run --manifest-path core/Cargo.toml --release -- submit-state
 
-check_account:
-	@echo "Fetching Merkle path and leaf hash..."
-	@cd state_utility/merkle_path && cargo r --release -- $(MINA_RPC_URL) ../../public_key.txt
-	@echo "Done!"
-	@echo "Verifying Merkle proof inclusion..."
-	@cd eth_verifier && make setup && make merkle_locally
-	@echo "Done!"
+submit_account:
+	@cargo run --manifest-path core/Cargo.toml --release -- submit-account ${PUBLIC_KEY} ${STATE_HASH}
 
-sepolia.wrap_and_deploy:
-	@echo "Setting up o1js..."
-	@git submodule update --init --recursive
-	@echo "Fetching state proof from Mina node..."
-	@cd polling_service && sh run.sh
-	@echo "Done!"
-	@echo "Creating circuit gates..."
-	@cd verifier_circuit && npm i && make
-	@echo "Done!"
-	@echo "Creating KZG proof..."
-	@cd kzg_prover && cargo r --release
-	@echo "Done!"
-	@echo "Fetching Merkle root..."
-	@cd state_utility && sh run.sh
-	@echo "Done!"
-	@echo "Deploying verifier in Sepolia..."
-	@cd eth_verifier && make sepolia.deploy_deser
-	@echo "Done!"
-	@echo "Once the verifier deployment is confirmed, set CONTRACT_ADDRESS env var and run:"
-	@echo "  make sepolia.verify"
+gen_contract_abis:
+	forge build --root contract/
+	forge build --root example/eth_contract
+	cp contract/out/MinaStateSettlement.sol/MinaStateSettlement.json core/abi/MinaStateSettlement.json
+	cp contract/out/MinaAccountValidation.sol/MinaAccountValidation.json core/abi/MinaAccountValidation.json
+	cp example/eth_contract/out/SudokuValidity.sol/SudokuValidity.json example/app/abi/SudokuValidity.json
 
-sepolia.verify:
-	@echo "Uploading proof and Merkle root to Sepolia..."
-	@cd eth_verifier && make sepolia.upload_proof_and_merkle_root
-	@echo "Done!"
-	@echo "Once the upload is confirmed in Sepolia, press any key to continue."; read REPLY
-	@echo "Verifying uploaded proof in Sepolia..."
-	@cd eth_verifier && make sepolia.verify
-	@echo "Done!"
-	@echo "Once the proof verification is confirmed in Sepolia, press any key to continue."; read REPLY
-	@echo "Verifying Merkle proof inclusion in Sepolia..."
-	@cd eth_verifier && make sepolia.merkle_verify
-	@echo "Done!"
+deploy_contract: gen_contract_abis
+	@cargo run --manifest-path contract_deployer/Cargo.toml --release
+
+deploy_example_contract: gen_contract_abis
+	@cargo run --manifest-path example/app/Cargo.toml --release -- deploy-contract
+
+execute_example:
+	cd example/mina_zkapp; \
+	npm run build; \
+	node build/src/run.js
+	cargo run --manifest-path example/app/Cargo.toml --release -- validate-solution