Ecrecover soundness

.cargo/config.toml

@@ -1,2 +1,6 @@
 [target.'cfg(target_os="macos")']
 rustflags = ["-C", "link-args=-framework CoreFoundation -framework Security"]
+[net]
+git-fetch-with-cli = true
+[env]
+RUST_MIN_STACK = "16777216"

.github/ciChecksScripts/wakeUpRunner.sh

@@ -1,23 +1,49 @@
 #!/bin/bash
 
 profile="cirunner"
-runner_vpc_id="vpc-08ac0db4d8a7cce9e"
+runner_vpc_id1="vpc-8bdf97ec"
+runner_vpc_id2="vpc-1176d875"
+region_opt="--region us-west-2"
 
 # Get runner status
-runner=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[ci-checks-runner] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)
+runner1=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[jenkins] Name=network-interface.vpc-id,Values=[$runner_vpc_id1] --query "Reservations[*].Instances[*][InstanceId]" ${region_opt} --output text | xargs)
+runner2=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[jenkins] Name=network-interface.vpc-id,Values=[$runner_vpc_id2] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)
 
+{
+    while true; do
+        runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner1 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
+        echo 'runner1 - '$runner_status
+        if [[ $runner_status = "stopped" ]]; then
+            aws ec2 start-instances --profile $profile --instance-ids $runner1 ${region_opt}
+            break
+        elif [[ $runner_status = "running" ]]; then
+            echo 'waiting for runner1 restore'
+            sleep 30
+            runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner1 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
+            if [[ $runner_status = "running" ]]; then
+                break
+            fi
+        else
+            sleep 30
+        fi
+    done
+}&
 while true; do
-    runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner --query "Reservations[*].Instances[*].State.[Name]" --output text)
-    if [ $runner_status = "stopped" ]; then
-        aws ec2 start-instances --profile $profile --instance-ids $runner
-        exit 0
-    elif [ $runner_status = "running" ]; then
-        sleep 120
-        runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner --query "Reservations[*].Instances[*].State.[Name]" --output text)
-        if [ $runner_status = "running" ]; then
-            exit 0
+    runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" --output text)
+    echo 'runner2 - '$runner_status
+    if [[ $runner_status = "stopped" ]]; then
+        aws ec2 start-instances --profile $profile --instance-ids $runner2
+        break
+    elif [[ $runner_status = "running" ]]; then
+        echo 'waiting for runner2 restore'
+        sleep 30
+        runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" --output text)
+        if [[ $runner_status = "running" ]]; then
+            break
         fi
     else
         sleep 30
     fi
 done
+
+exit 0

.github/proverCiScripts/benchmarks_result_reporting/reporting_main.py

@@ -2,9 +2,9 @@
 from pprint import pprint
 import reporting_modules as rmod
 
-env = json.load(open('/home/ubuntu/env.json'))
-cstats = '/home/ubuntu/cpu.stats'
-mstats = '/home/ubuntu/mem.stats'
+env = json.load(open('/home/CI/env.json'))
+cstats = '/home/CI/cpu.stats'
+mstats = '/home/CI/mem.stats'
 
 def main():
     parser = argparse.ArgumentParser(

.github/proverCiScripts/benchmarks_result_reporting/reporting_modules.py

@@ -94,8 +94,8 @@ def log_processor(pull_request,circuit, degree):
     SETUP_PREFIX     = "[Setup generation]"
     PROOFGEN_PREFIX  = "[Proof generation]"
     PROOFVER_PREFIX  = "[Proof verification]"
-    logfile = [i for i in os.listdir('/home/ubuntu/') if 'proverlog' in i][0]
-    f = open(f'/home/ubuntu/{logfile}', 'r')
+    logfile = [i for i in os.listdir('/home/CI/') if 'proverlog' in i][0]
+    f = open(f'/home/CI/{logfile}', 'r')
     logdata = f.read()
     logdata = logdata.split("\n")
     running = [i for i in logdata if 'running' in i and 'test' in i][0].split()[1]

.github/proverCiScripts/deployToProver.sh

@@ -3,7 +3,7 @@
 #set -x
 
 prnumber=$1
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$1"
 
 source_dir=$2

.github/proverCiScripts/execBench.sh

@@ -3,7 +3,7 @@ set -e
 #set -x
 
 prnumber=$1
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$1"
 k=$2
 circuit=$(echo $3 | awk '{ print $2 }' | tr '[:upper:]' '[:lower:]')

.github/proverCiScripts/getSysstat.sh

@@ -3,7 +3,7 @@ set -e
 #set -x
 
 prnumber=$1
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$prnumber"
 
 logfile=$(ls $target_dir | grep proverlog | xargs -n 1 basename)

.github/proverCiScripts/injectHalo2Revision.sh

@@ -3,7 +3,7 @@
 #set -x
 
 prnumber=$1
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$1"
 
 _revision=$2

.github/proverCiScripts/prepareProver.sh

@@ -3,7 +3,7 @@
 #set -x
 
 prnumber=$1
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$1"
 source_dir=$2
 

.github/proverCiScripts/processResults.sh

@@ -5,7 +5,7 @@ set -e
 prnumber=$1
 label=$2
 degree=$3
-base_dir="/home/ubuntu/CI_Prover_Benches/"
+base_dir="/home/CI/CI_Prover_Benches/"
 target_dir="$base_dir"PR"$prnumber"
 
 rm -f ~/*.stats

.github/proverCiScripts/shutdownProver.sh

@@ -3,7 +3,7 @@
 #set -x
 
 profile="cirunner"
-provers_vpc_id="vpc-09fb44da782f32abb"
+provers_vpc_id="vpc-1176d875"
 
 running_prover=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[proverbench-multiAZ] Name=instance-state-name,Values=[running] Name=network-interface.vpc-id,Values=[$provers_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text)
 

.github/proverCiScripts/wakeUpProver.sh

@@ -3,23 +3,23 @@
 #set -x
 
 profile="cirunner"
-provers_vpc_id="vpc-09fb44da782f32abb"
+provers_vpc_id="vpc-1176d875"
 dns_ipaddr=$(dig prover.cirunners.internal +short)
 zone_id=$(aws route53 --profile $profile list-hosted-zones --query 'HostedZones[?Name==`cirunners.internal.`].[Id]' --output text | awk -F \/ '{ print $3 }')
 route53_dir=".github/proverCiScripts/misc"
 
 sshprover () {
-    ssh -o ConnectTimeout=5 prover
+    ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no prover "uptime"
 }
 
 # Get running provers IDs
 provers_running=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[proverbench-multiAZ] Name=instance-state-name,Values=[running] Name=network-interface.vpc-id,Values=[$provers_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text)
 provers_running_num=$(echo $provers_running | wc -w)
 
-if [ $provers_running_num -gt 1 ]; then
+if [[ $provers_running_num -gt 1 ]]; then
     echo "More than 1 provers running"
     exit 1
-elif [ $provers_running_num -eq 0 ]; then
+elif [[ $provers_running_num -eq 0 ]]; then
     # Get provers IDs and start first available
     provers=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[proverbench-multiAZ] Name=network-interface.vpc-id,Values=[$provers_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)
 else
@@ -28,7 +28,7 @@ else
 fi
 
 for prover in $provers; do
-    [ ! -z $single_prover_running ] || aws ec2 start-instances --profile $profile --instance-ids $prover
+    [[ ! -z $single_prover_running ]] || aws ec2 start-instances --profile $profile --instance-ids $prover
     if [ $? -eq 0 ]; then
         ipaddr=$(aws ec2 describe-instances --profile $profile --instance-ids $prover --query "Reservations[*].Instances[*].NetworkInterfaces[*].[PrivateIpAddress]" --output text)
         if [ $ipaddr != $dns_ipaddr ]; then
@@ -38,7 +38,7 @@ for prover in $provers; do
             aws route53 change-resource-record-sets --profile $profile --hosted-zone-id $zone_id --change-batch file://$route53_dir/route53.template.json
             sleep 61
             rm $route53_dir/route53.template.json
-	    ssh-keygen -f "/home/ubuntu/.ssh/known_hosts" -R "prover.cirunners.internal"
+	    ssh-keygen -f "/home/CI/.ssh/known_hosts" -R "prover.cirunners.internal"
         fi
         break
     fi

.github/workflows/ProverBenchFromHalo2.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - run: echo "halo2 PR ${{ env.HALO2PR }} submitted by ${{ env.GH_USER }}"
       - run: echo "Running prover benchmarking due to ${{ github.event.inputs.event-type }}."        
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: 'halo2benchmarking'
       - run: .github/proverCiScripts/wakeUpProver.sh