Skip to content

Commit 3689ae5

Browse files
committed
chore: add rpc_url and beacon_url based on NETWORK param and verify_agg_proof for every network
1 parent c01526e commit 3689ae5

1 file changed

Lines changed: 22 additions & 11 deletions

File tree

Makefile

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
SHELL := /bin/bash
44
OS := $(shell uname -s)
55

6+
NETWORK=devnet # devnet | holesky-stage | holesky
7+
ifeq ($(NETWORK)), devnet)
8+
RPC_URL ?= http://localhost:8545
9+
BEACON_URL ?= http://localhost:58001
10+
endif
11+
12+
ifeq ($(NETWORK), holesky)
13+
RPC_URL ?= https://ethereum-holesky-rpc.publicnode.com
14+
BEACON_URL ?= https://eth-beacon-chain-holesky.drpc.org/rest/
15+
endif
16+
17+
ifeq ($(NETWORK), holesky-stage)
18+
RPC_URL ?= https://ethereum-holesky-rpc.publicnode.com
19+
BEACON_URL ?= https://eth-beacon-chain-holesky.drpc.org/rest/
20+
endif
21+
622
CONFIG_FILE?=config-files/config.yaml
723
export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
824
AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
@@ -190,30 +206,29 @@ start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Sta
190206
start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
191207
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
192208

193-
194-
verify_aggregated_proof_sp1_holesky_stage:
209+
verify_aggregated_proof_sp1:
195210
@echo "Verifying SP1 in aggregated proofs on holesky..."
196211
@cd batcher/aligned/ && \
197212
cargo run verify-agg-proof \
198-
--network holesky-stage \
213+
--network $(NETWORK) \
199214
--from-block $(FROM_BLOCK) \
200215
--proving_system SP1 \
201216
--public_input ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.pub \
202217
--program-id-file ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.vk \
203218
--beacon_url $(BEACON_URL) \
204-
--rpc_url https://ethereum-holesky-rpc.publicnode.com
219+
--rpc_url $(RPC_URL)
205220

206-
verify_aggregated_proof_risc0_holesky_stage:
221+
verify_aggregated_proof_risc0:
207222
@echo "Verifying RISC0 in aggregated proofs on holesky..."
208223
@cd batcher/aligned/ && \
209224
cargo run verify-agg-proof \
210-
--network holesky-stage \
225+
--network $(NETWORK) \
211226
--from-block $(FROM_BLOCK) \
212227
--proving_system Risc0 \
213228
--program-id-file ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
214229
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
215230
--beacon_url $(BEACON_URL) \
216-
--rpc_url https://ethereum-holesky-rpc.publicnode.com
231+
--rpc_url $(RPC_URL)
217232

218233
install_aggregation_mode: ## Install the aggregation mode with proving enabled
219234
cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator
@@ -459,10 +474,6 @@ build_batcher_client:
459474
batcher/target/release/aligned:
460475
@cd batcher/aligned && cargo b --release
461476

462-
463-
RPC_URL=http://localhost:8545
464-
NETWORK=devnet # devnet | holesky-stage | holesky
465-
466477
batcher_send_sp1_task:
467478
@echo "Sending SP1 fibonacci task to Batcher..."
468479
@cd batcher/aligned/ && cargo run --release -- submit \

0 commit comments

Comments
 (0)