make operator not payable

This commit is contained in:
poma 2019-11-01 03:56:24 +03:00
parent b578213b0c
commit 1d258715e0
3 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,7 @@ contract ERC20Mixer is Mixer {
uint256 _denomination, uint256 _denomination,
uint8 _merkleTreeHeight, uint8 _merkleTreeHeight,
uint256 _emptyElement, uint256 _emptyElement,
address payable _operator, address _operator,
address _token address _token
) Mixer(_verifier, _denomination, _merkleTreeHeight, _emptyElement, _operator) public { ) Mixer(_verifier, _denomination, _merkleTreeHeight, _emptyElement, _operator) public {
token = _token; token = _token;

View File

@ -19,7 +19,7 @@ contract ETHMixer is Mixer {
uint256 _denomination, uint256 _denomination,
uint8 _merkleTreeHeight, uint8 _merkleTreeHeight,
uint256 _emptyElement, uint256 _emptyElement,
address payable _operator address _operator
) Mixer(_verifier, _denomination, _merkleTreeHeight, _emptyElement, _operator) public { ) Mixer(_verifier, _denomination, _merkleTreeHeight, _emptyElement, _operator) public {
} }

View File

@ -28,7 +28,7 @@ contract Mixer is MerkleTreeWithHistory {
// - receive a relayer fee // - receive a relayer fee
// - disable new deposits in case of emergency // - disable new deposits in case of emergency
// - update snark verification key until this ability is permanently disabled // - update snark verification key until this ability is permanently disabled
address payable public operator; address public operator;
bool public isDepositsEnabled = true; bool public isDepositsEnabled = true;
bool public isVerifierUpdateAllowed = true; bool public isVerifierUpdateAllowed = true;
modifier onlyOperator { modifier onlyOperator {
@ -51,7 +51,7 @@ contract Mixer is MerkleTreeWithHistory {
uint256 _denomination, uint256 _denomination,
uint8 _merkleTreeHeight, uint8 _merkleTreeHeight,
uint256 _emptyElement, uint256 _emptyElement,
address payable _operator address _operator
) MerkleTreeWithHistory(_merkleTreeHeight, _emptyElement) public { ) MerkleTreeWithHistory(_merkleTreeHeight, _emptyElement) public {
verifier = IVerifier(_verifier); verifier = IVerifier(_verifier);
operator = _operator; operator = _operator;
@ -134,7 +134,7 @@ contract Mixer is MerkleTreeWithHistory {
} }
/** @dev operator can change his address */ /** @dev operator can change his address */
function changeOperator(address payable _newAccount) external onlyOperator { function changeOperator(address _newAccount) external onlyOperator {
operator = _newAccount; operator = _newAccount;
} }
} }