Added low-gas methods for VerseVerifier

oasysgames · Dec 21, 2022 · 4aff95e · 4aff95e
1 parent 3c04363
commit 4aff95e
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 2 deletions.
diff --git a/contracts/IStakeManager.sol b/contracts/IStakeManager.sol
@@ -415,6 +415,22 @@ interface IStakeManager {
      */
     function getTotalRewards(address[] memory validators, uint256 epochs) external view returns (uint256 rewards);
 
+    /**
+     * Returns the staked amount of the validator.
+     * @param validator Validator address.
+     * @param epoch Target epoch number.
+     * @return stakes Staked amounts.
+     */
+    function getValidatorStakes(address validator, uint256 epoch) external view returns (uint256 stakes);
+
+    /**
+     * Returns the staked amount of the operator.
+     * @param operator Operator address.
+     * @param epoch Target epoch number.
+     * @return stakes Staked amounts.
+     */
+    function getOperatorStakes(address operator, uint256 epoch) external view returns (uint256 stakes);
+
     /**
      * Returns a list of stakers and amounts to the validator.
      * @param validator Validator address.

diff --git a/contracts/StakeManager.sol b/contracts/StakeManager.sol
@@ -598,6 +598,25 @@ contract StakeManager is IStakeManager, System {
         return rewards;
     }
 
+    /**
+     * @inheritdoc IStakeManager
+     */
+    function getValidatorStakes(address validator, uint256 epoch) external view returns (uint256 stakes) {
+        epoch = epoch > 0 ? epoch : environment.epoch();
+        return validators[validator].getTotalStake(epoch);
+    }
+
+    /**
+     * @inheritdoc IStakeManager
+     */
+    function getOperatorStakes(address operator, uint256 epoch) external view returns (uint256 stakes) {
+        Validator storage validator = validators[operatorToOwner[operator]];
+        if (validator.operator != operator) return 0;
+
+        epoch = epoch > 0 ? epoch : environment.epoch();
+        return validator.getTotalStake(epoch);
+    }
+
     /**
      * @inheritdoc IStakeManager
      */

diff --git a/test/StakeManager.spec.ts b/test/StakeManager.spec.ts
@@ -2027,7 +2027,7 @@ describe('StakeManager', () => {
       expect(actual1.unlockTimes).to.satisfy((times: BigNumber[]) => times.every((x) => x.toNumber() == 0))
     })
 
-    it('getValidatorStakes()', async () => {
+    it('getValidatorStakes(address,uint256,uint256,uint256)', async () => {
       await staker1.stake(Token.OAS, validator1, '10')
       await toNextEpoch()
 
@@ -2105,6 +2105,41 @@ describe('StakeManager', () => {
       )
     })
 
+    it('getValidatorStakes(address,uint256) and getOperatorStakes()', async () => {
+      const check = async (validator: Validator, epoch: number, exp: string) => {
+        const actual1 = await stakeManager['getValidatorStakes(address,uint256)'](validator.owner.address, epoch)
+        const actual2 = await stakeManager.getOperatorStakes(validator.operator.address, epoch)
+        expect(actual1.toString()).to.equal(toWei(exp))
+        expect(actual2.toString()).to.equal(toWei(exp))
+      }
+
+      await staker1.stake(Token.OAS, validator1, '10')
+      await toNextEpoch()
+
+      await staker2.stake(Token.OAS, validator1, '20')
+      await toNextEpoch()
+
+      await staker1.stake(Token.OAS, validator1, '30')
+      await staker3.stake(Token.OAS, validator1, '30')
+      await toNextEpoch()
+
+      await staker4.stake(Token.OAS, validator1, '40')
+      await staker5.stake(Token.OAS, validator1, '50')
+      await staker6.stake(Token.OAS, validator1, '60')
+      await toNextEpoch()
+
+      await staker2.unstakeV2(Token.OAS, validator1, '20')
+      await toNextEpoch()
+
+      await check(validator1, 1, '0')
+      await check(validator1, 2, '10')
+      await check(validator1, 3, '30')
+      await check(validator1, 4, '90')
+      await check(validator1, 5, '240')
+      await check(validator1, 6, '220')
+      await check(validator1, 0, '220')
+    })
+
     it('getStakerStakes()', async () => {
       await staker1.stake(Token.OAS, validator1, '5')
       await staker1.stake(Token.OAS, validator1, '5')

diff --git a/test/helpers.ts b/test/helpers.ts
@@ -97,7 +97,7 @@ class Validator {
     howMany = 100,
     expectNewCursor?: number,
   ) {
-    const { _stakers, stakes, newCursor } = await this._contract.getValidatorStakes(
+    const { _stakers, stakes, newCursor } = await this._contract['getValidatorStakes(address,uint256,uint256,uint256)'](
       this.owner.address,
       epoch,
       cursor,