Skip to content

Commit

Permalink
fix the bug that gen_config generate wrong configs
Browse files Browse the repository at this point in the history
  • Loading branch information
evan committed Mar 28, 2024
1 parent b8bd2d6 commit 000def8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
18 changes: 11 additions & 7 deletions service/config/gen_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ if [ "$tls" = true ]; then
for prover in "${provers[@]}"; do
prover_name="prover${id}"
IFS=':' read -r host port <<< "$prover"
bash certgen.sh --cn $prover_name --ssl-dns $host
bash certgen.sh --cn $prover_name --ssl-dns ${host}
rm -rf ${prover_name}.csr
((id++))
done
bash certgen.sh --cn client --ssl-dns localhost
rm -rf client.csr
rm -rf ca.srl
rm -rf openssl.cnf
cd -
fi

Expand All @@ -33,24 +36,25 @@ else
stage_template_content=$(cat stage_template.toml)
fi
stage_config="$stage_template_content"
stage_config="${stage_config//\{\{addr\}\}/${stage}}"
IFS=':' read -r host port <<< "$stage"
stage_config="${stage_config//\{\{addr\}\}/0.0.0.0:${port}}"
# generate prover addrs
prover_addrs=""
for prover in "${provers[@]}"; do
if [ -z "$result" ]; then
prover_addrs="$prover"
if [ -z "$prover_addrs" ]; then
prover_addrs="$prover\""
else
prover_addrs="$prover_addrs, \"$prover\""
prover_addrs="$prover_addrs, \"$prover"
fi
done
stage_config="${stage_config//\{\{prover_addrs\}\}/\"${prover_addrs}\"}"
# generate snark addrs
snark_addrs=""
for snark in "${snarks[@]}"; do
if [ -z "$result" ]; then
if [ -z "$snark_addrs" ]; then
snark_addrs="$snark"
else
snark_addrs="$prover_addrs, \"$snark\""
snark_addrs="$prover_addrs, \"$snark"
fi
done
stage_config="${stage_config//\{\{snark_addrs\}\}/\"${snark_addrs}\"}"
Expand Down
6 changes: 3 additions & 3 deletions service/config/stage_tls_template.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addr = "0.0.0.0:50000"
prover_addrs = ["127.0.0.1:50001", "127.0.0.1:50002"]
snark_addrs = ["127.0.0.1:50051"]
addr = "{{addr}}"
prover_addrs = [{{prover_addrs}}]
snark_addrs = [{{snark_addrs}}]
base_dir = "/tmp/zkm/test/test_proof"
ca_cert_path = "tools/certs/ca.pem"
cert_path = "tools/certs/stage.pem"
Expand Down

0 comments on commit 000def8

Please sign in to comment.