diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f4b4744..b05d082 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,5 +21,6 @@ jobs: - name: Execute tests run: | sh ./test-compile-circuits.sh + npm run test npm run test-circuits npm run test-sc diff --git a/src/miksi.ts b/src/miksi.ts index baf629e..1dd4bf3 100644 --- a/src/miksi.ts +++ b/src/miksi.ts @@ -10,7 +10,6 @@ const Web3 = require("web3"); // const buildBn128 = require("wasmsnark").buildBn128; -const nLevels = 17; const coinCode = "0"; // refearing to ETH const ethAmount = '1'; const amount = Web3.utils.toWei(ethAmount, 'ether'); @@ -26,12 +25,12 @@ exports.calcCommitment = (key, secret) => { return commitment; }; -exports.calcDepositWitness = async (wasm, key, secret, commitments) => { +exports.calcDepositWitness = async (wasm, nLevels, key, secret, commitments) => { const poseidon = circomlib.poseidon.createHash(6, 8, 57); const nullifier = poseidon([key, secret]).toString(); const commitment = poseidon([coinCode, amount, secret, nullifier]).toString(); - console.log("PROVA", poseidon([key, commitment]).toString()); + console.log("Commitment", commitment.toString()); // rebuild the tree let tree = await smt.newMemEmptyTrie(); @@ -79,7 +78,6 @@ exports.calcDepositWitness = async (wasm, key, secret, commitments) => { "coinCode": coinCode, "amount": amount, "secret": secret, - "nullifier": nullifier, "oldKey": oldKey, "oldValue": oldValue, "siblingsOld": siblingsOld, @@ -120,7 +118,7 @@ exports.calcDepositWitness = async (wasm, key, secret, commitments) => { }; } -exports.calcWithdrawWitness = async (wasm, key, secret, commitments, addr) => { +exports.calcWithdrawWitness = async (wasm, nLevels, key, secret, commitments, addr) => { const poseidon = circomlib.poseidon.createHash(6, 8, 57); const nullifier = poseidon([key, secret]).toString(); const commitment = poseidon([coinCode, amount, secret, nullifier]).toString(); diff --git a/test/miksi.test.ts b/test/miksi.test.ts index 3352c93..cc4e199 100644 --- a/test/miksi.test.ts +++ b/test/miksi.test.ts @@ -8,14 +8,15 @@ describe("deposit test", function () { this.timeout(200000); it("Test Deposit", async () => { + const nLevels = 4; const secret = "1234567890"; const key = 1; const commitments = []; - const wasm = await fs.promises.readFile("./build/deposit.wasm"); + const wasm = await fs.promises.readFile("./test/build/deposit.wasm"); console.log("w", wasm.length); - const witness = await miksi.calcDepositWitness(wasm, key, secret, commitments); + const witness = await miksi.calcDepositWitness(wasm, nLevels, key, secret, commitments); // console.log("w", witness);