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

changed merkleTree vars to uint32 where appropriate

Browse source
This commit is contained in:
poma 2019-11-03 13:11:22 +03:00
parent f783b45559
commit e9c2055bb4
5 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contracts/ERC20Mixer.sol
View file

@ -19,7 +19,7 @@ contract ERC20Mixer is Mixer {
constructor(
IVerifier _verifier,
uint256 _denomination,
uint8 _merkleTreeHeight,
uint32 _merkleTreeHeight,
address _operator,
address _token
) Mixer(_verifier, _denomination, _merkleTreeHeight, _operator) public {

2
contracts/ETHMixer.sol
View file

@ -17,7 +17,7 @@ contract ETHMixer is Mixer {
constructor(
IVerifier _verifier,
uint256 _denomination,
uint8 _merkleTreeHeight,
uint32 _merkleTreeHeight,
address _operator
) Mixer(_verifier, _denomination, _merkleTreeHeight, _operator) public {
}

19
contracts/MerkleTreeWithHistory.sol
View file

@ -19,26 +19,27 @@ contract MerkleTreeWithHistory {
uint256 public constant FIELD_SIZE = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
uint256 public constant ZERO_VALUE = 5702960885942360421128284892092891246826997279710054143430547229469817701242; // = MiMC("tornado")
uint256 public levels;
uint32 public levels;
// the following variables are made public for easier testing and debugging and
// are not supposed to be accessed in regular code
uint256 public constant ROOT_HISTORY_SIZE = 100;
uint32 public constant ROOT_HISTORY_SIZE = 100;
uint256[ROOT_HISTORY_SIZE] public roots;
uint256 public currentRootIndex = 0;
uint32 public currentRootIndex = 0;
uint32 public nextIndex = 0;
uint256[] public filledSubtrees;
uint256[] public zeros;
constructor(uint256 _treeLevels) public {
constructor(uint32 _treeLevels) public {
require(_treeLevels > 0, "_treeLevels should be greater than zero");
require(_treeLevels < 32, "_treeLevels should be less than 32");
levels = _treeLevels;
uint256 currentZero = ZERO_VALUE;
zeros.push(currentZero);
filledSubtrees.push(currentZero);
for (uint8 i = 1; i < levels; i++) {
for (uint32 i = 1; i < levels; i++) {
currentZero = hashLeftRight(currentZero, currentZero);
zeros.push(currentZero);
filledSubtrees.push(currentZero);
@ -61,15 +62,15 @@ contract MerkleTreeWithHistory {
return R;
}
function _insert(uint256 _leaf) internal returns(uint256 index) {
function _insert(uint256 _leaf) internal returns(uint32 index) {
uint32 currentIndex = nextIndex;
require(currentIndex != 2**levels, "Merkle tree is full. No more leafs can be added");
require(currentIndex != uint32(2)**levels, "Merkle tree is full. No more leafs can be added");
nextIndex += 1;
uint256 currentLevelHash = _leaf;
uint256 left;
uint256 right;
for (uint256 i = 0; i < levels; i++) {
for (uint32 i = 0; i < levels; i++) {
if (currentIndex % 2 == 0) {
left = currentLevelHash;
right = zeros[i];
@ -97,7 +98,7 @@ contract MerkleTreeWithHistory {
if (_root == 0) {
return false;
}
uint256 i = currentRootIndex;
uint32 i = currentRootIndex;
do {
if (_root == roots[i]) {
return true;

6
contracts/Mixer.sol
View file

@ -35,7 +35,7 @@ contract Mixer is MerkleTreeWithHistory {
_;
}
event Deposit(uint256 indexed commitment, uint256 leafIndex, uint256 timestamp);
event Deposit(uint256 indexed commitment, uint32 leafIndex, uint256 timestamp);
event Withdrawal(address to, uint256 nullifierHash, address indexed relayer, uint256 fee);
/**
@ -48,7 +48,7 @@ contract Mixer is MerkleTreeWithHistory {
constructor(
IVerifier _verifier,
uint256 _denomination,
uint8 _merkleTreeHeight,
uint32 _merkleTreeHeight,
address _operator
) MerkleTreeWithHistory(_merkleTreeHeight) public {
require(_denomination > 0, "denomination should be greater than 0");
@ -64,7 +64,7 @@ contract Mixer is MerkleTreeWithHistory {
function deposit(uint256 _commitment) public payable {
require(!isDepositsDisabled, "deposits are disabled");
require(!commitments[_commitment], "The commitment has been submitted");
uint256 insertedIndex = _insert(_commitment);
uint32 insertedIndex = _insert(_commitment);
commitments[_commitment] = true;
_processDeposit();