crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary payable keywords

Browse Source
This commit is contained in:
Amir Bandeali 2019-10-14 09:58:31 +09:00
parent 4f6958b7b5
commit 9d9fe882b6
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/staking/contracts/src/ZrxVault.sol
View File

@ -35,7 +35,7 @@ contract ZrxVault is
using LibSafeMath for uint256; using LibSafeMath for uint256;
// Address of staking proxy contract // Address of staking proxy contract
address payable public stakingProxyAddress; address public stakingProxyAddress;
// True iff vault has been set to Catastrophic Failure Mode // True iff vault has been set to Catastrophic Failure Mode
bool public isInCatastrophicFailure; bool public isInCatastrophicFailure;
@ -91,7 +91,7 @@ contract ZrxVault is
/// @dev Sets the address of the StakingProxy contract. /// @dev Sets the address of the StakingProxy contract.
/// Note that only the contract owner can call this function. /// Note that only the contract owner can call this function.
/// @param _stakingProxyAddress Address of Staking proxy contract. /// @param _stakingProxyAddress Address of Staking proxy contract.
function setStakingProxy(address payable _stakingProxyAddress) function setStakingProxy(address _stakingProxyAddress)
external external
onlyAuthorized onlyAuthorized
{ {

2
contracts/staking/contracts/src/interfaces/IStructs.sol
View File

@ -97,7 +97,7 @@ interface IStructs {
/// @param operator of the pool. /// @param operator of the pool.
/// @param operatorShare Fraction of the total balance owned by the operator, in ppm. /// @param operatorShare Fraction of the total balance owned by the operator, in ppm.
struct Pool { struct Pool {
address payable operator; address operator;
uint32 operatorShare; uint32 operatorShare;
} }
} }

2
contracts/staking/contracts/src/interfaces/IZrxVault.sol
View File

@ -50,7 +50,7 @@ interface IZrxVault {
/// @dev Sets the address of the StakingProxy contract. /// @dev Sets the address of the StakingProxy contract.
/// Note that only the contract staker can call this function. /// Note that only the contract staker can call this function.
/// @param _stakingProxyAddress Address of Staking proxy contract. /// @param _stakingProxyAddress Address of Staking proxy contract.
function setStakingProxy(address payable _stakingProxyAddress) function setStakingProxy(address _stakingProxyAddress)
external; external;
/// @dev Vault enters into Catastrophic Failure Mode. /// @dev Vault enters into Catastrophic Failure Mode.

8
contracts/staking/contracts/src/stake/MixinStake.sol
View File

@ -35,7 +35,7 @@ contract MixinStake is
function stake(uint256 amount) function stake(uint256 amount)
external external
{ {
address payable staker = msg.sender; address staker = msg.sender;
// deposit equivalent amount of ZRX into vault // deposit equivalent amount of ZRX into vault
getZrxVault().depositFrom(staker, amount); getZrxVault().depositFrom(staker, amount);
@ -109,7 +109,7 @@ contract MixinStake is
) )
external external
{ {
address payable staker = msg.sender; address staker = msg.sender;
// handle delegation // handle delegation
if (from.status == IStructs.StakeStatus.DELEGATED) { if (from.status == IStructs.StakeStatus.DELEGATED) {
@ -154,7 +154,7 @@ contract MixinStake is
/// @param amount Amount of stake to delegate. /// @param amount Amount of stake to delegate.
function _delegateStake( function _delegateStake(
bytes32 poolId, bytes32 poolId,
address payable staker, address staker,
uint256 amount uint256 amount
) )
private private
@ -192,7 +192,7 @@ contract MixinStake is
/// @param amount Amount of stake to un-delegate. /// @param amount Amount of stake to un-delegate.
function _undelegateStake( function _undelegateStake(
bytes32 poolId, bytes32 poolId,
address payable staker, address staker,
uint256 amount uint256 amount
) )
private private

2
contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
View File

@ -51,7 +51,7 @@ contract MixinStakingPool is
returns (bytes32 poolId) returns (bytes32 poolId)
{ {
// note that an operator must be payable // note that an operator must be payable
address payable operator = msg.sender; address operator = msg.sender;
// compute unique id for this pool // compute unique id for this pool
poolId = lastPoolId = bytes32(uint256(lastPoolId).safeAdd(1)); poolId = lastPoolId = bytes32(uint256(lastPoolId).safeAdd(1));