Git-Mirrors/tornado-core
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-core.git synced 2025-08-01 03:16:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

my commit

Browse source 
to 0.7

update constructor calls in tests

remove 0.5 from config
This commit is contained in:
mirru2532 2021-10-26 21:19:02 +02:00
parent 77af0c5bdd
commit 09423d692b
16 changed files with 15104 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contracts/Mocks/BadRecipient.sol
View file

@ -1,7 +1,7 @@
pragma solidity ^0.5.0;
pragma solidity >=0.5.0 <0.8.0;
contract BadRecipient {
function() external {
fallback() external {
require(false, "this contract does not accept ETH");
}
}

12
contracts/Mocks/ERC20Mock.sol
View file

@ -1,10 +1,12 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.6;
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Mintable.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Detailed.sol";
contract ERC20Mock is ERC20Detailed, ERC20Mintable {
constructor() ERC20Detailed("DAIMock", "DAIM", 18) public {
contract ERC20Mock is ERC20 {
constructor() ERC20("DAIMock", "DAIM") {
}
function mint(address receiver, uint256 amount) external {
_mint(receiver, amount);
}
}

18
contracts/Mocks/IUSDT.sol
View file

@ -1,10 +1,10 @@
pragma solidity 0.5.17;
pragma solidity ^0.7.6;
contract ERC20Basic {
abstract contract ERC20Basic {
uint public _totalSupply;
function totalSupply() public view returns (uint);
function balanceOf(address who) public view returns (uint);
function transfer(address to, uint value) public;
function totalSupply() public view virtual returns (uint);
function balanceOf(address who) public view virtual returns (uint);
function transfer(address to, uint value) public virtual;
event Transfer(address indexed from, address indexed to, uint value);
}
@ -12,9 +12,9 @@ contract ERC20Basic {
* @title ERC20 interface
* @dev see https://github.com/ethereum/EIPs/issues/20
*/
contract IUSDT is ERC20Basic {
function allowance(address owner, address spender) public view returns (uint);
function transferFrom(address from, address to, uint value) public;
function approve(address spender, uint value) public;
abstract contract IUSDT is ERC20Basic {
function allowance(address owner, address spender) public view virtual returns (uint);
function transferFrom(address from, address to, uint value) public virtual;
function approve(address spender, uint value) public virtual;
event Approval(address indexed owner, address indexed spender, uint value);
}

4
contracts/Mocks/MerkleTreeWithHistoryMock.sol
View file

@ -1,10 +1,10 @@
pragma solidity 0.5.17;
pragma solidity ^0.7.6;
import '../MerkleTreeWithHistory.sol';
contract MerkleTreeWithHistoryMock is MerkleTreeWithHistory {
constructor (uint32 _treeLevels) MerkleTreeWithHistory(_treeLevels) public {}
constructor (IHasher _hasher, uint32 _treeLevels) MerkleTreeWithHistory(_treeLevels, _hasher) {}
function insert(bytes32 _leaf) public {
_insert(_leaf);