Merge fbf96e4 into a2dcb5f

Author: MauroToscano

.github/workflows/build-and-test-go.yml

@@ -13,7 +13,7 @@ on:
       - "common/**"
       - "core/**"
       - "metrics/**"
-      - ".github/workflows/build-go.yml"
+      - ".github/workflows/build-and-test-go.yml"
 env:
   FFI_FOR_RELEASE: false
 jobs:
@@ -31,15 +31,83 @@ jobs:
       - name: foundry-toolchain
         uses: foundry-rs/foundry-toolchain@v1.2.0
 
+      - name: Cache SP1 bindings
+        id: cache-sp1
+        uses: actions/cache@v4
+        with:
+          path: operator/sp1/lib/libsp1_verifier_ffi.so
+          key: sp1-bindings-${{ runner.os }}-${{ hashFiles('operator/sp1/lib/**/*.rs', 'operator/sp1/lib/Cargo.*') }}
+
       - name: Build SP1 bindings
+        if: steps.cache-sp1.outputs.cache-hit != 'true'
         run: make build_sp1_linux
 
+      - name: Clean SP1 build artifacts
+        if: steps.cache-sp1.outputs.cache-hit != 'true'
+        run: rm -rf operator/sp1/lib/target
+
+      - name: Cache Risc Zero bindings
+        id: cache-risc-zero
+        uses: actions/cache@v4
+        with:
+          path: operator/risc_zero/lib/librisc_zero_verifier_ffi.so
+          key: risc-zero-bindings-${{ runner.os }}-${{ hashFiles('operator/risc_zero/lib/**/*.rs', 'operator/risc_zero/lib/Cargo.*') }}
+
       - name: Build Risc Zero go bindings
+        if: steps.cache-risc-zero.outputs.cache-hit != 'true'
         run: make build_risc_zero_linux
 
+      - name: Clean Risc Zero build artifacts
+        if: steps.cache-risc-zero.outputs.cache-hit != 'true'
+        run: rm -rf operator/risc_zero/lib/target
+
+      - name: Cache Merkle Tree bindings
+        id: cache-merkle-tree
+        uses: actions/cache@v4
+        with:
+          path: |
+            operator/merkle_tree/lib/libmerkle_tree.so
+            operator/merkle_tree/lib/libmerkle_tree.a
+          key: merkle-tree-bindings-${{ runner.os }}-${{ hashFiles('operator/merkle_tree/lib/**/*.rs', 'operator/merkle_tree/lib/Cargo.*') }}
+
       - name: Build Merkle Tree bindings
+        if: steps.cache-merkle-tree.outputs.cache-hit != 'true'
         run: make build_merkle_tree_linux
 
+      - name: Clean Merkle Tree build artifacts
+        if: steps.cache-merkle-tree.outputs.cache-hit != 'true'
+        run: rm -rf operator/merkle_tree/lib/target
+
+      - name: Cache Mina bindings
+        id: cache-mina
+        uses: actions/cache@v4
+        with:
+          path: operator/mina/lib/libmina_state_verifier_ffi.so
+          key: mina-bindings-${{ runner.os }}-${{ hashFiles('operator/mina/lib/**/*.rs', 'operator/mina/lib/Cargo.*') }}
+
+      - name: Build Mina bindings
+        if: steps.cache-mina.outputs.cache-hit != 'true'
+        run: make build_mina_linux
+
+      - name: Clean Mina build artifacts
+        if: steps.cache-mina.outputs.cache-hit != 'true'
+        run: rm -rf operator/mina/lib/target
+
+      - name: Cache Mina Account bindings
+        id: cache-mina-account
+        uses: actions/cache@v4
+        with:
+          path: operator/mina_account/lib/libmina_account_verifier_ffi.so
+          key: mina-account-bindings-${{ runner.os }}-${{ hashFiles('operator/mina_account/lib/**/*.rs', 'operator/mina_account/lib/Cargo.*') }}
+
+      - name: Build Mina Account bindings
+        if: steps.cache-mina-account.outputs.cache-hit != 'true'
+        run: make build_mina_account_linux
+
+      - name: Clean Mina Account build artifacts
+        if: steps.cache-mina-account.outputs.cache-hit != 'true'
+        run: rm -rf operator/mina_account/lib/target
+
       - name: Build operator
         run: go build operator/cmd/main.go
 

.github/workflows/build-and-test-rust.yml

@@ -123,5 +123,5 @@ jobs:
 
       - name: Run AggregationMode tests
         run: |
-          cd aggregation_mode
-          cargo test --all
+          cd aggregation_mode/proof_aggregator && cargo test
+          cd ../batcher && cargo test

.github/workflows/test-mina.yml

@@ -0,0 +1,33 @@
+name: test-mina
+
+on:
+  merge_group:
+  push:
+    branches: [main]
+  pull_request:
+    branches: ["*"]
+    paths:
+      - 'operator/mina/**'
+      - 'operator/mina_account/**'
+      - '.github/workflows/test-mina.yml'
+
+jobs:
+    test:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-go@v5
+          with:
+            go-version: '1.22'
+            cache: false
+        - uses: actions-rs/toolchain@v1
+          with:
+            toolchain: stable
+        - name: Test Mina Rust
+          run: make test_mina_rust_ffi
+        - name: Test Mina go bindings
+          run: make test_mina_go_bindings_linux
+        - name: Test Mina Account Rust
+          run: make test_mina_account_rust_ffi
+        - name: Test Mina Account go bindings
+          run: make test_mina_account_go_bindings_linux

Makefile

@@ -32,8 +32,8 @@ ifeq ($(OS),Darwin)
 endif
 
 ifeq ($(OS),Linux)
-	export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib
-	OPERATOR_FFIS=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib
+	export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
+	OPERATOR_FFIS=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
 endif
 
 ifeq ($(OS),Linux)
@@ -252,6 +252,9 @@ proof_aggregator_start_dev: is_aggregator_set reset_last_aggregated_block ./aggr
 proof_aggregator_start_dev_ethereum_package: is_aggregator_set reset_last_aggregated_block ./aggregation_mode/target/release/proof_aggregator_dev ## Starts proof aggregator with mock proofs (DEV mode) in ethereum package. Parameters: AGGREGATOR=<sp1|risc0>
 	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator_dev config-files/config-proof-aggregator-mock-ethereum-package.yaml
 
+proof_aggregator_test_without_compiling_agg_programs:
+	cd aggregation_mode && SKIP_AGG_PROGRAMS_BUILD=1 cargo test -p proof_aggregator --tests -- --nocapture
+
 ### All CPU proof aggregator receipts
 ./aggregation_mode/target/release/proof_aggregator_cpu: $(AGGREGATION_MODE_SOURCES)
 	AGGREGATOR=$(AGGREGATOR) cargo build --features prove --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator_cpu
@@ -300,7 +303,41 @@ proof_aggregator_install: ## Install the aggregation mode with proving enabled
 	cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator_gpu --locked
 
 proof_aggregator_write_program_ids: ## Write proof aggregator zkvm programs ids
-	@cd aggregation_mode && ./scripts/build_programs.sh
+	@cd aggregation_mode/proof_aggregator && ./scripts/build_programs.sh
+
+agg_mode_docker_up:
+	@cd aggregation_mode && docker compose up -d
+
+agg_mode_docker_down:
+	@cd aggregation_mode && docker compose down
+
+agg_mode_docker_clean: agg_mode_docker_down
+	docker volume rm aggregation-mode_postgres_data
+
+agg_mode_run_migrations: agg_mode_docker_up
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin migrate -- postgres://postgres:postgres@localhost:5435/
+
+agg_mode_batcher_start_local: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_batcher -- config-files/config-agg-mode-batcher.yaml
+
+agg_mode_batcher_start_ethereum_package: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_batcher -- config-files/config-agg-mode-batcher-ethereum-package.yaml
+
+AGG_MODE_SENDER ?= 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
+agg_mode_batcher_send_payment:
+	@cast send --value 1ether \
+		0x922D6956C99E12DFeB3224DEA977D0939758A1Fe \
+		--private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
+
+agg_mode_batcher_send_sp1_proof:
+	@NONCE=$$(curl -s http://127.0.0.1:8089/nonce/0x70997970C51812dc3A010C7d01b50e0d17dc79C8 | jq -r '.data.nonce'); \
+	curl -X POST \
+		-H "Content-Type: multipart/form-data" \
+		-F "nonce=$${NONCE}" \
+		-F "proof=@scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof" \
+		-F "program_vk=@scripts/test_files/sp1/sp1_fibonacci_5_0_0_vk.bin" \
+		-F "signature_hex=0x0" \
+		http://127.0.0.1:8089/proof/sp1
 
 __AGGREGATOR__: ## ____
 
@@ -703,6 +740,58 @@ batcher_send_circom_groth16_bn256_no_pub_input_burst: crates/target/release/alig
 		--rpc_url $(RPC_URL) \
 		--network $(NETWORK)
 
+batcher_send_mina_task:
+	@echo "Sending Mina state task to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
+		--public_input ../../scripts/test_files/mina/devnet_mina_state.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
+batcher_send_mina_task_bad_hash:
+	@echo "Sending Mina state task to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
+		--public_input ../../scripts/test_files/mina/mina_state_bad_hash.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
+batcher_send_mina_burst:
+	@echo "Sending Mina state task to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
+		--public_input ../../scripts/test_files/mina/devnet_mina_state.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--repetitions $(BURST_SIZE) \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
+batcher_send_mina_account_task:
+	@echo "Sending Mina account task to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system MinaAccount \
+		--proof ../../scripts/test_files/mina_account/mina_account.proof \
+		--public_input ../../scripts/test_files/mina_account/mina_account.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
+batcher_send_mina_account_burst:
+	@echo "Sending Mina account task to Batcher..."
+	@cd crates/cli/ && cargo run --release -- submit \
+		--proving_system MinaAccount \
+		--proof ../../scripts/test_files/mina_account/mina_account.proof \
+		--public_input ../../scripts/test_files/mina_account/mina_account.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--repetitions $(BURST_SIZE) \
+		--rpc_url $(RPC_URL) \
+		--network $(NETWORK)
+
 batcher_send_proof_with_random_address: ## Send a proof with a random address to Batcher. Parameters: RPC_URL, NETWORK, PROOF_TYPE, REPETITIONS
 	@cd crates/cli/ && ./send_proof_with_random_address.sh
 
@@ -968,6 +1057,48 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
 	@echo "Testing Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree/... -v
 
+__MINA_FFI__: ##
+build_mina_macos:
+	@cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG}
+	@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.dylib operator/mina/lib/libmina_state_verifier_ffi.dylib
+
+build_mina_linux:
+	@cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG}
+	@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.so operator/mina/lib/libmina_state_verifier_ffi.so
+
+test_mina_rust_ffi:
+	@echo "Testing Mina Rust FFI source code..."
+	@cd operator/mina/lib && cargo t --release
+
+test_mina_go_bindings_macos: build_mina_macos
+	@echo "Testing Mina Go bindings..."
+	go test ./operator/mina/... -v
+
+test_mina_go_bindings_linux: build_mina_linux
+	@echo "Testing Mina Go bindings..."
+	go test ./operator/mina/... -v
+
+__MINA_ACCOUNT_FFI__: ##
+build_mina_account_macos:
+	@cd operator/mina_account/lib && cargo build --release
+	@cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.dylib operator/mina_account/lib/libmina_account_verifier_ffi.dylib
+
+build_mina_account_linux:
+	@cd operator/mina_account/lib && cargo build --release
+	@cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.so operator/mina_account/lib/libmina_account_verifier_ffi.so
+
+test_mina_account_rust_ffi:
+	@echo "Testing Mina Account Rust FFI source code..."
+	@cd operator/mina_account/lib && cargo t --release
+
+test_mina_account_go_bindings_macos: build_mina_account_macos
+	@echo "Testing Mina Account Go bindings..."
+	go test ./operator/mina_account/... -v
+
+test_mina_account_go_bindings_linux: build_mina_account_linux
+	@echo "Testing Mina Account Go bindings..."
+	go test ./operator/mina_account/... -v
+
 __FFI__: ## ____
 
 build_all_ffi: ## Build all FFIs
@@ -979,13 +1110,17 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 	@$(MAKE) build_sp1_macos
 	@$(MAKE) build_risc_zero_macos
 	@$(MAKE) build_merkle_tree_macos
+	@$(MAKE) build_mina_macos
+	@$(MAKE) build_mina_account_macos
 	@echo "All macOS FFIs built successfully."
 
 build_all_ffi_linux: ## Build all FFIs for Linux
 	@echo "Building all FFIs for Linux..."
 	@$(MAKE) build_sp1_linux
 	@$(MAKE) build_risc_zero_linux
 	@$(MAKE) build_merkle_tree_linux
+	@$(MAKE) build_mina_linux
+	@$(MAKE) build_mina_account_linux
 	@echo "All Linux FFIs built successfully."
 
 __EXPLORER__: ## ____
@@ -1193,6 +1328,30 @@ docker_batcher_send_circom_groth16_bn256_no_pub_input_burst:
 			  --rpc_url $(DOCKER_RPC_URL) \
 			  --max_fee 0.1ether
 
+docker_batcher_send_mina_burst:
+	@echo "Sending Mina state task to Batcher..."
+	docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
+              --private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
+              --proving_system Mina \
+              --proof ./scripts/test_files/mina/devnet_mina_state.proof \
+              --public_input ./scripts/test_files/mina/devnet_mina_state.pub \
+              --repetitions $(DOCKER_BURST_SIZE) \
+              --proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
+              --rpc_url $(DOCKER_RPC_URL) \
+			  --max_fee 0.1ether
+
+docker_batcher_send_mina_account_burst:
+	@echo "Sending Mina account task to Batcher..."
+	docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
+              --private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
+              --proving_system MinaAccount \
+              --proof ./scripts/test_files/mina_account/mina_account.proof \
+              --public_input ./scripts/test_files/mina_account/mina_account.pub \
+              --repetitions $(DOCKER_BURST_SIZE) \
+              --proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
+              --rpc_url $(DOCKER_RPC_URL) \
+			  --max_fee 0.1ether
+
 # Update target as new proofs are supported.
 docker_batcher_send_all_proofs_burst:
 	@$(MAKE) docker_batcher_send_sp1_burst
@@ -1202,6 +1361,8 @@ docker_batcher_send_all_proofs_burst:
 	@$(MAKE) docker_batcher_send_gnark_groth16_burst
 	@$(MAKE) docker_batcher_send_circom_groth16_bn256_burst
 	@$(MAKE) docker_batcher_send_circom_groth16_bn256_no_pub_input_burst
+	@$(MAKE) docker_batcher_send_mina_burst
+	@$(MAKE) docker_batcher_send_mina_account_burst
 
 docker_batcher_send_infinite_groth16:
 	docker exec $(shell docker ps | grep batcher | awk '{print $$1}') \
@@ -1239,7 +1400,7 @@ docker_verify_proofs_onchain:
 	  '
 
 DOCKER_PROOFS_WAIT_TIME=60
-DOCKER_SENT_PROOFS=7
+DOCKER_SENT_PROOFS=9
 
 docker_verify_proof_submission_success: 
 	@echo "Verifying proofs were successfully submitted..."