0.0.21

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "circomlib",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -601,10 +601,9 @@
       }
     },
     "circom": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/circom/-/circom-0.0.34.tgz",
-      "integrity": "sha512-R7yNW8PtX2xREtLYWZ/o5cfKHT/qa+CveXsGVAX1ej7mPrTat9mlEMXEy2vX//IuP9/cnYTY/KxJ2SN05PUeGA==",
-      "dev": true,
+      "version": "0.0.35",
+      "resolved": "https://registry.npmjs.org/circom/-/circom-0.0.35.tgz",
+      "integrity": "sha512-MWsJPYPH+s9wN2I5abEHUIAyFVsgTCy+UzJh///WnflXfh3c1tlbv8zt1VV+YHHREpyS+WF5ZBr7TujpaVFu5g==",
       "requires": {
         "big-integer": "^1.6.32",
         "optimist": "^0.6.1",
@@ -3863,7 +3862,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
       "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
@@ -3872,8 +3870,7 @@
         "wordwrap": {
           "version": "0.0.3",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-          "dev": true
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
         }
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circomlib",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Basic circuits library for Circom",
   "main": "index.js",
   "directories": {
@@ -26,12 +26,12 @@
   "dependencies": {
     "blake-hash": "^1.1.0",
     "blake2b": "^2.1.3",
+    "circom": "0.0.35",
     "snarkjs": "^0.1.20",
     "typedarray-to-buffer": "^3.1.5",
     "web3": "^1.0.0-beta.55"
   },
   "devDependencies": {
-    "circom": "0.0.35",
     "eslint-plugin-mocha": "^5.2.0",
     "ganache-cli": "^6.4.4",
     "mocha": "^5.2.0"

src/poseidon.js

@@ -36,6 +36,8 @@ exports.getMatrix = (t, seed, nRounds) => {
     if (typeof seed === "undefined") seed = SEED;
     if (typeof nRounds === "undefined") nRounds = NROUNDSF + NROUNDSP;
     if (typeof t === "undefined") t = T;
+    assert(t<=6);  // Force the same matrix for all.
+    t=6;
     let nonce = "0000";
     let cmatrix = getPseudoRandom(seed+"_matrix_"+nonce, t*2);
     while (!allDifferent(cmatrix)) {

src/poseidon_gencontract.js

@@ -121,7 +121,7 @@ function createCode(t, nRoundsF, nRoundsP, seed) {
     // We ignore the pointer and the length and just load 6 values to the state
     // (Stack positions 0-5) If the array is shorter, we just set zeros.
     for (let i=0; i<t; i++) {
-        C.push(0x44+(0x20*(5-i)));
+        C.push(0x44+(0x20*(t-1-i)));
         C.calldataload();
     }
 

test/circuits/poseidon3_test.circom

@@ -0,0 +1,3 @@
+include "../../circuits/poseidon.circom"
+
+component main = Poseidon(2, 3, 8, 57);

test/poseidoncircuit.js

@@ -18,43 +18,74 @@ describe("Blake2b version test", function() {
 });
 
 describe("Poseidon Circuit test", function () {
-    let circuit;
+    let circuit6;
+    let circuit3;
 
     this.timeout(100000);
 
     before( async () => {
-        const cirDef = await compiler(path.join(__dirname, "circuits", "poseidon_test.circom"));
-
-        circuit = new snarkjs.Circuit(cirDef);
-
-        console.log("Poseidon constraints: " + circuit.nConstraints);
+        const cirDef6 = await compiler(path.join(__dirname, "circuits", "poseidon6_test.circom"));
+        circuit6 = new snarkjs.Circuit(cirDef6);
+        console.log("Poseidon6 constraints: " + circuit6.nConstraints);
+        const cirDef3 = await compiler(path.join(__dirname, "circuits", "poseidon3_test.circom"));
+        circuit3 = new snarkjs.Circuit(cirDef3);
+        console.log("Poseidon3 constraints: " + circuit3.nConstraints);
     });
 
-    it("Should check constrain of hash([1, 2])", async () => {
-        const w = circuit.calculateWitness({inputs: [1, 2]});
+    it("Should check constrain of hash([1, 2]) t=6", async () => {
+        const w = circuit6.calculateWitness({inputs: [1, 2]});
 
-        const res = w[circuit.getSignalIdx("main.out")];
+        const res = w[circuit6.getSignalIdx("main.out")];
 
         const hash = poseidon.createHash(6, 8, 57);
 
         const res2 = hash([1,2]);
-        assert.equal('12242166908188651009877250812424843524687801523336557272219921456462821518061', res2.toString());
+        assert.equal("12242166908188651009877250812424843524687801523336557272219921456462821518061", res2.toString());
         assert.equal(res.toString(), res2.toString());
-        assert(circuit.checkWitness(w));
+        assert(circuit6.checkWitness(w));
     });
 
-    it("Should check constrain of hash([3, 4])", async () => {
-        const w = circuit.calculateWitness({inputs: [3, 4]});
+    it("Should check constrain of hash([3, 4]) t=6", async () => {
+        const w = circuit6.calculateWitness({inputs: [3, 4]});
 
-        const res = w[circuit.getSignalIdx("main.out")];
+        const res = w[circuit6.getSignalIdx("main.out")];
 
         const hash = poseidon.createHash(6, 8, 57);
 
         const res2 = hash([3, 4]);
-        assert.equal('17185195740979599334254027721507328033796809509313949281114643312710535000993', res2.toString());
+        assert.equal("17185195740979599334254027721507328033796809509313949281114643312710535000993", res2.toString());
 
         assert.equal(res.toString(), res2.toString());
 
-        assert(circuit.checkWitness(w));
+        assert(circuit6.checkWitness(w));
+    });
+
+
+    it("Should check constrain of hash([1, 2]) t=3", async () => {
+        const w = circuit3.calculateWitness({inputs: [1, 2]});
+
+        const res = w[circuit3.getSignalIdx("main.out")];
+
+        const hash = poseidon.createHash(3, 8, 57);
+
+        const res2 = hash([1,2]);
+        assert.equal("2104035019328376391822106787753454168168617545136592089411833517434990977743", res2.toString());
+        assert.equal(res.toString(), res2.toString());
+        assert(circuit3.checkWitness(w));
+    });
+
+    it("Should check constrain of hash([3, 4]) t=3", async () => {
+        const w = circuit3.calculateWitness({inputs: [3, 4]});
+
+        const res = w[circuit3.getSignalIdx("main.out")];
+
+        const hash = poseidon.createHash(3, 8, 57);
+
+        const res2 = hash([3, 4]);
+        assert.equal("12456141564250880945411182508630957604732712316993112736876413121277158512223", res2.toString());
+
+        assert.equal(res.toString(), res2.toString());
+
+        assert(circuit3.checkWitness(w));
     });
 });

test/poseidoncontract.js

@@ -8,13 +8,13 @@ const bigInt = require("snarkjs").bigInt;
 const assert = chai.assert;
 const log = (msg) => { if (process.env.MOCHA_VERBOSE) console.log(msg); };
 
-const SEED = "mimc";
-
-describe("Poseidon Smart contract test", () => {
+describe("Poseidon Smart contract test", function () {
     let testrpc;
     let web3;
-    let mimc;
+    let poseidon6;
+    let poseidon3;
     let accounts;
+    this.timeout(100000);
 
     before(async () => {
         web3 = new Web3(ganache.provider(), null, { transactionConfirmationBlocks: 1 });
@@ -24,17 +24,23 @@ describe("Poseidon Smart contract test", () => {
     it("Should deploy the contract", async () => {
         const C = new web3.eth.Contract(poseidonGenContract.abi);
 
-        mimc = await C.deploy({
-            data: poseidonGenContract.createCode()
+        poseidon6 = await C.deploy({
+            data: poseidonGenContract.createCode(6)
+        }).send({
+            gas: 2500000,
+            from: accounts[0]
+        });
+        poseidon3 = await C.deploy({
+            data: poseidonGenContract.createCode(3)
         }).send({
             gas: 2500000,
             from: accounts[0]
         });
     });
 
-    it("Shold calculate the mimic correctly", async () => {
+    it("Shold calculate the poseidon correctly t=6", async () => {
 
-        const res = await mimc.methods.poseidon([1,2]).call();
+        const res = await poseidon6.methods.poseidon([1,2]).call();
 
         // console.log("Cir: " + bigInt(res.toString(16)).toString(16));
 
@@ -45,5 +51,19 @@ describe("Poseidon Smart contract test", () => {
 
         assert.equal(res.toString(), res2.toString());
     });
+    it("Shold calculate the poseidon correctly t=3", async () => {
+
+        const res = await poseidon3.methods.poseidon([1,2]).call();
+
+        // console.log("Cir: " + bigInt(res.toString(16)).toString(16));
+
+        const hash = Poseidon.createHash(3, 8, 57);
+
+        const res2 = hash([1,2]);
+        // console.log("Ref: " + bigInt(res2).toString(16));
+
+        assert.equal(res.toString(), res2.toString());
+    });
+
 });
 

test/sha256.js

@@ -80,11 +80,11 @@ describe("SHA256 test", () => {
         console.log("Vars: "+circuit.nVars);
         console.log("Constraints: "+circuit.nConstraints);
 
-/*
-        const testStr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
 
-        const b = Buffer.from(testStr, 'utf8');
-*/
+        // const testStr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+
+        // const b = Buffer.from(testStr, 'utf8');
+
         const b = new Buffer.alloc(64);
         for (let i=0; i<64; i++) {
             b[i] = i+1;
@@ -95,7 +95,7 @@ describe("SHA256 test", () => {
             .digest("hex");
 
         const arrIn = buffer2bitArray(b);
-        const witness = circuit.calculateWitness({ "in": arrIn } /*, {logOutput: true} */);
+        const witness = circuit.calculateWitness({ "in": arrIn }, {logOutput: false});
 
         const arrOut = witness.slice(1, 257);
         const hash2 = bitArray2buffer(arrOut).toString("hex");
@@ -104,7 +104,6 @@ describe("SHA256 test", () => {
 
     }).timeout(1000000);
 
-
     it("Should calculate a hash of 2 compressor", async () => {
         const cirDef = await compiler(path.join(__dirname, "circuits", "sha256_test448.circom"),  {reduceConstraints:false}  );
         const circuit = new snarkjs.Circuit(cirDef);
@@ -112,20 +111,19 @@ describe("SHA256 test", () => {
         console.log("Vars: "+circuit.nVars);
         console.log("Constraints: "+circuit.nConstraints);
 
-
         const testStr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
 
-        const b = Buffer.from(testStr, 'utf8');
-        for (let i=0; i<64; i++) {
-            b[i] = i+1;
-        }
+        const b = Buffer.from(testStr, "utf8");
+        // for (let i=0; i<64; i++) {
+        //    b[i] = i+1;
+        // }
 
         const hash = crypto.createHash("sha256")
             .update(b)
             .digest("hex");
 
         const arrIn = buffer2bitArray(b);
-        const witness = circuit.calculateWitness({ "in": arrIn } /*, {logOutput: true} */);
+        const witness = circuit.calculateWitness({ "in": arrIn } , {logOutput: false});
 
         const arrOut = witness.slice(1, 257);
         const hash2 = bitArray2buffer(arrOut).toString("hex");