Skip to content

Commit c98f2d7

Browse files
JuArceJuArce
committed
Merge branch 'refs/heads/staging' into 2189-infraaggregation-mode-add-terraform-setup
2 parents 935ff4f + cef571e commit c98f2d7

File tree

169 files changed

+39887
-5235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+39887
-5235
lines changed

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

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- "common/**"
1414
- "core/**"
1515
- "metrics/**"
16-
- ".github/workflows/build-go.yml"
16+
- ".github/workflows/build-and-test-go.yml"
1717
env:
1818
FFI_FOR_RELEASE: false
1919
jobs:
@@ -31,15 +31,83 @@ jobs:
3131
- name: foundry-toolchain
3232
uses: foundry-rs/[email protected]
3333

34+
- name: Cache SP1 bindings
35+
id: cache-sp1
36+
uses: actions/cache@v4
37+
with:
38+
path: operator/sp1/lib/libsp1_verifier_ffi.so
39+
key: sp1-bindings-${{ runner.os }}-${{ hashFiles('operator/sp1/lib/**/*.rs', 'operator/sp1/lib/Cargo.*') }}
40+
3441
- name: Build SP1 bindings
42+
if: steps.cache-sp1.outputs.cache-hit != 'true'
3543
run: make build_sp1_linux
3644

45+
- name: Clean SP1 build artifacts
46+
if: steps.cache-sp1.outputs.cache-hit != 'true'
47+
run: rm -rf operator/sp1/lib/target
48+
49+
- name: Cache Risc Zero bindings
50+
id: cache-risc-zero
51+
uses: actions/cache@v4
52+
with:
53+
path: operator/risc_zero/lib/librisc_zero_verifier_ffi.so
54+
key: risc-zero-bindings-${{ runner.os }}-${{ hashFiles('operator/risc_zero/lib/**/*.rs', 'operator/risc_zero/lib/Cargo.*') }}
55+
3756
- name: Build Risc Zero go bindings
57+
if: steps.cache-risc-zero.outputs.cache-hit != 'true'
3858
run: make build_risc_zero_linux
3959

60+
- name: Clean Risc Zero build artifacts
61+
if: steps.cache-risc-zero.outputs.cache-hit != 'true'
62+
run: rm -rf operator/risc_zero/lib/target
63+
64+
- name: Cache Merkle Tree bindings
65+
id: cache-merkle-tree
66+
uses: actions/cache@v4
67+
with:
68+
path: |
69+
operator/merkle_tree/lib/libmerkle_tree.so
70+
operator/merkle_tree/lib/libmerkle_tree.a
71+
key: merkle-tree-bindings-${{ runner.os }}-${{ hashFiles('operator/merkle_tree/lib/**/*.rs', 'operator/merkle_tree/lib/Cargo.*') }}
72+
4073
- name: Build Merkle Tree bindings
74+
if: steps.cache-merkle-tree.outputs.cache-hit != 'true'
4175
run: make build_merkle_tree_linux
4276

77+
- name: Clean Merkle Tree build artifacts
78+
if: steps.cache-merkle-tree.outputs.cache-hit != 'true'
79+
run: rm -rf operator/merkle_tree/lib/target
80+
81+
- name: Cache Mina bindings
82+
id: cache-mina
83+
uses: actions/cache@v4
84+
with:
85+
path: operator/mina/lib/libmina_state_verifier_ffi.so
86+
key: mina-bindings-${{ runner.os }}-${{ hashFiles('operator/mina/lib/**/*.rs', 'operator/mina/lib/Cargo.*') }}
87+
88+
- name: Build Mina bindings
89+
if: steps.cache-mina.outputs.cache-hit != 'true'
90+
run: make build_mina_linux
91+
92+
- name: Clean Mina build artifacts
93+
if: steps.cache-mina.outputs.cache-hit != 'true'
94+
run: rm -rf operator/mina/lib/target
95+
96+
- name: Cache Mina Account bindings
97+
id: cache-mina-account
98+
uses: actions/cache@v4
99+
with:
100+
path: operator/mina_account/lib/libmina_account_verifier_ffi.so
101+
key: mina-account-bindings-${{ runner.os }}-${{ hashFiles('operator/mina_account/lib/**/*.rs', 'operator/mina_account/lib/Cargo.*') }}
102+
103+
- name: Build Mina Account bindings
104+
if: steps.cache-mina-account.outputs.cache-hit != 'true'
105+
run: make build_mina_account_linux
106+
107+
- name: Clean Mina Account build artifacts
108+
if: steps.cache-mina-account.outputs.cache-hit != 'true'
109+
run: rm -rf operator/mina_account/lib/target
110+
43111
- name: Build operator
44112
run: go build operator/cmd/main.go
45113

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,6 @@ jobs:
123123
124124
- name: Run AggregationMode tests
125125
run: |
126-
cd aggregation_mode
127-
cargo test --all
126+
cd aggregation_mode/proof_aggregator && cargo test
127+
cd ../gateway && cargo test
128+
cd ../payments_poller && cargo test

‎.github/workflows/test-mina.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: test-mina
2+
3+
on:
4+
merge_group:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: ["*"]
9+
paths:
10+
- 'operator/mina/**'
11+
- 'operator/mina_account/**'
12+
- '.github/workflows/test-mina.yml'
13+
14+
jobs:
15+
test:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-go@v5
20+
with:
21+
go-version: '1.22'
22+
cache: false
23+
- uses: actions-rs/toolchain@v1
24+
with:
25+
toolchain: stable
26+
- name: Test Mina Rust
27+
run: make test_mina_rust_ffi
28+
- name: Test Mina go bindings
29+
run: make test_mina_go_bindings_linux
30+
- name: Test Mina Account Rust
31+
run: make test_mina_account_rust_ffi
32+
- name: Test Mina Account go bindings
33+
run: make test_mina_account_go_bindings_linux

‎Makefile‎

Lines changed: 171 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ifeq ($(OS),Darwin)
3232
endif
3333

3434
ifeq ($(OS),Linux)
35-
export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib
36-
OPERATOR_FFIS=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib
35+
export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
36+
OPERATOR_FFIS=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/sp1/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
3737
endif
3838

3939
ifeq ($(OS),Linux)
@@ -240,7 +240,7 @@ reset_last_aggregated_block:
240240
@echo "Resetting last aggregated block..."
241241
@echo '{"last_aggregated_block":0}' > config-files/proof-aggregator.last_aggregated_block.json
242242

243-
AGGREGATION_MODE_SOURCES = $(wildcard ./aggregation_mode/Cargo.toml) $(wildcard ./aggregation_mode/src/**) $(wildcard ./aggregation_mode/aggregation_programs/risc0/Cargo.toml) $(wildcard ./aggregation_mode/aggregation_programs/risc0/src/**) $(wildcard ./aggregation_mode/aggregation_programs/sp1/Cargo.toml) $(wildcard ./aggregation_mode/aggregation_programs/sp1/src/**)
243+
AGGREGATION_MODE_SOURCES = $(wildcard ./aggregation_mode/Cargo.toml) $(wildcard ./aggregation_mode/proof_aggregator/Cargo.toml) $(wildcard ./aggregation_mode/proof_aggregator/src/**) $(wildcard ./aggregation_mode/proof_aggregator/aggregation_programs/risc0/Cargo.toml) $(wildcard ./aggregation_mode/proof_aggregator/aggregation_programs/risc0/src/**) $(wildcard ./aggregation_mode/proof_aggregator/aggregation_programs/sp1/Cargo.toml) $(wildcard ./aggregation_mode/proof_aggregator/aggregation_programs/sp1/src/**)
244244

245245
### All Dev proof aggregator receipts with no real proving
246246
./aggregation_mode/target/release/proof_aggregator_dev: $(AGGREGATION_MODE_SOURCES)
@@ -252,6 +252,9 @@ proof_aggregator_start_dev: is_aggregator_set reset_last_aggregated_block ./aggr
252252
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>
253253
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator_dev config-files/config-proof-aggregator-mock-ethereum-package.yaml
254254

255+
proof_aggregator_test_without_compiling_agg_programs:
256+
cd aggregation_mode && SKIP_AGG_PROGRAMS_BUILD=1 cargo test -p proof_aggregator --tests -- --nocapture
257+
255258
### All CPU proof aggregator receipts
256259
./aggregation_mode/target/release/proof_aggregator_cpu: $(AGGREGATION_MODE_SOURCES)
257260
AGGREGATOR=$(AGGREGATOR) cargo build --features prove --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator_cpu
@@ -300,7 +303,46 @@ proof_aggregator_install: ## Install the aggregation mode with proving enabled
300303
cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator_gpu --locked
301304

302305
proof_aggregator_write_program_ids: ## Write proof aggregator zkvm programs ids
303-
@cd aggregation_mode && ./scripts/build_programs.sh
306+
@cd aggregation_mode/proof_aggregator && ./scripts/build_programs.sh
307+
308+
agg_mode_docker_up:
309+
@cd aggregation_mode && docker compose up -d
310+
311+
agg_mode_docker_down:
312+
@cd aggregation_mode && docker compose down
313+
314+
agg_mode_docker_clean: agg_mode_docker_down
315+
docker volume rm aggregation-mode_postgres_data
316+
317+
agg_mode_run_migrations: agg_mode_docker_up
318+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin migrate -- postgres://postgres:postgres@localhost:5435/
319+
320+
agg_mode_gateway_start_local: agg_mode_run_migrations
321+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin gateway -- config-files/config-agg-mode-gateway.yaml
322+
323+
agg_mode_gateway_start_ethereum_package: agg_mode_run_migrations
324+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin gateway -- config-files/config-agg-mode-gateway-ethereum-package.yaml
325+
326+
agg_mode_payments_poller_start_local: agg_mode_run_migrations
327+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin payments_poller -- config-files/config-agg-mode-gateway.yaml
328+
329+
agg_mode_payments_poller_start_ethereum_package: agg_mode_run_migrations
330+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin payments_poller -- config-files/config-agg-mode-gateway-ethereum-package.yaml
331+
332+
AGG_MODE_SENDER ?= 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
333+
agg_mode_gateway_send_payment:
334+
@cast send --value 1ether \
335+
0x922D6956C99E12DFeB3224DEA977D0939758A1Fe \
336+
--private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
337+
338+
agg_mode_gateway_send_sp1_proof:
339+
@cargo run --manifest-path aggregation_mode/cli/Cargo.toml -- submit sp1 \
340+
--proof scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
341+
--vk scripts/test_files/sp1/sp1_fibonacci_5_0_0_vk.bin \
342+
--private-key "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
343+
344+
agg_mode_get_quotas:
345+
curl -X GET http://127.0.0.1:8089/quotas/0x70997970C51812dc3A010C7d01b50e0d17dc79C8
304346

305347
__AGGREGATOR__: ## ____
306348

@@ -703,6 +745,58 @@ batcher_send_circom_groth16_bn256_no_pub_input_burst: crates/target/release/alig
703745
--rpc_url $(RPC_URL) \
704746
--network $(NETWORK)
705747

748+
batcher_send_mina_task:
749+
@echo "Sending Mina state task to Batcher..."
750+
@cd crates/cli/ && cargo run --release -- submit \
751+
--proving_system Mina \
752+
--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
753+
--public_input ../../scripts/test_files/mina/devnet_mina_state.pub \
754+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
755+
--rpc_url $(RPC_URL) \
756+
--network $(NETWORK)
757+
758+
batcher_send_mina_task_bad_hash:
759+
@echo "Sending Mina state task to Batcher..."
760+
@cd crates/cli/ && cargo run --release -- submit \
761+
--proving_system Mina \
762+
--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
763+
--public_input ../../scripts/test_files/mina/mina_state_bad_hash.pub \
764+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
765+
--rpc_url $(RPC_URL) \
766+
--network $(NETWORK)
767+
768+
batcher_send_mina_burst:
769+
@echo "Sending Mina state task to Batcher..."
770+
@cd crates/cli/ && cargo run --release -- submit \
771+
--proving_system Mina \
772+
--proof ../../scripts/test_files/mina/devnet_mina_state.proof \
773+
--public_input ../../scripts/test_files/mina/devnet_mina_state.pub \
774+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
775+
--repetitions $(BURST_SIZE) \
776+
--rpc_url $(RPC_URL) \
777+
--network $(NETWORK)
778+
779+
batcher_send_mina_account_task:
780+
@echo "Sending Mina account task to Batcher..."
781+
@cd crates/cli/ && cargo run --release -- submit \
782+
--proving_system MinaAccount \
783+
--proof ../../scripts/test_files/mina_account/mina_account.proof \
784+
--public_input ../../scripts/test_files/mina_account/mina_account.pub \
785+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
786+
--rpc_url $(RPC_URL) \
787+
--network $(NETWORK)
788+
789+
batcher_send_mina_account_burst:
790+
@echo "Sending Mina account task to Batcher..."
791+
@cd crates/cli/ && cargo run --release -- submit \
792+
--proving_system MinaAccount \
793+
--proof ../../scripts/test_files/mina_account/mina_account.proof \
794+
--public_input ../../scripts/test_files/mina_account/mina_account.pub \
795+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
796+
--repetitions $(BURST_SIZE) \
797+
--rpc_url $(RPC_URL) \
798+
--network $(NETWORK)
799+
706800
batcher_send_proof_with_random_address: ## Send a proof with a random address to Batcher. Parameters: RPC_URL, NETWORK, PROOF_TYPE, REPETITIONS
707801
@cd crates/cli/ && ./send_proof_with_random_address.sh
708802

@@ -968,6 +1062,48 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
9681062
@echo "Testing Merkle Tree Go bindings..."
9691063
go test ./operator/merkle_tree/... -v
9701064

1065+
__MINA_FFI__: ##
1066+
build_mina_macos:
1067+
@cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG}
1068+
@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.dylib operator/mina/lib/libmina_state_verifier_ffi.dylib
1069+
1070+
build_mina_linux:
1071+
@cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG}
1072+
@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.so operator/mina/lib/libmina_state_verifier_ffi.so
1073+
1074+
test_mina_rust_ffi:
1075+
@echo "Testing Mina Rust FFI source code..."
1076+
@cd operator/mina/lib && cargo t --release
1077+
1078+
test_mina_go_bindings_macos: build_mina_macos
1079+
@echo "Testing Mina Go bindings..."
1080+
go test ./operator/mina/... -v
1081+
1082+
test_mina_go_bindings_linux: build_mina_linux
1083+
@echo "Testing Mina Go bindings..."
1084+
go test ./operator/mina/... -v
1085+
1086+
__MINA_ACCOUNT_FFI__: ##
1087+
build_mina_account_macos:
1088+
@cd operator/mina_account/lib && cargo build --release
1089+
@cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.dylib operator/mina_account/lib/libmina_account_verifier_ffi.dylib
1090+
1091+
build_mina_account_linux:
1092+
@cd operator/mina_account/lib && cargo build --release
1093+
@cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.so operator/mina_account/lib/libmina_account_verifier_ffi.so
1094+
1095+
test_mina_account_rust_ffi:
1096+
@echo "Testing Mina Account Rust FFI source code..."
1097+
@cd operator/mina_account/lib && cargo t --release
1098+
1099+
test_mina_account_go_bindings_macos: build_mina_account_macos
1100+
@echo "Testing Mina Account Go bindings..."
1101+
go test ./operator/mina_account/... -v
1102+
1103+
test_mina_account_go_bindings_linux: build_mina_account_linux
1104+
@echo "Testing Mina Account Go bindings..."
1105+
go test ./operator/mina_account/... -v
1106+
9711107
__FFI__: ## ____
9721108

9731109
build_all_ffi: ## Build all FFIs
@@ -979,13 +1115,17 @@ build_all_ffi_macos: ## Build all FFIs for macOS
9791115
@$(MAKE) build_sp1_macos
9801116
@$(MAKE) build_risc_zero_macos
9811117
@$(MAKE) build_merkle_tree_macos
1118+
@$(MAKE) build_mina_macos
1119+
@$(MAKE) build_mina_account_macos
9821120
@echo "All macOS FFIs built successfully."
9831121

9841122
build_all_ffi_linux: ## Build all FFIs for Linux
9851123
@echo "Building all FFIs for Linux..."
9861124
@$(MAKE) build_sp1_linux
9871125
@$(MAKE) build_risc_zero_linux
9881126
@$(MAKE) build_merkle_tree_linux
1127+
@$(MAKE) build_mina_linux
1128+
@$(MAKE) build_mina_account_linux
9891129
@echo "All Linux FFIs built successfully."
9901130

9911131
__EXPLORER__: ## ____
@@ -1193,6 +1333,30 @@ docker_batcher_send_circom_groth16_bn256_no_pub_input_burst:
11931333
--rpc_url $(DOCKER_RPC_URL) \
11941334
--max_fee 0.1ether
11951335

1336+
docker_batcher_send_mina_burst:
1337+
@echo "Sending Mina state task to Batcher..."
1338+
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
1339+
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
1340+
--proving_system Mina \
1341+
--proof ./scripts/test_files/mina/devnet_mina_state.proof \
1342+
--public_input ./scripts/test_files/mina/devnet_mina_state.pub \
1343+
--repetitions $(DOCKER_BURST_SIZE) \
1344+
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
1345+
--rpc_url $(DOCKER_RPC_URL) \
1346+
--max_fee 0.1ether
1347+
1348+
docker_batcher_send_mina_account_burst:
1349+
@echo "Sending Mina account task to Batcher..."
1350+
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') aligned submit \
1351+
--private_key $(DOCKER_PROOFS_PRIVATE_KEY) \
1352+
--proving_system MinaAccount \
1353+
--proof ./scripts/test_files/mina_account/mina_account.proof \
1354+
--public_input ./scripts/test_files/mina_account/mina_account.pub \
1355+
--repetitions $(DOCKER_BURST_SIZE) \
1356+
--proof_generator_addr $(PROOF_GENERATOR_ADDRESS) \
1357+
--rpc_url $(DOCKER_RPC_URL) \
1358+
--max_fee 0.1ether
1359+
11961360
# Update target as new proofs are supported.
11971361
docker_batcher_send_all_proofs_burst:
11981362
@$(MAKE) docker_batcher_send_sp1_burst
@@ -1202,6 +1366,8 @@ docker_batcher_send_all_proofs_burst:
12021366
@$(MAKE) docker_batcher_send_gnark_groth16_burst
12031367
@$(MAKE) docker_batcher_send_circom_groth16_bn256_burst
12041368
@$(MAKE) docker_batcher_send_circom_groth16_bn256_no_pub_input_burst
1369+
@$(MAKE) docker_batcher_send_mina_burst
1370+
@$(MAKE) docker_batcher_send_mina_account_burst
12051371

12061372
docker_batcher_send_infinite_groth16:
12071373
docker exec $(shell docker ps | grep batcher | awk '{print $$1}') \
@@ -1239,7 +1405,7 @@ docker_verify_proofs_onchain:
12391405
'
12401406

12411407
DOCKER_PROOFS_WAIT_TIME=60
1242-
DOCKER_SENT_PROOFS=7
1408+
DOCKER_SENT_PROOFS=9
12431409

12441410
docker_verify_proof_submission_success:
12451411
@echo "Verifying proofs were successfully submitted..."

0 commit comments

Comments
 (0)