explicitly include circomlib. cloned and installed circomlib in circu…

…its directory. Fixes circom-lsp path issues.

.gitignore

@@ -3,7 +3,6 @@ target
 
 
 node_modules/*
-
 build/*
 ptau/*
 client/node_modules

circuits/aes-ctr/cipher.circom

@@ -1,9 +1,9 @@
 pragma circom 2.1.9;
 
 include "key_expansion.circom";
-include "circomlib/circuits/comparators.circom";
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/gates.circom";
+include "../circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/gates.circom";
 include "transformations.circom";
 include "mix_columns.circom";
 

circuits/aes-ctr/ctr.circom

@@ -2,6 +2,8 @@ pragma circom 2.1.9;
 
 include "cipher.circom";
 include "transformations.circom";
+// include "../circomlib/circuits/comparators.circom";
+// include "comparators.circom";
 
 template EncryptCTR(l,nk){
         signal input plainText[l];
@@ -141,4 +143,4 @@ template GenerateCounterBlocks(n){
                 }
 
         }
-}
+}

circuits/aes-ctr/mix_columns.circom

@@ -1,9 +1,9 @@
 pragma circom 2.1.9;
 
 include "transformations.circom";
-include "circomlib/circuits/comparators.circom";
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/gates.circom";
+include "../circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/gates.circom";
 include "tbox.circom";
 
 // MixColumns: Applies the equation for each column:

circuits/aes-ctr/sbox128.circom

@@ -1,6 +1,6 @@
 pragma circom 2.1.9;
 
-include "circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/comparators.circom";
 
 template SBox128() {
     signal input in;

circuits/aes-ctr/tbox.circom

@@ -1,7 +1,7 @@
 pragma circom 2.1.9;
 
 include "transformations.circom";
-include "circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/bitify.circom";
 
 //tbox[0] =>> multiplication by 2
 //tbox[1] =>> multiplication by 3

circuits/aes-ctr/transformations.circom

@@ -1,8 +1,8 @@
 pragma circom 2.1.9;
 
-include "circomlib/circuits/comparators.circom";
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/gates.circom";
+include "../circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/gates.circom";
 include "utils.circom";
 
 // ShiftRows: Performs circular left shift on each row

circuits/aes-ctr/utils.circom

@@ -1,9 +1,9 @@
 pragma circom 2.1.9;
 
 include "sbox128.circom";
-include "circomlib/circuits/comparators.circom";
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/gates.circom";
+include "../circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/gates.circom";
 
 // Converts an array of bytes to an array of words
 template BytesToWords(n) {
@@ -158,4 +158,4 @@ template XorBits(){
         xor[i].b <== b[i];
         out[i] <== xor[i].out;
     }
-}
+}

circuits/aes-gcm/aes-gcm.circom

@@ -3,7 +3,7 @@ pragma circom 2.1.9;
 include "../aes-ctr/ctr.circom";
 include "ghash.circom";
 include "../aes-ctr/cipher.circom";
-include "circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/bitify.circom";
 include "utils.circom";
 include "gctr.circom";
 include "helper_functions.circom";

circuits/aes-gcm/gfmulx.circom

@@ -1,6 +1,6 @@
 pragma circom 2.1.9;
 
-// include "circomlib/circuits/gates.circom";
+// include "../circomlib/circuits/gates.circom";
 include "helper_functions.circom";
 
 // compute x * `in` over ghash polynomial

circuits/aes-gcm/helper_functions.circom

@@ -1,8 +1,8 @@
 pragma circom 2.1.9;
 
-include "circomlib/circuits/bitify.circom";
-include "circomlib/circuits/gates.circom";
-include "circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/bitify.circom";
+include "../circomlib/circuits/gates.circom";
+include "../circomlib/circuits/comparators.circom";
 
 // parse LE bits to int
 template ParseLEBytes64() {

circuits/aes-gcm/nistgmul.circom

@@ -1,9 +1,9 @@
 pragma circom 2.1.9;
 
 include "utils.circom"; // xor
-include "circomlib/circuits/comparators.circom"; // isZero
+include "../circomlib/circuits/comparators.circom"; // isZero
 include "helper_functions.circom"; // bitwise right shift
-include "circomlib/circuits/mux1.circom"; // multiplexer
+include "../circomlib/circuits/mux1.circom"; // multiplexer
 include "../aes-ctr/utils.circom"; // xorbyte
 
 // Algorithm 1: X •Y

circuits/aes-gcm/utils.circom

@@ -1,7 +1,7 @@
 pragma circom 2.1.9;
 
-include "circomlib/circuits/comparators.circom";
-include "circomlib/circuits/mux1.circom";
+include "../circomlib/circuits/comparators.circom";
+include "../circomlib/circuits/mux1.circom";
 
 // Increment a 32-bit word, represented as a 4-byte array
 //

circuits/circomlib/README.md

@@ -0,0 +1,20 @@
+# CircomLib
+## AES-proof repo authors note: 
+Circomlib explicitly included to resolve `circom-lsp` linking errors.
+
+## Description
+
+- This repository contains a library of circuit templates. 
+- All files are copyrighted under 2018 0KIMS association and part of the free software [circom](https://github.com/iden3/circom) (Zero Knowledge Circuit Compiler). 
+- You can read more about the circom language in [the circom documentation webpage](https://docs.circom.io/).
+
+## Organisation
+
+This respository contains 5 folders:
+- `circuits`: it contains the implementation of different cryptographic primitives in circom language.
+- `calcpedersenbases`: set of functions in JavaScript used to find a set of points in [Baby Jubjub](https://github.com/barryWhiteHat/baby_jubjub) elliptic curve that serve as basis for the [Pedersen Hash](https://github.com/zcash/zcash/issues/2234).
+- `doc`: it contains some circuit schemes in ASCII (must be opened with Monodraw, an ASCII art editor for Mac).
+- `src`: it contains similar implementation of circuits in JavaScript.
+- `test`: tests.
+
+A description of the specific circuit templates for the `circuit` folder will be soon updated.