tornadocash
/
tornado-nova
mirror of https://github.com/tornadocash/tornado-nova
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add commitment to compliance signature

This commit is contained in:
Alexey 2021-11-08 18:05:57 +03:00
parent 2a6fca70fa
commit 07a4d600f4
No known key found for this signature in database
GPG Key ID: C77958099D784E76
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
circuits/keypair.circom
View File

@ -12,11 +12,13 @@ template Keypair() {
template Signature() { template Signature() {
signal input privateKey; signal input privateKey;
signal input commitment;
signal input merklePath; signal input merklePath;
signal output out; signal output out;
component hasher = Poseidon(2); component hasher = Poseidon(3);
hasher.inputs[0] <== privateKey; hasher.inputs[0] <== privateKey;
hasher.inputs[1] <== merklePath; hasher.inputs[1] <== commitment;
hasher.inputs[2] <== merklePath;
out <== hasher.out; out <== hasher.out;
} }

17
circuits/transaction.circom
View File

@ -11,7 +11,7 @@ Utxo structure:
} }
commitment = hash(amount, pubKey, blinding) commitment = hash(amount, pubKey, blinding)
nullifier = hash(commitment, merklePath, sign(merklePath, privKey)) nullifier = hash(commitment, merklePath, sign(privKey, commitment, merklePath))
*/ */
// Universal JoinSplit transaction with nIns inputs and 2 outputs // Universal JoinSplit transaction with nIns inputs and 2 outputs
@ -39,7 +39,7 @@ template Transaction(levels, nIns, nOuts, zeroLeaf) {
component inKeypair[nIns]; component inKeypair[nIns];
component inSignature[nIns]; component inSignature[nIns];
component inUtxoHasher[nIns]; component commitmentHasher[nIns];
component nullifierHasher[nIns]; component nullifierHasher[nIns];
component tree[nIns]; component tree[nIns];
component checkRoot[nIns]; component checkRoot[nIns];
@ -50,23 +50,24 @@ template Transaction(levels, nIns, nOuts, zeroLeaf) {
inKeypair[tx] = Keypair(); inKeypair[tx] = Keypair();
inKeypair[tx].privateKey <== inPrivateKey[tx]; inKeypair[tx].privateKey <== inPrivateKey[tx];
inUtxoHasher[tx] = Poseidon(3); commitmentHasher[tx] = Poseidon(3);
inUtxoHasher[tx].inputs[0] <== inAmount[tx]; commitmentHasher[tx].inputs[0] <== inAmount[tx];
inUtxoHasher[tx].inputs[1] <== inKeypair[tx].publicKey; commitmentHasher[tx].inputs[1] <== inKeypair[tx].publicKey;
inUtxoHasher[tx].inputs[2] <== inBlinding[tx]; commitmentHasher[tx].inputs[2] <== inBlinding[tx];
inSignature[tx] = Signature(); inSignature[tx] = Signature();
inSignature[tx].privateKey <== inPrivateKey[tx]; inSignature[tx].privateKey <== inPrivateKey[tx];
inSignature[tx].commitment <== commitmentHasher[tx].out;
inSignature[tx].merklePath <== inPathIndices[tx]; inSignature[tx].merklePath <== inPathIndices[tx];
nullifierHasher[tx] = Poseidon(3); nullifierHasher[tx] = Poseidon(3);
nullifierHasher[tx].inputs[0] <== inUtxoHasher[tx].out; nullifierHasher[tx].inputs[0] <== commitmentHasher[tx].out;
nullifierHasher[tx].inputs[1] <== inPathIndices[tx]; nullifierHasher[tx].inputs[1] <== inPathIndices[tx];
nullifierHasher[tx].inputs[2] <== inSignature[tx].out; nullifierHasher[tx].inputs[2] <== inSignature[tx].out;
nullifierHasher[tx].out === inputNullifier[tx]; nullifierHasher[tx].out === inputNullifier[tx];
tree[tx] = MerkleProof(levels); tree[tx] = MerkleProof(levels);
tree[tx].leaf <== inUtxoHasher[tx].out; tree[tx].leaf <== commitmentHasher[tx].out;
tree[tx].pathIndices <== inPathIndices[tx]; tree[tx].pathIndices <== inPathIndices[tx];
for (var i = 0; i < levels; i++) { for (var i = 0; i < levels; i++) {
tree[tx].pathElements[i] <== inPathElements[tx][i]; tree[tx].pathElements[i] <== inPathElements[tx][i];

4
src/keypair.js
View File

@ -85,8 +85,8 @@ class Keypair {
* @param {string|number|BigNumber} merklePath a hex string with merkle path * @param {string|number|BigNumber} merklePath a hex string with merkle path
* @returns {BigNumber} a hex string with signature * @returns {BigNumber} a hex string with signature
*/ */
sign(merklePath) { sign(commitment, merklePath) {
return poseidonHash([this.privkey, merklePath]) return poseidonHash([this.privkey, commitment, merklePath])
} }
/** /**

2
src/utxo.js
View File

@ -46,7 +46,7 @@ class Utxo {
) { ) {
throw new Error('Can not compute nullifier without utxo index or private key') throw new Error('Can not compute nullifier without utxo index or private key')
} }
const signature = this.keypair.privkey ? this.keypair.sign(this.index || 0) : 0 const signature = this.keypair.privkey ? this.keypair.sign(this.getCommitment(), this.index || 0) : 0
this._nullifier = poseidonHash([this.getCommitment(), this.index || 0, signature]) this._nullifier = poseidonHash([this.getCommitment(), this.index || 0, signature])
} }
return this._nullifier return this._nullifier

3
test/full.test.js
View File

@ -377,8 +377,9 @@ describe('TornadoPool', function () {
blinding: aliceDepositUtxo.blinding, blinding: aliceDepositUtxo.blinding,
}, },
nullifier: { nullifier: {
commitment,
merklePath: index, merklePath: index,
signature: aliceDepositUtxo.keypair.sign(index), signature: aliceDepositUtxo.keypair.sign(commitment, index),
}, },
} }