Skip to content

Commit c08304c

Browse files
MarcosNicolauMarcosNicolau
committed
refactor: make targets
1 parent b5ebe9a commit c08304c

1 file changed

Lines changed: 50 additions & 50 deletions

File tree

‎Makefile‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggreg
192192

193193
verify_aggregated_proof_sp1_holesky_stage:
194194
@echo "Verifying SP1 in aggregated proofs on holesky..."
195-
@cd batcher/aligned/ && \
195+
@cd crates/cli/ && \
196196
cargo run verify-agg-proof \
197197
--network holesky-stage \
198198
--from-block $(FROM_BLOCK) \
@@ -204,7 +204,7 @@ verify_aggregated_proof_sp1_holesky_stage:
204204

205205
verify_aggregated_proof_risc0_holesky_stage:
206206
@echo "Verifying RISC0 in aggregated proofs on holesky..."
207-
@cd batcher/aligned/ && \
207+
@cd crates/cli/ && \
208208
cargo run verify-agg-proof \
209209
--network holesky-stage \
210210
--from-block $(FROM_BLOCK) \
@@ -424,48 +424,48 @@ BURST_SIZE ?= 5
424424
user_fund_payment_service:
425425
@. ./scripts/user_fund_payment_service_devnet.sh
426426

427-
./batcher/aligned-batcher/.env:
428-
@echo "To start the Batcher ./batcher/aligned-batcher/.env needs to be manually set"; false;
427+
./crates/batcher/.env:
428+
@echo "To start the Batcher ./crates/batcher/.env needs to be manually set"; false;
429429

430-
batcher_start: ./batcher/aligned-batcher/.env user_fund_payment_service
430+
batcher_start: ./crates/batcher/.env user_fund_payment_service
431431
@echo "Starting Batcher..."
432-
@cargo run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./batcher/aligned-batcher/.env
432+
@cargo run --manifest-path ./crates/batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./crates/batcher/.env
433433

434434
batcher_start_local: user_fund_payment_service
435435
@echo "Starting Batcher..."
436436
@$(MAKE) run_storage &
437-
@cargo run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./batcher/aligned-batcher/.env.dev
437+
@cargo run --manifest-path ./crates/batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./crates/batcher/.env.dev
438438

439439
batcher_start_local_no_fund:
440440
@echo "Starting Batcher..."
441441
@$(MAKE) run_storage &
442-
@cargo run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./batcher/aligned-batcher/.env.dev
442+
@cargo run --manifest-path ./crates/batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./crates/batcher/.env.dev
443443

444444
install_batcher:
445-
@cargo install --path batcher/aligned-batcher
445+
@cargo install --path crates/batcher
446446

447447
install_aligned:
448-
@./batcher/aligned/install_aligned.sh
448+
@./crates/cli/install_aligned.sh
449449

450450
uninstall_aligned:
451451
@rm -rf ~/.aligned && echo "Aligned uninstalled"
452452

453453
install_aligned_compiling:
454-
@cargo install --path batcher/aligned
454+
@cargo install --path crates/cli
455455

456456
build_batcher_client:
457-
@cd batcher/aligned && cargo b --release
457+
@cd crates/cli && cargo b --release
458458

459-
batcher/target/release/aligned:
460-
@cd batcher/aligned && cargo b --release
459+
crates/target/release/aligned:
460+
@cd crates/cli && cargo b --release
461461

462462

463463
RPC_URL=http://localhost:8545
464464
NETWORK=devnet # devnet | holesky-stage | holesky
465465

466466
batcher_send_sp1_task:
467467
@echo "Sending SP1 fibonacci task to Batcher..."
468-
@cd batcher/aligned/ && cargo run --release -- submit \
468+
@cd crates/cli/ && cargo run --release -- submit \
469469
--proving_system SP1 \
470470
--proof ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.proof \
471471
--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.elf \
@@ -475,7 +475,7 @@ batcher_send_sp1_task:
475475

476476
batcher_send_sp1_burst:
477477
@echo "Sending SP1 fibonacci task to Batcher..."
478-
@cd batcher/aligned/ && cargo run --release -- submit \
478+
@cd crates/cli/ && cargo run --release -- submit \
479479
--proving_system SP1 \
480480
--proof ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.proof \
481481
--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.elf \
@@ -486,11 +486,11 @@ batcher_send_sp1_burst:
486486

487487
batcher_send_infinite_sp1:
488488
@echo "Sending infinite SP1 fibonacci task to Batcher..."
489-
@./batcher/aligned/send_infinite_sp1_tasks/send_infinite_sp1_tasks.sh
489+
@./crates/cli/send_infinite_sp1_tasks/send_infinite_sp1_tasks.sh
490490

491491
batcher_send_risc0_task:
492492
@echo "Sending Risc0 fibonacci task to Batcher..."
493-
@cd batcher/aligned/ && cargo run --release -- submit \
493+
@cd crates/cli/ && cargo run --release -- submit \
494494
--proving_system Risc0 \
495495
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.proof \
496496
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
@@ -501,7 +501,7 @@ batcher_send_risc0_task:
501501

502502
batcher_send_risc0_task_no_pub_input:
503503
@echo "Sending Risc0 no pub input task to Batcher..."
504-
@cd batcher/aligned/ && cargo run --release -- submit \
504+
@cd crates/cli/ && cargo run --release -- submit \
505505
--proving_system Risc0 \
506506
--proof ../../scripts/test_files/risc_zero/no_public_inputs/risc_zero_no_pub_input_2_0.proof \
507507
--vm_program ../../scripts/test_files/risc_zero/no_public_inputs/no_pub_input_id_2_0.bin \
@@ -511,7 +511,7 @@ batcher_send_risc0_task_no_pub_input:
511511

512512
batcher_send_risc0_burst:
513513
@echo "Sending Risc0 fibonacci task to Batcher..."
514-
@cd batcher/aligned/ && cargo run --release -- submit \
514+
@cd crates/cli/ && cargo run --release -- submit \
515515
--proving_system Risc0 \
516516
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.proof \
517517
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
@@ -521,9 +521,9 @@ batcher_send_risc0_burst:
521521
--rpc_url $(RPC_URL) \
522522
--network $(NETWORK)
523523

524-
batcher_send_plonk_bn254_task: batcher/target/release/aligned
524+
batcher_send_plonk_bn254_task: crates/target/release/aligned
525525
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
526-
@cd batcher/aligned/ && cargo run --release -- submit \
526+
@cd crates/cli/ && cargo run --release -- submit \
527527
--proving_system GnarkPlonkBn254 \
528528
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
529529
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
@@ -532,9 +532,9 @@ batcher_send_plonk_bn254_task: batcher/target/release/aligned
532532
--rpc_url $(RPC_URL) \
533533
--network $(NETWORK)
534534

535-
batcher_send_plonk_bn254_burst: batcher/target/release/aligned
535+
batcher_send_plonk_bn254_burst: crates/target/release/aligned
536536
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
537-
@cd batcher/aligned/ && cargo run --release -- submit \
537+
@cd crates/cli/ && cargo run --release -- submit \
538538
--proving_system GnarkPlonkBn254 \
539539
--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
540540
--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
@@ -544,9 +544,9 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
544544
--repetitions $(BURST_SIZE) \
545545
--network $(NETWORK)
546546

547-
batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
547+
batcher_send_plonk_bls12_381_task: crates/target/release/aligned
548548
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
549-
@cd batcher/aligned/ && cargo run --release -- submit \
549+
@cd crates/cli/ && cargo run --release -- submit \
550550
--proving_system GnarkPlonkBls12_381 \
551551
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
552552
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
@@ -555,9 +555,9 @@ batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
555555
--rpc_url $(RPC_URL) \
556556
--network $(NETWORK)
557557

558-
batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
558+
batcher_send_plonk_bls12_381_burst: crates/target/release/aligned
559559
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
560-
@cd batcher/aligned/ && cargo run --release -- submit \
560+
@cd crates/cli/ && cargo run --release -- submit \
561561
--proving_system GnarkPlonkBls12_381 \
562562
--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
563563
--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
@@ -567,9 +567,9 @@ batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
567567
--rpc_url $(RPC_URL) \
568568
--network $(NETWORK)
569569

570-
batcher_send_groth16_bn254_task: batcher/target/release/aligned
570+
batcher_send_groth16_bn254_task: crates/target/release/aligned
571571
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
572-
@cd batcher/aligned/ && cargo run --release -- submit \
572+
@cd crates/cli/ && cargo run --release -- submit \
573573
--proving_system Groth16Bn254 \
574574
--proof ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.proof \
575575
--public_input ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.pub \
@@ -578,91 +578,91 @@ batcher_send_groth16_bn254_task: batcher/target/release/aligned
578578
--rpc_url $(RPC_URL) \
579579
--network $(NETWORK)
580580

581-
batcher_send_infinite_groth16: batcher/target/release/aligned ## Send a different Groth16 BN254 proof using the client every 3 seconds
581+
batcher_send_infinite_groth16: crates/target/release/aligned ## Send a different Groth16 BN254 proof using the client every 3 seconds
582582
@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
583583
@echo "Sending a different GROTH16 BN254 proof in a loop every n seconds..."
584-
@./batcher/aligned/send_infinite_tasks.sh 4
584+
@./crates/cli/send_infinite_tasks.sh 4
585585

586-
batcher_send_burst_groth16: batcher/target/release/aligned
586+
batcher_send_burst_groth16: crates/target/release/aligned
587587
@echo "Sending a burst of tasks to Batcher..."
588588
@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
589-
@./batcher/aligned/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
589+
@./crates/cli/send_burst_tasks.sh $(BURST_SIZE) $(START_COUNTER)
590590

591591
batcher_send_proof_with_random_address:
592-
@cd batcher/aligned/ && ./send_proof_with_random_address.sh
592+
@cd crates/cli/ && ./send_proof_with_random_address.sh
593593

594594
batcher_send_burst_with_random_address:
595-
@cd batcher/aligned/ && ./send_burst_with_random_address.sh
595+
@cd crates/cli/ && ./send_burst_with_random_address.sh
596596

597597
__TASK_SENDER__:
598598
BURST_TIME_SECS ?= 3
599599

600600
task_sender_generate_groth16_proofs:
601-
@cd batcher/aligned-task-sender && \
601+
@cd crates/task-sender && \
602602
cargo run --release -- generate-proofs \
603603
--number-of-proofs $(NUMBER_OF_PROOFS) --proof-type groth16 \
604604
--dir-to-save-proofs $(CURDIR)/scripts/test_files/task_sender/proofs
605605

606606
# ===== DEVNET =====
607607
task_sender_fund_wallets_devnet:
608-
@cd batcher/aligned-task-sender && \
608+
@cd crates/task-sender && \
609609
cargo run --release -- generate-and-fund-wallets \
610610
--eth-rpc-url http://localhost:8545 \
611611
--network devnet \
612612
--amount-to-deposit 1 \
613613
--amount-to-deposit-to-aligned 0.9999 \
614-
--private-keys-filepath $(CURDIR)/batcher/aligned-task-sender/wallets/devnet
614+
--private-keys-filepath $(CURDIR)/crates/task-sender/wallets/devnet
615615

616616
task_sender_send_infinite_proofs_devnet:
617-
@cd batcher/aligned-task-sender && \
617+
@cd crates/task-sender && \
618618
cargo run --release -- send-infinite-proofs \
619619
--burst-size $(BURST_SIZE) --burst-time-secs $(BURST_TIME_SECS) \
620620
--eth-rpc-url http://localhost:8545 \
621621
--network devnet \
622622
--proofs-dirpath $(CURDIR)/scripts/test_files/task_sender/proofs \
623-
--private-keys-filepath $(CURDIR)/batcher/aligned-task-sender/wallets/devnet
623+
--private-keys-filepath $(CURDIR)/crates/task-sender/wallets/devnet
624624

625625
task_sender_test_connections_devnet:
626-
@cd batcher/aligned-task-sender && \
626+
@cd crates/task-sender && \
627627
cargo run --release -- test-connections \
628628
--num-senders $(NUM_SENDERS) \
629629
--network devnet
630630

631631
# ===== HOLESKY-STAGE =====
632632
task_sender_generate_and_fund_wallets_holesky_stage:
633-
@cd batcher/aligned-task-sender && \
633+
@cd crates/task-sender && \
634634
cargo run --release -- generate-and-fund-wallets \
635635
--eth-rpc-url https://ethereum-holesky-rpc.publicnode.com \
636636
--network holesky-stage \
637637
--funding-wallet-private-key $(FUNDING_WALLET_PRIVATE_KEY) \
638638
--number-wallets $(NUM_WALLETS) \
639639
--amount-to-deposit $(AMOUNT_TO_DEPOSIT) \
640640
--amount-to-deposit-to-aligned $(AMOUNT_TO_DEPOSIT_TO_ALIGNED) \
641-
--private-keys-filepath $(CURDIR)/batcher/aligned-task-sender/wallets/holesky-stage
641+
--private-keys-filepath $(CURDIR)/crates/task-sender/wallets/holesky-stage
642642

643643
task_sender_send_infinite_proofs_holesky_stage:
644-
@cd batcher/aligned-task-sender && \
644+
@cd crates/task-sender && \
645645
cargo run --release -- send-infinite-proofs \
646646
--burst-size $(BURST_SIZE) --burst-time-secs $(BURST_TIME_SECS) \
647647
--eth-rpc-url https://ethereum-holesky-rpc.publicnode.com \
648648
--network holesky-stage \
649649
--proofs-dirpath $(CURDIR)/scripts/test_files/task_sender/proofs \
650-
--private-keys-filepath $(CURDIR)/batcher/aligned-task-sender/wallets/holesky-stage
650+
--private-keys-filepath $(CURDIR)/crates/task-sender/wallets/holesky-stage
651651

652652
task_sender_test_connections_holesky_stage:
653-
@cd batcher/aligned-task-sender && \
653+
@cd crates/task-sender && \
654654
cargo run --release -- test-connections \
655655
--num-senders $(NUM_SENDERS) \
656656
--network holesky-stage
657657

658658
__UTILS__:
659659
aligned_get_user_balance_devnet:
660-
@cd batcher/aligned/ && cargo run --release -- get-user-balance \
660+
@cd crates/cli/ && cargo run --release -- get-user-balance \
661661
--user_addr $(USER_ADDR) \
662662
--network devnet
663663

664664
aligned_get_user_balance_holesky:
665-
@cd batcher/aligned/ && cargo run --release -- get-user-balance \
665+
@cd crates/cli/ && cargo run --release -- get-user-balance \
666666
--rpc_url https://ethereum-holesky-rpc.publicnode.com \
667667
--network holesky \
668668
--user_addr $(USER_ADDR)
@@ -1334,7 +1334,7 @@ ethereum_package_rm: ## Stops and removes the ethereum_package environment and u
13341334
batcher_start_ethereum_package: user_fund_payment_service
13351335
@echo "Starting Batcher..."
13361336
@$(MAKE) run_storage &
1337-
@cargo run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher-ethereum-package.yaml --env-file ./batcher/aligned-batcher/.env.dev
1337+
@cargo run --manifest-path ./crates/batcher/Cargo.toml --release -- --config ./config-files/config-batcher-ethereum-package.yaml --env-file ./crates/batcher/.env.dev
13381338

13391339
aggregator_start_ethereum_package:
13401340
$(MAKE) aggregator_start AGG_CONFIG_FILE=config-files/config-aggregator-ethereum-package.yaml

0 commit comments

Comments
 (0)