Update hardhat-zkit and fix typization (#10)

Author: Hrom131

package-lock.json

@@ -41,7 +41,7 @@
     "@iden3/contracts": "^1.4.7",
     "@iden3/js-crypto": "^1.0.3",
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
-    "@solarity/hardhat-zkit": "^0.1.2",
+    "@solarity/hardhat-zkit": "^0.2.1",
     "@solarity/solidity-lib": "^2.7.3",
     "@typechain/ethers-v6": "^0.5.1",
     "@types/chai": "^4.3.14",

package.json

@@ -1,17 +1,16 @@
 import { expect } from "chai";
 import { ethers, zkit } from "hardhat";
 
-import { CircuitZKit } from "@solarity/zkit";
-
 import { Reverter } from "../helpers/reverter";
 
 import { CommitmentVerifierVerifier } from "@ethers-v6";
+import { CommitmentVerifier } from "@zkit";
 
 describe("Commitment", () => {
   const reverter = new Reverter();
 
   let commitmentVerifier: CommitmentVerifierVerifier;
-  let commitmentCircuit: CircuitZKit;
+  let commitmentCircuit: CommitmentVerifier;
 
   before("setup", async () => {
     const CommitmentMockVerifier = await ethers.getContractFactory("CommitmentVerifierVerifier");
@@ -31,16 +30,16 @@ describe("Commitment", () => {
     });
 
     // Poseidon(1, 2)
-    expect(proofStruct.publicSignals[0]).to.equal(
+    expect(proofStruct.publicSignals.commitment).to.equal(
       "7853200120776062878684798364095072458815029376092732009249414926327459813530",
     );
     // Poseidon(1)
-    expect(proofStruct.publicSignals[1]).to.equal(
+    expect(proofStruct.publicSignals.nullifierHash).to.equal(
       "18586133768512220936620570745912940619677854269274689475585506675881198879027",
     );
 
     const [pA, pB, pC, publicSignals] = await commitmentCircuit.generateCalldata(proofStruct);
 
-    expect(await commitmentVerifier.verifyProof(pA, pB, pC, publicSignals as any)).to.be.true;
+    expect(await commitmentVerifier.verifyProof(pA, pB, pC, publicSignals)).to.be.true;
   });
 });

test/blinders/Commitment.test.ts

@@ -1,17 +1,16 @@
 import { expect } from "chai";
 import { ethers, zkit } from "hardhat";
 
-import { CircuitZKit } from "@solarity/zkit";
-
 import { deployPoseidonFacade } from "../helpers/poseidon/poseidon-deployer";
 import { Reverter } from "../helpers/reverter";
 
 import { SparseMerkleTreeMock, SparseMerkleTreeVerifierVerifier } from "@ethers-v6";
+import { SparseMerkleTreeVerifier } from "@zkit";
 
 describe("SparseMerkleTree", () => {
   const reverter = new Reverter();
 
-  let smtCircuit: CircuitZKit;
+  let smtCircuit: SparseMerkleTreeVerifier;
 
   let smtMock: SparseMerkleTreeMock;
   let smtVerifier: SparseMerkleTreeVerifierVerifier;