Rollback to pse halo2 and halo2wrong for first release

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
           cache-on-failure: true
 
       - name: Run test
-        run: cargo test --all --features test -- --nocapture
+        run: cargo test --all --all-features -- --nocapture
 
 
   lint:

.gitignore

@@ -2,6 +2,6 @@
 .DS_Store
 
 /target
-fixture
+testdata
 
 Cargo.lock

Cargo.toml

@@ -1,11 +1,9 @@
 [package]
-name = "plonk-verifier"
+name = "plonk_verifier"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ff = "0.12.0"
-group = "0.12.0"
 itertools = "0.10.3"
 lazy_static = "1.4.0"
 num-bigint = "0.4"
@@ -14,44 +12,46 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 halo2_curves = { git = "https://github.com/privacy-scaling-explorations/halo2curves", tag = "0.2.1", package = "halo2curves" }
 
-# halo2
-blake2b_simd = { version = "1.0.0", optional = true }
-halo2_proofs = { version = "0.2.0", optional = true }
-halo2_wrong = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", package = "halo2wrong", optional = true }
-halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", package = "ecc", optional = true }
-halo2_wrong_maingate = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", package = "maingate", optional = true }
-halo2_wrong_transcript = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", package = "transcript", optional = true }
-poseidon = { git = "https://github.com/privacy-scaling-explorations/poseidon", branch = "padding", optional = true }
+# system_halo2
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v2022_09_10", optional = true }
 
-# evm
+# loader_evm
 ethereum_types = { package = "ethereum-types", version = "0.13.1", default-features = false, features = ["std"], optional = true }
-foundry_evm = { git = "https://github.com/foundry-rs/foundry", package = "foundry-evm", rev = "93ee742d", optional = true }
-crossterm = { version = "0.22.1", optional = true }
-tui = { version = "0.16.0", default-features = false, features = ["crossterm"], optional = true }
 sha3 = { version = "0.10.1", optional = true }
 
+# loader_halo2
+halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09", package = "ecc", optional = true }
+halo2_wrong_transcript = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09", package = "transcript", optional = true }
+poseidon = { git = "https://github.com/privacy-scaling-explorations/poseidon", branch = "padding", optional = true }
+
 [dev-dependencies]
 paste = "1.0.7"
 
+# system_halo2
+halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09", package = "ecc" }
+
+# loader_evm
+foundry_evm = { git = "https://github.com/foundry-rs/foundry", package = "foundry-evm", rev = "6b1ee60e" }
+crossterm = { version = "0.22.1" }
+tui = { version = "0.16.0", default-features = false, features = ["crossterm"] }
+
 [features]
-default = ["halo2", "evm"]
-test = ["halo2", "evm"]
+default = ["loader_evm", "loader_halo2", "system_halo2"]
+
+loader_evm = ["dep:ethereum_types", "dep:sha3"]
+loader_halo2 = ["dep:halo2_proofs", "dep:halo2_wrong_ecc", "dep:halo2_wrong_transcript", "dep:poseidon"]
 
-halo2 = ["dep:blake2b_simd", "dep:halo2_proofs", "dep:halo2_wrong", "dep:halo2_wrong_ecc", "dep:halo2_wrong_maingate", "dep:halo2_wrong_transcript", "dep:poseidon"]
-evm = ["dep:foundry_evm", "dep:crossterm", "dep:tui", "dep:ethereum_types", "dep:sha3"]
-sanity-check = []
+system_halo2 = ["dep:halo2_proofs"]
 
-[patch.crates-io]
-halo2_proofs = { git = "https://github.com/han0110/halo2", branch = "experiment", package = "halo2_proofs" }
+sanity_check = []
 
 [patch."https://github.com/privacy-scaling-explorations/halo2"]
-halo2_proofs = { git = "https://github.com/han0110/halo2", branch = "experiment", package = "halo2_proofs" }
+halo2_proofs = { git = "https://github.com/han0110/halo2", branch = "feature/configurable-instance-query", package = "halo2_proofs" }
 
-[patch."https://github.com/privacy-scaling-explorations/halo2curves"]
-halo2_curves = { git = "https://github.com//privacy-scaling-explorations/halo2curves", tag = "0.2.1", package = "halo2curves" }
+[[example]]
+name = "evm-verifier"
+required-features = ["loader_evm", "system_halo2"]
 
-[patch."https://github.com/privacy-scaling-explorations/halo2wrong"]
-halo2_wrong = { git = "https://github.com/han0110/halo2wrong", branch = "feature/range-chip-with-tagged-table", package = "halo2wrong" }
-halo2_wrong_ecc = { git = "https://github.com/han0110/halo2wrong", branch = "feature/range-chip-with-tagged-table", package = "ecc" }
-halo2_wrong_maingate = { git = "https://github.com/han0110/halo2wrong", branch = "feature/range-chip-with-tagged-table", package = "maingate" }
-halo2_wrong_transcript = { git = "https://github.com/han0110/halo2wrong", branch = "feature/range-chip-with-tagged-table", package = "transcript" }
+[[example]]
+name = "evm-verifier-with-accumulator"
+required-features = ["loader_halo2", "loader_evm", "system_halo2"]