Add support for ZoKrates with curly brackets (wip)

Cargo.toml

@@ -93,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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,3 @@
-
-def main(private<1> u32 a, private<2> u32 b, public u32 v) -> u32:
-  return a * b + v
+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

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

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

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

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

@@ -1,3 +1,4 @@
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-    u32[2] c = [a, b]
-    return c[0] + c[1] 
+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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-  u32 c = 0x00000001
-  return a + b + c
+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

@@ -1,3 +1,4 @@
-def main(private<1> bool a, private<2> bool b) -> bool:
-  bool c = true
-  return a == c 
+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

@@ -1,5 +1,7 @@
-def add(u32 a, u32 b) -> u32:
-    return a + b
+def add(u32 a, u32 b) -> u32 {
+    return a + b;
+}
 
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-  return add(a, b) + add(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

@@ -1,5 +1,7 @@
-def sub(u32 b, u32 a) -> u32:
-    return a - b
+def sub(u32 b, u32 a) -> u32 {
+    return a - b;
+}
 
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-  return sub(b, a)
+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

@@ -1,2 +1,3 @@
-def main(private<1> u32 a, private<2> u32 b, public bool sel) -> u32:
-    return if sel then a else b fi 
+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

@@ -1,2 +1,3 @@
-def main(private<1> bool a, private<2> bool b, public bool sel) -> bool:
-    return if sel then a else b fi 
+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

@@ -1,2 +1,3 @@
-def main(private<1> u32 a, private<2> u32 b, public bool sel) -> u32:
-    return if sel then a else b fi 
+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

@@ -1,6 +1,6 @@
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-    for u32 i in 0..4 do    
-        a = a + b
-    endfor
-    return a
-
+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

@@ -1,6 +1,7 @@
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-    u32 res = 0x00000000
-    for u32 i in 0..5 do 
-        res = res + i
-    endfor
-    return res
+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

@@ -1,2 +1,3 @@
-def main(private<1> u32 a, private<2> u32 b,  private<2> u32 c) -> u32:
-  return a + b + c
+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

@@ -1,2 +1,3 @@
-def main(private<1> bool a, private<2> bool b, private<2> bool c) -> bool:
-  return a && b && c
+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

@@ -1,3 +1,4 @@
-def main(private<1> u32 a, private<2> u32 b) -> u32:
-  u32 c = 0x00000001
-  return a << c
+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

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

examples/ZoKratesCurly/opt/3_plus_opt.zok

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

examples/ZoKratesCurly/opt/id_opt.zok

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

examples/ZoKratesCurly/opt/log.zok

@@ -1,10 +1,12 @@
-def u8log2(u8 x) -> u8:
-  u8 acc = 0x00
-  for field i in 0..8 do
-      acc = acc + if x != 0x00 then 0x01 else 0x00 fi
-      x = x >> 1
-  endfor
-  return acc
+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)
+def main(private u8 x) -> u8 {
+    return x + u8log2(x);
+}

examples/ZoKratesCurly/opt/log16.zok

@@ -1,10 +1,12 @@
-def u16log2(u16 x) -> u16:
-  u16 acc = 0x0000
-  for field i in 0..16 do
-      acc = acc + if x != 0x0000 then 0x0001 else 0x0000 fi
-      x = x >> 1
-  endfor
-  return acc
+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 u16 x) -> u16:
-  return x + u16log2(x)
+def main(private x: u16) -> u16 {
+    return x + u16log2(x);
+}

examples/ZoKratesCurly/opt/mult_opt.zok

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

examples/ZoKratesCurly/opt/plus_3_opt.zok

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

examples/ZoKratesCurly/opt/times_2_opt.zok

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