Git-Mirrors/tornado-core
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-core.git synced 2025-04-04 21:15:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add encryptedNote arg

Browse Source
This commit is contained in:
Brian Li 2021-04-18 09:49:45 -07:00
parent 0450c4aa1b
commit 2abf02f818
8 changed files with 10128 additions and 6814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2378
client/contracts/ERC20Tornado.json
View File

File diff suppressed because one or more lines are too long

2128
client/contracts/FeeManager.json
View File

File diff suppressed because it is too large Load Diff

2
client/contracts/Hasher.json
View File

@ -51,5 +51,5 @@
}
},
"schemaVersion": "3.3.4",
"updatedAt": "2021-04-12T00:15:10.073Z"
"updatedAt": "2021-04-18T15:21:30.822Z"
}

4123
client/contracts/IFeeManager.json
View File

File diff suppressed because one or more lines are too long

4123
client/contracts/IVerifier.json
View File

File diff suppressed because one or more lines are too long

4168
client/contracts/Tornado.json
View File

File diff suppressed because one or more lines are too long

4
contracts/Tornado.sol
View File

@ -31,6 +31,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);
event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);
event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
event EncryptedNote(address indexed sender, bytes encryptedNote);
/**
@dev The constructor
@ -57,7 +58,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
@dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.
@param _commitment the note commitment, which is PedersenHash(nullifier + secret)
*/
function deposit(bytes32 _commitment) external payable nonReentrant {
function deposit(bytes32 _commitment, bytes calldata _encryptedNote) external payable nonReentrant {
require(!commitments[_commitment], "The commitment has been submitted");
uint32 insertedIndex = _insert(_commitment);
@ -65,6 +66,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
_processDeposit();
emit Deposit(_commitment, insertedIndex, block.timestamp);
emit EncryptedNote(msg.sender, _encryptedNote);
}
/** @dev this function is defined in a child contract */

16
test/ERC20Tornado.test.js
View File

@ -94,7 +94,7 @@ contract('ERC20Tornado', accounts => {
const commitment = toFixedHex(43)
await token.approve(tornado.address, tokenDenomination)
let { logs } = await tornado.deposit(commitment, { from: sender })
let { logs } = await tornado.deposit(commitment, [], { from: sender })
logs[0].event.should.be.equal('Deposit')
logs[0].args.commitment.should.be.equal(commitment)
@ -105,7 +105,7 @@ contract('ERC20Tornado', accounts => {
const commitment = toFixedHex(43)
await token.approve(tornado.address, tokenDenomination)
let error = await tornado.deposit(commitment, { from: sender, value: 1e6 }).should.be.rejected
let error = await tornado.deposit(commitment, [], { from: sender, value: 1e6 }).should.be.rejected
error.reason.should.be.equal('ETH value is supposed to be 0 for ERC20 instance')
})
})
@ -122,7 +122,7 @@ contract('ERC20Tornado', accounts => {
// Uncomment to measure gas usage
// let gas = await tornado.deposit.estimateGas(toBN(deposit.commitment.toString()), { from: user, gasPrice: '0' })
// console.log('deposit gas:', gas)
await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' })
await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' })
const balanceUserAfter = await token.balanceOf(user)
balanceUserAfter.should.be.eq.BN(toBN(balanceUserBefore).sub(toBN(tokenDenomination)))
@ -209,7 +209,7 @@ contract('ERC20Tornado', accounts => {
// Uncomment to measure gas usage
// let gas = await tornado.deposit.estimateGas(toBN(deposit.commitment.toString()), { from: user, gasPrice: '0' })
// console.log('deposit gas:', gas)
await tornado.deposit(toFixedHex(deposit.commitment), {
await tornado.deposit(toFixedHex(deposit.commitment), [], {
from: user,
gasPrice: "0",
});
@ -329,7 +329,7 @@ contract('ERC20Tornado', accounts => {
const balanceUserBefore = await token.balanceOf(user)
await token.approve(tornado.address, tokenDenomination, { from: user })
await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' })
await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' })
const balanceUserAfter = await token.balanceOf(user)
balanceUserAfter.should.be.eq.BN(toBN(balanceUserBefore).sub(toBN(tokenDenomination)))
@ -405,7 +405,7 @@ contract('ERC20Tornado', accounts => {
await tree.insert(deposit.commitment)
await token.mint(user, tokenDenomination)
await token.approve(tornado.address, tokenDenomination, { from: user })
await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' })
await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' })
const { root, path_elements, path_index } = await tree.path(0)
@ -468,7 +468,7 @@ contract('ERC20Tornado', accounts => {
console.log('approve done')
const allowanceUser = await usdtToken.allowance(user, tornado.address)
console.log('allowanceUser', allowanceUser.toString())
await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' })
await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' })
console.log('deposit done')
const balanceUserAfter = await usdtToken.balanceOf(user)
@ -557,7 +557,7 @@ contract('ERC20Tornado', accounts => {
console.log('balanceUserBefore', balanceUserBefore.toString())
await token.approve(tornado.address, tokenDenomination, { from: user })
console.log('approve done')
await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' })
await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' })
console.log('deposit done')
const balanceUserAfter = await token.balanceOf(user)