Git-Mirrors/tornado-cli
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-cli.git synced 2025-07-30 17:58:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use merkle tree from npm & remove ./lib

Browse source 
Reference: 0c6e638852

- fixed yarn installation bug as well
This commit is contained in:
Ayanami 2022-02-27 07:32:24 +09:00
parent 863474c203
commit d55ca374e4
No known key found for this signature in database
GPG key ID: 0CABDF03077D92E4
22 changed files with 697 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cli.js
View file

@ -9,7 +9,7 @@ const snarkjs = require('snarkjs')
const crypto = require('crypto')
const circomlib = require('circomlib')
const bigInt = snarkjs.bigInt
const merkleTree = require('./lib/MerkleTree')
const merkleTree = require('fixed-merkle-tree')
const Web3 = require('web3')
const Web3HttpProvider = require('web3-providers-http');
const buildGroth16 = require('websnark/src/groth16')
@ -232,7 +232,7 @@ async function generateMerkleProof(deposit, currency, amount) {
const tree = new merkleTree(MERKLE_TREE_HEIGHT, leaves)
// Validate that our data is correct
const root = await tree.root()
const root = tree.root()
const isValidRoot = await tornadoContract.methods.isKnownRoot(toHex(root)).call()
const isSpent = await tornadoContract.methods.isSpent(toHex(deposit.nullifierHash)).call()
assert(isValidRoot === true, 'Merkle tree is corrupted')
@ -240,7 +240,8 @@ async function generateMerkleProof(deposit, currency, amount) {
assert(leafIndex >= 0, 'The deposit is not found in the tree')
// Compute merkle proof of our commitment
return tree.path(leafIndex)
const { pathElements, pathIndices } = tree.path(leafIndex)
return { root, pathElements, pathIndices }
}
/**
@ -253,7 +254,7 @@ async function generateMerkleProof(deposit, currency, amount) {
*/
async function generateProof({ deposit, currency, amount, recipient, relayerAddress = 0, fee = 0, refund = 0 }) {
// Compute merkle proof of our commitment
const { root, path_elements, path_index } = await generateMerkleProof(deposit, currency, amount)
const { root, pathElements, pathIndices } = await generateMerkleProof(deposit, currency, amount)
// Prepare circuit input
const input = {
@ -268,8 +269,8 @@ async function generateProof({ deposit, currency, amount, recipient, relayerAddr
// Private snark inputs
nullifier: deposit.nullifier,
secret: deposit.secret,
pathElements: path_elements,
pathIndices: path_index
pathElements: pathElements,
pathIndices: pathIndices
}
console.log('Generating SNARK proof')