Skip to content

Commit 2f5cf5f

Browse files
committed
Merge branch 'avoid_recompiling_to_start_aggregator' of github.com:yetanotherco/aligned_layer into avoid_recompiling_to_start_aggregator
2 parents 06b80bd + 1b156d2 commit 2f5cf5f

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,32 +172,27 @@ reset_last_aggregated_block:
172172
@echo "Resetting last aggregated block..."
173173
@echo '{"last_aggregated_block":0}' > config-files/proof-aggregator.last_aggregated_block.json
174174

175-
176175
### All Dev proof aggregator receipts with no real proving
177176
./aggregation_mode/target/release/proof_aggregator_dev: $(wildcard ./aggregation_mode/src/*) $(wildcard ./aggregation_programs/risc0/src/*) $(wildcard ./aggregation_programs/sp1/src/*)
178177
AGGREGATOR=$(AGGREGATOR) cargo build --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator_dev
179178

180-
181179
start_proof_aggregator_dev: is_aggregator_set reset_last_aggregated_block ./aggregation_mode/target/release/proof_aggregator_dev ## Starts proof aggregator with mock proofs (DEV mode)
182180
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator_dev config-files/config-proof-aggregator-mock.yaml
183181

184182
start_proof_aggregator_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
185183
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator_dev config-files/config-proof-aggregator-mock-ethereum-package.yaml
186184

187185
### All CPU proof aggregator receipts
188-
189186
./aggregation_mode/target/release/proof_aggregator_cpu: $(wildcard ./aggregation_mode/src/*) $(wildcard ./aggregation_programs/risc0/src/*) $(wildcard ./aggregation_programs/sp1/src/*)
190187
AGGREGATOR=$(AGGREGATOR) cargo build --features prove --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator_cpu
191188

192189
start_proof_aggregator: ./aggregation_mode/target/release/proof_aggregator_cpu is_aggregator_set ## Starts proof aggregator with proving activated
193-
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator config-files/config-proof-aggregator.yaml
190+
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator_cpu config-files/config-proof-aggregator.yaml
194191

195-
196-
start_proof_aggregator_ethereum_package: ./aggregation_mode/target/release/proof_aggregator is_aggregator_set ## Starts proof aggregator with proving activated in ethereum package
197-
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator config-files/config-proof-aggregator-ethereum-package.yaml
192+
start_proof_aggregator_ethereum_package: ./aggregation_mode/target/release/proof_aggregator_cpu is_aggregator_set ## Starts proof aggregator with proving activated in ethereum package
193+
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator_cpu config-files/config-proof-aggregator-ethereum-package.yaml
198194

199195
### All GPU proof aggregator receipts
200-
201196
./aggregation_mode/target/release/proof_aggregator_gpu: $(wildcard ./aggregation_mode/src/*) $(wildcard ./aggregation_programs/risc0/src/*) $(wildcard ./aggregation_programs/sp1/src/*)
202197
AGGREGATOR=$(AGGREGATOR) cargo build --features "prove,gpu" --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator_gpu
203198

@@ -207,7 +202,6 @@ start_proof_aggregator_gpu: ./aggregation_mode/target/release/proof_aggregator_g
207202
start_proof_aggregator_gpu_ethereum_package: ./aggregation_mode/target/release/proof_aggregator_gpu is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
208203
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda ./aggregation_mode/target/release/proof_aggregator_gpu config-files/config-proof-aggregator-ethereum-package.yaml
209204

210-
211205
verify_aggregated_proof_sp1_holesky_stage:
212206
@echo "Verifying SP1 in aggregated proofs on holesky..."
213207
@cd batcher/aligned/ && \

0 commit comments

Comments
 (0)