circom-compat · arnaucube's git mirror

new features to make ark-circom slimmer (#45)

* new features

* fmt

* update wasm feature

* revert

* update

---------

Co-authored-by: tyshkor <tyshko1@gmail.com>

tyshko-rostyslav 122977916+tyshko-rostyslav@users.noreply.github.com

Mon, 20 Mar 2023 19:47:32 +0100

commit

f97ac2b2458fd14489bc70375bb45688f5ef26a8

parent

b892c62597687c23341cda1e8e89d58bb6428f36

3 files changed, 12 insertions(+), 5 deletions(-)

jump to

Cargo.lock

Cargo.toml

src/zkey.rs

M Cargo.lock → Cargo.lock

@@ -3740,6 +3740,7 @@ "wasmer-engine-dylib",
  "wasmer-engine-universal",
  "wasmer-types",
  "wasmer-vm",
+ "wasmparser",
  "wat",
  "winapi",
 ]

M Cargo.toml → Cargo.toml

@@ -3,9 +3,12 @@ name = "ark-circom"
 version = "0.1.0"
 edition = "2018"
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [dependencies]
 # WASM operations
-wasmer = { version = "2.0" }
+wasmer = { version = "2.0", default-features = false }
 fnv = { version = "1.0.3", default-features = false }
 num = { version = "0.4.0" }
 num-traits = { version = "0.2.0", default-features = false }
@@ -17,7 +20,7 @@ ark-ec = { version = "0.4.1", default-features = false, features = ["parallel"] }
 ark-ff = { version = "0.4.1", default-features = false, features = ["parallel", "asm"] }
 ark-std = { version = "0.4.0", default-features = false, features = ["parallel"] }
 ark-bn254 = { version = "0.4.0" }
-ark-groth16 = { version = "0.4.0", features = ["parallel"] }
+ark-groth16 = { version = "0.4.0", default-features = false, features = ["parallel"] }
 ark-poly = { version = "0.4.1", default-features = false, features = ["parallel"] }
 ark-relations = { version = "0.4.0", default-features = false }
 ark-serialize = { version = "0.4.1", default-features = false }
@@ -47,7 +50,8 @@ name = "groth16"
 harness = false
 
 [features]
+default = ["wasmer/default", "circom-2", "ethereum"]
+wasm = ["wasmer/js-default"]
 bench-complex-all = []
 circom-2 = []
 ethereum = ["ethers-core"]
-default = ["circom-2", "ethereum"]

M src/zkey.rs → src/zkey.rs

@@ -482,7 +482,8 @@ fn can_deser_g1_vec() {
         let n_vars = 10;
         let buf = vec![g1_buf(); n_vars]
             .iter()
-            .flatten().cloned()
+            .flatten()
+            .cloned()
             .collect::<Vec<_>>();
         let expected = vec![g1_one(); n_vars];
 
@@ -505,7 +506,8 @@ fn can_deser_g2_vec() {
         let n_vars = 10;
         let buf = vec![g2_buf(); n_vars]
             .iter()
-            .flatten().cloned()
+            .flatten()
+            .cloned()
             .collect::<Vec<_>>();
         let expected = vec![g2_one(); n_vars];