[WIP] halo2 circuits

packages/halo2-circuits/Cargo.toml

@@ -2,7 +2,7 @@
 name = "halo2-circuits"
 version = "0.1.0"
 edition = "2021"
-authors = ["hiroism007"]
+authors = ["hiroism007", "chokermaxx"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -11,29 +11,17 @@ num-bigint = { version = "0.4", features = ["rand"] }
 sha2 = "0.10.6"
 rand = "0.8.5"
 rsa = { version = "0.6.1", features = ["serde"] }
-halo2-rsa = { branch = "main", default-features = false, features = [
-    "halo2-axiom",
-    "display",
-], git = "https://github.com/MynaWallet/halo2-rsa.git" }
-halo2-base = { branch = "community-edition", default-features = false, features = [
-    "halo2-axiom",
-    "display",
-    "test-utils",
-], git = "https://github.com/axiom-crypto/halo2-lib.git" }
-zkevm-hashes = { branch = "feat/zkevm-sha256", default-features = false, features = [
-    "halo2-axiom",
-    "display",
-], git = "https://github.com/axiom-crypto/halo2-lib.git" }
-halo2-sha256-unoptimized = { branch = "main", default-features = false, features = [
-    "halo2-axiom",
-    "display",
-], git = "https://github.com/zkpdf/halo2-sha256-unoptimized.git" }
-snark-verifier-sdk = { branch = "community-edition", default-features = false, features = [
+halo2-rsa = { git = "https://github.com/MynaWallet/halo2-rsa.git" }
+halo2-base = { git = "https://github.com/MynaWallet/halo2-lib.git", branch = "sha256" }
+halo2-ecc = { git = "https://github.com/MynaWallet/halo2-lib.git", branch = "sha256" }
+zkevm-hashes = { git = "https://github.com/MynaWallet/halo2-lib.git", branch = "sha256" }
+snark-verifier-sdk = { default-features = false, features = [
     "halo2-axiom",
     "display",
     "loader_evm",
     "loader_halo2",
-], git = "https://github.com/axiom-crypto/snark-verifier.git" }
+    "revm"
+], git = "https://github.com/MynaWallet/snark-verifier.git", branch = "release-0.1.6-rc0" }
 x509-parser = { version = "0.15", features = ["verify"] }
 openssl = "0.10"
 num-traits = "0.2.15"
@@ -50,6 +38,9 @@ tokio = { version = "1.16", features = [
     "rt-multi-thread",
     "macros",
 ] }
+pse-poseidon = { git = "https://github.com/axiom-crypto/pse-poseidon.git" }
+halo2-sha256-unoptimized = { git = "https://github.com/MynaWallet/halo2-sha256-unoptimized.git" }
+bincode = "1"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 getrandom = { version = "0.2", features = ["js"] }
@@ -65,4 +56,4 @@ criterion = "0.4"
 default = ["halo2-axiom", "display"]
 display = ["halo2-base/display"]
 halo2-pse = ["halo2-base/halo2-pse"]
-halo2-axiom = ["halo2-base/halo2-axiom"]
+halo2-axiom = ["halo2-base/halo2-axiom"]

packages/halo2-circuits/README.md

@@ -57,23 +57,69 @@ You can refer to these repos of RSA verification circuits.
 - [zk-email-verify](https://github.com/zkemail/zk-email-verify)
 - [zkCert](https://github.com/zkCert/halo2-zkcert)
 
-## Example Usage
+# Usage
+## For off-chain verification
+### Create the directory where proofs are stored
+```bash
+mkdir -p build/app
+```
+
+### Generate the common reference string
+```bash
+cargo run app trusted-setup
+```
+
+### Generate pk & vk
+```bash
+cargo run app keys
+```
+
+### Generate a proof
+```bash
+cargo run app prove
+```
 
+### Run the verification code written in Rust
+```bash
+cargo run app verify
+```
+
+### Run the verification code written in Solidity
+This fails because of the big proof size.
+```bash
+cargo run app evm
+```
+
+## For on-chain verification
+Run `cargo run app keys` first.
+
+### Create the directory where proofs are stored
+```bash
+mkdir -p build/agg
+```
+
+### Generate a proof that's ready to be aggregated
+```bash
+cargo run app snark
+```
 
+### Generate pk & vk
 ```bash
-# `k`: degree that expresses the size of circuit (i.e., 2^k is the number of rows in the circuit)
-cargo run -r gen-params --k 17
+cargo run agg keys
 ```
 
+### Generate a proof
 ```bash
-cargo run -r gen-rsa-keys # generate pk
+cargo run agg prove
 ```
 
+### Run the verification code written in Rust
 ```bash
-cargo run -r prove-rsa # verify rsa locally
+cargo run agg verify
 ```
 
-You need to install solc 0.8.19 or 0.8.20 locally.
+### Run the verification code written in Solidity
+This succeeds because of the tiny proof size.
 ```bash
-cargo run -r gen-rsa-verify-evm-proof  # generate a verifier contract and proof inputs for evm 
+cargo run agg evm
 ```

packages/halo2-circuits/rustfmt.toml

@@ -0,0 +1,14 @@
+edition = "2021"
+version = "Two"
+tab_spaces = 4
+use_small_heuristics = "Max"
+max_width = 120
+wrap_comments = true
+comment_width = 120
+format_code_in_doc_comments = true
+doc_comment_code_block_width = 120
+normalize_doc_attributes = true
+imports_granularity = "Crate"
+hex_literal_case = "Upper"
+condense_wildcard_suffixes = true
+use_try_shorthand = true