Git-Mirrors/tornado-core
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-core.git synced 2025-08-10 07:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update feeToSetter

Browse source 
- Don't modify the interface to processWithdraw
 - Add SafeMath and use it
 - Add tests for all the FeeManager methods
 - Update existing unit test for feeToSetter
This commit is contained in:
Brian Li 2021-04-11 18:33:03 -07:00
parent 29ea4f8f08
commit b19b1fe600
15 changed files with 13926 additions and 8662 deletions
Download patch file Download diff file Expand all files Collapse all files

5
contracts/Tornado.sol
View file

@ -9,6 +9,7 @@ contract IVerifier {
contract IFeeManager {
function feeTo() external view returns (address);
function protocolFeeDivisor() external view returns (uint256);
}
contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
@ -83,12 +84,12 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), "Invalid withdraw proof");
nullifierHashes[_nullifierHash] = true;
_processWithdraw(_recipient, _relayer, _fee, _refund, feeManager.feeTo());
_processWithdraw(_recipient, _relayer, _fee, _refund);
emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);
}
/** @dev this function is defined in a child contract */
function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund, address _feeTo) internal;
function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;
/** @dev whether a note is already spent */
function isSpent(bytes32 _nullifierHash) public view returns(bool) {