Git-Mirrors/tornado-core
1
0
Fork 0
mirror of https://github.com/tornadocash/tornado-core.git synced 2025-05-31 20:14:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

update solidity to 0.7.6

Browse source
This commit is contained in:
poma 2021-03-11 23:05:59 +03:00
parent f189a657c9
commit 54a7bdcb04
No known key found for this signature in database
GPG key ID: BA20CB01FE165657
14 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contracts/ERC20Tornado.sol
View file

@ -10,7 +10,7 @@
*/
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "./Tornado.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@ -26,7 +26,7 @@ contract ERC20Tornado is Tornado {
uint256 _denomination,
uint32 _merkleTreeHeight,
IERC20 _token
) public Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight) {
) Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight) {
token = _token;
}

4
contracts/ETHTornado.sol
View file

@ -10,7 +10,7 @@
*/
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "./Tornado.sol";
@ -20,7 +20,7 @@ contract ETHTornado is Tornado {
IHasher _hasher,
uint256 _denomination,
uint32 _merkleTreeHeight
) public Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight) {}
) Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight) {}
function _processDeposit() internal override {
require(msg.value == denomination, "Please send `mixDenomination` ETH along with transaction");

4
contracts/MerkleTreeWithHistory.sol
View file

@ -10,7 +10,7 @@
*/
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
interface IHasher {
function MiMCSponge(uint256 in_xL, uint256 in_xR) external pure returns (uint256 xL, uint256 xR);
@ -35,7 +35,7 @@ contract MerkleTreeWithHistory {
uint32 public currentRootIndex = 0;
uint32 public nextIndex = 0;
constructor(uint32 _levels, IHasher _hasher) public {
constructor(uint32 _levels, IHasher _hasher) {
require(_levels > 0, "_levels should be greater than zero");
require(_levels < 32, "_levels should be less than 32");
levels = _levels;

2
contracts/Mocks/BadRecipient.sol
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
contract BadRecipient {
fallback() external {

2
contracts/Mocks/ERC20Mock.sol
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

2
contracts/Mocks/IDeployer.sol
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
interface IDeployer {
function deploy(bytes memory _initCode, bytes32 _salt) external returns (address payable createdContract);

2
contracts/Mocks/IUSDT.sol
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
interface ERC20Basic {
function _totalSupply() external returns (uint256);

4
contracts/Mocks/MerkleTreeWithHistoryMock.sol
View file

@ -1,10 +1,10 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "../MerkleTreeWithHistory.sol";
contract MerkleTreeWithHistoryMock is MerkleTreeWithHistory {
constructor(uint32 _treeLevels, IHasher _hasher) public MerkleTreeWithHistory(_treeLevels, _hasher) {}
constructor(uint32 _treeLevels, IHasher _hasher) MerkleTreeWithHistory(_treeLevels, _hasher) {}
function insert(bytes32 _leaf) public {
_insert(_leaf);

4
contracts/Tornado.sol
View file

@ -10,7 +10,7 @@
*/
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "./MerkleTreeWithHistory.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
@ -42,7 +42,7 @@ abstract contract Tornado is MerkleTreeWithHistory, ReentrancyGuard {
IHasher _hasher,
uint256 _denomination,
uint32 _merkleTreeHeight
) public MerkleTreeWithHistory(_merkleTreeHeight, _hasher) {
) MerkleTreeWithHistory(_merkleTreeHeight, _hasher) {
require(_denomination > 0, "denomination should be greater than 0");
verifier = _verifier;
denomination = _denomination;

2
contracts/Verifier.sol
View file

@ -32,7 +32,7 @@
// 2019 OKIMS
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
library Pairing {
uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;

4
contracts/cTornado.sol
View file

@ -10,7 +10,7 @@
*/
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.0;
pragma solidity ^0.7.0;
import "./ERC20Tornado.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@ -26,7 +26,7 @@ contract cTornado is ERC20Tornado {
uint256 _denomination,
uint32 _merkleTreeHeight,
IERC20 _token
) public ERC20Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight, _token) {
) ERC20Tornado(_verifier, _hasher, _denomination, _merkleTreeHeight, _token) {
require(address(_comp) != address(0), "Invalid COMP token address");
comp = _comp;
}