updates

TODO

@@ -0,0 +1 @@
+* update verifier

circuits/merkleTree.circom

@@ -6,7 +6,7 @@ template HashLeftRight() {
     signal input right;
     signal output hash;
 
-    component hasher = MiMCSponge(2, 220, 1);
+    component hasher = MiMCSponge(2, 1);
     hasher.ins[0] <== left;
     hasher.ins[1] <== right;
     hasher.k <== 0;

circuits/transaction.circom

@@ -120,4 +120,4 @@ template Transaction(levels, zeroLeaf) {
     }
 }
 
-component main = Transaction(20, 3193090221241211970002919215846211184824251841300455796635909287157453409439);
+component main = Transaction(5, 3193090221241211970002919215846211184824251841300455796635909287157453409439);

circuits/utils.circom

@@ -18,7 +18,7 @@ template TransactionHasher() {
 
     signal output commitment;
 
-    component hasher = MiMCSponge(3, 220, 1);
+    component hasher = MiMCSponge(3, 1);
     hasher.ins[0] <== amount;
     hasher.ins[1] <== blinding;
     hasher.ins[2] <== publicKey;
@@ -34,7 +34,7 @@ template NullifierHasher() {
 
     signal output nullifier;
 
-    component hasher = MiMCSponge(3, 220, 1);
+    component hasher = MiMCSponge(3, 1);
     hasher.ins[0] <== commitment;
     hasher.ins[1] <== merklePath;
     hasher.ins[2] <== privateKey;

contracts/Migrations.sol

@@ -0,0 +1,23 @@
+pragma solidity >=0.4.21 <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);
+  }
+}

contracts/Verifier.sol

@@ -0,0 +1 @@
+../build/circuits/Verifier.sol

migrations/1_deploy_verifier.js

@@ -0,0 +1,6 @@
+/* global artifacts */
+const Verifier = artifacts.require('Verifier')
+
+module.exports = function(deployer) {
+  deployer.deploy(Verifier)
+}

migrations/1_initial_migration.js

@@ -1,5 +0,0 @@
-const Migrations = artifacts.require("Migrations");
-
-module.exports = function(deployer) {
-  deployer.deploy(Migrations);
-};

migrations/2_deploy_pool.js

@@ -0,0 +1,11 @@
+/* global artifacts */
+const Verifier = artifacts.require('Verifier')
+const TornadoPool = artifacts.require('TornadoPool')
+
+module.exports = function(deployer, network, accounts) {
+  return deployer.then(async () => {
+    const verifier = await Verifier.deployed()
+    const tornado = await deployer.deploy(TornadoPool, verifier.address)
+    console.log('TornadoPool\'s address ', tornado.address)
+  })
+}

package.json

@@ -7,13 +7,28 @@
     "test": "test"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "cli": "npx ts-node src/index.ts",
+    "build:circuit:compile": "npx circom circuits/transaction.circom -o build/circuits/transaction.json && npx snarkjs info -c build/circuits/transaction.json",
+    "build:circuit:setup": "npx snarkjs setup --protocol groth -c build/circuits/transaction.json --pk build/circuits/transaction_proving_key.json --vk build/circuits/transaction_verification_key.json",
+    "build:circuit:bin": "node node_modules/websnark/tools/buildpkey.js -i build/circuits/transaction_proving_key.json -o build/circuits/transaction_proving_key.bin",
+    "build:circuit:contract": "npx snarkjs generateverifier -v build/circuits/Verifier.sol --vk build/circuits/transaction_verification_key.json",
+    "build:circuit": "mkdir -p build/circuits && npm run build:circuit:compile && npm run build:circuit:setup && npm run build:circuit:bin && npm run build:circuit:contract",
+    "migrate:dev": "npx truffle migrate --network development --reset"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "@openzeppelin/contracts": "^2.5.0",
-    "circomlib": "0.0.21"
+    "bignumber.js": "^9.0.0",
+    "circom": "0.0.35",
+    "circomlib": "git+https://github.com/tornadocash/circomlib.git#c372f14d324d57339c88451834bf2824e73bbdbc",
+    "snarkjs": "git+https://github.com/tornadocash/snarkjs.git#869181cfaf7526fe8972073d31655493a04326d5",
+    "typescript": "^3.8.3",
+    "websnark": "git+https://github.com/tornadocash/websnark.git#2041cfa5fa0b71cd5cca9022a4eeea4afe28c9f7"
+  },
+  "devDependencies": {
+    "ganache-cli": "^6.9.1",
+    "ts-node": "^8.8.2"
   }
 }

src/index.ts

@@ -0,0 +1,14 @@
+
+import BigNumber from "bignumber.js"
+
+class UTXO {
+  amount: BigNumber;
+  blinding: BigNumber;
+  pubkey: BigNumber;
+}
+
+async function main() {
+  const deposit = new UTXO();
+}
+
+main()

truffle-config.js

@@ -42,11 +42,11 @@ module.exports = {
     // tab if you use this network and you must also set the `host`, `port` and `network_id`
     // options below to some value.
     //
-    // development: {
+    development: {
-    //  host: "127.0.0.1",     // Localhost (default: none)
+     host: "127.0.0.1",     // Localhost (default: none)
-    //  port: 8545,            // Standard Ethereum port (default: none)
+     port: 8545,            // Standard Ethereum port (default: none)
-    //  network_id: "*",       // Any network (default: none)
+     network_id: "*",       // Any network (default: none)
-    // },
+    },
 
     // Another network with more advanced options...
     // advanced: {
@@ -85,15 +85,15 @@ module.exports = {
   // Configure your compilers
   compilers: {
     solc: {
-      // version: "0.5.1",    // Fetch exact version from solc-bin (default: truffle's version)
+      version: "0.5.17",    // Fetch exact version from solc-bin (default: truffle's version)
       // docker: true,        // Use "0.5.1" you've installed locally with docker (default: false)
-      // settings: {          // See the solidity docs for advice about optimization and evmVersion
+      settings: {          // See the solidity docs for advice about optimization and evmVersion
-      //  optimizer: {
+       optimizer: {
-      //    enabled: false,
+         enabled: true,
-      //    runs: 200
+         runs: 200
-      //  },
+       },
-      //  evmVersion: "byzantium"
+       //evmVersion: "byzantium"
-      // }
+      }
     }
   }
 }

tsconfig.json

@@ -0,0 +1,81 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "esnext",
+    /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "module": "commonjs",
+    /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "lib": [
+      "esnext.bigint"
+    ],
+    /* Specify library files to be included in the compilation. */
+     "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "declarationDir": "dist/types",
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+     "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+     "outDir": "dist",                        /* Redirect output structure to the directory. */
+     "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,
+    /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+     "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+     "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    "experimentalDecorators": true,
+    /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "forceConsistentCasingInFileNames": true,
+    "typeRoots": [
+      "node_modules/@types"
+    ]
+    /* Disallow inconsistently-cased references to the same file. */
+  },
+  "include": ["./src/**/*"]
+}