Git-Mirrors/tornado-core
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-core.git synced 2024-09-21 08:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from peppersec/reduce-nullifier-bits

Browse Source 
reduce nullifier bits to 31
This commit is contained in:
Roman Storm 2019-08-01 10:00:25 -07:00 committed by GitHub
commit a657860418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
circuits/withdraw.circom
View File

@ -10,16 +10,16 @@ template CommitmentHasher() {
signal output commitment; signal output commitment;
signal output nullifierHash; signal output nullifierHash;
component commitmentHasher = Pedersen(512); component commitmentHasher = Pedersen(496);
component nullifierHasher = Pedersen(256); component nullifierHasher = Pedersen(248);
component nullifierBits = Num2Bits(256); component nullifierBits = Num2Bits(248);
component secretBits = Num2Bits(256); component secretBits = Num2Bits(248);
nullifierBits.in <== nullifier; nullifierBits.in <== nullifier;
secretBits.in <== secret; secretBits.in <== secret;
for (var i = 0; i < 256; i++) { for (var i = 0; i < 248; i++) {
nullifierHasher.in[i] <== nullifierBits.out[i]; nullifierHasher.in[i] <== nullifierBits.out[i];
commitmentHasher.in[i] <== nullifierBits.out[i]; commitmentHasher.in[i] <== nullifierBits.out[i];
commitmentHasher.in[i + 256] <== secretBits.out[i]; commitmentHasher.in[i + 248] <== secretBits.out[i];
} }
commitment <== commitmentHasher.out[0]; commitment <== commitmentHasher.out[0];

4
cli.js
View File

@ -21,7 +21,7 @@ const pedersenHash = (data) => circomlib.babyJub.unpackPoint(circomlib.pedersenH
function createDeposit(nullifier, secret) { function createDeposit(nullifier, secret) {
let deposit = { nullifier, secret } let deposit = { nullifier, secret }
deposit.preimage = Buffer.concat([deposit.nullifier.leInt2Buff(32), deposit.secret.leInt2Buff(32)]) deposit.preimage = Buffer.concat([deposit.nullifier.leInt2Buff(31), deposit.secret.leInt2Buff(31)])
deposit.commitment = pedersenHash(deposit.preimage) deposit.commitment = pedersenHash(deposit.preimage)
return deposit return deposit
} }
@ -61,7 +61,7 @@ async function withdraw(note, receiver) {
}) })
const tree = new merkleTree(MERKLE_TREE_HEIGHT, EMPTY_ELEMENT, leaves) const tree = new merkleTree(MERKLE_TREE_HEIGHT, EMPTY_ELEMENT, leaves)
const validRoot = await mixer.methods.isKnownRoot(await tree.root()).call() const validRoot = await mixer.methods.isKnownRoot(await tree.root()).call()
const nullifierHash = pedersenHash(deposit.nullifier.leInt2Buff(32)) const nullifierHash = pedersenHash(deposit.nullifier.leInt2Buff(31))
const nullifierHashToCheck = nullifierHash.toString(16).padStart('66', '0x000000') const nullifierHashToCheck = nullifierHash.toString(16).padStart('66', '0x000000')
const isSpent = await mixer.methods.isSpent(nullifierHashToCheck).call() const isSpent = await mixer.methods.isSpent(nullifierHashToCheck).call()
assert(validRoot === true) assert(validRoot === true)

16
test/Mixer.test.js
View File

@ -29,7 +29,7 @@ function generateDeposit() {
secret: rbigint(31), secret: rbigint(31),
nullifier: rbigint(31), nullifier: rbigint(31),
} }
const preimage = Buffer.concat([deposit.nullifier.leInt2Buff(32), deposit.secret.leInt2Buff(32)]) const preimage = Buffer.concat([deposit.nullifier.leInt2Buff(31), deposit.secret.leInt2Buff(31)])
deposit.commitment = pedersenHash(preimage) deposit.commitment = pedersenHash(preimage)
return deposit return deposit
} }
@ -138,7 +138,7 @@ contract('Mixer', accounts => {
const input = stringifyBigInts({ const input = stringifyBigInts({
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
fee, fee,
@ -194,7 +194,7 @@ contract('Mixer', accounts => {
const input = stringifyBigInts({ const input = stringifyBigInts({
// public // public
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
receiver, receiver,
fee, fee,
@ -245,7 +245,7 @@ contract('Mixer', accounts => {
const input = stringifyBigInts({ const input = stringifyBigInts({
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
fee, fee,
@ -269,7 +269,7 @@ contract('Mixer', accounts => {
const input = stringifyBigInts({ const input = stringifyBigInts({
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
fee, fee,
@ -293,7 +293,7 @@ contract('Mixer', accounts => {
const oneEtherFee = bigInt(1e18) // 1 ether const oneEtherFee = bigInt(1e18) // 1 ether
const input = stringifyBigInts({ const input = stringifyBigInts({
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
fee: oneEtherFee, fee: oneEtherFee,
@ -316,7 +316,7 @@ contract('Mixer', accounts => {
const { root, path_elements, path_index } = await tree.path(0) const { root, path_elements, path_index } = await tree.path(0)
const input = stringifyBigInts({ const input = stringifyBigInts({
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
root, root,
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
@ -344,7 +344,7 @@ contract('Mixer', accounts => {
const input = stringifyBigInts({ const input = stringifyBigInts({
root, root,
nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(32)), nullifierHash: pedersenHash(deposit.nullifier.leInt2Buff(31)),
nullifier: deposit.nullifier, nullifier: deposit.nullifier,
receiver, receiver,
fee, fee,