From e0dfc2ab6c6893e36af1440eb21ce0afa0ecd62a Mon Sep 17 00:00:00 2001 From: arnaucube Date: Sat, 9 May 2020 19:01:41 +0200 Subject: [PATCH] Add very initial version of smart contracts with tests --- .gitattributes | 1 + .github/workflows/tests.yml | 10 +- README.md | 18 +- circuits/README.md | 6 - circuits/{circuits => }/withdraw.circom | 12 +- compile-circuits.sh | 36 ++++ contracts/Miksi.sol | 52 ++++++ contracts/helpers/Migrations.sol | 23 +++ contracts/verifier.sol | 227 ++++++++++++++++++++++++ migrations/1_initial_migration.js | 5 + migrations/2_deploy_contracts.js | 5 + package-lock.json | 54 +++++- package.json | 9 +- test/{ => circuits}/withdraw.test.ts | 2 +- test/contracts/miksi.test.ts | 81 +++++++++ truffle-config.js | 23 +++ 16 files changed, 537 insertions(+), 27 deletions(-) create mode 100644 .gitattributes delete mode 100644 circuits/README.md rename circuits/{circuits => }/withdraw.circom (65%) create mode 100755 compile-circuits.sh create mode 100644 contracts/Miksi.sol create mode 100644 contracts/helpers/Migrations.sol create mode 100644 contracts/verifier.sol create mode 100644 migrations/1_initial_migration.js create mode 100644 migrations/2_deploy_contracts.js rename test/{ => circuits}/withdraw.test.ts (92%) create mode 100644 test/contracts/miksi.test.ts create mode 100644 truffle-config.js diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..52031de --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sol linguist-language=Solidity diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90d4e72..dd4db64 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,10 +12,14 @@ jobs: node-version: [ 10.x ] steps: - - uses: actions/checkout@v2 + - name: Checkout code + uses: actions/checkout@v2 - name: Use Nodejs uses: actions/setup-node@v1 - name: Install node_modules run: npm install - - name: Test circom circuits - run: npm run test + - name: Execute tests + run: | + sh ./compile-circuits.sh + npm run test-circuits + npm run test-sc diff --git a/README.md b/README.md index f76690b..bccbd73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,20 @@ -# miksilo +# miksi [![Test](https://github.com/miksi-labs/miksi-core/workflows/Test/badge.svg)](https://github.com/miksi-labs/miksi-core/actions?query=workflow%3ATest) + +*From Esperanto, **miksi** (miks·i): to mingle, to blend, to mix, to shuffle* + + + +**Warning:** This repository is in a very early stage. + +## Circuits tests +``` +npm run test-circuits +``` + +## Smart Contracts tests +``` +npm run test-sc +``` ### Compile circom circuit & generate Groth16 verifier contract diff --git a/circuits/README.md b/circuits/README.md deleted file mode 100644 index 846f1e1..0000000 --- a/circuits/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# circuits - -Circuits used by miksi. - -**Warning:** This repository is in a very early stage. - diff --git a/circuits/circuits/withdraw.circom b/circuits/withdraw.circom similarity index 65% rename from circuits/circuits/withdraw.circom rename to circuits/withdraw.circom index efa4c45..f331220 100644 --- a/circuits/circuits/withdraw.circom +++ b/circuits/withdraw.circom @@ -15,12 +15,12 @@ PRI_secret+--------->+ | */ -include "../../node_modules/circomlib/circuits/babyjub.circom"; -include "../../node_modules/circomlib/circuits/comparators.circom"; -include "../../node_modules/circomlib/circuits/poseidon.circom"; -include "../../node_modules/circomlib/circuits/bitify.circom"; -include "../../node_modules/circomlib/circuits/smt/smtverifier.circom"; -include "../../node_modules/circomlib/circuits/smt/smtprocessor.circom"; +include "../node_modules/circomlib/circuits/babyjub.circom"; +include "../node_modules/circomlib/circuits/comparators.circom"; +include "../node_modules/circomlib/circuits/poseidon.circom"; +include "../node_modules/circomlib/circuits/bitify.circom"; +include "../node_modules/circomlib/circuits/smt/smtverifier.circom"; +include "../node_modules/circomlib/circuits/smt/smtprocessor.circom"; template Withdraw() { signal input coinCode; diff --git a/compile-circuits.sh b/compile-circuits.sh new file mode 100755 index 0000000..99b3b01 --- /dev/null +++ b/compile-circuits.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# npm install +rm -r build +mkdir build +cd build + +echo $(date +"%T") "circom ../circuits/withdraw.circom --r1cs --wasm --sym" +itime="$(date -u +%s)" +../node_modules/.bin/circom ../circuits/withdraw.circom --r1cs --wasm --sym +ftime="$(date -u +%s)" +echo " ($(($(date -u +%s)-$itime))s)" + +echo $(date +"%T") "snarkjs info -r withdraw.r1cs" +../node_modules/.bin/snarkjs info -r withdraw.r1cs + +echo $(date +"%T") "snarkjs setup" +itime="$(date -u +%s)" +../node_modules/.bin/snarkjs setup -r withdraw.r1cs +echo " ($(($(date -u +%s)-$itime))s)" +echo $(date +"%T") "trusted setup generated" + +# sed -i 's/null/["0","0","0"]/g' proving_key.json + + +echo $(date +"%T") "snarkjs generateverifier" +itime="$(date -u +%s)" +../node_modules/.bin/snarkjs generateverifier +echo " ($(($(date -u +%s)-$itime))s)" +echo $(date +"%T") "generateverifier generated" + +sed -i "s/solidity ^0.5.0/solidity ^0.6.0/g" verifier.sol +sed -i "s/gas/gas()/g" verifier.sol +sed -i "s/return the sum/return r the sum/g" verifier.sol +sed -i "s/return the product/return r the product/g" verifier.sol +cp verifier.sol ../contracts/verifier.sol diff --git a/contracts/Miksi.sol b/contracts/Miksi.sol new file mode 100644 index 0000000..c8ca843 --- /dev/null +++ b/contracts/Miksi.sol @@ -0,0 +1,52 @@ +pragma solidity ^0.6.0; + +import './verifier.sol'; + +contract Miksi { + Verifier verifier; + + constructor( address _verifierContractAddr) public { + verifier = Verifier(_verifierContractAddr); + } + + mapping(uint256 => Deposit) deposits; + + struct Deposit { + uint256 coinCode; + uint256 amount; + } + + function deposit( + uint256 coinCode, + uint256 amount, + uint256 commitment + ) public { + deposits[commitment] = Deposit(coinCode, amount); + } + + function getDeposit( + uint256 commitment + ) public view returns (uint256, uint256) { + return ( + deposits[commitment].coinCode, + deposits[commitment].amount + ); + } + + function withdraw( + uint256 commitment, + uint[2] memory a, + uint[2][2] memory b, + uint[2] memory c + ) public { + + uint256[3] memory input = [ + deposits[commitment].coinCode, + deposits[commitment].amount, + commitment + ]; + require(verifier.verifyProof(a, b, c, input), "zkProof withdraw could not be verified"); + + // zk verification passed, proceed with the withdraw + } +} diff --git a/contracts/helpers/Migrations.sol b/contracts/helpers/Migrations.sol new file mode 100644 index 0000000..9b6ff08 --- /dev/null +++ b/contracts/helpers/Migrations.sol @@ -0,0 +1,23 @@ +pragma solidity ^0.6.0; + +contract Migrations { + address public owner; + uint public last_completed_migration; + + constructor() public { + owner = msg.sender; + } + + modifier restricted() { + if (msg.sender == owner) _; + } + + function setCompleted(uint completed) public restricted { + last_completed_migration = completed; + } + + function upgrade(address new_address) public restricted { + Migrations upgraded = Migrations(new_address); + upgraded.setCompleted(last_completed_migration); + } +} diff --git a/contracts/verifier.sol b/contracts/verifier.sol new file mode 100644 index 0000000..dd7cca9 --- /dev/null +++ b/contracts/verifier.sol @@ -0,0 +1,227 @@ +// +// Copyright 2017 Christian Reitwiessner +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// 2019 OKIMS +// ported to solidity 0.5 +// fixed linter warnings +// added requiere error messages +// +pragma solidity ^0.6.0; +library Pairing { + struct G1Point { + uint X; + uint Y; + } + // Encoding of field elements is: X[0] * z + X[1] + struct G2Point { + uint[2] X; + uint[2] Y; + } + /// @return the generator of G1 + function P1() internal pure returns (G1Point memory) { + return G1Point(1, 2); + } + /// @return the generator of G2 + function P2() internal pure returns (G2Point memory) { + // Original code point + return G2Point( + [11559732032986387107991004021392285783925812861821192530917403151452391805634, + 10857046999023057135944570762232829481370756359578518086990519993285655852781], + [4082367875863433681332203403145435568316851327593401208105741076214120093531, + 8495653923123431417604973247489272438418190587263600148770280649306958101930] + ); + +/* + // Changed by Jordi point + return G2Point( + [10857046999023057135944570762232829481370756359578518086990519993285655852781, + 11559732032986387107991004021392285783925812861821192530917403151452391805634], + [8495653923123431417604973247489272438418190587263600148770280649306958101930, + 4082367875863433681332203403145435568316851327593401208105741076214120093531] + ); +*/ + } + /// @return the negation of p, i.e. p.addition(p.negate()) should be zero. + function negate(G1Point memory p) internal pure returns (G1Point memory) { + // The prime q in the base field F_q for G1 + uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; + if (p.X == 0 && p.Y == 0) + return G1Point(0, 0); + return G1Point(p.X, q - (p.Y % q)); + } + /// @return r the sum of two points of G1 + function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) { + uint[4] memory input; + input[0] = p1.X; + input[1] = p1.Y; + input[2] = p2.X; + input[3] = p2.Y; + bool success; + // solium-disable-next-line security/no-inline-assembly + assembly { + success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) + // Use "invalid" to make gas() estimation work + switch success case 0 { invalid() } + } + require(success,"pairing-add-failed"); + } + /// @return r the product of a point on G1 and a scalar, i.e. + /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p. + function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) { + uint[3] memory input; + input[0] = p.X; + input[1] = p.Y; + input[2] = s; + bool success; + // solium-disable-next-line security/no-inline-assembly + assembly { + success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) + // Use "invalid" to make gas() estimation work + switch success case 0 { invalid() } + } + require (success,"pairing-mul-failed"); + } + /// @return the result of computing the pairing check + /// e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 + /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should + /// return true. + function pairing(G1Point[] memory p1, G2Point[] memory p2) internal view returns (bool) { + require(p1.length == p2.length,"pairing-lengths-failed"); + uint elements = p1.length; + uint inputSize = elements * 6; + uint[] memory input = new uint[](inputSize); + for (uint i = 0; i < elements; i++) + { + input[i * 6 + 0] = p1[i].X; + input[i * 6 + 1] = p1[i].Y; + input[i * 6 + 2] = p2[i].X[0]; + input[i * 6 + 3] = p2[i].X[1]; + input[i * 6 + 4] = p2[i].Y[0]; + input[i * 6 + 5] = p2[i].Y[1]; + } + uint[1] memory out; + bool success; + // solium-disable-next-line security/no-inline-assembly + assembly { + success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) + // Use "invalid" to make gas() estimation work + switch success case 0 { invalid() } + } + require(success,"pairing-opcode-failed"); + return out[0] != 0; + } + /// Convenience method for a pairing check for two pairs. + function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal view returns (bool) { + G1Point[] memory p1 = new G1Point[](2); + G2Point[] memory p2 = new G2Point[](2); + p1[0] = a1; + p1[1] = b1; + p2[0] = a2; + p2[1] = b2; + return pairing(p1, p2); + } + /// Convenience method for a pairing check for three pairs. + function pairingProd3( + G1Point memory a1, G2Point memory a2, + G1Point memory b1, G2Point memory b2, + G1Point memory c1, G2Point memory c2 + ) internal view returns (bool) { + G1Point[] memory p1 = new G1Point[](3); + G2Point[] memory p2 = new G2Point[](3); + p1[0] = a1; + p1[1] = b1; + p1[2] = c1; + p2[0] = a2; + p2[1] = b2; + p2[2] = c2; + return pairing(p1, p2); + } + /// Convenience method for a pairing check for four pairs. + function pairingProd4( + G1Point memory a1, G2Point memory a2, + G1Point memory b1, G2Point memory b2, + G1Point memory c1, G2Point memory c2, + G1Point memory d1, G2Point memory d2 + ) internal view returns (bool) { + G1Point[] memory p1 = new G1Point[](4); + G2Point[] memory p2 = new G2Point[](4); + p1[0] = a1; + p1[1] = b1; + p1[2] = c1; + p1[3] = d1; + p2[0] = a2; + p2[1] = b2; + p2[2] = c2; + p2[3] = d2; + return pairing(p1, p2); + } +} +contract Verifier { + using Pairing for *; + struct VerifyingKey { + Pairing.G1Point alfa1; + Pairing.G2Point beta2; + Pairing.G2Point gamma2; + Pairing.G2Point delta2; + Pairing.G1Point[] IC; + } + struct Proof { + Pairing.G1Point A; + Pairing.G2Point B; + Pairing.G1Point C; + } + function verifyingKey() internal pure returns (VerifyingKey memory vk) { + vk.alfa1 = Pairing.G1Point(14097801211944906051089174223297219347615673653483074396722237348255135354793,11521805996213505094241296676841118790602800394351210524781678600259635687017); + vk.beta2 = Pairing.G2Point([10568113084382768459048600842325733541704319994390569016962727798975578285556,12153127494717088082185264166292331483064881810067105818973650106079389053760], [15466853815350922606512198371753750557123426982658771465057849995060646541965,19455599286846641316750628844277996370086220302684811162394897510245086369063]); + vk.gamma2 = Pairing.G2Point([9953206108281020354042857864759150528133680155656326486566810703438203105960,2135441618643414785978676900143212634198799871478347410262755821177928527954], [12268954056182736147684854354337352872362113322749551731236862327324643375709,1876815956335882350254399331991656204647508838653345904292805224558359111754]); + vk.delta2 = Pairing.G2Point([2663201400823710456782609562902977142452976016992514856722909325946187937310,14978203394907966123099039365683754435614065359984166192966572314168591418734], [21214052898049569224905859982289894645182104181183009284067141977584101227593,5359205214835186177822827375213125847159194113298572556544149883988483807673]); + vk.IC = new Pairing.G1Point[](4); + vk.IC[0] = Pairing.G1Point(13408366362878504901998541398762720605356468458453065115215476638573116973612,5444591120479812671974498312523952995185895771090546719531123873877970703107); + vk.IC[1] = Pairing.G1Point(17521475475731634509173671006849258017401865133255449322161532195113052551951,9591040297172512635747124918118916335434286018868426662476696440648139959562); + vk.IC[2] = Pairing.G1Point(10318918062415458864931153468077926819897264015796609757736600478356825989809,2525805381962488186604363053663950289666098935158384096965441697921773574413); + vk.IC[3] = Pairing.G1Point(12285798798872837559598057721617037310744162378880792291377164843222236229469,16499092667373175512569946766276627516609608654521959670983218776858111396618); + + } + function verify(uint[] memory input, Proof memory proof) internal view returns (uint) { + uint256 snark_scalar_field = 21888242871839275222246405745257275088548364400416034343698204186575808495617; + VerifyingKey memory vk = verifyingKey(); + require(input.length + 1 == vk.IC.length,"verifier-bad-input"); + // Compute the linear combination vk_x + Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); + for (uint i = 0; i < input.length; i++) { + require(input[i] < snark_scalar_field,"verifier-gte-snark-scalar-field"); + vk_x = Pairing.addition(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); + } + vk_x = Pairing.addition(vk_x, vk.IC[0]); + if (!Pairing.pairingProd4( + Pairing.negate(proof.A), proof.B, + vk.alfa1, vk.beta2, + vk_x, vk.gamma2, + proof.C, vk.delta2 + )) return 1; + return 0; + } + function verifyProof( + uint[2] memory a, + uint[2][2] memory b, + uint[2] memory c, + uint[3] memory input + ) public view returns (bool r) { + Proof memory proof; + proof.A = Pairing.G1Point(a[0], a[1]); + proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); + proof.C = Pairing.G1Point(c[0], c[1]); + uint[] memory inputValues = new uint[](input.length); + for(uint i = 0; i < input.length; i++){ + inputValues[i] = input[i]; + } + if (verify(inputValues, proof) == 0) { + return true; + } else { + return false; + } + } +} diff --git a/migrations/1_initial_migration.js b/migrations/1_initial_migration.js new file mode 100644 index 0000000..9629336 --- /dev/null +++ b/migrations/1_initial_migration.js @@ -0,0 +1,5 @@ +var Migrations = artifacts.require("./contracts/helpers/Migrations.sol"); + +module.exports = function(deployer) { + deployer.deploy(Migrations); +}; diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js new file mode 100644 index 0000000..c82f47e --- /dev/null +++ b/migrations/2_deploy_contracts.js @@ -0,0 +1,5 @@ +const Verifier = artifacts.require("../contracts/Verifier"); + +module.exports = function(deployer) { + deployer.deploy(Verifier); +}; diff --git a/package-lock.json b/package-lock.json index d06b1a2..1d8a818 100644 --- a/package-lock.json +++ b/package-lock.json @@ -132,6 +132,12 @@ "color-convert": "^1.9.0" } }, + "app-module-path": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz", + "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU=", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -532,6 +538,15 @@ "ffjavascript": "0.1.0", "fnv-plus": "^1.3.1" } + }, + "ffjavascript": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.1.0.tgz", + "integrity": "sha512-dmKlUasSfvUcxBm8nCSKl2x7EFJsXA7OVP8XLFA03T2+6mAc3IiVLC2ambEVOcMOhyhl0vJfVZjM9f9d38D1rw==", + "dev": true, + "requires": { + "big-integer": "^1.6.48" + } } } }, @@ -540,7 +555,6 @@ "resolved": "https://registry.npmjs.org/circom_runtime/-/circom_runtime-0.0.5.tgz", "integrity": "sha512-WEZHnRO1AJIDI2w1yX6rq4G1/MMKnExT3qirjBQR7x43i9Ww3E/wusBHTbXWLb8aYyxsBU07LGy0YXPywPGYvA==", "requires": { - "ffjavascript": "0.1.0", "fnv-plus": "^1.3.1" } }, @@ -552,7 +566,6 @@ "blake-hash": "^1.1.0", "blake2b": "^2.1.3", "circom": "0.5.9", - "ffjavascript": "0.1.0", "web3": "^1.2.6" }, "dependencies": { @@ -565,7 +578,6 @@ "circom_runtime": "0.0.5", "fastfile": "0.0.1", "ffiasm": "0.0.2", - "ffjavascript": "0.1.0", "ffwasm": "0.0.7", "fnv-plus": "^1.3.1", "r1csfile": "0.0.5", @@ -1257,9 +1269,10 @@ } }, "ffjavascript": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.1.0.tgz", - "integrity": "sha512-dmKlUasSfvUcxBm8nCSKl2x7EFJsXA7OVP8XLFA03T2+6mAc3IiVLC2ambEVOcMOhyhl0vJfVZjM9f9d38D1rw==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.1.3.tgz", + "integrity": "sha512-eAeIowhX8JB7scNMw3OgY2ecIlhmx7qPS/AJ7wW8ue6mv6/Wqm3o67CSdT6yuzeJaGoqo9FhoTFj8QiSz5MfGg==", + "dev": true, "requires": { "big-integer": "^1.6.48" } @@ -2136,6 +2149,12 @@ "wrappy": "1" } }, + "original-require": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/original-require/-/original-require-1.0.1.tgz", + "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=", + "dev": true + }, "os-locale": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", @@ -2341,8 +2360,7 @@ "resolved": "https://registry.npmjs.org/r1csfile/-/r1csfile-0.0.5.tgz", "integrity": "sha512-B+BdKPb/WUTp4N/3X4d1Spgx9Ojx5tFVejGZRJxpTtzq34mC8Vi/czWfiPj85V8kud31lCfYcZ16z7+czvM0Sw==", "requires": { - "fastfile": "0.0.1", - "ffjavascript": "0.1.0" + "fastfile": "0.0.1" } }, "ramda": { @@ -2672,6 +2690,15 @@ "wrap-ansi": "^2.0.0" } }, + "ffjavascript": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.1.0.tgz", + "integrity": "sha512-dmKlUasSfvUcxBm8nCSKl2x7EFJsXA7OVP8XLFA03T2+6mAc3IiVLC2ambEVOcMOhyhl0vJfVZjM9f9d38D1rw==", + "dev": true, + "requires": { + "big-integer": "^1.6.48" + } + }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -3063,6 +3090,17 @@ "punycode": "^2.1.1" } }, + "truffle": { + "version": "5.1.25", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.1.25.tgz", + "integrity": "sha512-7iGKMkITjInGD1AFD7mKwxowQiNmPYx08jym/u8oNXVsYPYCZ6NbkMNSdf6TFXTTrEQe+tPEIy+CNF1Oc6DDzA==", + "dev": true, + "requires": { + "app-module-path": "^2.2.0", + "mocha": "5.2.0", + "original-require": "1.0.1" + } + }, "ts-node": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz", diff --git a/package.json b/package.json index 36ad5ae..09bdfca 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "scripts": { "clean": "rm -fR dist", "build": "npm run clean && ./node_modules/.bin/tsc --strictNullChecks", - "test": "./node_modules/.bin/mocha -r ts-node/register test/**/*.ts" + "test-circuits": "./node_modules/.bin/mocha -r ts-node/register test/circuits/*.ts", + "test-sc": "truffle test test/contracts/*.ts", + "truffle": "truffle" }, "license": "GPL-3.0", "dependencies": { @@ -17,6 +19,7 @@ "circom": "0.5.10", "eslint-plugin-mocha": "^6.1.0", "snarkjs": "^0.1.31", + "ffjavascript": "0.1.3", "@types/chai": "^4.1.7", "@types/mocha": "^5.2.6", "chai": "^4.2.0", @@ -24,6 +27,8 @@ "mocha-steps": "^1.3.0", "ts-node": "^7.0.1", "tslint": "^5.18.0", - "typescript": "^3.5.3" + "typescript": "^3.5.3", + "truffle": "^5.0.0-beta.0", + "web3": "^1.0.0-beta.30" } } diff --git a/test/withdraw.test.ts b/test/circuits/withdraw.test.ts similarity index 92% rename from test/withdraw.test.ts rename to test/circuits/withdraw.test.ts index 64cebe8..34c814c 100644 --- a/test/withdraw.test.ts +++ b/test/circuits/withdraw.test.ts @@ -12,7 +12,7 @@ describe("withdraw test", function () { it("Test Withdraw", async () => { const circuit = await tester( - path.join(__dirname, "../circuits/circuits", "withdraw.circom"), + path.join(__dirname, "../../circuits", "withdraw.circom"), {reduceConstraints: false} ); diff --git a/test/contracts/miksi.test.ts b/test/contracts/miksi.test.ts new file mode 100644 index 0000000..fd6fe66 --- /dev/null +++ b/test/contracts/miksi.test.ts @@ -0,0 +1,81 @@ +const Verifier = artifacts.require("../../contracts/Verifier"); +const Miksi = artifacts.require("../../contracts/Miksi.sol"); + +const chai = require("chai"); +const expect = chai.expect; + +const fs = require("fs"); +const { groth } = require('snarkjs'); +const { stringifyBigInts, unstringifyBigInts } = require('ffjavascript').utils; +const WitnessCalculatorBuilder = require("circom_runtime").WitnessCalculatorBuilder; +const circomlib = require("circomlib"); + +contract("miksi", (accounts) => { + + + const { + 0: owner, + 1: idEth1, + 2: idEth2, + 3: idEth3, + } = accounts; + + let insVerifier; + let insMiksi; + + before(async () => { + + insVerifier = await Verifier.new(); + insMiksi = await Miksi.new(insVerifier.address); + }); + + it("miksi flow", async () => { + const secret = "123456789"; + + const coinCode = "1"; + const amount = "100"; + + const poseidon = circomlib.poseidon.createHash(6, 8, 57); + const commitment = poseidon([coinCode, amount, secret]).toString(); + + // deposit + await insMiksi.deposit(coinCode, amount, commitment); + + // getDeposit data + const res = await insMiksi.getDeposit(commitment); + expect(res[0].toString()).to.be.equal(coinCode); + expect(res[1].toString()).to.be.equal(amount); + + + // calculate witness + const wasm = await fs.promises.readFile("./build/withdraw.wasm"); + const input = unstringifyBigInts({ + "coinCode": coinCode, + "amount": amount, + "commitment": commitment, + "secret": secret + }); + const options = {}; + const wc = await WitnessCalculatorBuilder(wasm, options); + const w = await wc.calculateWitness(input); + const witness = unstringifyBigInts(stringifyBigInts(w)); + + // generate zkproof of commitment using snarkjs (as is a test) + const provingKey = unstringifyBigInts(JSON.parse(fs.readFileSync("./build/proving_key.json", "utf8"))); + + const {proof, publicSignals} = groth.genProof(provingKey, witness); + + // withdraw + const resW = await insMiksi.withdraw( + commitment, + [proof.pi_a[0].toString(), proof.pi_a[1].toString()], + [ + [proof.pi_b[0][1].toString(), proof.pi_b[0][0].toString()], + [proof.pi_b[1][1].toString(), proof.pi_b[1][0].toString()] + ], + [proof.pi_c[0].toString(), proof.pi_c[1].toString()] + ); + console.log("resW", resW); + + }); +}); diff --git a/truffle-config.js b/truffle-config.js new file mode 100644 index 0000000..2d8605c --- /dev/null +++ b/truffle-config.js @@ -0,0 +1,23 @@ +/* + * NB: since truffle-hdwallet-provider 0.0.5 you must wrap HDWallet providers in a + * function when declaring them. Failure to do so will cause commands to hang. ex: + * ``` + * mainnet: { + * provider: function() { + * return new HDWalletProvider(mnemonic, 'https://mainnet.infura.io/') + * }, + * network_id: '1', + * gas: 4500000, + * gasPrice: 10000000000, + * }, + */ + +module.exports = { + // See + // to customize your Truffle configuration! + compilers: { + solc: { + version: "0.6.0" + } + } +};