prover2 (re-write of prover member crate)

.gitignore

@@ -5,7 +5,6 @@
 .idea
 *.log
 *.json
-*.sh
 *.txt
 *.srs
-tmp
+tmp

Cargo.toml

@@ -12,7 +12,8 @@ members = [
     "mock",
     "testool",
     "aggregator",
-    "prover"
+    "prover",
+    "prover2"
 ]
 resolver = "2"
 

prover2/.gitignore

@@ -0,0 +1 @@
+test_data/

prover2/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "prover2"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+aggregator = { path = "../aggregator" }
+eth-types = { path = "../eth-types" }
+gadgets = { path = "../gadgets" }
+zkevm-circuits = { path = "../zkevm-circuits" }
+
+anyhow.workspace = true
+base64.workspace = true
+ethers-core.workspace = true
+halo2_proofs.workspace = true
+once_cell.workspace = true
+rand.workspace = true
+rand_xorshift.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+snark-verifier.workspace = true
+snark-verifier-sdk.workspace = true
+
+git-version = "0.3.5"
+thiserror = "1.0"
+tracing = "0.1"
+
+[dev-dependencies]
+tracing-subscriber = { version = "0.3", features = ["env-filter", "std"] }

prover2/Makefile

@@ -0,0 +1,13 @@
+help: ## Display this help screen
+	@grep -h \
+		-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
+		awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+# usage:
+# make download-setup -e degree=20 dir=./test_data/.params
+download-setup:
+	sh scripts/download_setup.sh ${degree} ${dir}
+
+# usage:
+# make setup-test-data -e dir=./test_data/.configs
+setup-test-data:
+	sh scripts/setup_test_data.sh ${dir}

prover2/configs/layer1.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 24,
+  "num_advice": [
+    15
+  ],
+  "num_lookup_advice": [
+    2
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 20,
+  "limb_bits": 88,
+  "num_limbs": 3
+}

prover2/configs/layer2.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 25,
+  "num_advice": [
+    1
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 24,
+  "limb_bits": 88,
+  "num_limbs": 3
+}

prover2/configs/layer3.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 21,
+  "num_advice": [
+    63
+  ],
+  "num_lookup_advice": [
+    8
+  ],
+  "num_fixed": 2,
+  "lookup_bits": 20,
+  "limb_bits": 88,
+  "num_limbs": 3
+}

prover2/configs/layer4.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 26,
+  "num_advice": [
+    2
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 25,
+  "limb_bits": 88,
+  "num_limbs": 3
+}

prover2/configs/layer5.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 21,
+  "num_advice": [
+    4
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 20,
+  "limb_bits" :88,
+  "num_limbs": 3
+}

prover2/configs/layer6.config

@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 26,
+  "num_advice": [
+    1
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 25,
+  "limb_bits": 88,
+  "num_limbs": 3
+}

prover2/scripts/download_setup.sh

@@ -0,0 +1,15 @@
+set -x
+set -e
+
+# Set degree to env SCROLL_PROVER_MAX_DEGREE, first input or default value 26.
+degree="${SCROLL_PROVER_MAX_DEGREE:-${1:-26}}"
+
+# Set the output dir to second input or default as `./integration/params`.
+dir="${2:-"./test_data/.params"}"
+mkdir -p "$dir"
+
+file="$dir"/params"${degree}"
+rm -f "$file"
+
+# degree 1 - 26
+axel -ac https://circuit-release.s3.us-west-2.amazonaws.com/setup/params"$degree" -o "$file"

prover2/scripts/setup_test_data.sh

@@ -0,0 +1,11 @@
+set -x
+set -e
+
+dir="${1:-"./test_data/.configs"}"
+mkdir -p "$dir"
+
+for ((i = 1; i < 7; ++i)); do
+	template="./configs/layer${i}.config"
+	file="$dir/layer${i}.config"
+	jq ".degree = ${i}" ${template} > ${file}
+done