Add support for ZoKrates with curly brackets (wip)

Cargo.toml

@@ -20,6 +20,8 @@ rsmt2 = { version = "0.14", optional = true }
 ieee754 = { version = "0.2", optional = true}
 zokrates_parser = { path = "third_party/ZoKrates/zokrates_parser", optional = true }
 zokrates_pest_ast = { path = "third_party/ZoKrates/zokrates_pest_ast", optional = true }
+zokrates_curly_parser = { package = "zokrates_parser", path = "third_party/ZoKratesCurly/zokrates_parser", optional = true }
+zokrates_curly_pest_ast = { package = "zokrates_pest_ast", path = "third_party/ZoKratesCurly/zokrates_pest_ast", optional = true }
 typed-arena = { version = "2.0", optional = true }
 log = "0.4"
 thiserror = "1.0"
@@ -65,6 +67,7 @@ default = []
 # frontends
 c = ["lang-c"]
 zok = ["smt", "zokrates_parser", "zokrates_pest_ast", "typed-arena", "petgraph"]
+zokc = ["smt", "zokrates_curly_parser", "zokrates_curly_pest_ast", "typed-arena", "petgraph"]
 datalog = ["pest", "pest-ast", "pest_derive", "from-pest", "lazy_static"]
 # backends
 smt = ["rsmt2", "ieee754"]
@@ -90,6 +93,10 @@ required-features = ["bellman", "poly"]
 name = "zxi"
 required-features = ["smt", "zok"]
 
+[[example]]
+name = "zcxi"
+required-features = ["smt", "zokc"]
+
 [[example]]
 name = "zxc"
 required-features = ["smt", "zok"]

driver.py

@@ -16,6 +16,7 @@
     "r1cs",
     "smt",
     "zok",
+    "zokc",
     "datalog",
     "bellman",
     "spartan",

examples/ZoKratesCurly/mpc/unit_tests/2pc_millionaires.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a < b;
+}

examples/ZoKratesCurly/mpc/unit_tests/2pc_structs.zok

@@ -0,0 +1,11 @@
+struct Pt {
+    u32 x;
+    u32 y;
+}
+
+def main(private u32 a, private u32 b) -> u32 {
+    Pt c = Pt {x: 0, y: 1};
+    c.x = a;
+    c.y = b;
+    return c.y + c.x;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_add.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a + b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_int_equals.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a == b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_int_greater_equals.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a >= b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_int_greater_than.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a > b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_int_less_equals.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a <= b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_int_less_than.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> bool {
+    return a < b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_mult.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a * b;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_mult_add_pub.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b, u32 v) -> u32 {
+    return a * b + v;
+}

examples/ZoKratesCurly/mpc/unit_tests/arithmetic_tests/2pc_sub.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a - b;
+}

examples/ZoKratesCurly/mpc/unit_tests/array_tests/2pc_array_ret.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32[2] {
+    return [a, b];
+}

examples/ZoKratesCurly/mpc/unit_tests/array_tests/2pc_array_sum.zok

@@ -0,0 +1,4 @@
+def main(private u32 a, private u32 b) -> u32 {
+    u32[2] c = [a, b];
+    return c[0] + c[1];
+}

examples/ZoKratesCurly/mpc/unit_tests/bitwise_tests/2pc_bitwise_and.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a & b;
+}

examples/ZoKratesCurly/mpc/unit_tests/bitwise_tests/2pc_bitwise_or.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a | b;
+}

examples/ZoKratesCurly/mpc/unit_tests/bitwise_tests/2pc_bitwise_xor.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b) -> u32 {
+    return a ^ b;
+}

examples/ZoKratesCurly/mpc/unit_tests/boolean_tests/2pc_boolean_and.zok

@@ -0,0 +1,3 @@
+def main(private bool a, private bool b) -> bool {
+    return a && b;
+}

examples/ZoKratesCurly/mpc/unit_tests/boolean_tests/2pc_boolean_equals.zok

@@ -0,0 +1,3 @@
+def main(private bool a, private bool b) -> bool {
+    return a == b;
+}

examples/ZoKratesCurly/mpc/unit_tests/boolean_tests/2pc_boolean_or.zok

@@ -0,0 +1,3 @@
+def main(private bool a, private bool b) -> bool {
+    return a || b;
+}

examples/ZoKratesCurly/mpc/unit_tests/const_tests/2pc_const_arith.zok

@@ -0,0 +1,4 @@
+def main(private u32 a, private u32 b) -> u32 {
+    u32 c = 1;
+    return a + b + c;
+}

examples/ZoKratesCurly/mpc/unit_tests/const_tests/2pc_const_bool.zok

@@ -0,0 +1,4 @@
+def main(private bool a, private bool b) -> bool {
+    bool c = true;
+    return a == c;
+}

examples/ZoKratesCurly/mpc/unit_tests/function_tests/2pc_function_add.zok

@@ -0,0 +1,7 @@
+def add(u32 a, u32 b) -> u32 {
+    return a + b;
+}
+
+def main(private u32 a, private u32 b) -> u32 {
+    return add(a, b) + add(a, b);
+}

examples/ZoKratesCurly/mpc/unit_tests/function_tests/function_arg_order.zok

@@ -0,0 +1,7 @@
+def sub(u32 b, u32 a) -> u32 {
+    return a - b;
+}
+
+def main(private u32 a, private u32 b) -> u32 {
+    return sub(b, a);
+}

examples/ZoKratesCurly/mpc/unit_tests/ite_tests/2pc_ite_only_if.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b, public bool sel) -> u32 {
+    return if sel { a } else { b };
+}

examples/ZoKratesCurly/mpc/unit_tests/ite_tests/2pc_ite_ret_bool.zok

@@ -0,0 +1,3 @@
+def main(private bool a, private bool b, public bool sel) -> bool {
+    return if sel { a } else { b };
+}

examples/ZoKratesCurly/mpc/unit_tests/ite_tests/2pc_ite_ret_int.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b, public bool sel) -> u32 {
+    return if sel { a } else { b };
+}

examples/ZoKratesCurly/mpc/unit_tests/loop_tests/2pc_loop_addition.zok

@@ -0,0 +1,6 @@
+def main(private u32 a, private u32 b) -> u32 {
+    for u32 i in 0..4 {
+        a = a + b;
+    }
+    return a;
+}

examples/ZoKratesCurly/mpc/unit_tests/loop_tests/2pc_loop_sum.zok

@@ -0,0 +1,7 @@
+def main(private u32 a, private u32 b) -> u32 {
+    u32 mut res = 0x00000000;
+    for u32 i in 0..5 {
+        res = res + i;
+    }
+    return res;
+}

examples/ZoKratesCurly/mpc/unit_tests/nary_arithmetic_tests/2pc_nary_arithmetic_add.zok

@@ -0,0 +1,3 @@
+def main(private u32 a, private u32 b, private u32 c) -> u32 {
+    return a + b + c;
+}

examples/ZoKratesCurly/mpc/unit_tests/nary_boolean_tests/2pc_nary_boolean_and.zok

@@ -0,0 +1,3 @@
+def main(private bool a, private bool b, private bool c) -> bool {
+    return a && b && c;
+}

examples/ZoKratesCurly/mpc/unit_tests/shift_tests/2pc_lhs.zok

@@ -0,0 +1,4 @@
+def main(private u32 a, private u32 b) -> u32 {
+    u32 c = 0x00000001;
+    return a << c;
+}

examples/ZoKratesCurly/mpc/unit_tests/shift_tests/2pc_rhs.zok

@@ -0,0 +1,4 @@
+def main(private u32 a, private u32 b) -> u32 {
+    u32 c = 0x00000001;
+    return a >> c;
+}

examples/ZoKratesCurly/opt/3_plus_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return x + x + x;
+}

examples/ZoKratesCurly/opt/id_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return x;
+}

examples/ZoKratesCurly/opt/log.zok

@@ -0,0 +1,12 @@
+def u8log2(u8 x) -> u8 {
+    u8 mut acc = 0x00;
+    for field i in 0..8 {
+        acc = acc + if x != 0x00 { 0x01 } else { 0x00 };
+        x = x >> 1;
+    }
+    return acc;
+}
+
+def main(private u8 x) -> u8 {
+    return x + u8log2(x);
+}

examples/ZoKratesCurly/opt/log16.zok

@@ -0,0 +1,12 @@
+def u16log2(x: u16) -> u16 {
+    u16 mut acc = 0x0000;
+    for field i in 0..16 {
+        acc = acc + if x != 0x0000 { 0x0001 } else { 0x0000 };
+        x = x >> 1;
+    }
+    return acc;
+}
+
+def main(private x: u16) -> u16 {
+    return x + u16log2(x);
+}

examples/ZoKratesCurly/opt/mult_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x, private u8 y) -> u8 {
+    return x * y;
+}

examples/ZoKratesCurly/opt/plus_3_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return 0x03 + x;
+}

examples/ZoKratesCurly/opt/times_2_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return 0x02 * x;
+}

examples/ZoKratesCurly/opt/times_2_u32_opt.zok

@@ -0,0 +1,3 @@
+def main(private u32 x) -> u32 {
+    return 0x00000002 * x;
+}

examples/ZoKratesCurly/opt/times_3_opt.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return 0x03 * x;
+}

examples/ZoKratesCurly/pf/2024_05_24_benny_bug.zok.pin

@@ -0,0 +1,7 @@
+(set_default_modulus 52435875175126190479447740508185965837690552500527637822603658699938581184513
+(let (
+    (x #f6)
+) false ; ignored
+))
+
+

examples/ZoKratesCurly/pf/2024_05_24_benny_bug.zok.vin

@@ -0,0 +1,7 @@
+(set_default_modulus 52435875175126190479447740508185965837690552500527637822603658699938581184513
+(let (
+    (x #f6)
+    (return #f0)
+) false ; ignored
+))
+

examples/ZoKratesCurly/pf/2024_05_31_benny_bug.zok.pin

@@ -0,0 +1,6 @@
+(set_default_modulus 52435875175126190479447740508185965837690552500527637822603658699938581184513
+(let (
+    (x #f6)
+) false ; ignored
+))
+

examples/ZoKratesCurly/pf/2024_05_31_benny_bug.zok.vin

@@ -0,0 +1,7 @@
+(set_default_modulus 52435875175126190479447740508185965837690552500527637822603658699938581184513
+(let (
+    (x #f6)
+    (return #f6)
+) false ; ignored
+))
+

examples/ZoKratesCurly/pf/2024_06_02_chad_bug.zok

@@ -0,0 +1,23 @@
+struct BigNat_init_quotient<Qm1, Lp1> {
+    field[Qm1][Lp1] limbs;
+    field last_limb;
+}
+
+struct BigNat_init<N, Lp1> {
+    field[N][Lp1] limbs;
+}
+struct BigNatModMult_init<Qm1, Lp1, ZG, CL> {
+    BigNat_init_quotient<Qm1, Lp1> quotient_init;
+    BigNat_init<ZG, CL> carry_init;
+}
+
+const u32 Qm1 = 7;
+const u32 Lp1 = 4;
+const u32 ZG = 2;
+const u32 CL = 5;
+
+def main(private BigNatModMult_init<Qm1,Lp1,ZG,CL>[1] intermediate_mod) -> bool {
+    BigNat_init<ZG, CL> carry = intermediate_mod[0].carry_init;
+    assert(carry.limbs[0][0] == 1);
+    return true;
+}

examples/ZoKratesCurly/pf/2024_07_01_chad_bug_wit.zok

@@ -0,0 +1,19 @@
+def unsafe_baz<M>(field input) -> field[M] {
+    return [input; M];
+}
+
+def foo<M>(field input) -> field[M] {
+    unsafe witness field[M] inputs = unsafe_baz::<M>(input);
+    assert(inputs[0] == input);
+    return inputs;
+}
+
+def bar<N, M>(field[N][M] input) -> field[M] {
+    return foo::<M>(input[0][0]);
+}
+
+def main(field[8] a) -> bool {
+    field[8] x = bar::<2, 8>([a, a]);
+    field[8] y = bar::<2, 8>([x, a]);
+    return true;
+}

examples/ZoKratesCurly/pf/3_plus.zok

@@ -0,0 +1,3 @@
+def main(private u8 x) -> u8 {
+    return x + x + x;
+}

examples/ZoKratesCurly/pf/3_plus.zok.pin

@@ -0,0 +1,5 @@
+(let (
+    (x #x04)
+)
+    false
+)

examples/ZoKratesCurly/pf/3_plus.zok.vin

@@ -0,0 +1,6 @@
+(let (
+    (return #x0c)
+)
+    false
+)
+

examples/ZoKratesCurly/pf/arr_str_arr_str.zok

@@ -0,0 +1,15 @@
+struct Pt {
+    field x;
+    field y;
+}
+
+struct Pts {
+    Pt[2] pts;
+}
+
+def main(private field y) -> field {
+    Pt p1 = Pt {x: 2, y: y};
+    Pt p2 = Pt {x: y, y: 2};
+    Pts[1] pts = [Pts { pts: [p1, p2] }];
+    return pts[0].pts[0].y * pts[0].pts[1].x;
+}