diff --git a/contracts/staking/contracts/src/Staking.sol b/contracts/staking/contracts/src/Staking.sol index bf4fc0e1d0..d032bd670a 100644 --- a/contracts/staking/contracts/src/Staking.sol +++ b/contracts/staking/contracts/src/Staking.sol @@ -318,7 +318,7 @@ contract Staking is ///// REWARDS ///// - function computeOperatorReward(address operator, bytes32 poolId) + function computeOperatorRewardBalance(address operator, bytes32 poolId) external view returns (uint256) @@ -326,7 +326,7 @@ contract Staking is } - function computeDelegatorReward(address owner, bytes32 poolId) + function computeDelegatorRewardBalance(address owner, bytes32 poolId) external view returns (uint256) diff --git a/contracts/staking/contracts/src/core/MixinStake.sol b/contracts/staking/contracts/src/core/MixinStake.sol index 91f3a20eb6..fdac72a7fb 100644 --- a/contracts/staking/contracts/src/core/MixinStake.sol +++ b/contracts/staking/contracts/src/core/MixinStake.sol @@ -173,7 +173,7 @@ contract MixinStake is // update delegator's share of reward pool // note that this uses the snapshot parameters - uint256 poolBalance = rewardVault.poolBalanceOf(poolId); + uint256 poolBalance = rewardVault.balanceOfPool(poolId); uint256 buyIn = _computeBuyInDenominatedInShadowAsset( amount, _delegatedStakeByPoolId, @@ -215,7 +215,7 @@ contract MixinStake is // get payout // TODO -- not full balance, just balance that belongs to delegators. - uint256 poolBalance = rewardVault.poolBalanceOf(poolId); + uint256 poolBalance = rewardVault.balanceOfPool(poolId); uint256 payoutInRealAsset; uint256 payoutInShadowAsset; if (_delegatedStakeToPoolByOwner == amount) { diff --git a/contracts/staking/contracts/src/interfaces/IRewardVault.sol b/contracts/staking/contracts/src/interfaces/IRewardVault.sol index 1c2370338c..ed33a5fdcd 100644 --- a/contracts/staking/contracts/src/interfaces/IRewardVault.sol +++ b/contracts/staking/contracts/src/interfaces/IRewardVault.sol @@ -49,12 +49,12 @@ interface IRewardVault { view returns (uint256); - function operatorBalanceOf(bytes32 poolId) + function balanceOfOperator(bytes32 poolId) external view returns (uint256); - function poolBalanceOf(bytes32 poolId) + function balanceOfPool(bytes32 poolId) external view returns (uint256); diff --git a/contracts/staking/contracts/src/vaults/RewardVault.sol b/contracts/staking/contracts/src/vaults/RewardVault.sol index 518e52bd91..cbf1a4d233 100644 --- a/contracts/staking/contracts/src/vaults/RewardVault.sol +++ b/contracts/staking/contracts/src/vaults/RewardVault.sol @@ -136,7 +136,7 @@ contract RewardVault is return balance.operatorBalance + balance.poolBalance; } - function operatorBalanceOf(bytes32 poolId) + function balanceOfOperator(bytes32 poolId) external view returns (uint256) @@ -144,7 +144,7 @@ contract RewardVault is return balanceByPoolId[poolId].operatorBalance; } - function poolBalanceOf(bytes32 poolId) + function balanceOfPool(bytes32 poolId) external view returns (uint256) diff --git a/contracts/staking/test/core_test.ts b/contracts/staking/test/core_test.ts index b7ce9f1f43..b755ac0b99 100644 --- a/contracts/staking/test/core_test.ts +++ b/contracts/staking/test/core_test.ts @@ -558,15 +558,15 @@ describe('Staking Core', () => { const stakingContractAddress = stakingWrapper.getStakingContract().address; const notStakingContractAddress = poolOperator; // create pool in vault - await stakingWrapper.rewardVaultCreatePoolAsync(poolId, poolOperator, operatorShare, stakingContractAddress); + await stakingWrapper.rewardVaultCreatePoolAsync(poolId, operatorShare, stakingContractAddress); // should fail to create pool if it already exists await expectTransactionFailedAsync( - stakingWrapper.rewardVaultCreatePoolAsync(poolId, poolOperator, operatorShare, stakingContractAddress), + stakingWrapper.rewardVaultCreatePoolAsync(poolId, operatorShare, stakingContractAddress), RevertReason.PoolAlreadyExists ); // should fail to create a pool from an address other than the staking contract await expectTransactionFailedAsync( - stakingWrapper.rewardVaultCreatePoolAsync(poolId, poolOperator, operatorShare, notStakingContractAddress), + stakingWrapper.rewardVaultCreatePoolAsync(poolId, operatorShare, notStakingContractAddress), RevertReason.OnlyCallableByStakingContract ); }); @@ -923,9 +923,9 @@ describe('Staking Core', () => { new BigNumber('20.31028'), // 20.31028447343014834523983759032242063760612769662934308289 ]; const payoutByPoolOperator = await Promise.all([ - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[0]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[1]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[2]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[0]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[1]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[2]), ]); const payoutAcurateToFiveDecimalsByPoolOperator = await Promise.all([ stakingWrapper.trimFloat(stakingWrapper.toFloatingPoint(payoutByPoolOperator[0], 18), 5), @@ -1070,9 +1070,9 @@ describe('Staking Core', () => { ]; const payoutByPoolOperator = await Promise.all([ - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[0]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[1]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[2]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[0]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[1]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[2]), ]); const payoutAcurateToFiveDecimalsByPoolOperator = await Promise.all([ @@ -1089,9 +1089,9 @@ describe('Staking Core', () => { ///// 10 CHECK DELEGATOR BY UNDELEGATING ///// const poolPayoutById = await Promise.all([ - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[0]), - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[1]), - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[2]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[0]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[1]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[2]), ]); const ethBalancesByDelegatorInit = await Promise.all([ stakingWrapper.getEthBalanceAsync(delegators[0]), @@ -1259,9 +1259,9 @@ describe('Staking Core', () => { ]; const payoutByPoolOperator = await Promise.all([ - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[0]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[1]), - stakingWrapper.rewardVaultGetBalanceAsync(poolIds[2]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[0]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[1]), + stakingWrapper.rewardVaultBalanceOfAsync(poolIds[2]), ]); const payoutAcurateToFiveDecimalsByPoolOperator = await Promise.all([ @@ -1275,9 +1275,9 @@ describe('Staking Core', () => { ///// 10 CHECK DELEGATOR PAYOUT BY UNDELEGATING ///// const poolPayoutById = await Promise.all([ - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[0]), - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[1]), - stakingWrapper.rewardVaultPoolBalanceOfAsync(poolIds[2]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[0]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[1]), + stakingWrapper.rewardVaultBalanceOfPoolAsync(poolIds[2]), ]); const ethBalancesByDelegatorInit = await Promise.all([ stakingWrapper.getEthBalanceAsync(delegators[0]), diff --git a/contracts/staking/test/utils/staking_wrapper.ts b/contracts/staking/test/utils/staking_wrapper.ts index 979674df21..6d1491ab65 100644 --- a/contracts/staking/test/utils/staking_wrapper.ts +++ b/contracts/staking/test/utils/staking_wrapper.ts @@ -448,29 +448,23 @@ export class StakingWrapper { const txReceipt = await this._executeTransactionAsync(calldata, zeroExMultisigAddress); return txReceipt; } - public async rewardVaultGetBalanceAsync(poolId: string): Promise { + public async rewardVaultBalanceOfAsync(poolId: string): Promise { const balance = await this.getRewardVaultContract().balanceOf.callAsync(poolId); return balance; } - public async rewardVaultOperatorBalanceOfAsync(poolId: string): Promise { - const balance = await this.getRewardVaultContract().operatorBalanceOf.callAsync(poolId); + public async rewardVaultBalanceOfOperatorAsync(poolId: string): Promise { + const balance = await this.getRewardVaultContract().balanceOfOperator.callAsync(poolId); return balance; } - public async rewardVaultPoolBalanceOfAsync(poolId: string): Promise { - const balance = await this.getRewardVaultContract().poolBalanceOf.callAsync(poolId); + public async rewardVaultBalanceOfPoolAsync(poolId: string): Promise { + const balance = await this.getRewardVaultContract().balanceOfPool.callAsync(poolId); return balance; } - public async rewardVaultCreatePoolAsync(poolId: string, poolOperator: string, poolOperatorShare: number, stakingContractAddress: string): Promise { + public async rewardVaultCreatePoolAsync(poolId: string, poolOperatorShare: number, stakingContractAddress: string): Promise { const calldata = this.getRewardVaultContract().createPool.getABIEncodedTransactionData(poolId, poolOperatorShare); const txReceipt = await this._executeTransactionAsync(calldata, stakingContractAddress); return txReceipt; } - /* - public async getEthBalanceOfRewardVaultAsync(): Promise { - const balance = await this.getRewardVaultContract().balanceOf.callAsync(this.getZrxVaultContract().address); - return balance; - } - */ ///// ZRX VAULT ///// public async getZrxVaultBalance(holder: string): Promise { const balance = await this.getZrxVaultContract().balanceOf.callAsync(holder);