Skip to content

Commit 3106a3c

Browse files
NicolasRampolditaturosatiMauroToscano
authored
refactor: delete task sender (#531)
Co-authored-by: Tatu <65305492+srosati@users.noreply.github.com> Co-authored-by: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com>
1 parent 3ba1dca commit 3106a3c

110 files changed

Lines changed: 145 additions & 670 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,3 @@ jobs:
3030
run: go build operator/cmd/main.go
3131
- name: Build aggregator
3232
run: go build aggregator/cmd/main.go
33-
- name: Build task sender
34-
run: go build task_sender/cmd/main.go

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ out
66
cache
77
**/build
88
**/target
9-
task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/**
9+
scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/**
1010
batcher/aligned/batch_inclusion_responses/*
1111
**/aligned_verification_data
1212
**/broadcast

Makefile

Lines changed: 55 additions & 183 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ rm -rf ~/.aligned/aligned_verification_data/ &&
4646
aligned submit \
4747
--proving_system SP1 \
4848
--proof ~/.aligned/test_files/sp1_fibonacci.proof \
49-
--vm_program ~/.aligned/test_files/sp1_fibonacci-elf \
49+
--vm_program ~/.aligned/test_files/sp1_fibonacci.elf \
5050
--aligned_verification_data_path ~/.aligned/aligned_verification_data \
5151
--conn wss://batcher.alignedlayer.com
5252
```

README_SEND_PROOFS.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ aligned submit \
5757
rm -rf ./aligned_verification_data/ &&
5858
aligned submit \
5959
--proving_system SP1 \
60-
--proof ./batcher/aligned/test_files/sp1/sp1_fibonacci.proof \
61-
--vm_program ./batcher/aligned/test_files/sp1/sp1_fibonacci-elf \
60+
--proof ./scripts/test_files/sp1/sp1_fibonacci.proof \
61+
--vm_program ./scripts/test_files/sp1/sp1_fibonacci.elf \
6262
--conn wss://batcher.alignedlayer.com \
6363
--keystore_path ~/.aligned_keystore/keystore0
6464
```
@@ -85,8 +85,8 @@ aligned submit \
8585
rm -rf ~/.aligned/aligned_verification_data/ &&
8686
aligned submit \
8787
--proving_system Risc0 \
88-
--proof ./batcher/aligned/test_files/risc_zero/risc_zero_fibonacci.proof \
89-
--vm_program ./batcher/aligned/test_files/risc_zero/fibonacci_id.bin \
88+
--proof ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
89+
--vm_program ./scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
9090
--aligned_verification_data_path ~/.aligned/aligned_verification_data \
9191
--keystore_path ~/.aligned_keystore/keystore0
9292
```
@@ -114,9 +114,9 @@ aligned submit \
114114
rm -rf ./aligned_verification_data/ &&
115115
aligned submit \
116116
--proving_system GnarkPlonkBn254 \
117-
--proof ./batcher/aligned/test_files/plonk_bn254/plonk.proof \
118-
--public_input ./batcher/aligned/test_files/plonk_bn254/plonk_pub_input.pub \
119-
--vk ./batcher/aligned/test_files/plonk_bn254/plonk.vk \
117+
--proof ./scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
118+
--public_input ./scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
119+
--vk ./scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
120120
--conn wss://batcher.alignedlayer.com \
121121
--keystore_path ~/.aligned_keystore/keystore0
122122
```
@@ -125,9 +125,9 @@ aligned submit \
125125
rm -rf ./aligned_verification_data/ &&
126126
aligned submit \
127127
--proving_system GnarkPlonkBls12_381 \
128-
--proof ./batcher/aligned/test_files/plonk_bls12_381/plonk.proof \
129-
--public_input ./batcher/aligned/test_files/plonk_bls12_381/plonk_pub_input.pub \
130-
--vk ./batcher/aligned/test_files/plonk_bls12_381/plonk.vk \
128+
--proof ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
129+
--public_input ./scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
130+
--vk ./scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
131131
--conn wss://batcher.alignedlayer.com \
132132
--keystore_path ~/.aligned_keystore/keystore0
133133
```
@@ -136,9 +136,9 @@ aligned submit \
136136
rm -rf ./aligned_verification_data/ &&
137137
aligned submit \
138138
--proving_system Groth16Bn254 \
139-
--proof ./batcher/aligned/test_files/groth16/ineq_1_groth16.proof \
140-
--public_input ./batcher/aligned/test_files/groth16/ineq_1_groth16.pub \
141-
--vk ./batcher/aligned/test_files/groth16/ineq_1_groth16.vk \
139+
--proof ./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.proof \
140+
--public_input ./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.pub \
141+
--vk ./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.vk \
142142
--conn wss://batcher.alignedlayer.com \
143143
--keystore_path ~/.aligned_keystore/keystore0
144144
```

batcher/aligned/generate_proof_and_send.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ else
2020
fi
2121

2222
echo "Generating proof $x != 0"
23-
go run task_sender/test_examples/gnark_groth16_bn254_infinite_script/cmd/main.go $x
23+
go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go $x
2424

2525
./batcher/target/release/aligned submit \
2626
--proving_system Groth16Bn254 \
2727
--repetitions $repetitions \
28-
--proof task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.proof \
29-
--public_input task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.pub \
30-
--vk task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk \
28+
--proof scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.proof \
29+
--public_input scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.pub \
30+
--vk scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk \
3131
--private_key $USER_PRIVATE_KEY \
3232
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657

batcher/aligned/get_proof_test_files.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
SP1_ELF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/batcher/aligned/test_files/sp1/sp1_fibonacci-elf"
4-
SP1_PROOF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/batcher/aligned/test_files/sp1/sp1_fibonacci.proof"
3+
SP1_ELF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/scripts/test_files/sp1/sp1_fibonacci.elf"
4+
SP1_PROOF_URL="https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/scripts/test_files/sp1/sp1_fibonacci.proof"
55

6-
SP1_ELF_NAME="sp1_fibonacci-elf"
6+
SP1_ELF_NAME="sp1_fibonacci.elf"
77
SP1_PROOF_NAME="sp1_fibonacci.proof"
88

99
BASE_DIR=$HOME

batcher/aligned/send_infinite_sp1_tasks/send_infinite_sp1_tasks.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ do
2222

2323
aligned submit \
2424
--proving_system SP1 \
25-
--proof test_files/sp1/sp1_fibonacci.proof \
26-
--vm_program test_files/sp1/sp1_fibonacci-elf \
25+
--proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
26+
--vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
2727
--proof_generator_addr "$random_addr"
2828

2929
sleep "$timer"

batcher/aligned/send_infinite_tasks.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ while true
1717
do
1818
echo "Generating proof $counter != 0"
1919

20-
go run task_sender/test_examples/gnark_groth16_bn254_infinite_script/cmd/main.go $counter
20+
go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go $counter
2121

22-
cd ./batcher/aligned && cargo run --release -- submit --proving_system Groth16Bn254 --proof ../../task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.proof --public_input ../../task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.pub --vk ../../task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.vk --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
22+
cd ./batcher/aligned && cargo run --release -- submit --proving_system Groth16Bn254 --proof ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.proof --public_input ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.pub --vk ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${counter}_groth16.vk --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
2323
cd ../..
2424

2525
sleep $timer

batcher/aligned/test_files/batch_inclusion_data/17bd5db82ef731ba3710b22df8e3c1ca6a5cde0a8d1ca1681664e4ff9b25574f_295.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)