diff --git a/.gitignore b/.gitignore index 08062cd8..30082090 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,7 @@ # ZoKrates default files out -out.code -out.wit +out.ztf proof.json proving.key verification.key diff --git a/out.code b/out.code new file mode 100644 index 00000000..9680b0df --- /dev/null +++ b/out.code @@ -0,0 +1,6 @@ +def main() -> (4): + (1 * ~one) * (42 * ~one) == 1 * ~out_0 + (1 * ~one) * (43 * ~one) == 1 * ~out_1 + (1 * ~one) * (0) == 1 * ~out_2 + (1 * ~one) * (1 * ~one) == 1 * ~out_3 + return ~out_0, ~out_1, ~out_2, ~out_3 diff --git a/zokrates_book/src/concepts/comments.md b/zokrates_book/src/concepts/comments.md index 268a2f4b..cd06cfeb 100644 --- a/zokrates_book/src/concepts/comments.md +++ b/zokrates_book/src/concepts/comments.md @@ -3,5 +3,5 @@ Comments can be added with double-slashes. ```zokrates -{{#include ../../../zokrates_cli/examples/book/comments.code}} +{{#include ../../../zokrates_cli/examples/book/comments.zok}} ``` \ No newline at end of file diff --git a/zokrates_book/src/concepts/control_flow.md b/zokrates_book/src/concepts/control_flow.md index 24b1c2f1..bfebf346 100644 --- a/zokrates_book/src/concepts/control_flow.md +++ b/zokrates_book/src/concepts/control_flow.md @@ -9,7 +9,7 @@ Function calls can help make programs clearer and more modular. However, using f Arguments are passed by value. ```zokrates -{{#include ../../../zokrates_cli/examples/book/side_effects.code}} +{{#include ../../../zokrates_cli/examples/book/side_effects.zok}} ``` ### If expressions @@ -17,7 +17,7 @@ Arguments are passed by value. An if expression allows you to branch your code depending on a condition. ```zokrates -{{#include ../../../zokrates_cli/examples/book/if_else.code}} +{{#include ../../../zokrates_cli/examples/book/if_else.zok}} ``` The condition supports `<`, `<=`, `>`, `>=`, `==`, which can be combined with the boolean operators `&&`, `||` and `!`. @@ -29,7 +29,7 @@ The condition supports `<`, `<=`, `>`, `>=`, `==`, which can be combined with th For loops are available with the following syntax: ```zokrates -{{#include ../../../zokrates_cli/examples/book/for.code}} +{{#include ../../../zokrates_cli/examples/book/for.zok}} ``` The bounds have to be known at compile time, so only constants are allowed. diff --git a/zokrates_book/src/concepts/functions.md b/zokrates_book/src/concepts/functions.md index 3a3bf85a..be307bae 100644 --- a/zokrates_book/src/concepts/functions.md +++ b/zokrates_book/src/concepts/functions.md @@ -3,14 +3,14 @@ A function has to be declared at the top level before it is called. ```zokrates -{{#include ../../../zokrates_cli/examples/book/function_declaration.code}} +{{#include ../../../zokrates_cli/examples/book/function_declaration.zok}} ``` A function's signature has to be explicitly provided. Functions can return many values by providing them as a comma-separated list. ```zokrates -{{#include ../../../zokrates_cli/examples/book/multi_return.code}} +{{#include ../../../zokrates_cli/examples/book/multi_return.zok}} ``` ### Inference @@ -18,11 +18,11 @@ Functions can return many values by providing them as a comma-separated list. When defining a variable as the return value of a function, types are optional: ```zokrates -{{#include ../../../zokrates_cli/examples/book/multi_def.code}} +{{#include ../../../zokrates_cli/examples/book/multi_def.zok}} ``` If there is an ambiguity, providing the types of some of the assigned variables is necessary. ```zokrates -{{#include ../../../zokrates_cli/examples/book/type_annotations.code}} +{{#include ../../../zokrates_cli/examples/book/type_annotations.zok}} ``` \ No newline at end of file diff --git a/zokrates_book/src/concepts/imports.md b/zokrates_book/src/concepts/imports.md index a8e93b6d..25d3dcb4 100644 --- a/zokrates_book/src/concepts/imports.md +++ b/zokrates_book/src/concepts/imports.md @@ -1,27 +1,27 @@ ## Imports -You can separate your code into multiple ZoKrates files using `import` statements: +You can separate your code into multiple ZoKrates files using `import` statements, ignoring the `.zok` extension of the imported file: ### Relative Imports You can import a resource in the same folder directly, like this: ```zokrates -import "./mycode.code" +import "./mycode" ``` There also is a handy syntax to import from the parent directory: ```zokrates -import "../mycode.code" +import "../mycode" ``` Also imports further up the file-system are supported: ```zokrates -import "../../../mycode.code" +import "../../../mycode" ``` You can also choose to rename the imported resource, like so: ```zokrates -import "./mycode.code" as abc +import "./mycode" as abc ``` ### Absolute Imports diff --git a/zokrates_book/src/concepts/stdlib.md b/zokrates_book/src/concepts/stdlib.md index b648db8d..150afd97 100644 --- a/zokrates_book/src/concepts/stdlib.md +++ b/zokrates_book/src/concepts/stdlib.md @@ -9,7 +9,7 @@ The following section highlights a subset of available imports: #### sha256 ```zokrates -import "hashes/sha256/512Padded.code" +import "hashes/sha256/512Padded.zok" ``` A function that takes 2 `field[256]` arrays as inputs and returns their sha256 compression function as an array of 256 field elements. @@ -17,18 +17,18 @@ A function that takes 2 `field[256]` arrays as inputs and returns their sha256 c #### sha256compression ```zokrates -import "hashes/sha256/512bit.code" +import "hashes/sha256/512bit.zok" ``` A function that takes 2 `field[256]` arrays as inputs and returns their sha256 compression function as an array of 256 field elements. The difference with `sha256` is that no padding is added at the end of the message, which makes it more efficient but also less compatible with Solidity. -There also is support for 2-round (1024-bit input) and and 3-round (1536-bit input) variants, using `hashes/1024bit.code` or `hashes/1536bit.code` respectively. +There also is support for 2-round (1024-bit input) and and 3-round (1536-bit input) variants, using `hashes/1024bit.zok` or `hashes/1536bit.zok` respectively. #### sha256packed ```zokrates -import "hashes/sha256/512bitPacked.code" +import "hashes/sha256/512bitPacked.zok" ``` A function that takes an array of 4 field elements as inputs, unpacks each of them to 128 bits (big endian), concatenates them and applies sha256. It then returns an array of 2 field elements, each representing 128 bits of the result. @@ -38,7 +38,7 @@ A function that takes an array of 4 field elements as inputs, unpacks each of th #### Proof of private-key ownership ```zokrates -import "ecc/proofOfOwnership.code" +import "ecc/proofOfOwnership.zok" ``` Verifies match of a given public/private keypair. Checks if the following equation holds for the provided keypair: @@ -48,7 +48,7 @@ where `G` is the chosen base point of the subgroup and `*` denotes scalar multip #### Signature verification ```zokrates -import "signatures/verifyEddsa.code" +import "signatures/verifyEddsa.zok" ``` Verifies an EdDSA Signature. Checks the correctness of a given EdDSA Signature `(R,S)` for the provided public key `A` and message `(M0, M1)`. Check out this [python repository](https://github.com/Zokrates/pycrypto) for tooling to create valid signatures. diff --git a/zokrates_book/src/concepts/types.md b/zokrates_book/src/concepts/types.md index 5e64e1eb..27f2259d 100644 --- a/zokrates_book/src/concepts/types.md +++ b/zokrates_book/src/concepts/types.md @@ -13,7 +13,7 @@ The prime `p` is set to `2188824287183927522224640574525727508854836440041603434 While `field` values mostly behave like unsigned integers, one should keep in mind that they overflow at `p` and not some power of 2, so that we have: ```zokrates -{{#include ../../../zokrates_cli/examples/book/field_overflow.code}} +{{#include ../../../zokrates_cli/examples/book/field_overflow.zok}} ``` ### `bool` @@ -36,7 +36,7 @@ Arrays can contain elements of any type and have arbitrary dimensions. The following examples code shows examples of how to use arrays: ```zokrates -{{#include ../../../zokrates_cli/examples/book/array.code}} +{{#include ../../../zokrates_cli/examples/book/array.zok}} ``` #### Declaration and Initialization @@ -66,7 +66,7 @@ In summary, this leads to the following scheme for array declarations: Consider the following example: ```zokrates -{{#include ../../../zokrates_cli/examples/book/multidim_array.code}} +{{#include ../../../zokrates_cli/examples/book/multidim_array.zok}} ``` #### Spreads and Slices diff --git a/zokrates_book/src/concepts/variables.md b/zokrates_book/src/concepts/variables.md index dab25416..8d58da06 100644 --- a/zokrates_book/src/concepts/variables.md +++ b/zokrates_book/src/concepts/variables.md @@ -7,7 +7,7 @@ Variables are mutable, and always passed by value to functions. Shadowing is not allowed. ```zokrates -{{#include ../../../zokrates_cli/examples/book/no_shadowing.code}} +{{#include ../../../zokrates_cli/examples/book/no_shadowing.zok}} ``` ### Scope @@ -16,11 +16,11 @@ Shadowing is not allowed. Functions have their own scope ```zokrates -{{#include ../../../zokrates_cli/examples/book/function_scope.code}} +{{#include ../../../zokrates_cli/examples/book/function_scope.zok}} ``` #### For-loop For-loops have their own scope ```zokrates -{{#include ../../../zokrates_cli/examples/book/for_scope.code}} +{{#include ../../../zokrates_cli/examples/book/for_scope.zok}} ``` \ No newline at end of file diff --git a/zokrates_book/src/gettingstarted.md b/zokrates_book/src/gettingstarted.md index 3cc94af6..6e0bad85 100644 --- a/zokrates_book/src/gettingstarted.md +++ b/zokrates_book/src/gettingstarted.md @@ -33,10 +33,10 @@ cd target/release ## Hello ZoKrates! -First, create the text-file `root.code` and implement your program. In this example, we will prove knowledge of the square root `a` of a number `b`: +First, create the text-file `root.zok` and implement your program. In this example, we will prove knowledge of the square root `a` of a number `b`: ```zokrates -{{#include ../../zokrates_cli/examples/book/factorize.code}} +{{#include ../../zokrates_cli/examples/book/factorize.zok}} ``` Some observations: @@ -47,7 +47,7 @@ Then run the different phases of the protocol: ```bash # compile -./zokrates compile -i root.code +./zokrates compile -i root.zok # perform the setup phase ./zokrates setup # execute the program diff --git a/zokrates_book/src/reference/cli.md b/zokrates_book/src/reference/cli.md index 66d6ee8e..571bb3be 100644 --- a/zokrates_book/src/reference/cli.md +++ b/zokrates_book/src/reference/cli.md @@ -10,12 +10,13 @@ You can see an overview of the available subcommands by running ## `compile` ```sh -./zokrates compile -i /path/to/add.code +./zokrates compile -i /path/to/add.zok ``` -Compiles a `.code` file into ZoKrates internal representation of arithmetic circuits. +Compiles a `.zok` source code file into ZoKrates internal representation of arithmetic circuits. -Creates a compiled `.code` file at `./out.code`. +Creates a compiled binary file at `./out`. +Unless the `--light` flag is set, a human readable `.ztf` file is generated, which displays the compilation output in ZoKrates Text Format. ## `compute-witness` @@ -23,7 +24,7 @@ Creates a compiled `.code` file at `./out.code`. ./zokrates compute-witness -a 1 2 3 ``` -Computes a witness for the compiled program found at `./out.code` and arguments to the program. +Computes a witness for the compiled program found at `./out` and arguments to the program. A witness is a valid assignment of the variables, which include the results of the computation. Arguments to the program are passed as a space-separated list with the `-a` flag, or over `stdin`. @@ -35,7 +36,7 @@ Creates a witness file at `./witness` ./zokrates setup ``` -Generates a trusted setup for the compiled program found at `./out.code`. +Generates a trusted setup for the compiled program found at `./out`. Creates a proving key and a verifying key at `./proving.key` and `./verifying.key`. These keys are derived from a source of randomness, commonly referred to as “toxic waste”. Anyone having access to the source of randomness can produce fake proofs that will be accepted by a verifier following the protocol. @@ -46,7 +47,7 @@ These keys are derived from a source of randomness, commonly referred to as “t ./zokrates export-verifier ``` -Using the verifying key at `./verifying.key`, generates a Solidity contract which contains the generated verification key and a public function to verify a solution to the compiled program at `./out.code`. +Using the verifying key at `./verifying.key`, generates a Solidity contract which contains the generated verification key and a public function to verify a solution to the compiled program at `./out`. Creates a verifier contract at `./verifier.sol`. @@ -56,7 +57,7 @@ Creates a verifier contract at `./verifier.sol`. ./zokrates generate-proof ``` -Using the proving key at `./proving.key`, generates a proof for a computation of the compiled program `./out.code` resulting in `./witness`. +Using the proving key at `./proving.key`, generates a proof for a computation of the compiled program `./out` resulting in `./witness`. Returns the proof, for example: diff --git a/zokrates_book/src/reference/Testing.md b/zokrates_book/src/reference/testing.md similarity index 100% rename from zokrates_book/src/reference/Testing.md rename to zokrates_book/src/reference/testing.md diff --git a/zokrates_book/src/sha256example.md b/zokrates_book/src/sha256example.md index e4373208..38572546 100644 --- a/zokrates_book/src/sha256example.md +++ b/zokrates_book/src/sha256example.md @@ -13,10 +13,10 @@ Make sure you have followed the instructions in the [Getting Started](gettingsta We will start this tutorial by using ZoKrates to compute the hash for an arbitrarily chosen preimage, being the number `5` in this example. -First, we create a new file named `hashexample.code` with the following content: +First, we create a new file named `hashexample.zok` with the following content: ```zokrates -{{#include ../../zokrates_cli/examples/book/hashexample.code}} +{{#include ../../zokrates_cli/examples/book/hashexample.zok}} ``` The first line imports the `sha256packed` function from the ZoKrates standard library. @@ -32,7 +32,7 @@ Having our problem described in ZoKrates' DSL, we can now continue using ZoKrate First, we compile the program into an arithmetic circuit using the `compile` command. ```sh -./zokrates compile -i hashexample.code +./zokrates compile -i hashexample.zok ``` As a next step we can create a witness file using the following command: @@ -67,10 +67,10 @@ Let's recall our goal: Peggy wants to prove that she knows a preimage for a dige To make it work, the two parties have to follow their roles in the protocol: -First, Victor has to specify what hash he is interested in. Therefore, we have to adjust the zkSNARK circuit, compiled by ZoKrates, such that in addition to computing the digest, it also validates it against the digest of interest, provided by Victor. This leads to the following update for `hashexample.code`: +First, Victor has to specify what hash he is interested in. Therefore, we have to adjust the zkSNARK circuit, compiled by ZoKrates, such that in addition to computing the digest, it also validates it against the digest of interest, provided by Victor. This leads to the following update for `hashexample.zok`: ```zokrates -{{#include ../../zokrates_cli/examples/book/hashexample_updated.code}} +{{#include ../../zokrates_cli/examples/book/hashexample_updated.zok}} ``` Note that we now compare the result of `sha256packed` with the hard-coded correct solution defined by Victor. The lines which we added are treated as assertions: the verifier will not accept a proof where these constraints were not satisfied. Clearly, this program only returns 1 if all of the computed bits are equal. @@ -78,7 +78,7 @@ Note that we now compare the result of `sha256packed` with the hard-coded correc So, having defined the program, Victor is now ready to compile the code: ```sh -./zokrates compile -i hashexample.code +./zokrates compile -i hashexample.zok ``` Based on that Victor can run the setup phase and export verifier smart contract as a Solidity file: diff --git a/zokrates_cli/examples/add.code b/zokrates_cli/examples/add.zok similarity index 100% rename from zokrates_cli/examples/add.code rename to zokrates_cli/examples/add.zok diff --git a/zokrates_cli/examples/argument_reassign.code b/zokrates_cli/examples/argument_reassign.zok similarity index 100% rename from zokrates_cli/examples/argument_reassign.code rename to zokrates_cli/examples/argument_reassign.zok diff --git a/zokrates_cli/examples/arrays/array_argument.code b/zokrates_cli/examples/arrays/array_argument.zok similarity index 100% rename from zokrates_cli/examples/arrays/array_argument.code rename to zokrates_cli/examples/arrays/array_argument.zok diff --git a/zokrates_cli/examples/arrays/array_loop.code b/zokrates_cli/examples/arrays/array_loop.zok similarity index 100% rename from zokrates_cli/examples/arrays/array_loop.code rename to zokrates_cli/examples/arrays/array_loop.zok diff --git a/zokrates_cli/examples/arrays/array_loop_update.code b/zokrates_cli/examples/arrays/array_loop_update.zok similarity index 100% rename from zokrates_cli/examples/arrays/array_loop_update.code rename to zokrates_cli/examples/arrays/array_loop_update.zok diff --git a/zokrates_cli/examples/arrays/boolean_array.code b/zokrates_cli/examples/arrays/boolean_array.zok similarity index 100% rename from zokrates_cli/examples/arrays/boolean_array.code rename to zokrates_cli/examples/arrays/boolean_array.zok diff --git a/zokrates_cli/examples/arrays/constant_array.code b/zokrates_cli/examples/arrays/constant_array.zok similarity index 100% rename from zokrates_cli/examples/arrays/constant_array.code rename to zokrates_cli/examples/arrays/constant_array.zok diff --git a/zokrates_cli/examples/arrays/cube.code b/zokrates_cli/examples/arrays/cube.zok similarity index 100% rename from zokrates_cli/examples/arrays/cube.code rename to zokrates_cli/examples/arrays/cube.zok diff --git a/zokrates_cli/examples/arrays/if_eq.code b/zokrates_cli/examples/arrays/if_eq.zok similarity index 100% rename from zokrates_cli/examples/arrays/if_eq.code rename to zokrates_cli/examples/arrays/if_eq.zok diff --git a/zokrates_cli/examples/arrays/init_with_value.code b/zokrates_cli/examples/arrays/init_with_value.zok similarity index 100% rename from zokrates_cli/examples/arrays/init_with_value.code rename to zokrates_cli/examples/arrays/init_with_value.zok diff --git a/zokrates_cli/examples/arrays/lookup.code b/zokrates_cli/examples/arrays/lookup.zok similarity index 100% rename from zokrates_cli/examples/arrays/lookup.code rename to zokrates_cli/examples/arrays/lookup.zok diff --git a/zokrates_cli/examples/arrays/multidim_update.code b/zokrates_cli/examples/arrays/multidim_update.zok similarity index 100% rename from zokrates_cli/examples/arrays/multidim_update.code rename to zokrates_cli/examples/arrays/multidim_update.zok diff --git a/zokrates_cli/examples/arrays/return_array.code b/zokrates_cli/examples/arrays/return_array.zok similarity index 100% rename from zokrates_cli/examples/arrays/return_array.code rename to zokrates_cli/examples/arrays/return_array.zok diff --git a/zokrates_cli/examples/arrays/return_variable_array.code b/zokrates_cli/examples/arrays/return_variable_array.zok similarity index 100% rename from zokrates_cli/examples/arrays/return_variable_array.code rename to zokrates_cli/examples/arrays/return_variable_array.zok diff --git a/zokrates_cli/examples/arrays/slicefrom.code b/zokrates_cli/examples/arrays/slicefrom.zok similarity index 100% rename from zokrates_cli/examples/arrays/slicefrom.code rename to zokrates_cli/examples/arrays/slicefrom.zok diff --git a/zokrates_cli/examples/arrays/update.code b/zokrates_cli/examples/arrays/update.zok similarity index 100% rename from zokrates_cli/examples/arrays/update.code rename to zokrates_cli/examples/arrays/update.zok diff --git a/zokrates_cli/examples/arrays/update_with_call.code b/zokrates_cli/examples/arrays/update_with_call.zok similarity index 100% rename from zokrates_cli/examples/arrays/update_with_call.code rename to zokrates_cli/examples/arrays/update_with_call.zok diff --git a/zokrates_cli/examples/arrays/value.code b/zokrates_cli/examples/arrays/value.zok similarity index 100% rename from zokrates_cli/examples/arrays/value.code rename to zokrates_cli/examples/arrays/value.zok diff --git a/zokrates_cli/examples/arrays/wrap_select.code b/zokrates_cli/examples/arrays/wrap_select.zok similarity index 100% rename from zokrates_cli/examples/arrays/wrap_select.code rename to zokrates_cli/examples/arrays/wrap_select.zok diff --git a/zokrates_cli/examples/book/array.code b/zokrates_cli/examples/book/array.zok similarity index 100% rename from zokrates_cli/examples/book/array.code rename to zokrates_cli/examples/book/array.zok diff --git a/zokrates_cli/examples/book/comments.code b/zokrates_cli/examples/book/comments.zok similarity index 100% rename from zokrates_cli/examples/book/comments.code rename to zokrates_cli/examples/book/comments.zok diff --git a/zokrates_cli/examples/book/factorize.code b/zokrates_cli/examples/book/factorize.zok similarity index 100% rename from zokrates_cli/examples/book/factorize.code rename to zokrates_cli/examples/book/factorize.zok diff --git a/zokrates_cli/examples/book/field_overflow.code b/zokrates_cli/examples/book/field_overflow.zok similarity index 100% rename from zokrates_cli/examples/book/field_overflow.code rename to zokrates_cli/examples/book/field_overflow.zok diff --git a/zokrates_cli/examples/book/for.code b/zokrates_cli/examples/book/for.zok similarity index 100% rename from zokrates_cli/examples/book/for.code rename to zokrates_cli/examples/book/for.zok diff --git a/zokrates_cli/examples/book/for_scope.code b/zokrates_cli/examples/book/for_scope.zok similarity index 100% rename from zokrates_cli/examples/book/for_scope.code rename to zokrates_cli/examples/book/for_scope.zok diff --git a/zokrates_cli/examples/book/function_declaration.code b/zokrates_cli/examples/book/function_declaration.zok similarity index 100% rename from zokrates_cli/examples/book/function_declaration.code rename to zokrates_cli/examples/book/function_declaration.zok diff --git a/zokrates_cli/examples/book/function_scope.code b/zokrates_cli/examples/book/function_scope.zok similarity index 100% rename from zokrates_cli/examples/book/function_scope.code rename to zokrates_cli/examples/book/function_scope.zok diff --git a/zokrates_cli/examples/book/hashexample.code b/zokrates_cli/examples/book/hashexample.zok similarity index 70% rename from zokrates_cli/examples/book/hashexample.code rename to zokrates_cli/examples/book/hashexample.zok index 94cc3d88..ba90147e 100644 --- a/zokrates_cli/examples/book/hashexample.code +++ b/zokrates_cli/examples/book/hashexample.zok @@ -1,4 +1,4 @@ -import "hashes/sha256/512bitPacked.code" as sha256packed +import "hashes/sha256/512bitPacked" as sha256packed def main(private field a, private field b, private field c, private field d) -> (field[2]): h = sha256packed([a, b, c, d]) diff --git a/zokrates_cli/examples/book/hashexample_updated.code b/zokrates_cli/examples/book/hashexample_updated.zok similarity index 80% rename from zokrates_cli/examples/book/hashexample_updated.code rename to zokrates_cli/examples/book/hashexample_updated.zok index e396cb1e..b7daee58 100644 --- a/zokrates_cli/examples/book/hashexample_updated.code +++ b/zokrates_cli/examples/book/hashexample_updated.zok @@ -1,4 +1,4 @@ -import "hashes/sha256/512bitPacked.code" as sha256packed +import "hashes/sha256/512bitPacked" as sha256packed def main(private field a, private field b, private field c, private field d) -> (field): h = sha256packed([a, b, c, d]) diff --git a/zokrates_cli/examples/book/if_else.code b/zokrates_cli/examples/book/if_else.zok similarity index 100% rename from zokrates_cli/examples/book/if_else.code rename to zokrates_cli/examples/book/if_else.zok diff --git a/zokrates_cli/examples/book/multi_def.code b/zokrates_cli/examples/book/multi_def.zok similarity index 100% rename from zokrates_cli/examples/book/multi_def.code rename to zokrates_cli/examples/book/multi_def.zok diff --git a/zokrates_cli/examples/book/multi_return.code b/zokrates_cli/examples/book/multi_return.zok similarity index 100% rename from zokrates_cli/examples/book/multi_return.code rename to zokrates_cli/examples/book/multi_return.zok diff --git a/zokrates_cli/examples/book/multidim_array.code b/zokrates_cli/examples/book/multidim_array.zok similarity index 100% rename from zokrates_cli/examples/book/multidim_array.code rename to zokrates_cli/examples/book/multidim_array.zok diff --git a/zokrates_cli/examples/book/no_shadowing.code b/zokrates_cli/examples/book/no_shadowing.zok similarity index 100% rename from zokrates_cli/examples/book/no_shadowing.code rename to zokrates_cli/examples/book/no_shadowing.zok diff --git a/zokrates_cli/examples/book/side_effects.code b/zokrates_cli/examples/book/side_effects.zok similarity index 100% rename from zokrates_cli/examples/book/side_effects.code rename to zokrates_cli/examples/book/side_effects.zok diff --git a/zokrates_cli/examples/book/type_annotations.code b/zokrates_cli/examples/book/type_annotations.zok similarity index 100% rename from zokrates_cli/examples/book/type_annotations.code rename to zokrates_cli/examples/book/type_annotations.zok diff --git a/zokrates_cli/examples/bool_and.code b/zokrates_cli/examples/bool_and.zok similarity index 100% rename from zokrates_cli/examples/bool_and.code rename to zokrates_cli/examples/bool_and.zok diff --git a/zokrates_cli/examples/bool_not.code b/zokrates_cli/examples/bool_not.zok similarity index 100% rename from zokrates_cli/examples/bool_not.code rename to zokrates_cli/examples/bool_not.zok diff --git a/zokrates_cli/examples/bool_or.code b/zokrates_cli/examples/bool_or.zok similarity index 100% rename from zokrates_cli/examples/bool_or.code rename to zokrates_cli/examples/bool_or.zok diff --git a/zokrates_cli/examples/boolean_literal.code b/zokrates_cli/examples/boolean_literal.zok similarity index 100% rename from zokrates_cli/examples/boolean_literal.code rename to zokrates_cli/examples/boolean_literal.zok diff --git a/zokrates_cli/examples/brackets.code b/zokrates_cli/examples/brackets.zok similarity index 100% rename from zokrates_cli/examples/brackets.code rename to zokrates_cli/examples/brackets.zok diff --git a/zokrates_cli/examples/comments.code b/zokrates_cli/examples/comments.zok similarity index 100% rename from zokrates_cli/examples/comments.code rename to zokrates_cli/examples/comments.zok diff --git a/zokrates_cli/examples/comparison_operators.code b/zokrates_cli/examples/comparison_operators.zok similarity index 100% rename from zokrates_cli/examples/comparison_operators.code rename to zokrates_cli/examples/comparison_operators.zok diff --git a/zokrates_cli/examples/conditions.code b/zokrates_cli/examples/conditions.zok similarity index 100% rename from zokrates_cli/examples/conditions.code rename to zokrates_cli/examples/conditions.zok diff --git a/zokrates_cli/examples/dex/decodeOrder.code b/zokrates_cli/examples/dex/decodeOrder.zok similarity index 96% rename from zokrates_cli/examples/dex/decodeOrder.code rename to zokrates_cli/examples/dex/decodeOrder.zok index 3bca63d2..db917f29 100644 --- a/zokrates_cli/examples/dex/decodeOrder.code +++ b/zokrates_cli/examples/dex/decodeOrder.zok @@ -1,4 +1,4 @@ -import "./popLeastSignificantBit.code" +import "./popLeastSignificantBit" def main(field order) -> (field, field, field, field): // MSB diff --git a/zokrates_cli/examples/dex/decodeOrderBitwise.code b/zokrates_cli/examples/dex/decodeOrderBitwise.zok similarity index 100% rename from zokrates_cli/examples/dex/decodeOrderBitwise.code rename to zokrates_cli/examples/dex/decodeOrderBitwise.zok diff --git a/zokrates_cli/examples/dex/emptyOrder.code b/zokrates_cli/examples/dex/emptyOrder.zok similarity index 100% rename from zokrates_cli/examples/dex/emptyOrder.code rename to zokrates_cli/examples/dex/emptyOrder.zok diff --git a/zokrates_cli/examples/dex/isPartialOrder.code b/zokrates_cli/examples/dex/isPartialOrder.zok similarity index 100% rename from zokrates_cli/examples/dex/isPartialOrder.code rename to zokrates_cli/examples/dex/isPartialOrder.zok diff --git a/zokrates_cli/examples/dex/limitLessThanPrice.code b/zokrates_cli/examples/dex/limitLessThanPrice.zok similarity index 100% rename from zokrates_cli/examples/dex/limitLessThanPrice.code rename to zokrates_cli/examples/dex/limitLessThanPrice.zok diff --git a/zokrates_cli/examples/dex/popLeastSignificantBit.code b/zokrates_cli/examples/dex/popLeastSignificantBit.zok similarity index 100% rename from zokrates_cli/examples/dex/popLeastSignificantBit.code rename to zokrates_cli/examples/dex/popLeastSignificantBit.zok diff --git a/zokrates_cli/examples/dex/ringtrade_example.code b/zokrates_cli/examples/dex/ringtrade_example.zok similarity index 98% rename from zokrates_cli/examples/dex/ringtrade_example.code rename to zokrates_cli/examples/dex/ringtrade_example.zok index f1f19c38..44f50479 100644 --- a/zokrates_cli/examples/dex/ringtrade_example.code +++ b/zokrates_cli/examples/dex/ringtrade_example.zok @@ -1,5 +1,5 @@ -import "./decodeOrder.code" -import "./limitLessThanPrice.code" +import "./decodeOrder" +import "./limitLessThanPrice" def tupleForTokensWithValue(field value) -> (field[3]): return [value, value, value] diff --git a/zokrates_cli/examples/error/empty-error.code b/zokrates_cli/examples/error/empty-error.zok similarity index 100% rename from zokrates_cli/examples/error/empty-error.code rename to zokrates_cli/examples/error/empty-error.zok diff --git a/zokrates_cli/examples/error/forbidden_power_base.code b/zokrates_cli/examples/error/forbidden_power_base.zok similarity index 100% rename from zokrates_cli/examples/error/forbidden_power_base.code rename to zokrates_cli/examples/error/forbidden_power_base.zok diff --git a/zokrates_cli/examples/error/out_of_for_scope.code b/zokrates_cli/examples/error/out_of_for_scope.zok similarity index 100% rename from zokrates_cli/examples/error/out_of_for_scope.code rename to zokrates_cli/examples/error/out_of_for_scope.zok diff --git a/zokrates_cli/examples/error/shadowing.code b/zokrates_cli/examples/error/shadowing.zok similarity index 100% rename from zokrates_cli/examples/error/shadowing.code rename to zokrates_cli/examples/error/shadowing.zok diff --git a/zokrates_cli/examples/error/unassigned.code b/zokrates_cli/examples/error/unassigned.zok similarity index 100% rename from zokrates_cli/examples/error/unassigned.code rename to zokrates_cli/examples/error/unassigned.zok diff --git a/zokrates_cli/examples/error/wrongsyntax-error.code b/zokrates_cli/examples/error/wrongsyntax-error.zok similarity index 100% rename from zokrates_cli/examples/error/wrongsyntax-error.code rename to zokrates_cli/examples/error/wrongsyntax-error.zok diff --git a/zokrates_cli/examples/factorization.code b/zokrates_cli/examples/factorization.zok similarity index 100% rename from zokrates_cli/examples/factorization.code rename to zokrates_cli/examples/factorization.zok diff --git a/zokrates_cli/examples/flatten.code b/zokrates_cli/examples/flatten.zok similarity index 100% rename from zokrates_cli/examples/flatten.code rename to zokrates_cli/examples/flatten.zok diff --git a/zokrates_cli/examples/for.code b/zokrates_cli/examples/for.zok similarity index 100% rename from zokrates_cli/examples/for.code rename to zokrates_cli/examples/for.zok diff --git a/zokrates_cli/examples/functions/expressions.code b/zokrates_cli/examples/functions/expressions.zok similarity index 100% rename from zokrates_cli/examples/functions/expressions.code rename to zokrates_cli/examples/functions/expressions.zok diff --git a/zokrates_cli/examples/functions/functions.code b/zokrates_cli/examples/functions/functions.zok similarity index 100% rename from zokrates_cli/examples/functions/functions.code rename to zokrates_cli/examples/functions/functions.zok diff --git a/zokrates_cli/examples/functions/multi_functions.code b/zokrates_cli/examples/functions/multi_functions.zok similarity index 100% rename from zokrates_cli/examples/functions/multi_functions.code rename to zokrates_cli/examples/functions/multi_functions.zok diff --git a/zokrates_cli/examples/functions/multi_shadowing.code b/zokrates_cli/examples/functions/multi_shadowing.zok similarity index 100% rename from zokrates_cli/examples/functions/multi_shadowing.code rename to zokrates_cli/examples/functions/multi_shadowing.zok diff --git a/zokrates_cli/examples/functions/no_args_multiple.code b/zokrates_cli/examples/functions/no_args_multiple.zok similarity index 100% rename from zokrates_cli/examples/functions/no_args_multiple.code rename to zokrates_cli/examples/functions/no_args_multiple.zok diff --git a/zokrates_cli/examples/functions/shadowing.code b/zokrates_cli/examples/functions/shadowing.zok similarity index 100% rename from zokrates_cli/examples/functions/shadowing.code rename to zokrates_cli/examples/functions/shadowing.zok diff --git a/zokrates_cli/examples/functions_equivalent.code b/zokrates_cli/examples/functions_equivalent.zok similarity index 100% rename from zokrates_cli/examples/functions_equivalent.code rename to zokrates_cli/examples/functions_equivalent.zok diff --git a/zokrates_cli/examples/if_eq.code b/zokrates_cli/examples/if_eq.zok similarity index 100% rename from zokrates_cli/examples/if_eq.code rename to zokrates_cli/examples/if_eq.zok diff --git a/zokrates_cli/examples/imports/bar.code b/zokrates_cli/examples/imports/bar.zok similarity index 100% rename from zokrates_cli/examples/imports/bar.code rename to zokrates_cli/examples/imports/bar.zok diff --git a/zokrates_cli/examples/imports/baz.code b/zokrates_cli/examples/imports/baz.zok similarity index 100% rename from zokrates_cli/examples/imports/baz.code rename to zokrates_cli/examples/imports/baz.zok diff --git a/zokrates_cli/examples/imports/foo.code b/zokrates_cli/examples/imports/foo.zok similarity index 50% rename from zokrates_cli/examples/imports/foo.code rename to zokrates_cli/examples/imports/foo.zok index b624cbab..6e2e0540 100644 --- a/zokrates_cli/examples/imports/foo.code +++ b/zokrates_cli/examples/imports/foo.zok @@ -1,4 +1,4 @@ -from "./baz.code" import main as baz +import "./baz" def main() -> (field): return baz() \ No newline at end of file diff --git a/zokrates_cli/examples/imports/import.code b/zokrates_cli/examples/imports/import.zok similarity index 52% rename from zokrates_cli/examples/imports/import.code rename to zokrates_cli/examples/imports/import.zok index 6f708d24..eb495d4f 100644 --- a/zokrates_cli/examples/imports/import.code +++ b/zokrates_cli/examples/imports/import.zok @@ -1,5 +1,5 @@ -import "./foo.code" -import "./bar.code" +import "./foo" +import "./bar" def main() -> (field): return foo() + bar() \ No newline at end of file diff --git a/zokrates_cli/examples/imports/import_with_alias.code b/zokrates_cli/examples/imports/import_with_alias.zok similarity index 58% rename from zokrates_cli/examples/imports/import_with_alias.code rename to zokrates_cli/examples/imports/import_with_alias.zok index 38e1b0c7..2feb96ea 100644 --- a/zokrates_cli/examples/imports/import_with_alias.code +++ b/zokrates_cli/examples/imports/import_with_alias.zok @@ -1,4 +1,4 @@ -import "./foo.code" as d +import "./foo" as d def main() -> (field): return d() \ No newline at end of file diff --git a/zokrates_cli/examples/left_side_call.code b/zokrates_cli/examples/left_side_call.zok similarity index 100% rename from zokrates_cli/examples/left_side_call.code rename to zokrates_cli/examples/left_side_call.zok diff --git a/zokrates_cli/examples/merkleTree/pedersenPathProof3.code b/zokrates_cli/examples/merkleTree/pedersenPathProof3.zok similarity index 77% rename from zokrates_cli/examples/merkleTree/pedersenPathProof3.code rename to zokrates_cli/examples/merkleTree/pedersenPathProof3.zok index cebd967a..4f8fdaed 100644 --- a/zokrates_cli/examples/merkleTree/pedersenPathProof3.code +++ b/zokrates_cli/examples/merkleTree/pedersenPathProof3.zok @@ -1,8 +1,8 @@ -import "hashes/pedersen/512bit.code" as hash -import "ecc/edwardsCompress.code" as edwardsCompress -import "ecc/babyjubjubParams.code" as context -import "hashes/utils/256bitsDirectionHelper.code" as multiplex -import "utils/binary/not.code" as NOT +import "hashes/pedersen/512bit" as hash +import "ecc/edwardsCompress" as edwardsCompress +import "ecc/babyjubjubParams" as context +import "hashes/utils/256bitsDirectionHelper" as multiplex +import "utils/binary/not" as NOT // Merke-Tree inclusion proof for tree depth 3 using SNARK efficient pedersen hashes // directionSelector=> 1/true if current digest is on the rhs of the hash def main(field[256] rootDigest, private field[256] leafDigest, private field[3] directionSelector, field[256] PathDigest0, private field[256] PathDigest1, private field[256] PathDigest2) -> (field): diff --git a/zokrates_cli/examples/merkleTree/sha256PathProof3.code b/zokrates_cli/examples/merkleTree/sha256PathProof3.zok similarity index 87% rename from zokrates_cli/examples/merkleTree/sha256PathProof3.code rename to zokrates_cli/examples/merkleTree/sha256PathProof3.zok index 901ff5d3..f8f570c6 100644 --- a/zokrates_cli/examples/merkleTree/sha256PathProof3.code +++ b/zokrates_cli/examples/merkleTree/sha256PathProof3.zok @@ -1,6 +1,6 @@ -import "hashes/sha256/512bit.code" as sha256 -import "utils/multiplexer/256bit.code" as multiplex -import "utils/binary/not.code" as NOT +import "hashes/sha256/512bit" as sha256 +import "utils/multiplexer/256bit" as multiplex +import "utils/binary/not" as NOT // Merke-Tree inclusion proof for tree depth 3 diff --git a/zokrates_cli/examples/merkleTree/testpedersenPathProof3.code b/zokrates_cli/examples/merkleTree/testpedersenPathProof3.zok similarity index 98% rename from zokrates_cli/examples/merkleTree/testpedersenPathProof3.code rename to zokrates_cli/examples/merkleTree/testpedersenPathProof3.zok index b006f686..c71b809c 100644 --- a/zokrates_cli/examples/merkleTree/testpedersenPathProof3.code +++ b/zokrates_cli/examples/merkleTree/testpedersenPathProof3.zok @@ -1,4 +1,4 @@ -import "./pedersenPathProof3.code" +import "./pedersenPathProof3" // Merke-Tree inclusion proof for tree depth 3 // def main(field treeDepth, field[256] rootDigest, private field[256] leafDigest, private field[2] directionSelector, field[256] PathDigest0, private field[256] PathDigest1) -> (field): def main() -> (field): diff --git a/zokrates_cli/examples/merkleTree/testsha256PathProof3.code b/zokrates_cli/examples/merkleTree/testsha256PathProof3.zok similarity index 98% rename from zokrates_cli/examples/merkleTree/testsha256PathProof3.code rename to zokrates_cli/examples/merkleTree/testsha256PathProof3.zok index 60ef13c0..586e082c 100644 --- a/zokrates_cli/examples/merkleTree/testsha256PathProof3.code +++ b/zokrates_cli/examples/merkleTree/testsha256PathProof3.zok @@ -1,4 +1,4 @@ -import "./sha256PathProof3.code" as merkleTreeProof +import "./sha256PathProof3" as merkleTreeProof def main() -> (field): field treeDepth = 3 diff --git a/zokrates_cli/examples/multi_return.code b/zokrates_cli/examples/multi_return.zok similarity index 100% rename from zokrates_cli/examples/multi_return.code rename to zokrates_cli/examples/multi_return.zok diff --git a/zokrates_cli/examples/multi_return_sum.code b/zokrates_cli/examples/multi_return_sum.zok similarity index 100% rename from zokrates_cli/examples/multi_return_sum.code rename to zokrates_cli/examples/multi_return_sum.zok diff --git a/zokrates_cli/examples/multiple_witnesses.code b/zokrates_cli/examples/multiple_witnesses.zok similarity index 100% rename from zokrates_cli/examples/multiple_witnesses.code rename to zokrates_cli/examples/multiple_witnesses.zok diff --git a/zokrates_cli/examples/n_choose_k.code b/zokrates_cli/examples/n_choose_k.zok similarity index 100% rename from zokrates_cli/examples/n_choose_k.code rename to zokrates_cli/examples/n_choose_k.zok diff --git a/zokrates_cli/examples/no_flatten.code b/zokrates_cli/examples/no_flatten.zok similarity index 100% rename from zokrates_cli/examples/no_flatten.code rename to zokrates_cli/examples/no_flatten.zok diff --git a/zokrates_cli/examples/pow.code b/zokrates_cli/examples/pow.zok similarity index 100% rename from zokrates_cli/examples/pow.code rename to zokrates_cli/examples/pow.zok diff --git a/zokrates_cli/examples/propagate.code b/zokrates_cli/examples/propagate.zok similarity index 100% rename from zokrates_cli/examples/propagate.code rename to zokrates_cli/examples/propagate.zok diff --git a/zokrates_cli/examples/propagate_call.code b/zokrates_cli/examples/propagate_call.zok similarity index 100% rename from zokrates_cli/examples/propagate_call.code rename to zokrates_cli/examples/propagate_call.zok diff --git a/zokrates_cli/examples/reassignment.code b/zokrates_cli/examples/reassignment.zok similarity index 100% rename from zokrates_cli/examples/reassignment.code rename to zokrates_cli/examples/reassignment.zok diff --git a/zokrates_cli/examples/reduceable_exponent.code b/zokrates_cli/examples/reduceable_exponent.zok similarity index 100% rename from zokrates_cli/examples/reduceable_exponent.code rename to zokrates_cli/examples/reduceable_exponent.zok diff --git a/zokrates_cli/examples/runtime_errors/lt_overflow_max_plus_1.code b/zokrates_cli/examples/runtime_errors/lt_overflow_max_plus_1.zok similarity index 100% rename from zokrates_cli/examples/runtime_errors/lt_overflow_max_plus_1.code rename to zokrates_cli/examples/runtime_errors/lt_overflow_max_plus_1.zok diff --git a/zokrates_cli/examples/runtime_errors/lt_overflow_p_minus_one.code b/zokrates_cli/examples/runtime_errors/lt_overflow_p_minus_one.zok similarity index 100% rename from zokrates_cli/examples/runtime_errors/lt_overflow_p_minus_one.code rename to zokrates_cli/examples/runtime_errors/lt_overflow_p_minus_one.zok diff --git a/zokrates_cli/examples/sha256/binary/andxorandxorand.code b/zokrates_cli/examples/sha256/binary/andxorandxorand.zok similarity index 60% rename from zokrates_cli/examples/sha256/binary/andxorandxorand.code rename to zokrates_cli/examples/sha256/binary/andxorandxorand.zok index 1da72b7a..5094c306 100644 --- a/zokrates_cli/examples/sha256/binary/andxorandxorand.code +++ b/zokrates_cli/examples/sha256/binary/andxorandxorand.zok @@ -1,7 +1,7 @@ // ANDXORANDXORAND -import "utils/binary/xor.code" as XOR -import "utils/binary/and.code" as AND +import "utils/binary/xor" as XOR +import "utils/binary/and" as AND def main(field a, field b, field c) -> (field): return XOR(XOR(AND(a, b), AND(a, c)), AND(b, c)) \ No newline at end of file diff --git a/zokrates_cli/examples/sha256/binary/andxornotand.code b/zokrates_cli/examples/sha256/binary/andxornotand.code deleted file mode 100644 index 41bb5737..00000000 --- a/zokrates_cli/examples/sha256/binary/andxornotand.code +++ /dev/null @@ -1,8 +0,0 @@ -// ANDXORNOTAND - -import "utils/binary/and.code" as AND -import "utils/binary/xor.code" as XOR -import "utils/binary/not.code" as NOT - -def main(field a, field b, field c) -> (field): - return XOR(AND(a, b), AND(NOT(a), c)) diff --git a/zokrates_cli/examples/sha256/binary/andxornotand.zok b/zokrates_cli/examples/sha256/binary/andxornotand.zok new file mode 100644 index 00000000..fcb5b462 --- /dev/null +++ b/zokrates_cli/examples/sha256/binary/andxornotand.zok @@ -0,0 +1,8 @@ +// ANDXORNOTAND + +import "utils/binary/and" as AND +import "utils/binary/xor" as XOR +import "utils/binary/not" as NOT + +def main(field a, field b, field c) -> (field): + return XOR(AND(a, b), AND(NOT(a), c)) diff --git a/zokrates_cli/examples/sha256/binary/fulladd.code b/zokrates_cli/examples/sha256/binary/fulladd.zok similarity index 70% rename from zokrates_cli/examples/sha256/binary/fulladd.code rename to zokrates_cli/examples/sha256/binary/fulladd.zok index 375b8506..fbf13de5 100644 --- a/zokrates_cli/examples/sha256/binary/fulladd.code +++ b/zokrates_cli/examples/sha256/binary/fulladd.zok @@ -1,7 +1,7 @@ // FULLADD -import "./halfadd.code" as HALFADD -import "utils/binary/or.code" as OR +import "./halfadd" as HALFADD +import "utils/binary/or" as OR def main(field a, field b, field car) -> (field, field): out1, car1 = HALFADD(a, b) diff --git a/zokrates_cli/examples/sha256/binary/halfadd.code b/zokrates_cli/examples/sha256/binary/halfadd.zok similarity index 53% rename from zokrates_cli/examples/sha256/binary/halfadd.code rename to zokrates_cli/examples/sha256/binary/halfadd.zok index 4cfc96a7..15f0e6ec 100644 --- a/zokrates_cli/examples/sha256/binary/halfadd.code +++ b/zokrates_cli/examples/sha256/binary/halfadd.zok @@ -1,7 +1,7 @@ // HALFADD -import "utils/binary/xor.code" as XOR -import "utils/binary/and.code" as AND +import "utils/binary/xor" as XOR +import "utils/binary/and" as AND def main(field a, field b) -> (field, field): return XOR(a, b), AND(a, b) \ No newline at end of file diff --git a/zokrates_cli/examples/sha256/bitwise/32/and.code b/zokrates_cli/examples/sha256/bitwise/32/and.zok similarity index 87% rename from zokrates_cli/examples/sha256/bitwise/32/and.code rename to zokrates_cli/examples/sha256/bitwise/32/and.zok index f92320fe..7a36796f 100644 --- a/zokrates_cli/examples/sha256/bitwise/32/and.code +++ b/zokrates_cli/examples/sha256/bitwise/32/and.zok @@ -1,6 +1,6 @@ // AND -import "utils/binary/and.code" as AND +import "utils/binary/and" as AND def main(field[32] b, field[32] c) -> (field[32]): field[32] result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.code b/zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.zok similarity index 82% rename from zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.code rename to zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.zok index 13160f6c..334c5ba1 100644 --- a/zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.code +++ b/zokrates_cli/examples/sha256/bitwise/32/andxorandxorand.zok @@ -1,6 +1,6 @@ // ANDXORANDXORAND -import "./../../binary/andxorandxorand.code" as ANDXORANDXORAND +import "./../../binary/andxorandxorand" as ANDXORANDXORAND def main(field[32] b, field[32] c, field[32] d) -> (field[32]): field[32] result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/bitwise/32/andxornotand.code b/zokrates_cli/examples/sha256/bitwise/32/andxornotand.zok similarity index 83% rename from zokrates_cli/examples/sha256/bitwise/32/andxornotand.code rename to zokrates_cli/examples/sha256/bitwise/32/andxornotand.zok index ee23cb4e..f053e5aa 100644 --- a/zokrates_cli/examples/sha256/bitwise/32/andxornotand.code +++ b/zokrates_cli/examples/sha256/bitwise/32/andxornotand.zok @@ -1,6 +1,6 @@ // ANDXORNOTAND -import "./../../binary/andxornotand.code" as ANDXORNOTAND +import "./../../binary/andxornotand" as ANDXORNOTAND def main(field[32] b, field[32] c, field[32] d) -> (field[32]): field[32] result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/bitwise/32/not.code b/zokrates_cli/examples/sha256/bitwise/32/not.zok similarity index 86% rename from zokrates_cli/examples/sha256/bitwise/32/not.code rename to zokrates_cli/examples/sha256/bitwise/32/not.zok index ce235a0d..32fcddec 100644 --- a/zokrates_cli/examples/sha256/bitwise/32/not.code +++ b/zokrates_cli/examples/sha256/bitwise/32/not.zok @@ -1,6 +1,6 @@ // NOT -import "utils/binary/not.code" as NOT +import "utils/binary/not" as NOT def main(field[32] b) -> (field[32]): field[32] result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/bitwise/32/xor.code b/zokrates_cli/examples/sha256/bitwise/32/xor.zok similarity index 87% rename from zokrates_cli/examples/sha256/bitwise/32/xor.code rename to zokrates_cli/examples/sha256/bitwise/32/xor.zok index 6cd0d324..036c74f0 100644 --- a/zokrates_cli/examples/sha256/bitwise/32/xor.code +++ b/zokrates_cli/examples/sha256/bitwise/32/xor.zok @@ -1,6 +1,6 @@ // XOR -import "utils/binary/xor.code" as XOR +import "utils/binary/xor" as XOR def main(field[32] b, field[32] c) -> (field[32]): field[32] result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/utils/32/add.code b/zokrates_cli/examples/sha256/utils/32/add.zok similarity index 89% rename from zokrates_cli/examples/sha256/utils/32/add.code rename to zokrates_cli/examples/sha256/utils/32/add.zok index 61b76142..f7b6c7c4 100644 --- a/zokrates_cli/examples/sha256/utils/32/add.code +++ b/zokrates_cli/examples/sha256/utils/32/add.zok @@ -1,6 +1,6 @@ // ADD -import "../../binary/fulladd.code" as FULLADD +import "../../binary/fulladd" as FULLADD def main(field[32] b, field[32] c) -> (field[32]): field[33] car = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.code b/zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.zok similarity index 95% rename from zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.code rename to zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.zok index 3e7cc187..b736d169 100644 --- a/zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.code +++ b/zokrates_cli/examples/sha256/utils/32/ar17xar19xars10.zok @@ -1,6 +1,6 @@ // AR17XAR19XAR10 -import "../../bitwise/32/xor.code" as XOR +import "../../bitwise/32/xor" as XOR def RR17(field[32] b) -> (field[32]): return [b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23], b[24], b[25], b[26], b[27], b[28], b[29], b[30], b[31], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13], b[14]] diff --git a/zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.code b/zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.zok similarity index 95% rename from zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.code rename to zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.zok index bcea4d75..57f5e319 100644 --- a/zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.code +++ b/zokrates_cli/examples/sha256/utils/32/ar2xar13xar22.zok @@ -1,6 +1,6 @@ // AR2XAR13XAR22 -import "../../bitwise/32/xor.code" as XOR +import "../../bitwise/32/xor" as XOR def RR2(field[32] b) -> (field[32]): return [b[30], b[31], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23], b[24], b[25], b[26], b[27], b[28], b[29]] diff --git a/zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.code b/zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.zok similarity index 95% rename from zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.code rename to zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.zok index f70779bd..a23c9134 100644 --- a/zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.code +++ b/zokrates_cli/examples/sha256/utils/32/ar6xar11xar25.zok @@ -1,6 +1,6 @@ // AR6XAR11XAR25 -import "../../bitwise/32/xor.code" as XOR +import "../../bitwise/32/xor" as XOR def RR6(field[32] b) -> (field[32]): return [b[26], b[27], b[28], b[29], b[30], b[31], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23], b[24], b[25]] diff --git a/zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.code b/zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.zok similarity index 95% rename from zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.code rename to zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.zok index 772075b1..6c523303 100644 --- a/zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.code +++ b/zokrates_cli/examples/sha256/utils/32/ar7xar18xars3.zok @@ -1,6 +1,6 @@ // AR7XAR18XAR3 -import "../../bitwise/32/xor.code" as XOR +import "../../bitwise/32/xor" as XOR def RR7(field[32] b) -> (field[32]): return [b[25], b[26], b[27], b[28], b[29], b[30], b[31], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23], b[24]] diff --git a/zokrates_cli/examples/sha256/utils/32/compression_round.code b/zokrates_cli/examples/sha256/utils/32/compression_round.zok similarity index 80% rename from zokrates_cli/examples/sha256/utils/32/compression_round.code rename to zokrates_cli/examples/sha256/utils/32/compression_round.zok index 7816202f..100c2cd8 100644 --- a/zokrates_cli/examples/sha256/utils/32/compression_round.code +++ b/zokrates_cli/examples/sha256/utils/32/compression_round.zok @@ -1,10 +1,10 @@ // COMPRESSION ROUND -import "./ar6xar11xar25.code" as AR6XAR11XAR25 -import "./ar2xar13xar22.code" as AR2XAR13XAR22 -import "../../bitwise/32/andxornotand.code" as ANDXORNOTAND -import "../../bitwise/32/andxorandxorand.code" as ANDXORANDXORAND -import "./add.code" as ADD2 +import "./ar6xar11xar25" as AR6XAR11XAR25 +import "./ar2xar13xar22" as AR2XAR13XAR22 +import "../../bitwise/32/andxornotand" as ANDXORNOTAND +import "../../bitwise/32/andxorandxorand" as ANDXORANDXORAND +import "./add" as ADD2 def ADD5(field[32] a, field[32] b, field[32] c, field[32] d, field[32] e) -> (field[32]): ab = ADD2(a, b) diff --git a/zokrates_cli/examples/sha256/utils/32/extend.code b/zokrates_cli/examples/sha256/utils/32/extend.zok similarity index 82% rename from zokrates_cli/examples/sha256/utils/32/extend.code rename to zokrates_cli/examples/sha256/utils/32/extend.zok index 2005799d..f6964efa 100644 --- a/zokrates_cli/examples/sha256/utils/32/extend.code +++ b/zokrates_cli/examples/sha256/utils/32/extend.zok @@ -1,8 +1,8 @@ // EXTEND -import "./ar7xar18xars3.code" as AR7XAR18XAR3 -import "./ar17xar19xars10.code" as AR17XAR19XAR10 -import "./add.code" as ADD +import "./ar7xar18xars3" as AR7XAR18XAR3 +import "./ar17xar19xars10" as AR17XAR19XAR10 +import "./add" as ADD def ADD(field[32] a, field[32] b, field[32] c, field[32] d) -> (field[32]): ab = ADD(a, b) diff --git a/zokrates_cli/examples/simple_add.code b/zokrates_cli/examples/simple_add.zok similarity index 100% rename from zokrates_cli/examples/simple_add.code rename to zokrates_cli/examples/simple_add.zok diff --git a/zokrates_cli/examples/simple_ifelse.code b/zokrates_cli/examples/simple_ifelse.zok similarity index 100% rename from zokrates_cli/examples/simple_ifelse.code rename to zokrates_cli/examples/simple_ifelse.zok diff --git a/zokrates_cli/examples/simple_mul.code b/zokrates_cli/examples/simple_mul.zok similarity index 100% rename from zokrates_cli/examples/simple_mul.code rename to zokrates_cli/examples/simple_mul.zok diff --git a/zokrates_cli/examples/spaces_tabs_comments.code b/zokrates_cli/examples/spaces_tabs_comments.zok similarity index 100% rename from zokrates_cli/examples/spaces_tabs_comments.code rename to zokrates_cli/examples/spaces_tabs_comments.zok diff --git a/zokrates_cli/examples/sub.code b/zokrates_cli/examples/sub.zok similarity index 100% rename from zokrates_cli/examples/sub.code rename to zokrates_cli/examples/sub.zok diff --git a/zokrates_cli/examples/sudokuchecker.code b/zokrates_cli/examples/sudokuchecker.zok similarity index 100% rename from zokrates_cli/examples/sudokuchecker.code rename to zokrates_cli/examples/sudokuchecker.zok diff --git a/zokrates_cli/examples/synonyms.code b/zokrates_cli/examples/synonyms.zok similarity index 100% rename from zokrates_cli/examples/synonyms.code rename to zokrates_cli/examples/synonyms.zok diff --git a/zokrates_cli/examples/taxation.code b/zokrates_cli/examples/taxation.zok similarity index 100% rename from zokrates_cli/examples/taxation.code rename to zokrates_cli/examples/taxation.zok diff --git a/zokrates_cli/examples/test1.code b/zokrates_cli/examples/test1.zok similarity index 100% rename from zokrates_cli/examples/test1.code rename to zokrates_cli/examples/test1.zok diff --git a/zokrates_cli/examples/test_lt_max_value.code b/zokrates_cli/examples/test_lt_max_value.zok similarity index 100% rename from zokrates_cli/examples/test_lt_max_value.code rename to zokrates_cli/examples/test_lt_max_value.zok diff --git a/zokrates_cli/examples/waldo.code b/zokrates_cli/examples/waldo.zok similarity index 100% rename from zokrates_cli/examples/waldo.code rename to zokrates_cli/examples/waldo.zok diff --git a/zokrates_cli/examples/wavelets.code b/zokrates_cli/examples/wavelets.zok similarity index 100% rename from zokrates_cli/examples/wavelets.code rename to zokrates_cli/examples/wavelets.zok diff --git a/zokrates_cli/src/bin.rs b/zokrates_cli/src/bin.rs index 6e62adf5..511a5ecb 100644 --- a/zokrates_cli/src/bin.rs +++ b/zokrates_cli/src/bin.rs @@ -57,7 +57,7 @@ fn cli() -> Result<(), String> { .author("Jacob Eberhardt, Thibaut Schaeffer, Stefan Deml") .about("Supports generation of zkSNARKs from high level language code including Smart Contracts for proof verification on the Ethereum Blockchain.\n'I know that I show nothing!'") .subcommand(SubCommand::with_name("compile") - .about("Compiles into flattened conditions. Produces two files: human-readable '.code' file for debugging and binary file") + .about("Compiles into flattened conditions. Produces two files: human-readable '.ztf' file for debugging and binary file") .arg(Arg::with_name("input") .short("i") .long("input") @@ -270,7 +270,7 @@ fn cli() -> Result<(), String> { let bin_output_path = Path::new(sub_matches.value_of("output").unwrap()); - let hr_output_path = bin_output_path.to_path_buf().with_extension("code"); + let hr_output_path = bin_output_path.to_path_buf().with_extension("ztf"); let file = File::open(path.clone()).unwrap(); @@ -541,7 +541,7 @@ mod tests { #[test] fn examples() { - for p in glob("./examples/**/*.code").expect("Failed to read glob pattern") { + for p in glob("./examples/**/*.zok").expect("Failed to read glob pattern") { let path = match p { Ok(x) => x, Err(why) => panic!("Error: {:?}", why), @@ -572,7 +572,7 @@ mod tests { #[test] fn examples_with_input_success() { //these examples should compile and run - for p in glob("./examples/test*.code").expect("Failed to read glob pattern") { + for p in glob("./examples/test*.zok").expect("Failed to read glob pattern") { let path = match p { Ok(x) => x, Err(why) => panic!("Error: {:?}", why), @@ -604,7 +604,7 @@ mod tests { #[should_panic] fn examples_with_input_failure() { //these examples should compile but not run - for p in glob("./examples/runtime_errors/*.code").expect("Failed to read glob pattern") { + for p in glob("./examples/runtime_errors/*.zok").expect("Failed to read glob pattern") { let path = match p { Ok(x) => x, Err(why) => panic!("Error: {:?}", why), diff --git a/zokrates_cli/tests/code/arithmetics.code b/zokrates_cli/tests/code/arithmetics.zok similarity index 100% rename from zokrates_cli/tests/code/arithmetics.code rename to zokrates_cli/tests/code/arithmetics.zok diff --git a/zokrates_cli/tests/code/if_else_false.code b/zokrates_cli/tests/code/if_else_false.zok similarity index 100% rename from zokrates_cli/tests/code/if_else_false.code rename to zokrates_cli/tests/code/if_else_false.zok diff --git a/zokrates_cli/tests/code/if_else_true.code b/zokrates_cli/tests/code/if_else_true.zok similarity index 100% rename from zokrates_cli/tests/code/if_else_true.code rename to zokrates_cli/tests/code/if_else_true.zok diff --git a/zokrates_cli/tests/code/multidim_update.code b/zokrates_cli/tests/code/multidim_update.zok similarity index 100% rename from zokrates_cli/tests/code/multidim_update.code rename to zokrates_cli/tests/code/multidim_update.zok diff --git a/zokrates_cli/tests/code/n_choose_k.code b/zokrates_cli/tests/code/n_choose_k.zok similarity index 100% rename from zokrates_cli/tests/code/n_choose_k.code rename to zokrates_cli/tests/code/n_choose_k.zok diff --git a/zokrates_cli/tests/code/no_return.code b/zokrates_cli/tests/code/no_return.zok similarity index 100% rename from zokrates_cli/tests/code/no_return.code rename to zokrates_cli/tests/code/no_return.zok diff --git a/zokrates_cli/tests/code/return_array.code b/zokrates_cli/tests/code/return_array.zok similarity index 100% rename from zokrates_cli/tests/code/return_array.code rename to zokrates_cli/tests/code/return_array.zok diff --git a/zokrates_cli/tests/code/sha_round.code b/zokrates_cli/tests/code/sha_round.zok similarity index 100% rename from zokrates_cli/tests/code/sha_round.code rename to zokrates_cli/tests/code/sha_round.zok diff --git a/zokrates_cli/tests/code/simple_add.code b/zokrates_cli/tests/code/simple_add.zok similarity index 100% rename from zokrates_cli/tests/code/simple_add.code rename to zokrates_cli/tests/code/simple_add.zok diff --git a/zokrates_cli/tests/code/simple_mul.code b/zokrates_cli/tests/code/simple_mul.zok similarity index 100% rename from zokrates_cli/tests/code/simple_mul.code rename to zokrates_cli/tests/code/simple_mul.zok diff --git a/zokrates_cli/tests/code/taxation.code b/zokrates_cli/tests/code/taxation.zok similarity index 100% rename from zokrates_cli/tests/code/taxation.code rename to zokrates_cli/tests/code/taxation.zok diff --git a/zokrates_cli/tests/integration.rs b/zokrates_cli/tests/integration.rs index ed76fe44..972685ad 100644 --- a/zokrates_cli/tests/integration.rs +++ b/zokrates_cli/tests/integration.rs @@ -27,7 +27,7 @@ mod integration { if path.extension().unwrap() == "witness" { let program_name = Path::new(Path::new(path.file_stem().unwrap()).file_stem().unwrap()); - let prog = dir.join(program_name).with_extension("code"); + let prog = dir.join(program_name).with_extension("zok"); let witness = dir.join(program_name).with_extension("expected.witness"); let args = dir.join(program_name).with_extension("arguments.json"); test_compile_and_witness(program_name.to_str().unwrap(), &prog, &args, &witness); diff --git a/zokrates_core/src/imports.rs b/zokrates_core/src/imports.rs index bb4ce7da..589db42d 100644 --- a/zokrates_core/src/imports.rs +++ b/zokrates_core/src/imports.rs @@ -243,10 +243,10 @@ mod tests { #[test] fn create_with_no_alias() { assert_eq!( - Import::new(None, "./foo/bar/baz.code"), + Import::new(None, "./foo/bar/baz.zok"), Import { symbol: None, - source: "./foo/bar/baz.code", + source: "./foo/bar/baz.zok", alias: None, } ); @@ -255,10 +255,10 @@ mod tests { #[test] fn create_with_alias() { assert_eq!( - Import::new_with_alias(None, "./foo/bar/baz.code", &"myalias"), + Import::new_with_alias(None, "./foo/bar/baz.zok", &"myalias"), Import { symbol: None, - source: "./foo/bar/baz.code", + source: "./foo/bar/baz.zok", alias: Some("myalias"), } ); diff --git a/zokrates_core/src/semantics.rs b/zokrates_core/src/semantics.rs index 5b6efd5e..cc38b748 100644 --- a/zokrates_core/src/semantics.rs +++ b/zokrates_core/src/semantics.rs @@ -2028,12 +2028,12 @@ mod tests { #[test] fn imported_function() { - // foo.code + // foo.zok // def main() -> (): // return - // bar.code - // from "./foo.code" import main + // bar.zok + // from "./foo.zok" import main // after semantic check, `bar` should import a checked function diff --git a/zokrates_core_test/tests/tests/add.json b/zokrates_core_test/tests/tests/add.json index 76935916..ebc660a9 100644 --- a/zokrates_core_test/tests/tests/add.json +++ b/zokrates_core_test/tests/tests/add.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/add.code", + "entry_point": "./tests/tests/add.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/add.code b/zokrates_core_test/tests/tests/add.zok similarity index 100% rename from zokrates_core_test/tests/tests/add.code rename to zokrates_core_test/tests/tests/add.zok diff --git a/zokrates_core_test/tests/tests/array_if.json b/zokrates_core_test/tests/tests/array_if.json index fcb35110..6cfec59b 100644 --- a/zokrates_core_test/tests/tests/array_if.json +++ b/zokrates_core_test/tests/tests/array_if.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/array_if.code", + "entry_point": "./tests/tests/array_if.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/array_if.code b/zokrates_core_test/tests/tests/array_if.zok similarity index 100% rename from zokrates_core_test/tests/tests/array_if.code rename to zokrates_core_test/tests/tests/array_if.zok diff --git a/zokrates_core_test/tests/tests/assert_one.json b/zokrates_core_test/tests/tests/assert_one.json index 9a7d4ed4..2a8a099d 100644 --- a/zokrates_core_test/tests/tests/assert_one.json +++ b/zokrates_core_test/tests/tests/assert_one.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/assert_one.code", + "entry_point": "./tests/tests/assert_one.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/assert_one.code b/zokrates_core_test/tests/tests/assert_one.zok similarity index 100% rename from zokrates_core_test/tests/tests/assert_one.code rename to zokrates_core_test/tests/tests/assert_one.zok diff --git a/zokrates_core_test/tests/tests/fact_up_to_4.json b/zokrates_core_test/tests/tests/fact_up_to_4.json index 6c32ff24..b3936a18 100644 --- a/zokrates_core_test/tests/tests/fact_up_to_4.json +++ b/zokrates_core_test/tests/tests/fact_up_to_4.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/fact_up_to_4.code", + "entry_point": "./tests/tests/fact_up_to_4.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/fact_up_to_4.code b/zokrates_core_test/tests/tests/fact_up_to_4.zok similarity index 100% rename from zokrates_core_test/tests/tests/fact_up_to_4.code rename to zokrates_core_test/tests/tests/fact_up_to_4.zok diff --git a/zokrates_core_test/tests/tests/split.json b/zokrates_core_test/tests/tests/split.json index c05358a6..f1d5cfb8 100644 --- a/zokrates_core_test/tests/tests/split.json +++ b/zokrates_core_test/tests/tests/split.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/split.code", + "entry_point": "./tests/tests/split.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/split.code b/zokrates_core_test/tests/tests/split.zok similarity index 100% rename from zokrates_core_test/tests/tests/split.code rename to zokrates_core_test/tests/tests/split.zok diff --git a/zokrates_core_test/tests/tests/spread_slice.json b/zokrates_core_test/tests/tests/spread_slice.json index b2291bc1..afedb079 100644 --- a/zokrates_core_test/tests/tests/spread_slice.json +++ b/zokrates_core_test/tests/tests/spread_slice.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/spread_slice.code", + "entry_point": "./tests/tests/spread_slice.zok", "tests": [ { "input": { diff --git a/zokrates_core_test/tests/tests/spread_slice.code b/zokrates_core_test/tests/tests/spread_slice.zok similarity index 100% rename from zokrates_core_test/tests/tests/spread_slice.code rename to zokrates_core_test/tests/tests/spread_slice.zok diff --git a/zokrates_fs_resolver/src/lib.rs b/zokrates_fs_resolver/src/lib.rs index f8f8a53a..0d136b88 100644 --- a/zokrates_fs_resolver/src/lib.rs +++ b/zokrates_fs_resolver/src/lib.rs @@ -24,7 +24,7 @@ fn resolve_with_location<'a>( let source = Path::new(source); // paths starting with `./` or `../` are interpreted relative to the current file - // other paths `abc/def.code` are interpreted relative to $ZOKRATES_HOME + // other paths `abc/def` are interpreted relative to $ZOKRATES_HOME let base = match source.components().next() { Some(Component::CurDir) | Some(Component::ParentDir) => PathBuf::from(location), _ => PathBuf::from( @@ -32,7 +32,7 @@ fn resolve_with_location<'a>( ), }; - let path_owned = base.join(PathBuf::from(source)); + let path_owned = base.join(PathBuf::from(source)).with_extension("zok"); if path_owned.is_dir() { return Err(io::Error::new(io::ErrorKind::Other, "Not a file")); @@ -60,9 +60,17 @@ mod tests { #[test] fn valid_path_with_location() { - let (_, next_location, alias) = resolve(Some(String::from("./src")), &"./lib.rs").unwrap(); - assert_eq!(next_location, String::from("./src")); - assert_eq!(alias, String::from("lib")); + use std::io::Write; + + // create a source folder with a zok file + let folder = tempfile::tempdir().unwrap(); + let file_path = folder.path().join("bar.zok"); + let mut file = File::create(file_path).unwrap(); + writeln!(file, "some code").unwrap(); + let (_, next_location, alias) = + resolve(Some(folder.path().to_str().unwrap().to_string()), &"./bar").unwrap(); + assert_eq!(next_location, folder.path().to_str().unwrap().to_string()); + assert_eq!(alias, String::from("bar")); } #[test] @@ -73,13 +81,13 @@ mod tests { #[test] fn non_existing_file() { - let res = resolve(Some(String::from("./src")), &"./rubbish.rs"); + let res = resolve(Some(String::from("./src")), &"./rubbish"); assert!(res.is_err()); } #[test] fn invalid_location() { - let res = resolve(Some(String::from(",8!-$2abc")), &"./foo.code"); + let res = resolve(Some(String::from(",8!-$2abc")), &"./foo.zok"); assert!(res.is_err()); } @@ -95,31 +103,6 @@ mod tests { assert!(res.is_err()); } - #[test] - #[should_panic] - fn no_file_name_without_stdlib() { - // an empty string is interpreted relative to the HOME folder. If there's none, panic - std::env::remove_var(ZOKRATES_HOME); - let _res = resolve(Some(String::from(".")), &""); - } - - #[test] - fn no_file_name_with_stdlib() { - use std::io::Write; - - // create a HOME folder with a code file - let zokrates_home_folder = tempfile::tempdir().unwrap(); - let file_path = zokrates_home_folder.path().join("bar.code"); - let mut file = File::create(file_path).unwrap(); - writeln!(file, "").unwrap(); - - // assign HOME folder to ZOKRATES_HOME - std::env::set_var(ZOKRATES_HOME, zokrates_home_folder.path()); - - let res = resolve(Some(String::from(".")), &""); - assert!(res.is_err()); - } - #[test] fn treat_relative_as_local() { use std::io::BufRead; @@ -127,13 +110,13 @@ mod tests { // create a HOME folder with a code file let zokrates_home_folder = tempfile::tempdir().unwrap(); - let file_path = zokrates_home_folder.path().join("bar.code"); + let file_path = zokrates_home_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); // create a user folder with a code file let source_folder = tempfile::tempdir().unwrap(); - let file_path = source_folder.path().join("bar.code"); + let file_path = source_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); @@ -148,7 +131,7 @@ mod tests { .to_string_lossy() .to_string(), ), - &"./bar.code", + &"./bar.zok", ); assert!(result.is_ok()); let mut code = String::new(); @@ -164,13 +147,13 @@ mod tests { // create a HOME folder with a code file let zokrates_home_folder = tempfile::tempdir().unwrap(); - let file_path = zokrates_home_folder.path().join("bar.code"); + let file_path = zokrates_home_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); // create a user folder with a code file let source_folder = tempfile::tempdir().unwrap(); - let file_path = source_folder.path().join("bar.code"); + let file_path = source_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); @@ -185,7 +168,7 @@ mod tests { .to_string_lossy() .to_string(), ), - &"bar.code", + &"bar.zok", ); assert!(result.is_ok()); let mut code = String::new(); @@ -202,7 +185,7 @@ mod tests { // create a user folder with a code file let source_folder = tempfile::tempdir().unwrap(); let source_subfolder = tempfile::tempdir_in(&source_folder).unwrap(); - let file_path = source_folder.path().join("bar.code"); + let file_path = source_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); @@ -214,7 +197,7 @@ mod tests { .to_string_lossy() .to_string(), ), - &"../bar.code", + &"../bar.zok", ); assert!(result.is_ok()); let mut code = String::new(); @@ -229,21 +212,21 @@ mod tests { // create a HOME folder let zokrates_home_folder = tempfile::tempdir().unwrap(); - let file_path = zokrates_home_folder.path().join("bar.code"); + let file_path = zokrates_home_folder.path().join("bar.zok"); let mut file = File::create(file_path).unwrap(); writeln!(file, "").unwrap(); // assign HOME folder to ZOKRATES_HOME std::env::set_var(ZOKRATES_HOME, zokrates_home_folder.path()); - let result = resolve(Some("/path/to/user/folder".to_string()), &"./bar.code"); + let result = resolve(Some("/path/to/user/folder".to_string()), &"./bar.zok"); assert!(result.is_err()); } #[test] fn fail_if_not_found_in_std() { std::env::set_var(ZOKRATES_HOME, ""); - let result = resolve(Some("/path/to/source".to_string()), &"bar.code"); + let result = resolve(Some("/path/to/source".to_string()), &"bar.zok"); assert!(result.is_err()); } @@ -251,6 +234,6 @@ mod tests { #[should_panic] fn panic_if_home_not_set() { std::env::remove_var(ZOKRATES_HOME); - let _ = resolve(Some("/path/to/source".to_string()), &"bar.code"); + let _ = resolve(Some("/path/to/source".to_string()), &"bar.zok"); } } diff --git a/zokrates_github_resolver/src/lib.rs b/zokrates_github_resolver/src/lib.rs index c9fd6cec..302e6494 100644 --- a/zokrates_github_resolver/src/lib.rs +++ b/zokrates_github_resolver/src/lib.rs @@ -4,17 +4,17 @@ //! //! To import file from github, use following syntax: //! ```zokrates -//! import "github:user/repo/branch/path/to/file.code" +//! import "github:user/repo/branch/path/to/file" //! ``` //! //! For example: //! ```zokrates -//! import "github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/merkleTree/sha256PathProof3.code" as merkleTreeProof +//! import "github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/merkleTree/sha256PathProof3" as merkleTreeProof //! ``` //! -//! Example above imports file `zokrates_cli/examples/merkleTree/sha256PathProof3.code` located at ZoKrates +//! Example above imports file `zokrates_cli/examples/merkleTree/sha256PathProof3.zok` located at ZoKrates //! repository's `master` branch by downloading from URL: -//! https://raw.githubusercontent.com/Zokrates/ZoKrates/master/zokrates_cli/examples/merkleTree/sha256PathProof3.code +//! https://raw.githubusercontent.com/Zokrates/ZoKrates/master/zokrates_cli/examples/merkleTree/sha256PathProof3.zok //! use reqwest; @@ -112,12 +112,13 @@ fn download_from_github( path: &str, ) -> Result { let url = format!( - "{github}/{root}/{repo}/{branch}/{path}", + "{github}/{root}/{repo}/{branch}/{path}{extension}", github = github, root = root, repo = repo, branch = branch, - path = path + path = path, + extension = ".zok" ); download_url(&url) @@ -153,15 +154,15 @@ mod tests { fn init_github_mock() -> (Mock, Mock) { let m1 = mockito::mock( "GET", - "/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/foo.code", + "/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/foo.zok", ) .with_status(200) - .with_body_from_file("./static/foo.code") + .with_body_from_file("./static/foo.zok") .create(); let m2 = mockito::mock( "GET", - "/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/notfound.code", + "/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/notfound.zok", ) .with_status(404) .create(); @@ -172,7 +173,7 @@ mod tests { #[test] pub fn import_simple() { let res = parse_input_path(Path::new( - "github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/import.code", + "github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/import", )) .unwrap(); let (root, repo, branch, path) = res; @@ -180,15 +181,15 @@ mod tests { assert_eq!(root, "Zokrates"); assert_eq!(repo, "ZoKrates"); assert_eq!(branch, "master"); - assert_eq!(path, "zokrates_cli/examples/imports/import.code"); + assert_eq!(path, "zokrates_cli/examples/imports/import"); } #[test] #[should_panic] pub fn import_no_branch() { - // Correct syntax should be: github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/import.code + // Correct syntax should be: github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/import // but branch name is not specified - parse_input_path(Path::new("github.com/Zokrates/ZoKrates/test.code")).unwrap(); + parse_input_path(Path::new("github.com/Zokrates/ZoKrates/test")).unwrap(); } #[test] @@ -196,7 +197,7 @@ mod tests { pub fn import_relative_paths() { // Relative paths should not be allowed parse_input_path(Path::new( - "github.com/Zokrates/ZoKrates/master/examples/../imports.code", + "github.com/Zokrates/ZoKrates/master/examples/../imports", )) .unwrap(); } @@ -206,7 +207,7 @@ mod tests { let (_m0, _m1) = init_github_mock(); let res = resolve( Some("".to_string()), - &"github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/foo.code", + &"github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/foo", ); assert!(res.is_ok()); } @@ -216,7 +217,7 @@ mod tests { let (_m0, _m1) = init_github_mock(); assert!(resolve( Some("".to_string()), - &"github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/notfound.code" + &"github.com/Zokrates/ZoKrates/master/zokrates_cli/examples/imports/notfound" ) .is_err()); } diff --git a/zokrates_github_resolver/static/foo.code b/zokrates_github_resolver/static/foo.zok similarity index 100% rename from zokrates_github_resolver/static/foo.code rename to zokrates_github_resolver/static/foo.zok diff --git a/zokrates_parser/src/lib.rs b/zokrates_parser/src/lib.rs index be385565..a135024e 100644 --- a/zokrates_parser/src/lib.rs +++ b/zokrates_parser/src/lib.rs @@ -27,9 +27,9 @@ mod tests { use glob::glob; use std::fs; use std::io::Read; - // Traverse all .code files in examples dir + // Traverse all .zok files in examples dir for entry in - glob("../zokrates_cli/examples/**/*.code").expect("Failed to read glob pattern") + glob("../zokrates_cli/examples/**/*.zok").expect("Failed to read glob pattern") { match entry { Ok(path) => { diff --git a/zokrates_pest_ast/src/lib.rs b/zokrates_pest_ast/src/lib.rs index e86541be..78c4f17b 100644 --- a/zokrates_pest_ast/src/lib.rs +++ b/zokrates_pest_ast/src/lib.rs @@ -739,9 +739,8 @@ mod tests { use glob::glob; use std::fs; use std::io::Read; - // Traverse all .code files in examples dir - for entry in - glob("../zokrates_cli/examples/**/*.code").expect("Failed to read glob pattern") + // Traverse all .zok files in examples dir + for entry in glob("../zokrates_cli/examples/**/*.zok").expect("Failed to read glob pattern") { match entry { Ok(path) => { diff --git a/zokrates_stdlib/stdlib/ecc/babyjubjubParams.code b/zokrates_stdlib/stdlib/ecc/babyjubjubParams.zok similarity index 100% rename from zokrates_stdlib/stdlib/ecc/babyjubjubParams.code rename to zokrates_stdlib/stdlib/ecc/babyjubjubParams.zok diff --git a/zokrates_stdlib/stdlib/ecc/edwardsAdd.code b/zokrates_stdlib/stdlib/ecc/edwardsAdd.zok similarity index 92% rename from zokrates_stdlib/stdlib/ecc/edwardsAdd.code rename to zokrates_stdlib/stdlib/ecc/edwardsAdd.zok index 9027fcc1..99de1522 100644 --- a/zokrates_stdlib/stdlib/ecc/edwardsAdd.code +++ b/zokrates_stdlib/stdlib/ecc/edwardsAdd.zok @@ -1,4 +1,4 @@ -import "ecc/babyjubjubParams.code" as context +import "ecc/babyjubjubParams" as context // Add two points on a twisted Edwards curve // Curve parameters are defined with the last argument // https://en.wikipedia.org/wiki/Twisted_Edwards_curve#Addition_on_twisted_Edwards_curves diff --git a/zokrates_stdlib/stdlib/ecc/edwardsCompress.code b/zokrates_stdlib/stdlib/ecc/edwardsCompress.zok similarity index 89% rename from zokrates_stdlib/stdlib/ecc/edwardsCompress.code rename to zokrates_stdlib/stdlib/ecc/edwardsCompress.zok index 15426dac..7b874e7b 100644 --- a/zokrates_stdlib/stdlib/ecc/edwardsCompress.code +++ b/zokrates_stdlib/stdlib/ecc/edwardsCompress.zok @@ -1,4 +1,4 @@ -import "utils/pack/nonStrictUnpack256.code" as unpack256 +import "utils/pack/nonStrictUnpack256" as unpack256 // Compress JubJub Curve Point to 256bit array using big endianness bit order // Python reference code from pycrypto: // def compress(self): diff --git a/zokrates_stdlib/stdlib/ecc/edwardsNegate.code b/zokrates_stdlib/stdlib/ecc/edwardsNegate.zok similarity index 85% rename from zokrates_stdlib/stdlib/ecc/edwardsNegate.code rename to zokrates_stdlib/stdlib/ecc/edwardsNegate.zok index 49911c5d..af6d8156 100644 --- a/zokrates_stdlib/stdlib/ecc/edwardsNegate.code +++ b/zokrates_stdlib/stdlib/ecc/edwardsNegate.zok @@ -1,4 +1,4 @@ -import "ecc/babyjubjubParams.code" as context +import "ecc/babyjubjubParams" as context // Negate a point on an Edwards curve // Curve parameters are defined with the last argument // Twisted Edwards Curves, BBJLP-2008, section 2 pg 2 diff --git a/zokrates_stdlib/stdlib/ecc/edwardsOnCurve.code b/zokrates_stdlib/stdlib/ecc/edwardsOnCurve.zok similarity index 100% rename from zokrates_stdlib/stdlib/ecc/edwardsOnCurve.code rename to zokrates_stdlib/stdlib/ecc/edwardsOnCurve.zok diff --git a/zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.code b/zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.zok similarity index 87% rename from zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.code rename to zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.zok index 9ebb1293..ca0c5daf 100644 --- a/zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.code +++ b/zokrates_stdlib/stdlib/ecc/edwardsOrderCheck.zok @@ -1,6 +1,6 @@ -import "ecc/edwardsAdd.code" as add -import "ecc/edwardsScalarMult.code" as multiply -import "utils/pack/nonStrictUnpack256.code" as unpack256 +import "ecc/edwardsAdd" as add +import "ecc/edwardsScalarMult" as multiply +import "utils/pack/nonStrictUnpack256" as unpack256 // Verifies that the point is not one of the low-order points. // If any of the points is multiplied by the cofactor, the resulting point // will be infinity. diff --git a/zokrates_stdlib/stdlib/ecc/edwardsScalarMult.code b/zokrates_stdlib/stdlib/ecc/edwardsScalarMult.zok similarity index 91% rename from zokrates_stdlib/stdlib/ecc/edwardsScalarMult.code rename to zokrates_stdlib/stdlib/ecc/edwardsScalarMult.zok index b7cea471..ccd32539 100644 --- a/zokrates_stdlib/stdlib/ecc/edwardsScalarMult.code +++ b/zokrates_stdlib/stdlib/ecc/edwardsScalarMult.zok @@ -1,5 +1,5 @@ -import "ecc/edwardsAdd.code" as add -import "ecc/edwardsOnCurve.code" as assertOnCurve +import "ecc/edwardsAdd" as add +import "ecc/edwardsOnCurve" as assertOnCurve // Function that implements scalar multiplication for a fixed base point // Curve parameters are defined with the last argument // The exponent is hard-coded to a 256bit scalar, hence we allow wrapping around the group for certain diff --git a/zokrates_stdlib/stdlib/ecc/proofOfOwnership.code b/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok similarity index 85% rename from zokrates_stdlib/stdlib/ecc/proofOfOwnership.code rename to zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok index 96d9ad4b..f6b0c1fd 100644 --- a/zokrates_stdlib/stdlib/ecc/proofOfOwnership.code +++ b/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok @@ -1,6 +1,6 @@ -import "ecc/edwardsAdd.code" as add -import "ecc/edwardsScalarMult.code" as multiply -import "utils/pack/nonStrictUnpack256.code" as unpack256 +import "ecc/edwardsAdd" as add +import "ecc/edwardsScalarMult" as multiply +import "utils/pack/nonStrictUnpack256" as unpack256 /// Verifies match of a given public/private keypair. /// diff --git a/zokrates_stdlib/stdlib/hashes/pedersen/512bit.code b/zokrates_stdlib/stdlib/hashes/pedersen/512bit.zok similarity index 99% rename from zokrates_stdlib/stdlib/hashes/pedersen/512bit.code rename to zokrates_stdlib/stdlib/hashes/pedersen/512bit.zok index 861ce33a..ea704854 100644 --- a/zokrates_stdlib/stdlib/hashes/pedersen/512bit.code +++ b/zokrates_stdlib/stdlib/hashes/pedersen/512bit.zok @@ -1,8 +1,8 @@ -import "utils/multiplexer/lookup3bitSigned.code" as sel3s -import "utils/multiplexer/lookup2bit.code" as sel2 -import "ecc/babyjubjubParams.code" as context -import "ecc/edwardsAdd.code" as add -import "ecc/edwardsCompress.code" as edwardsCompress +import "utils/multiplexer/lookup3bitSigned" as sel3s +import "utils/multiplexer/lookup2bit" as sel2 +import "ecc/babyjubjubParams" as context +import "ecc/edwardsAdd" as add +import "ecc/edwardsCompress" as edwardsCompress // Code to export generators used in this example: // import bitstring diff --git a/zokrates_stdlib/stdlib/hashes/pedersen/6bit.code b/zokrates_stdlib/stdlib/hashes/pedersen/6bit.zok similarity index 89% rename from zokrates_stdlib/stdlib/hashes/pedersen/6bit.code rename to zokrates_stdlib/stdlib/hashes/pedersen/6bit.zok index 6189accd..ca535350 100644 --- a/zokrates_stdlib/stdlib/hashes/pedersen/6bit.code +++ b/zokrates_stdlib/stdlib/hashes/pedersen/6bit.zok @@ -1,7 +1,7 @@ -import "utils/multiplexer/lookup3bitSigned.code" as sel3s -import "utils/multiplexer/lookup2bit.code" as sel2 -import "ecc/babyjubjubParams.code" as context -import "ecc/edwardsAdd.code" as add +import "utils/multiplexer/lookup3bitSigned" as sel3s +import "utils/multiplexer/lookup2bit" as sel2 +import "ecc/babyjubjubParams" as context +import "ecc/edwardsAdd" as add def main(field[6] e) -> (field[2]): context = context() diff --git a/zokrates_stdlib/stdlib/hashes/sha256/1024bit.code b/zokrates_stdlib/stdlib/hashes/sha256/1024bit.zok similarity index 78% rename from zokrates_stdlib/stdlib/hashes/sha256/1024bit.code rename to zokrates_stdlib/stdlib/hashes/sha256/1024bit.zok index 49b48007..7ac2ab77 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/1024bit.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/1024bit.zok @@ -1,5 +1,5 @@ -import "./IVconstants.code" as IVconstants -import "./shaRoundNoBoolCheck.code" as sha256 +import "./IVconstants" as IVconstants +import "./shaRoundNoBoolCheck" as sha256 // A function that takes 4 field[256] arrays as inputs // and applies 2 rounds of sha256 compression. diff --git a/zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.code b/zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.zok similarity index 98% rename from zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.code rename to zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.zok index 4191d150..9d73110b 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/1024bitPadded.zok @@ -1,4 +1,4 @@ -import "./1536bit.code" as sha256 +import "./1536bit" as sha256 // Take two field[256] arrays as input // and returns their sha256 full round output as an array of 256 field elements. def main(field[256] a, field[256] b, field[256] c, field[256] d) -> (field[256]): diff --git a/zokrates_stdlib/stdlib/hashes/sha256/1536bit.code b/zokrates_stdlib/stdlib/hashes/sha256/1536bit.zok similarity index 81% rename from zokrates_stdlib/stdlib/hashes/sha256/1536bit.code rename to zokrates_stdlib/stdlib/hashes/sha256/1536bit.zok index 176b4c99..bcb3c008 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/1536bit.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/1536bit.zok @@ -1,5 +1,5 @@ -import "./IVconstants.code" as IVconstants -import "./shaRoundNoBoolCheck.code" as sha256 +import "./IVconstants" as IVconstants +import "./shaRoundNoBoolCheck" as sha256 // A function that takes 6 field[256] arrays as inputs // and applies 3 rounds of sha256 compression. diff --git a/zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.code b/zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.zok similarity index 97% rename from zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.code rename to zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.zok index 87c5b918..8c572edb 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/256bitPadded.zok @@ -1,4 +1,4 @@ -import "./512bit.code" as sha256 +import "./512bit" as sha256 // A function that takes 1 field[256] array as input // and returns the sha256 full round output as an array of 256 field elements. diff --git a/zokrates_stdlib/stdlib/hashes/sha256/512bit.code b/zokrates_stdlib/stdlib/hashes/sha256/512bit.zok similarity index 66% rename from zokrates_stdlib/stdlib/hashes/sha256/512bit.code rename to zokrates_stdlib/stdlib/hashes/sha256/512bit.zok index 1b54b001..1379ff79 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/512bit.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/512bit.zok @@ -1,9 +1,9 @@ -import "./IVconstants.code" as IVconstants -import "./shaRoundNoBoolCheck.code" as sha256 +import "./IVconstants" as IVconstants +import "./shaRoundNoBoolCheck" as sha256 // A function that takes 2 field[256] arrays as inputs // and returns their sha256 compression function as an array of 256 field elements. -// In contrast to full_round.code no padding is being applied +// In contrast to full_round.zok no padding is being applied def main(field[256] a, field[256] b) -> (field[256]): // a and b is NOT checked to be of type bool @@ -12,4 +12,4 @@ def main(field[256] a, field[256] b) -> (field[256]): digest = sha256(a, b, IV) //digest is constraint to be of type bool - return digest \ No newline at end of file + return digest diff --git a/zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.code b/zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.zok similarity index 81% rename from zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.code rename to zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.zok index 33172393..37b3305b 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/512bitPacked.zok @@ -1,6 +1,6 @@ -import "../../utils/pack/pack128.code" as pack128 -import "../../utils/pack/unpack128.code" as unpack128 -import "./512bitPadded.code" as sha256 +import "../../utils/pack/pack128" as pack128 +import "../../utils/pack/unpack128" as unpack128 +import "./512bitPadded" as sha256 // A function that takes an array of 4 field elements as inputs, unpacks each of them to 128 // bits (big endian), concatenates them and applies sha256. // It then returns an array of two field elements, each representing 128 bits of the result. diff --git a/zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.code b/zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.zok similarity index 98% rename from zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.code rename to zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.zok index da271974..5ea988e2 100644 --- a/zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.code +++ b/zokrates_stdlib/stdlib/hashes/sha256/512bitPadded.zok @@ -1,4 +1,4 @@ -import "./1024bit.code" as sha256 +import "./1024bit" as sha256 // A function that takes 2 field[256] arrays as inputs // and returns their sha256 full round output as an array of 256 field elements. diff --git a/zokrates_stdlib/stdlib/hashes/sha256/IVconstants.code b/zokrates_stdlib/stdlib/hashes/sha256/IVconstants.zok similarity index 100% rename from zokrates_stdlib/stdlib/hashes/sha256/IVconstants.code rename to zokrates_stdlib/stdlib/hashes/sha256/IVconstants.zok diff --git a/zokrates_stdlib/stdlib/hashes/sha256/shaRoundNoBoolCheck.code b/zokrates_stdlib/stdlib/hashes/sha256/shaRoundNoBoolCheck.zok similarity index 100% rename from zokrates_stdlib/stdlib/hashes/sha256/shaRoundNoBoolCheck.code rename to zokrates_stdlib/stdlib/hashes/sha256/shaRoundNoBoolCheck.zok diff --git a/zokrates_stdlib/stdlib/hashes/utils/256bitsDirectionHelper.code b/zokrates_stdlib/stdlib/hashes/utils/256bitsDirectionHelper.zok similarity index 100% rename from zokrates_stdlib/stdlib/hashes/utils/256bitsDirectionHelper.code rename to zokrates_stdlib/stdlib/hashes/utils/256bitsDirectionHelper.zok diff --git a/zokrates_stdlib/stdlib/signatures/verifyEddsa.code b/zokrates_stdlib/stdlib/signatures/verifyEddsa.zok similarity index 85% rename from zokrates_stdlib/stdlib/signatures/verifyEddsa.code rename to zokrates_stdlib/stdlib/signatures/verifyEddsa.zok index 343e40ce..2d88b4e1 100644 --- a/zokrates_stdlib/stdlib/signatures/verifyEddsa.code +++ b/zokrates_stdlib/stdlib/signatures/verifyEddsa.zok @@ -1,9 +1,9 @@ -import "hashes/sha256/1024bitPadded.code" as sha256 -import "ecc/edwardsScalarMult.code" as scalarMult -import "ecc/edwardsAdd.code" as add -import "utils/pack/nonStrictUnpack256.code" as unpack256 -import "ecc/edwardsOnCurve.code" as onCurve -import "ecc/edwardsOrderCheck.code" as orderCheck +import "hashes/sha256/1024bitPadded" as sha256 +import "ecc/edwardsScalarMult" as scalarMult +import "ecc/edwardsAdd" as add +import "utils/pack/nonStrictUnpack256" as unpack256 +import "ecc/edwardsOnCurve" as onCurve +import "ecc/edwardsOrderCheck" as orderCheck /// Verifies an EdDSA Signature. /// diff --git a/zokrates_stdlib/stdlib/utils/binary/and.code b/zokrates_stdlib/stdlib/utils/binary/and.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/binary/and.code rename to zokrates_stdlib/stdlib/utils/binary/and.zok diff --git a/zokrates_stdlib/stdlib/utils/binary/isbool.code b/zokrates_stdlib/stdlib/utils/binary/isbool.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/binary/isbool.code rename to zokrates_stdlib/stdlib/utils/binary/isbool.zok diff --git a/zokrates_stdlib/stdlib/utils/binary/not.code b/zokrates_stdlib/stdlib/utils/binary/not.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/binary/not.code rename to zokrates_stdlib/stdlib/utils/binary/not.zok diff --git a/zokrates_stdlib/stdlib/utils/binary/or.code b/zokrates_stdlib/stdlib/utils/binary/or.zok similarity index 59% rename from zokrates_stdlib/stdlib/utils/binary/or.code rename to zokrates_stdlib/stdlib/utils/binary/or.zok index 9a9ce47f..a06088ac 100644 --- a/zokrates_stdlib/stdlib/utils/binary/or.code +++ b/zokrates_stdlib/stdlib/utils/binary/or.zok @@ -1,7 +1,7 @@ // OR -import "./and.code" as AND -import "./not.code" as NOT +import "./and" as AND +import "./not" as NOT def main(field x, field y) -> (field): return NOT(AND(NOT(x), NOT(y))) \ No newline at end of file diff --git a/zokrates_stdlib/stdlib/utils/binary/xor.code b/zokrates_stdlib/stdlib/utils/binary/xor.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/binary/xor.code rename to zokrates_stdlib/stdlib/utils/binary/xor.zok diff --git a/zokrates_stdlib/stdlib/utils/casts/1024to256array.code b/zokrates_stdlib/stdlib/utils/casts/1024to256array.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/casts/1024to256array.code rename to zokrates_stdlib/stdlib/utils/casts/1024to256array.zok diff --git a/zokrates_stdlib/stdlib/utils/multiplexer/256bit.code b/zokrates_stdlib/stdlib/utils/multiplexer/256bit.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/multiplexer/256bit.code rename to zokrates_stdlib/stdlib/utils/multiplexer/256bit.zok diff --git a/zokrates_stdlib/stdlib/utils/multiplexer/2bit.code b/zokrates_stdlib/stdlib/utils/multiplexer/2bit.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/multiplexer/2bit.code rename to zokrates_stdlib/stdlib/utils/multiplexer/2bit.zok diff --git a/zokrates_stdlib/stdlib/utils/multiplexer/lookup1bit.code b/zokrates_stdlib/stdlib/utils/multiplexer/lookup1bit.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/multiplexer/lookup1bit.code rename to zokrates_stdlib/stdlib/utils/multiplexer/lookup1bit.zok diff --git a/zokrates_stdlib/stdlib/utils/multiplexer/lookup2bit.code b/zokrates_stdlib/stdlib/utils/multiplexer/lookup2bit.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/multiplexer/lookup2bit.code rename to zokrates_stdlib/stdlib/utils/multiplexer/lookup2bit.zok diff --git a/zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.code b/zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.zok similarity index 88% rename from zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.code rename to zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.zok index d5894a96..b4b79f1f 100644 --- a/zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.code +++ b/zokrates_stdlib/stdlib/utils/multiplexer/lookup3bitSigned.zok @@ -1,4 +1,4 @@ -import "./lookup2bit.code" as lookup +import "./lookup2bit" as lookup // /** // * Three-bit window lookup (2bits + signature bit) in 2bit table // * using two constraints. Maps the bits `b` to a list of constants `c` diff --git a/zokrates_stdlib/stdlib/utils/pack/nonStrictUnpack256.code b/zokrates_stdlib/stdlib/utils/pack/nonStrictUnpack256.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/pack/nonStrictUnpack256.code rename to zokrates_stdlib/stdlib/utils/pack/nonStrictUnpack256.zok diff --git a/zokrates_stdlib/stdlib/utils/pack/pack128.code b/zokrates_stdlib/stdlib/utils/pack/pack128.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/pack/pack128.code rename to zokrates_stdlib/stdlib/utils/pack/pack128.zok diff --git a/zokrates_stdlib/stdlib/utils/pack/pack256.code b/zokrates_stdlib/stdlib/utils/pack/pack256.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/pack/pack256.code rename to zokrates_stdlib/stdlib/utils/pack/pack256.zok diff --git a/zokrates_stdlib/stdlib/utils/pack/unpack128.code b/zokrates_stdlib/stdlib/utils/pack/unpack128.zok similarity index 100% rename from zokrates_stdlib/stdlib/utils/pack/unpack128.code rename to zokrates_stdlib/stdlib/utils/pack/unpack128.zok diff --git a/zokrates_stdlib/tests/tests/and.json b/zokrates_stdlib/tests/tests/and.json index 5234c410..64273a19 100644 --- a/zokrates_stdlib/tests/tests/and.json +++ b/zokrates_stdlib/tests/tests/and.json @@ -1,5 +1,5 @@ { - "entry_point": "./stdlib/utils/binary/and.code", + "entry_point": "./stdlib/utils/binary/and.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json index 11457b30..c7e6c571 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/edwardsAdd.code", + "entry_point": "./tests/tests/ecc/edwardsAdd.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsAdd.code b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.zok similarity index 85% rename from zokrates_stdlib/tests/tests/ecc/edwardsAdd.code rename to zokrates_stdlib/tests/tests/ecc/edwardsAdd.zok index 4641c266..6c5ac9fe 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsAdd.code +++ b/zokrates_stdlib/tests/tests/ecc/edwardsAdd.zok @@ -1,6 +1,6 @@ -import "ecc/edwardsAdd.code" as add -import "ecc/edwardsNegate.code" as neg -import "ecc/babyjubjubParams.code" as context +import "ecc/edwardsAdd" as add +import "ecc/edwardsNegate" as neg +import "ecc/babyjubjubParams" as context // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json index b17a104e..e4d6e067 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/edwardsCompress.code", + "entry_point": "./tests/tests/ecc/edwardsCompress.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsCompress.code b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.zok similarity index 89% rename from zokrates_stdlib/tests/tests/ecc/edwardsCompress.code rename to zokrates_stdlib/tests/tests/ecc/edwardsCompress.zok index 38aaed31..6a18be1b 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsCompress.code +++ b/zokrates_stdlib/tests/tests/ecc/edwardsCompress.zok @@ -1,5 +1,5 @@ -import "ecc/edwardsCompress.code" as edwardsCompress -import "ecc/babyjubjubParams.code" as context +import "ecc/edwardsCompress" as edwardsCompress +import "ecc/babyjubjubParams" as context // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json index 018d856a..c4bf025e 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/edwardsOnCurve.code", + "entry_point": "./tests/tests/ecc/edwardsOnCurve.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.code b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.zok similarity index 83% rename from zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.code rename to zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.zok index 5da13a9a..7f92a8bc 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.code +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOnCurve.zok @@ -1,5 +1,5 @@ -import "ecc/babyjubjubParams.code" as context -import "ecc/edwardsOnCurve.code" as onCurve +import "ecc/babyjubjubParams" as context +import "ecc/edwardsOnCurve" as onCurve // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json index 387bdaef..55f1af76 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/edwardsOrderCheck.code", + "entry_point": "./tests/tests/ecc/edwardsOrderCheck.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.code b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.zok similarity index 89% rename from zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.code rename to zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.zok index 1a2456f1..641f557c 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.code +++ b/zokrates_stdlib/tests/tests/ecc/edwardsOrderCheck.zok @@ -1,5 +1,5 @@ -import "ecc/edwardsOrderCheck.code" as orderCheck -import "ecc/babyjubjubParams.code" as context +import "ecc/edwardsOrderCheck" as orderCheck +import "ecc/babyjubjubParams" as context // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json index 029ae8a8..be2699b9 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json +++ b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/edwardsScalarMult.code", + "entry_point": "./tests/tests/ecc/edwardsScalarMult.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.code b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.zok similarity index 98% rename from zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.code rename to zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.zok index 8c6cdbd8..00f08260 100644 --- a/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.code +++ b/zokrates_stdlib/tests/tests/ecc/edwardsScalarMult.zok @@ -1,5 +1,5 @@ -import "ecc/babyjubjubParams.code" as context -import "ecc/edwardsScalarMult.code" as mul +import "ecc/babyjubjubParams" as context +import "ecc/edwardsScalarMult" as mul // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json index 9a0c3833..08148630 100644 --- a/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json +++ b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/ecc/proofOfOwnership.code", + "entry_point": "./tests/tests/ecc/proofOfOwnership.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.code b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.zok similarity index 82% rename from zokrates_stdlib/tests/tests/ecc/proofOfOwnership.code rename to zokrates_stdlib/tests/tests/ecc/proofOfOwnership.zok index 50ef0eb2..9e8a2f95 100644 --- a/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.code +++ b/zokrates_stdlib/tests/tests/ecc/proofOfOwnership.zok @@ -1,7 +1,7 @@ -import "ecc/babyjubjubParams.code" as context -import "ecc/proofOfOwnership.code" as proofOfOwnership -import "ecc/edwardsScalarMult.code" as multiply -import "utils/pack/nonStrictUnpack256.code" as unpack256 +import "ecc/babyjubjubParams" as context +import "ecc/proofOfOwnership" as proofOfOwnership +import "ecc/edwardsScalarMult" as multiply +import "utils/pack/nonStrictUnpack256" as unpack256 // Code to create test cases: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json index 04bee370..18627080 100644 --- a/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/pedersen/512bit.code", + "entry_point": "./tests/tests/hashes/pedersen/512bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.code b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.zok similarity index 98% rename from zokrates_stdlib/tests/tests/hashes/pedersen/512bit.code rename to zokrates_stdlib/tests/tests/hashes/pedersen/512bit.zok index 22053482..3cdd32d8 100644 --- a/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.code +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/512bit.zok @@ -12,7 +12,7 @@ // entropy_bits = bitstring.BitArray(bytes=entropy).bin // digest_bits = bitstring.BitArray(bytes=digest.compress()).bin -import "hashes/pedersen/512bit.code" as pedersen +import "hashes/pedersen/512bit" as pedersen def main() -> (field): diff --git a/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json index a08d8cbb..9104faf1 100644 --- a/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/pedersen/6bit.code", + "entry_point": "./tests/tests/hashes/pedersen/6bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.code b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.zok similarity index 91% rename from zokrates_stdlib/tests/tests/hashes/pedersen/6bit.code rename to zokrates_stdlib/tests/tests/hashes/pedersen/6bit.zok index f6e2fedd..832c9d2b 100644 --- a/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.code +++ b/zokrates_stdlib/tests/tests/hashes/pedersen/6bit.zok @@ -6,7 +6,7 @@ // bs = bitstring.BitArray('0b110000') // hasher.hash_bits(bs) -import "hashes/pedersen/6bit.code" as pedersen +import "hashes/pedersen/6bit" as pedersen def main() -> (field): diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json index 2d7cf5ff..672e60f9 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/sha256/512bit.code", + "entry_point": "./tests/tests/hashes/sha256/512bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bit.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.zok similarity index 98% rename from zokrates_stdlib/tests/tests/hashes/sha256/512bit.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bit.zok index cc943342..4c943001 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bit.code +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bit.zok @@ -1,4 +1,4 @@ -import "hashes/sha256/512bit.code" as sha256 +import "hashes/sha256/512bit" as sha256 def main() -> (field): field[256] a = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json index 9d2cc47e..4dfa5270 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.json @@ -1,5 +1,5 @@ { - "entry_point": "./stdlib/hashes/sha256/512bitPacked.code", + "entry_point": "./stdlib/hashes/sha256/512bitPacked.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.zok similarity index 93% rename from zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.zok index 569b44b7..471a0376 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.code +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked.zok @@ -15,7 +15,7 @@ // int(digest[32:], 16) // # 65303172752238645975888084098459749904 -import "hashes/sha256/512bitPacked.code" as sha256packed +import "hashes/sha256/512bitPacked" as sha256packed def main() -> (field): field a = 0 diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json index 86b6c9a6..5d2cc9cd 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPacked2.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/sha256/512bitPacked.code", + "entry_point": "./tests/tests/hashes/sha256/512bitPacked.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json index e137fb71..5136a964 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/sha256/512bitPadded.code", + "entry_point": "./tests/tests/hashes/sha256/512bitPadded.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.code b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.zok similarity index 98% rename from zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.code rename to zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.zok index 06ba66e2..483c7b61 100644 --- a/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.code +++ b/zokrates_stdlib/tests/tests/hashes/sha256/512bitPadded.zok @@ -12,7 +12,7 @@ // bin(int(digest, 16)) // # '0b1100011001001000000111100010001011000101111111110100000101100100101011110110100000001011100011001111101010100101111010001110110100110001001000001110111011111111100010011100010011110011000001111100010010100110111110101010101011100000010110011100111000010000' -import "hashes/sha256/512bitPadded.code" as sha256 +import "hashes/sha256/512bitPadded" as sha256 def main() -> (field): field[256] a = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json index a99cedcf..6fc884cb 100644 --- a/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json +++ b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/hashes/utils/256bitsDirectionHelper.code", + "entry_point": "./tests/tests/hashes/utils/256bitsDirectionHelper.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.code b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.zok similarity index 98% rename from zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.code rename to zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.zok index 597958d8..e3ae4a34 100644 --- a/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.code +++ b/zokrates_stdlib/tests/tests/hashes/utils/256bitsDirectionHelper.zok @@ -12,13 +12,13 @@ // entropy_bits = bitstring.BitArray(bytes=entropy).bin // digest_bits = bitstring.BitArray(bytes=digest.compress()).bin -import "hashes/utils/256bitsDirectionHelper.code" as dicrection +import "hashes/utils/256bitsDirectionHelper" as direction def left() -> (field): field[256] a = [0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0] field[256] b = [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1] - out = dicrection(0, a, b) + out = direction(0, a, b) out == [0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1] return 1 @@ -26,7 +26,7 @@ def right() -> (field): field[256] a = [0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0] field[256] b = [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1] - out = dicrection(1, a, b) + out = direction(1, a, b) out == [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0] return 1 diff --git a/zokrates_stdlib/tests/tests/or.json b/zokrates_stdlib/tests/tests/or.json index 020a3af7..6fa25fdc 100644 --- a/zokrates_stdlib/tests/tests/or.json +++ b/zokrates_stdlib/tests/tests/or.json @@ -1,5 +1,5 @@ { - "entry_point": "./stdlib/utils/binary/or.code", + "entry_point": "./stdlib/utils/binary/or.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json index c6887f83..f0a753d4 100644 --- a/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json +++ b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/signatures/verifyEddsa.code", + "entry_point": "./tests/tests/signatures/verifyEddsa.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/signatures/verifyEddsa.code b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.zok similarity index 95% rename from zokrates_stdlib/tests/tests/signatures/verifyEddsa.code rename to zokrates_stdlib/tests/tests/signatures/verifyEddsa.zok index bc4e79c3..382090db 100644 --- a/zokrates_stdlib/tests/tests/signatures/verifyEddsa.code +++ b/zokrates_stdlib/tests/tests/signatures/verifyEddsa.zok @@ -1,5 +1,5 @@ -import "signatures/verifyEddsa.code" as verifyEddsa -import "ecc/babyjubjubParams.code" as context +import "signatures/verifyEddsa" as verifyEddsa +import "ecc/babyjubjubParams" as context // Code to create test case: // https://github.com/Zokrates/pycrypto diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json index 834dfa5a..738c3f03 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/multiplexer/256bit.code", + "entry_point": "./tests/tests/utils/multiplexer/256bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.zok similarity index 98% rename from zokrates_stdlib/tests/tests/utils/multiplexer/256bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/256bit.zok index d95a02b8..ef907555 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.code +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/256bit.zok @@ -1,4 +1,4 @@ -import "utils/multiplexer/256bit.code" as multiplex +import "utils/multiplexer/256bit" as multiplex def left() -> (field): field bit = 0 //left diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json index ff6ad3ca..95cb4b28 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/multiplexer/2bit.code", + "entry_point": "./tests/tests/utils/multiplexer/2bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.zok similarity index 88% rename from zokrates_stdlib/tests/tests/utils/multiplexer/2bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/2bit.zok index 37b998ab..30d0e6c2 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.code +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/2bit.zok @@ -1,4 +1,4 @@ -import "utils/multiplexer/2bit.code" as multiplex +import "utils/multiplexer/2bit" as multiplex def left() -> (field): field bit = 0 //left diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json index deeef014..81068184 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/multiplexer/lookup1bit.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup1bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.zok similarity index 83% rename from zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.zok index f039dbe9..b602ea77 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.code +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup1bit.zok @@ -1,4 +1,4 @@ -import "utils/multiplexer/lookup1bit.code" as lookup +import "utils/multiplexer/lookup1bit" as lookup def left() -> (field): field sel = 0 //left diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json index a594889e..97866512 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/multiplexer/lookup2bit.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup2bit.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.zok similarity index 91% rename from zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.zok index 4e97abfe..7b3dae52 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.code +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup2bit.zok @@ -1,4 +1,4 @@ -import "utils/multiplexer/lookup2bit.code" as lookup +import "utils/multiplexer/lookup2bit" as lookup def first() -> (field): field[2] sel = [0,0] diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json index 3757c165..ddc4b935 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/multiplexer/lookup3bitSigned.code", + "entry_point": "./tests/tests/utils/multiplexer/lookup3bitSigned.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.code b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.zok similarity index 95% rename from zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.code rename to zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.zok index df5fc177..c3af4b44 100644 --- a/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.code +++ b/zokrates_stdlib/tests/tests/utils/multiplexer/lookup3bitSigned.zok @@ -1,4 +1,4 @@ -import "utils/multiplexer/lookup3bitSigned.code" as lookup +import "utils/multiplexer/lookup3bitSigned" as lookup def first() -> (field): field[3] sel = [0,0,0] diff --git a/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json index 9d6d2039..3f6a3ffb 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json +++ b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/pack/nonStrictUnpack256.code", + "entry_point": "./tests/tests/utils/pack/nonStrictUnpack256.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.code b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.zok similarity index 98% rename from zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.code rename to zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.zok index c9856333..44a32919 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.code +++ b/zokrates_stdlib/tests/tests/utils/pack/nonStrictUnpack256.zok @@ -1,4 +1,4 @@ -import "utils/pack/nonStrictUnpack256.code" as unpack256 +import "utils/pack/nonStrictUnpack256" as unpack256 def testFive() -> (field): diff --git a/zokrates_stdlib/tests/tests/utils/pack/pack128.json b/zokrates_stdlib/tests/tests/utils/pack/pack128.json index beadfbc1..f339e1be 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/pack128.json +++ b/zokrates_stdlib/tests/tests/utils/pack/pack128.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/pack/pack128.code", + "entry_point": "./tests/tests/utils/pack/pack128.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/pack/pack128.code b/zokrates_stdlib/tests/tests/utils/pack/pack128.zok similarity index 97% rename from zokrates_stdlib/tests/tests/utils/pack/pack128.code rename to zokrates_stdlib/tests/tests/utils/pack/pack128.zok index c6388662..604de3cf 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/pack128.code +++ b/zokrates_stdlib/tests/tests/utils/pack/pack128.zok @@ -1,4 +1,4 @@ -import "utils/pack/pack128.code" as pack128 +import "utils/pack/pack128" as pack128 def testFive() -> (field): diff --git a/zokrates_stdlib/tests/tests/utils/pack/unpack128.json b/zokrates_stdlib/tests/tests/utils/pack/unpack128.json index 91ea3516..81cec6a8 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/unpack128.json +++ b/zokrates_stdlib/tests/tests/utils/pack/unpack128.json @@ -1,5 +1,5 @@ { - "entry_point": "./tests/tests/utils/pack/unpack128.code", + "entry_point": "./tests/tests/utils/pack/unpack128.zok", "tests": [ { "input": { diff --git a/zokrates_stdlib/tests/tests/utils/pack/unpack128.code b/zokrates_stdlib/tests/tests/utils/pack/unpack128.zok similarity index 96% rename from zokrates_stdlib/tests/tests/utils/pack/unpack128.code rename to zokrates_stdlib/tests/tests/utils/pack/unpack128.zok index 087505ce..e4e66d31 100644 --- a/zokrates_stdlib/tests/tests/utils/pack/unpack128.code +++ b/zokrates_stdlib/tests/tests/utils/pack/unpack128.zok @@ -1,4 +1,4 @@ -import "utils/pack/unpack128.code" as unpack128 +import "utils/pack/unpack128" as unpack128 def testFive() -> (field):