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

Remove getAvailableRewardsBalance public function, make wethReservedForPoolRewards public

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-24 09:08:21 -07:00
parent b6a96cea23
commit a7aa7feff4
6 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/staking/contracts/src/fees/MixinExchangeFees.sol
View File

@ -124,20 +124,6 @@ contract MixinExchangeFees is
activePoolsThisEpoch[poolId] = pool; activePoolsThisEpoch[poolId] = pool;
} }
/// @dev Returns the total balance of this contract, including WETH,
/// minus any WETH that has been reserved for rewards.
/// @return totalBalance Total balance.
function getAvailableRewardsBalance()
external
view
returns (uint256 totalBalance)
{
totalBalance = address(this).balance.safeAdd(
_getAvailableWethBalance()
);
return totalBalance;
}
/// @dev Get information on an active staking pool in this epoch. /// @dev Get information on an active staking pool in this epoch.
/// @param poolId Pool Id to query. /// @param poolId Pool Id to query.
/// @return pool ActivePool struct. /// @return pool ActivePool struct.

2
contracts/staking/contracts/src/immutable/MixinStorage.sol
View File

@ -147,7 +147,7 @@ contract MixinStorage is
IStructs.UnfinalizedState public unfinalizedState; IStructs.UnfinalizedState public unfinalizedState;
/// @dev The WETH balance of this contract that is reserved for pool reward payouts. /// @dev The WETH balance of this contract that is reserved for pool reward payouts.
uint256 internal _wethReservedForPoolRewards; uint256 public wethReservedForPoolRewards;
/// @dev Adds owner as an authorized address. /// @dev Adds owner as an authorized address.
constructor() constructor()

4
contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol
View File

@ -435,7 +435,7 @@ contract MixinStakingPoolRewards is
private private
{ {
rewardsByPoolId[poolId] = rewardsByPoolId[poolId].safeAdd(amount); rewardsByPoolId[poolId] = rewardsByPoolId[poolId].safeAdd(amount);
_wethReservedForPoolRewards = _wethReservedForPoolRewards.safeAdd(amount); wethReservedForPoolRewards = wethReservedForPoolRewards.safeAdd(amount);
} }
/// @dev Decreases rewards for a pool. /// @dev Decreases rewards for a pool.
@ -445,6 +445,6 @@ contract MixinStakingPoolRewards is
private private
{ {
rewardsByPoolId[poolId] = rewardsByPoolId[poolId].safeSub(amount); rewardsByPoolId[poolId] = rewardsByPoolId[poolId].safeSub(amount);
_wethReservedForPoolRewards = _wethReservedForPoolRewards.safeSub(amount); wethReservedForPoolRewards = wethReservedForPoolRewards.safeSub(amount);
} }
} }

2
contracts/staking/contracts/src/sys/MixinFinalizer.sol
View File

@ -257,7 +257,7 @@ contract MixinFinalizer is
returns (uint256 wethBalance) returns (uint256 wethBalance)
{ {
wethBalance = _getWethContract().balanceOf(address(this)) wethBalance = _getWethContract().balanceOf(address(this))
.safeSub(_wethReservedForPoolRewards); .safeSub(wethReservedForPoolRewards);
return wethBalance; return wethBalance;
} }

2
contracts/staking/test/actors/finalizer_actor.ts
View File

@ -241,7 +241,7 @@ export class FinalizerActor extends BaseActor {
this._stakingApiWrapper.stakingContract.getActiveStakingPoolThisEpoch.callAsync(poolId), this._stakingApiWrapper.stakingContract.getActiveStakingPoolThisEpoch.callAsync(poolId),
), ),
); );
const totalRewards = await this._stakingApiWrapper.stakingContract.getAvailableRewardsBalance.callAsync(); const totalRewards = await this._stakingApiWrapper.utils.getAvailableRewardsBalanceAsync();
const totalFeesCollected = BigNumber.sum(...activePools.map(p => p.feesCollected)); const totalFeesCollected = BigNumber.sum(...activePools.map(p => p.feesCollected));
const totalWeightedStake = BigNumber.sum(...activePools.map(p => p.weightedStake)); const totalWeightedStake = BigNumber.sum(...activePools.map(p => p.weightedStake));
if (totalRewards.eq(0) || totalFeesCollected.eq(0) || totalWeightedStake.eq(0)) { if (totalRewards.eq(0) || totalFeesCollected.eq(0) || totalWeightedStake.eq(0)) {

11
contracts/staking/test/utils/api_wrapper.ts
View File

@ -122,10 +122,13 @@ export class StakingApiWrapper {
); );
}, },
getEthAndWethBalanceOfAsync: async (address: string): Promise<BigNumber> => { getAvailableRewardsBalanceAsync: async (): Promise<BigNumber> => {
const ethBalance = await this._web3Wrapper.getBalanceInWeiAsync(address); const [ethBalance, wethBalance, reservedRewards] = await Promise.all([
const wethBalance = await this.wethContract.balanceOf.callAsync(address); this._web3Wrapper.getBalanceInWeiAsync(this.stakingProxyContract.address),
return BigNumber.sum(ethBalance, wethBalance); this.wethContract.balanceOf.callAsync(this.stakingProxyContract.address),
this.stakingContract.wethReservedForPoolRewards.callAsync(),
]);
return BigNumber.sum(ethBalance, wethBalance).minus(reservedRewards);
}, },
getParamsAsync: async (): Promise<StakingParams> => { getParamsAsync: async (): Promise<StakingParams> => {