mirror of
https://github.com/tornadocash/tornado-core.git
synced 2025-08-02 03:46:13 -04:00
docs and minor changes
This commit is contained in:
parent
5db6595c61
commit
9d75637b8c
5 changed files with 37 additions and 14 deletions
|
@ -25,15 +25,15 @@ contract MerkleTreeWithHistory {
|
|||
filled_subtrees.push(zeros[0]);
|
||||
|
||||
for (uint8 i = 1; i < levels; i++) {
|
||||
zeros.push(HashLeftRight(zeros[i-1], zeros[i-1]));
|
||||
zeros.push(hashLeftRight(zeros[i-1], zeros[i-1]));
|
||||
filled_subtrees.push(zeros[i]);
|
||||
}
|
||||
|
||||
roots = new uint256[](ROOT_HISTORY_SIZE);
|
||||
roots[0] = HashLeftRight(zeros[levels - 1], zeros[levels - 1]);
|
||||
roots[0] = hashLeftRight(zeros[levels - 1], zeros[levels - 1]);
|
||||
}
|
||||
|
||||
function HashLeftRight(uint256 left, uint256 right) public pure returns (uint256 mimc_hash) {
|
||||
function hashLeftRight(uint256 left, uint256 right) public pure returns (uint256 mimc_hash) {
|
||||
uint256 k = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
|
||||
uint256 R = 0;
|
||||
uint256 C = 0;
|
||||
|
@ -67,7 +67,7 @@ contract MerkleTreeWithHistory {
|
|||
right = current_level_hash;
|
||||
}
|
||||
|
||||
current_level_hash = HashLeftRight(left, right);
|
||||
current_level_hash = hashLeftRight(left, right);
|
||||
|
||||
current_index /= 2;
|
||||
}
|
||||
|
|
|
@ -1,15 +1,12 @@
|
|||
pragma solidity ^0.5.8;
|
||||
|
||||
import "./MerkleTreeWithHistory.sol";
|
||||
import "../node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol";
|
||||
|
||||
contract IVerifier {
|
||||
function verify(uint256[2] memory a, uint256[2][2] memory b, uint256[2] memory c, uint256[4] memory input) public returns(bool);
|
||||
}
|
||||
|
||||
contract Mixer is MerkleTreeWithHistory {
|
||||
using SafeMath for uint256;
|
||||
|
||||
uint256 public transferValue;
|
||||
mapping(uint256 => bool) public nullifiers;
|
||||
IVerifier verifier;
|
||||
|
@ -17,17 +14,34 @@ contract Mixer is MerkleTreeWithHistory {
|
|||
event Deposit(address from, uint256 commitment);
|
||||
event Withdraw(address to, uint256 nullifier, uint256 fee);
|
||||
|
||||
/**
|
||||
@dev The constructor
|
||||
@param _verifier the address of SNARK verifier for this contract
|
||||
@param _transferValue the value for all deposits in this contract in wei
|
||||
*/
|
||||
constructor(address _verifier, uint256 _transferValue) MerkleTreeWithHistory(16, 0) public {
|
||||
verifier = IVerifier(_verifier);
|
||||
transferValue = _transferValue;
|
||||
}
|
||||
|
||||
/**
|
||||
@dev Deposit funds into mixer. The caller must send value equal to `transferValue` of this mixer.
|
||||
@param commitment the note commitment, which is PedersenHash(nullifier + secret)
|
||||
*/
|
||||
function deposit(uint256 commitment) public payable {
|
||||
require(msg.value == transferValue, "Please send `transferValue` ETH along with transaction");
|
||||
insert(commitment);
|
||||
emit Deposit(msg.sender, commitment);
|
||||
}
|
||||
|
||||
/**
|
||||
@dev Withdraw deposit from the mixer. `a`, `b`, and `c` are zkSNARK proof data, and input is an array of circuit public inputs
|
||||
`input` array consists of:
|
||||
- merkle root of all deposits in the mixer
|
||||
- unique deposit nullifier to prevent double spends
|
||||
- the receiver of funds
|
||||
- optional fee that goes to the transaction sender (usually a relay)
|
||||
*/
|
||||
function withdraw(uint256[2] memory a, uint256[2][2] memory b, uint256[2] memory c, uint256[4] memory input) public {
|
||||
uint256 root = input[0];
|
||||
uint256 nullifier = input[1];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue