poma WIP

cli.js

@@ -13,6 +13,7 @@ const Web3 = require('web3')
 const buildGroth16 = require('websnark/src/groth16')
 const websnarkUtils = require('websnark/src/utils')
 const { toWei, fromWei } = require('web3-utils')
+const config = require('./config')
 
 let web3, tornado, erc20tornado, circuit, proving_key, groth16, erc20, senderAccount
 let MERKLE_TREE_HEIGHT, ETH_AMOUNT, TOKEN_AMOUNT, ERC20_TOKEN
@@ -28,7 +29,7 @@ const pedersenHash = data => circomlib.babyJub.unpackPoint(circomlib.pedersenHas
 
 /** BigNumber to hex string of specified length */
 function toHex(number, length = 32) {
-  let str = number instanceof Buffer ? number.toString('hex') : bigInt(number).toString(16)
+  const str = number instanceof Buffer ? number.toString('hex') : bigInt(number).toString(16)
   return '0x' + str.padStart(length * 2, '0')
 }
 
@@ -42,7 +43,7 @@ async function printBalance(account, name) {
  * Create deposit object from secret and nullifier
  */
 function createDeposit(nullifier, secret) {
-  let deposit = { nullifier, secret }
+  const deposit = { nullifier, secret }
   deposit.preimage = Buffer.concat([deposit.nullifier.leInt2Buff(31), deposit.secret.leInt2Buff(31)])
   deposit.commitment = pedersenHash(deposit.preimage)
   deposit.nullifierHash = pedersenHash(deposit.nullifier.leInt2Buff(31))
@@ -102,8 +103,8 @@ async function generateMerkleProof(contract, deposit) {
   const tree = new merkleTree(MERKLE_TREE_HEIGHT, leaves)
 
   // Find current commitment in the tree
-  let depositEvent = events.find(e => e.returnValues.commitment === toHex(deposit.commitment))
+  const depositEvent = events.find(e => e.returnValues.commitment === toHex(deposit.commitment))
-  let leafIndex = depositEvent ? depositEvent.returnValues.leafIndex : -1
+  const leafIndex = depositEvent ? depositEvent.returnValues.leafIndex : -1
 
   // Validate that our data is correct
   const isValidRoot = await contract.methods.isKnownRoot(toHex(await tree.root())).call()
@@ -119,33 +120,29 @@ async function generateMerkleProof(contract, deposit) {
 /**
  * Generate SNARK proof for withdrawal
  * @param contract Tornado contract address
- * @param note Note string
+ * @param note Note
  * @param recipient Funds recipient
  * @param relayer Relayer address
  * @param fee Relayer fee
  * @param refund Receive ether for exchanged tokens
  */
 async function generateProof(contract, note, recipient, relayer = 0, fee = 0, refund = 0) {
-  // Decode hex string and restore the deposit object
-  let buf = Buffer.from(note.slice(2), 'hex')
-  let deposit = createDeposit(bigInt.leBuff2int(buf.slice(0, 31)), bigInt.leBuff2int(buf.slice(31, 62)))
-
   // Compute merkle proof of our commitment
-  const { root, path_elements, path_index } = await generateMerkleProof(contract, deposit)
+  const { root, path_elements, path_index } = await generateMerkleProof(contract, note.deposit)
 
   // Prepare circuit input
   const input = {
     // Public snark inputs
     root: root,
-    nullifierHash: deposit.nullifierHash,
+    nullifierHash: note.deposit.nullifierHash,
     recipient: bigInt(recipient),
     relayer: bigInt(relayer),
     fee: bigInt(fee),
     refund: bigInt(refund),
 
     // Private snark inputs
-    nullifier: deposit.nullifier,
+    nullifier: note.deposit.nullifier,
-    secret: deposit.secret,
+    secret: note.deposit.secret,
     pathElements: path_elements,
     pathIndices: path_index,
   }
@@ -170,10 +167,11 @@ async function generateProof(contract, note, recipient, relayer = 0, fee = 0, re
 
 /**
  * Do an ETH withdrawal
- * @param note Note to withdraw
+ * @param noteString Note to withdraw
  * @param recipient Recipient address
  */
-async function withdraw(note, recipient) {
+async function withdraw(noteString, recipient) {
+  const note = parseNote(noteString)
   const { proof, args } = await generateProof(tornado, note, recipient)
 
   console.log('Submitting withdraw transaction')
@@ -183,10 +181,11 @@ async function withdraw(note, recipient) {
 
 /**
  * Do a ERC20 withdrawal
- * @param note Note to withdraw
+ * @param noteString Note to withdraw
  * @param recipient Recipient address
  */
-async function withdrawErc20(note, recipient) {
+async function withdrawErc20(noteString, recipient) {
+  const note = parseNote(noteString)
   const { proof, args } = await generateProof(erc20tornado, note, recipient)
 
   console.log('Submitting withdraw transaction')
@@ -196,11 +195,12 @@ async function withdrawErc20(note, recipient) {
 
 /**
  * Do an ETH withdrawal through relay
- * @param note Note to withdraw
+ * @param noteString Note to withdraw
  * @param recipient Recipient address
  * @param relayUrl Relay url address
  */
-async function withdrawRelay(note, recipient, relayUrl) {
+async function withdrawRelay(noteString, recipient, relayUrl) {
+  const note = parseNote(noteString)
   const resp = await axios.get(relayUrl + '/status')
   const { relayerAddress, netId, gasPrices } = resp.data
   assert(netId === await web3.eth.net.getId() || netId === '*', 'This relay is for different network')
@@ -213,18 +213,19 @@ async function withdrawRelay(note, recipient, relayUrl) {
   const resp2 = await axios.post(relayUrl + '/relay', { contract: tornado._address, proof: { proof, publicSignals: args } })
   console.log(`Transaction submitted through relay, tx hash: ${resp2.data.txHash}`)
 
-  let receipt = await waitForTxReceipt(resp2.data.txHash)
+  const receipt = await waitForTxReceipt(resp2.data.txHash)
   console.log('Transaction mined in block', receipt.blockNumber)
   console.log('Done')
 }
 
 /**
  * Do a ERC20 withdrawal through relay
- * @param note Note to withdraw
+ * @param noteString Note to withdraw
  * @param recipient Recipient address
  * @param relayUrl Relay url address
  */
-async function withdrawRelayErc20(note, recipient, relayUrl) {
+async function withdrawRelayErc20(noteString, recipient, relayUrl) {
+  const note = parseNote(noteString)
   const resp = await axios.get(relayUrl + '/status')
   const { relayerAddress, netId, gasPrices, ethPriceInDai } = resp.data
   assert(netId === await web3.eth.net.getId() || netId === '*', 'This relay is for different network')
@@ -238,7 +239,7 @@ async function withdrawRelayErc20(note, recipient, relayUrl) {
   const resp2 = await axios.post(relayUrl + '/relay', { contract: erc20tornado._address, proof: { proof, publicSignals: args } })
   console.log(`Transaction submitted through relay, tx hash: ${resp2.data.txHash}`)
 
-  let receipt = await waitForTxReceipt(resp2.data.txHash)
+  const receipt = await waitForTxReceipt(resp2.data.txHash)
   console.log('Transaction mined in block', receipt.blockNumber)
   console.log('Done')
 }
@@ -267,6 +268,25 @@ function waitForTxReceipt(txHash, attempts = 60, delay = 1000) {
   })
 }
 
+function parseNote(noteString) {
+  const noteRegex = /tornado-(?<currency>\w+)-(?<amount>[\d.]+)-(?<netId>\d+)-0x(?<note>[0-9a-fA-F]{124})/g
+  const match = noteRegex.exec(noteString)
+  if (!match) {
+    throw new Error('The note has invalid format')
+  }
+
+  const buf = Buffer.from(match.groups.note, 'hex')
+  const nullifier = bigInt.leBuff2int(buf.slice(0, 31))
+  const secret = bigInt.leBuff2int(buf.slice(31, 62))
+  const deposit = createDeposit(nullifier, secret)
+
+
+  const netId = Number(match.groups.netId)
+  const address = config.mixers['netId' + netId][match.groups.currency][match.groups.amount]
+
+  return { address, netId, deposit }
+}
+
 /**
  * Init web3, contracts, and snark
  */
@@ -284,7 +304,7 @@ async function init() {
     TOKEN_AMOUNT = 1e19
   } else {
     // Initialize from local node
-    web3 = new Web3('http://localhost:8545', null, { transactionConfirmationBlocks: 1 })
+    web3 = new Web3('https://mainnet.infura.io', null, { transactionConfirmationBlocks: 1 })
     contractJson = require('./build/contracts/ETHTornado.json')
     circuit = require('./build/circuits/withdraw.json')
     proving_key = fs.readFileSync('build/circuits/withdraw_proving_key.bin').buffer
@@ -297,10 +317,10 @@ async function init() {
     erc20tornadoJson = require('./build/contracts/ERC20Tornado.json')
   }
   groth16 = await buildGroth16()
-  let netId = await web3.eth.net.getId()
+  const netId = await web3.eth.net.getId()
   if (contractJson.networks[netId]) {
     const tx = await web3.eth.getTransaction(contractJson.networks[netId].transactionHash)
-    tornado = new web3.eth.Contract(contractJson.abi, contractJson.networks[netId].address)
+    tornado = new web3.eth.Contract(contractJson.abi, '0xb541fc07bC7619fD4062A54d96268525cBC6FfEF')
     tornado.deployedBlock = tx.blockNumber
   }
 

config.js

@@ -0,0 +1,151 @@
+require('dotenv').config()
+
+module.exports = {
+  version: '2.2',
+  netId: Number(process.env.NET_ID) || 42,
+  redisUrl: process.env.REDIS_URL,
+  rpcUrl: process.env.RPC_URL || 'https://kovan.infura.io/',
+  oracleRpcUrl: process.env.ORACLE_RPC_URL || 'https://mainnet.infura.io/',
+  oracleAddress: '0xB5eE7907FF5f4c1FC9086Fc117E6c397431F39ad',
+  privateKey: process.env.PRIVATE_KEY,
+  mixers: {
+    netId1: {
+      eth: {
+        mixerAddress: {
+          '0.1': '0x12D66f87A04A9E220743712cE6d9bB1B5616B8Fc',
+          '1': '0x47CE0C6eD5B0Ce3d3A51fdb1C52DC66a7c3c2936',
+          '10': '0x910Cbd523D972eb0a6f4cAe4618aD62622b39DbF',
+          '100': '0xA160cdAB225685dA1d56aa342Ad8841c3b53f291'
+        },
+        symbol: 'ETH',
+        decimals: 18
+      },
+      dai: {
+        mixerAddress: {
+          '100': '0xD4B88Df4D29F5CedD6857912842cff3b20C8Cfa3',
+          '1000': '0xFD8610d20aA15b7B2E3Be39B396a1bC3516c7144',
+          '10000': '0xF60dD140cFf0706bAE9Cd734Ac3ae76AD9eBC32A',
+          '100000': undefined
+        },
+        tokenAddress: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+        symbol: 'DAI',
+        decimals: 18
+      },
+      cdai: {
+        mixerAddress: {
+          '5000': '0x22aaA7720ddd5388A3c0A3333430953C68f1849b',
+          '50000': '0xBA214C1c1928a32Bffe790263E38B4Af9bFCD659',
+          '500000': '0xb1C8094B234DcE6e03f10a5b673c1d8C69739A00',
+          '5000000': undefined
+        },
+        tokenAddress: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643',
+        symbol: 'cDAI',
+        decimals: 8
+      },
+      usdc: {
+        mixerAddress: {
+          '100': '0xd96f2B1c14Db8458374d9Aca76E26c3D18364307',
+          '1000': '0x4736dCf1b7A3d580672CcE6E7c65cd5cc9cFBa9D',
+          '10000': '0xD691F27f38B395864Ea86CfC7253969B409c362d',
+          '100000': undefined
+        },
+        tokenAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+        symbol: 'USDC',
+        decimals: 6
+      },
+      cusdc: {
+        mixerAddress: {
+          '5000': '0xaEaaC358560e11f52454D997AAFF2c5731B6f8a6',
+          '50000': '0x1356c899D8C9467C7f71C195612F8A395aBf2f0a',
+          '500000': '0xA60C772958a3eD56c1F15dD055bA37AC8e523a0D',
+          '5000000': undefined
+        },
+        tokenAddress: '0x39AA39c021dfbaE8faC545936693aC917d5E7563',
+        symbol: 'cUSDC',
+        decimals: 8
+      },
+      usdt: {
+        mixerAddress: {
+          '100': '0x169AD27A470D064DEDE56a2D3ff727986b15D52B',
+          '1000': '0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f',
+          '10000': '0xF67721A2D8F736E75a49FdD7FAd2e31D8676542a',
+          '100000': '0x9AD122c22B14202B4490eDAf288FDb3C7cb3ff5E'
+        },
+        tokenAddress: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+        symbol: 'USDT',
+        decimals: 6
+      }
+    },
+    netId42: {
+      eth: {
+        mixerAddress: {
+          '0.1': '0x8b3f5393bA08c24cc7ff5A66a832562aAB7bC95f',
+          '1': '0xD6a6AC46d02253c938B96D12BE439F570227aE8E',
+          '10': '0xe1BE96331391E519471100c3c1528B66B8F4e5a7',
+          '100': '0xd037E0Ac98Dab2fCb7E296c69C6e52767Ae5414D'
+        },
+        symbol: 'ETH',
+        decimals: 18
+      },
+      dai: {
+        mixerAddress: {
+          '100': '0xdf2d3cC5F361CF95b3f62c4bB66deFe3FDE47e3D',
+          '1000': '0xD96291dFa35d180a71964D0894a1Ae54247C4ccD',
+          '10000': '0xb192794f72EA45e33C3DF6fe212B9c18f6F45AE3',
+          '100000': undefined
+        },
+        tokenAddress: '0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa',
+        symbol: 'DAI',
+        decimals: 18
+      },
+      cdai: {
+        mixerAddress: {
+          '5000': '0x6Fc9386ABAf83147b3a89C36D422c625F44121C8',
+          '50000': '0x7182EA067e0f050997444FCb065985Fd677C16b6',
+          '500000': '0xC22ceFd90fbd1FdEeE554AE6Cc671179BC3b10Ae',
+          '5000000': undefined
+        },
+        tokenAddress: '0xe7bc397DBd069fC7d0109C0636d06888bb50668c',
+        symbol: 'cDAI',
+        decimals: 8
+      },
+      usdc: {
+        mixerAddress: {
+          '100': '0x137E2B6d185018e7f09f6cf175a970e7fC73826C',
+          '1000': '0xcC7f1633A5068E86E3830e692e3e3f8f520525Af',
+          '10000': '0x28C8f149a0ab8A9bdB006B8F984fFFCCE52ef5EF',
+          '100000': undefined
+        },
+        tokenAddress: '0x75B0622Cec14130172EaE9Cf166B92E5C112FaFF',
+        symbol: 'USDC',
+        decimals: 6
+      },
+      cusdc: {
+        mixerAddress: {
+          '5000': '0xc0648F28ABA385c8a1421Bbf1B59e3c474F89cB0',
+          '50000': '0x0C53853379c6b1A7B74E0A324AcbDD5Eabd4981D',
+          '500000': '0xf84016A0E03917cBe700D318EB1b7a53e6e3dEe1',
+          '5000000': undefined
+        },
+        tokenAddress: '0xcfC9bB230F00bFFDB560fCe2428b4E05F3442E35',
+        symbol: 'cUSDC',
+        decimals: 8
+      },
+      usdt: {
+        mixerAddress: {
+          '100': '0x327853Da7916a6A0935563FB1919A48843036b42',
+          '1000': '0x531AA4DF5858EA1d0031Dad16e3274609DE5AcC0',
+          '10000': '0x0958275F0362cf6f07D21373aEE0cf37dFe415dD',
+          '100000': '0x14aEd24B67EaF3FF28503eB92aeb217C47514364'
+        },
+        tokenAddress: '0x03c5F29e9296006876d8DF210BCFfD7EA5Db1Cf1',
+        symbol: 'USDT',
+        decimals: 6
+      }
+    }
+  },
+  defaultGasPrice: 2,
+  gasOracleUrls: ['https://ethgasstation.info/json/ethgasAPI.json', 'https://gasprice.poa.network/'],
+  port: process.env.APP_PORT,
+  relayerServiceFee: Number(process.env.RELAYER_FEE)
+}