Skip to content

Commit 8a6340f

Browse files
PatStilesuri-99
andauthored
chore: rm halo2 from verifiers (#1128)
Co-authored-by: Urix <[email protected]>
1 parent d814f2b commit 8a6340f

Some content is hidden

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

50 files changed

+38
-6312
lines changed

.github/workflows/build-go.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,28 @@ on:
77
pull_request:
88
branches: ["*"]
99
paths:
10-
- 'operator/**'
11-
- 'aggregator/**'
12-
- 'common/**'
13-
- 'core/**'
14-
- 'metrics/**'
15-
- '.github/workflows/build-go.yml'
10+
- "operator/**"
11+
- "aggregator/**"
12+
- "common/**"
13+
- "core/**"
14+
- "metrics/**"
15+
- ".github/workflows/build-go.yml"
1616
env:
1717
FFI_FOR_RELEASE: false
1818
jobs:
1919
build:
2020
runs-on: ubuntu-latest
21-
21+
2222
steps:
2323
- uses: actions/checkout@v4
2424
- uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.22'
26+
go-version: "1.22"
2727
cache: false
2828
- name: Build SP1 bindings
2929
run: make build_sp1_linux
3030
- name: Build Risc Zero go bindings
3131
run: make build_risc_zero_linux
32-
- name: Build Halo2-KZG bindings
33-
run: make build_halo2_kzg_linux
34-
- name: Build Halo2-IPA bindings
35-
run: make build_halo2_ipa_linux
3632
- name: Build Merkle Tree bindings
3733
run: make build_merkle_tree_linux
3834
- name: Build Old Merkle Tree bindings

.github/workflows/test-halo2-ipa.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/test-halo2-kzg.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -365,50 +365,6 @@ batcher_send_burst_groth16: batcher/target/release/aligned
365365
@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
366366
@./batcher/aligned/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
367367

368-
batcher_send_halo2_ipa_task: batcher/target/release/aligned
369-
@echo "Sending Halo2 IPA 1!=0 task to Batcher..."
370-
@cd batcher/aligned/ && cargo run --release -- submit \
371-
--proving_system Halo2IPA \
372-
--proof ../../scripts/test_files/halo2_ipa/proof.bin \
373-
--public_input ../../scripts/test_files/halo2_ipa/pub_input.bin \
374-
--vk ../../scripts/test_files/halo2_ipa/params.bin \
375-
--rpc_url $(RPC_URL) \
376-
--network $(NETWORK)
377-
378-
batcher_send_halo2_ipa_task_burst_5: batcher/target/release/aligned
379-
@echo "Sending Halo2 IPA 1!=0 task to Batcher..."
380-
@cd batcher/aligned/ && cargo run --release -- submit \
381-
--proving_system Halo2IPA \
382-
--proof ../../scripts/test_files/halo2_ipa/proof.bin \
383-
--public_input ../../scripts/test_files/halo2_ipa/pub_input.bin \
384-
--vk ../../scripts/test_files/halo2_ipa/params.bin \
385-
--repetitions 5 \
386-
--rpc_url $(RPC_URL) \
387-
--network $(NETWORK)
388-
389-
batcher_send_halo2_kzg_task: batcher/target/release/aligned
390-
@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
391-
@cd batcher/aligned/ && cargo run --release -- submit \
392-
--proving_system Halo2KZG \
393-
--proof ../../scripts/test_files/halo2_kzg/proof.bin \
394-
--public_input ../../scripts/test_files/halo2_kzg/pub_input.bin \
395-
--vk ../../scripts/test_files/halo2_kzg/params.bin \
396-
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
397-
--rpc_url $(RPC_URL) \
398-
--network $(NETWORK)
399-
400-
batcher_send_halo2_kzg_task_burst_5: batcher/target/release/aligned
401-
@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
402-
@cd batcher/aligned/ && cargo run --release -- submit \
403-
--proving_system Halo2KZG \
404-
--proof ../../scripts/test_files/halo2_kzg/proof.bin \
405-
--public_input ../../scripts/test_files/halo2_kzg/pub_input.bin \
406-
--vk ../../scripts/test_files/halo2_kzg/params.bin \
407-
--repetitions 5 \
408-
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
409-
--rpc_url $(RPC_URL) \
410-
--network $(NETWORK)
411-
412368
__GENERATE_PROOFS__:
413369
# TODO add a default proving system
414370

@@ -601,69 +557,6 @@ test_merkle_tree_go_bindings_linux_old: build_merkle_tree_linux_old
601557
@echo "Testing Merkle Tree Go bindings..."
602558
go test ./operator/merkle_tree_old/... -v
603559

604-
__HALO2_KZG_FFI__: ##
605-
build_halo2_kzg_macos:
606-
@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
607-
@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.dylib operator/halo2kzg/lib/libhalo2kzg_verifier.dylib
608-
@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
609-
610-
build_halo2_kzg_linux:
611-
@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
612-
@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.so operator/halo2kzg/lib/libhalo2kzg_verifier.so
613-
@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
614-
615-
test_halo2_kzg_rust_ffi:
616-
@echo "Testing Halo2-KZG Rust FFI source code..."
617-
@cd operator/halo2kzg/lib && cargo t --release
618-
619-
test_halo2_kzg_go_bindings_macos: build_halo2_kzg_macos
620-
@echo "Testing Halo2-KZG Go bindings..."
621-
go test ./operator/halo2kzg/... -v
622-
623-
test_halo2_kzg_go_bindings_linux: build_halo2_kzg_linux
624-
@echo "Testing Halo2-KZG Go bindings..."
625-
go test ./operator/halo2kzg/... -v
626-
627-
generate_halo2_kzg_proof:
628-
@cd scripts/test_files/halo2_kzg && \
629-
cargo clean && \
630-
rm -f params.bin proof.bin pub_input.bin && \
631-
RUST_LOG=info cargo run --release && \
632-
echo "Generating halo2 plonk proof..." && \
633-
echo "Generated halo2 plonk proof!"
634-
635-
__HALO2_IPA_FFI__: ##
636-
build_halo2_ipa_macos:
637-
@cd operator/halo2ipa/lib && cargo build $(RELEASE_FLAG)
638-
@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.dylib operator/halo2ipa/lib/libhalo2ipa_verifier.dylib
639-
@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
640-
641-
build_halo2_ipa_linux:
642-
@cd operator/halo2ipa/lib && cargo build $(RELEASE_FLAG)
643-
@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.so operator/halo2ipa/lib/libhalo2ipa_verifier.so
644-
@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
645-
646-
test_halo2_ipa_rust_ffi:
647-
@echo "Testing Halo2-KZG Rust FFI source code..."
648-
@cd operator/halo2ipa/lib && cargo t --release
649-
650-
test_halo2_ipa_go_bindings_macos: build_halo2_ipa_macos
651-
@echo "Testing Halo2-KZG Go bindings..."
652-
go test ./operator/halo2ipa/... -v
653-
654-
test_halo2_ipa_go_bindings_linux: build_halo2_ipa_linux
655-
@echo "Testing Halo2-KZG Go bindings..."
656-
go test ./operator/halo2ipa/... -v
657-
658-
generate_halo2_ipa_proof:
659-
@cd scripts/test_files/halo2_ipa && \
660-
cargo clean && \
661-
rm -f params.bin proof.bin pub_input.bin && \
662-
RUST_LOG=info cargo run --release && \
663-
echo "Generating halo2 plonk proof..." && \
664-
echo "Generated halo2 plonk proof!"
665-
666-
667560
__BUILD_ALL_FFI__:
668561

669562
build_all_ffi: ## Build all FFIs
@@ -676,8 +569,6 @@ build_all_ffi_macos: ## Build all FFIs for macOS
676569
@$(MAKE) build_risc_zero_macos
677570
@$(MAKE) build_merkle_tree_macos
678571
@$(MAKE) build_merkle_tree_macos_old
679-
@$(MAKE) build_halo2_ipa_macos
680-
@$(MAKE) build_halo2_kzg_macos
681572
@echo "All macOS FFIs built successfully."
682573

683574
build_all_ffi_linux: ## Build all FFIs for Linux
@@ -686,8 +577,6 @@ build_all_ffi_linux: ## Build all FFIs for Linux
686577
@$(MAKE) build_risc_zero_linux
687578
@$(MAKE) build_merkle_tree_linux
688579
@$(MAKE) build_merkle_tree_linux_old
689-
@$(MAKE) build_halo2_ipa_linux
690-
@$(MAKE) build_halo2_kzg_linux
691580
@echo "All Linux FFIs built successfully."
692581

693582

0 commit comments

Comments
 (0)