Skip to content

Commit 7a83d1a

Browse files
fix: unhardcode sender ethereum address (#231)
Co-authored-by: jotabulacios <jbulacios@fi.uba.ar>
1 parent 5895f51 commit 7a83d1a

5 files changed

Lines changed: 38 additions & 19 deletions

File tree

Makefile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,26 @@ batcher_send_sp1_task:
132132
@cd batcher/client/ && cargo run --release -- \
133133
--proving_system SP1 \
134134
--proof test_files/sp1/sp1_fibonacci.proof \
135-
--vm_program test_files/sp1/sp1_fibonacci-elf
135+
--vm_program test_files/sp1/sp1_fibonacci-elf \
136+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
136137

137138
batcher_send_sp1_burst_5:
138139
@echo "Sending SP1 fibonacci task to Batcher..."
139140
@cd batcher/client/ && cargo run --release -- \
140141
--proving_system SP1 \
141142
--proof test_files/sp1/sp1_fibonacci.proof \
142143
--vm_program test_files/sp1/sp1_fibonacci-elf \
143-
--repetitions 5
144+
--repetitions 5 \
145+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
144146

145147
batcher_send_plonk_bn254_task: batcher/client/target/release/batcher-client
146148
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
147149
@cd batcher/client/ && cargo run --release -- \
148150
--proving_system GnarkPlonkBn254 \
149151
--proof test_files/plonk_bn254/plonk.proof \
150152
--public_input test_files/plonk_bn254/plonk_pub_input.pub \
151-
--vk test_files/plonk_bn254/plonk.vk
153+
--vk test_files/plonk_bn254/plonk.vk \
154+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
152155

153156
batcher_send_plonk_bls12_381_task: batcher/client/target/release/batcher-client
154157
@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
@@ -157,6 +160,7 @@ batcher_send_plonk_bls12_381_task: batcher/client/target/release/batcher-client
157160
--proof test_files/plonk_bls12_381/plonk.proof \
158161
--public_input test_files/plonk_bls12_381/plonk_pub_input.pub \
159162
--vk test_files/plonk_bls12_381/plonk.vk \
163+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
160164

161165

162166
batcher_send_groth16_bn254_task: batcher/client/target/release/batcher-client
@@ -165,7 +169,8 @@ batcher_send_groth16_bn254_task: batcher/client/target/release/batcher-client
165169
--proving_system Groth16Bn254 \
166170
--proof test_files/groth16/ineq_1_groth16.proof \
167171
--public_input test_files/groth16/ineq_1_groth16.pub \
168-
--vk test_files/groth16/ineq_1_groth16.vk
172+
--vk test_files/groth16/ineq_1_groth16.vk \
173+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
169174

170175
batcher_send_groth16_burst_5: batcher/client/target/release/batcher-client
171176
@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
@@ -174,7 +179,8 @@ batcher_send_groth16_burst_5: batcher/client/target/release/batcher-client
174179
--proof test_files/groth16/ineq_1_groth16.proof \
175180
--public_input test_files/groth16/ineq_1_groth16.pub \
176181
--vk test_files/groth16/ineq_1_groth16.vk \
177-
--repetitions 5
182+
--repetitions 5 \
183+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
178184

179185
batcher_send_infinite_groth16: ./batcher/client/target/release/batcher-client ## Send a different Groth16 BN254 proof using the task sender every 3 seconds
180186
@mkdir -p task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs

README.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ cargo run -- \
4040
--proving_system <SP1|GnarkPlonkBn254|GnarkPlonkBls12_381|Groth16Bn254> \
4141
--proof <proof_file> \
4242
--vm_program <vm_program_file> \
43-
--conn batcher.alignedlayer.com
43+
--conn batcher.alignedlayer.com \
44+
--proof_generator_addr <proof_generator_addr>
4445
```
4546

4647
**Example**
@@ -51,7 +52,8 @@ cargo run -- \
5152
--proving_system SP1 \
5253
--proof test_files/sp1/sp1_fibonacci.proof \
5354
--vm_program test_files/sp1/sp1_fibonacci-elf \
54-
--conn batcher.alignedlayer.com ;
55+
--conn batcher.alignedlayer.com \
56+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 ;
5557
popd
5658
```
5759

@@ -61,7 +63,8 @@ cargo run -- \
6163
--proving_system SP1 \
6264
--proof test_files/sp1/sp1_fibonacci.proof \
6365
--vm_program test_files/sp1/sp1_fibonacci-elf \
64-
--conn batcher.alignedlayer.com ; \
66+
--conn batcher.alignedlayer.com \
67+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 ;
6568
popd
6669
```
6770

@@ -76,7 +79,8 @@ cargo run -- \
7679
--proof <proof_file> \
7780
--public_input <public_input_file> \
7881
--vk <verification_key_file> \
79-
--conn batcher.alignedlayer.com ;
82+
--conn batcher.alignedlayer.com \
83+
--proof_generator_addr <proof_generator_addr> ;
8084
popd
8185
```
8286

@@ -89,7 +93,8 @@ cargo run --release -- \
8993
--proof test_files/plonk_bn254/plonk.proof \
9094
--public_input test_files/plonk_bn254/plonk_pub_input.pub \
9195
--vk test_files/plonk_bn254/plonk.vk \
92-
--conn batcher.alignedlayer.com ;
96+
--conn batcher.alignedlayer.com \
97+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 ;
9398
popd
9499
```
95100

@@ -100,7 +105,8 @@ cargo run -- \
100105
--proof test_files/plonk_bls12_381/plonk.proof \
101106
--public_input test_files/plonk_bls12_381/plonk_pub_input.pub \
102107
--vk test_files/plonk_bls12_381/plonk.vk \
103-
--conn batcher.alignedlayer.com ;
108+
--conn batcher.alignedlayer.com \
109+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 ;
104110
popd
105111
```
106112

@@ -111,7 +117,8 @@ cargo run -- \
111117
--proof test_files/groth16/ineq_1_groth16.proof \
112118
--public_input test_files/groth16/ineq_1_groth16.pub \
113119
--vk test_files/groth16/ineq_1_groth16.vk \
114-
--conn batcher.alignedlayer.com
120+
--conn batcher.alignedlayer.com \
121+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 ;
115122
popd
116123
```
117124

@@ -464,6 +471,7 @@ cd batcher/client/ && cargo run --release -- \
464471
--proof <proof_file> \
465472
--public-input <public_input_file> \
466473
--vm_program <vm_program_file> \
474+
--proof_generator_addr <proof_generator_addr>
467475
```
468476

469477

batcher/client/generate_proof_and_send.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ go run task_sender/test_examples/gnark_groth16_bn254_infinite_script/cmd/main.go
2121
--repetitions $repetitions \
2222
--proof task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.proof \
2323
--public_input task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.pub \
24-
--vk task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk
25-
26-
24+
--vk task_sender/test_examples/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk \
25+
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657

batcher/client/send_infinite_tasks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ do
1919

2020
go run task_sender/test_examples/gnark_groth16_bn254_infinite_script/cmd/main.go $counter
2121

22-
cd ./batcher/client && cargo run --release -- --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
22+
cd ./batcher/client && cargo run --release -- --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
2323
cd ../..
2424

2525
sleep $timer

batcher/client/src/main.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ struct Args {
4949
default_value = "1"
5050
)]
5151
repetitions: u32,
52+
53+
#[arg(
54+
name = "Proof generator address",
55+
long = "proof_generator_addr",
56+
default_value = "."
57+
)]
58+
proof_generator_addr: String,
59+
5260
}
5361

5462
#[tokio::main]
@@ -91,9 +99,7 @@ async fn main() {
9199
warn!("No VM program code file provided, continuing without VM program code...");
92100
}
93101

94-
// FIXME(marian): Dummy address for testing, this should be get by parameter
95-
let addr_str = "0x66f9664f97F2b50F62D13eA064982f936dE76657";
96-
let proof_generator_addr: Address = Address::parse_checksummed(addr_str, None).unwrap();
102+
let proof_generator_addr: Address = Address::parse_checksummed(&args.proof_generator_addr, None).unwrap();
97103

98104
let verification_data = VerificationData {
99105
proving_system,

0 commit comments

Comments
 (0)