Merge pull request #25 from ironbeer/dev-reduce-verse-verifier-gas

Reduced gas cost of Verse Verifier

artifacts/contracts/IStakeManager.sol/IStakeManager.json

@@ -569,6 +569,30 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "operator",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "epoch",
+          "type": "uint256"
+        }
+      ],
+      "name": "getOperatorStakes",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "stakes",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -826,6 +850,30 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "epoch",
+          "type": "uint256"
+        }
+      ],
+      "name": "getValidatorStakes",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "stakes",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {

artifacts/contracts/lib/Staker.sol/Staker.json

@@ -3,8 +3,8 @@
   "contractName": "Staker",
   "sourceName": "contracts/lib/Staker.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203c6fa6bac2ecf6631f4c5c7dca20535543f581cd779ec191ec568f2e78b8cfe364736f6c634300080c0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203c6fa6bac2ecf6631f4c5c7dca20535543f581cd779ec191ec568f2e78b8cfe364736f6c634300080c0033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200f3bac20a38e01aacdba1a01a41432c5ce7f540617da36891c84398f717583a364736f6c634300080c0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200f3bac20a38e01aacdba1a01a41432c5ce7f540617da36891c84398f717583a364736f6c634300080c0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

artifacts/contracts/lib/UpdateHistories.sol/UpdateHistories.json

@@ -3,8 +3,8 @@
   "contractName": "UpdateHistories",
   "sourceName": "contracts/lib/UpdateHistories.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212202b744cfab2a7a569afb6960a5ab8446276c4ee6a7851fc3536ab3cf2ed90acb864736f6c634300080c0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212202b744cfab2a7a569afb6960a5ab8446276c4ee6a7851fc3536ab3cf2ed90acb864736f6c634300080c0033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cb48adcdcf81ee643372b876cd2daf34d46162f4f6841e9ec6bff76c021bf43264736f6c634300080c0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cb48adcdcf81ee643372b876cd2daf34d46162f4f6841e9ec6bff76c021bf43264736f6c634300080c0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

artifacts/contracts/lib/Validator.sol/Validator.json

@@ -3,8 +3,8 @@
   "contractName": "Validator",
   "sourceName": "contracts/lib/Validator.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200cc340d21f7dde406399ac5436fdc12a8d3a6d01c4d9afafce0644ac37b9eeac64736f6c634300080c0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200cc340d21f7dde406399ac5436fdc12a8d3a6d01c4d9afafce0644ac37b9eeac64736f6c634300080c0033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122079571585221c2a7b77b78d0173a52c0ca98df07da7010ab7ed591235c9f82d6064736f6c634300080c0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122079571585221c2a7b77b78d0173a52c0ca98df07da7010ab7ed591235c9f82d6064736f6c634300080c0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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.

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
      */

contracts/lib/UpdateHistories.sol

@@ -4,44 +4,41 @@ pragma solidity 0.8.12;
 
 import { IEnvironment } from "../IEnvironment.sol";
 
+error PastEpoch();
+
 /**
  * @title UpdateHistories
  */
 library UpdateHistories {
-    function set(
-        uint256[] storage epochs,
-        uint256[] storage values,
-        uint256 nextEpoch,
-        uint256 value
-    ) internal {
-        extend(epochs, values, nextEpoch);
-        values[epochs.length - 1] = value;
-    }
-
     function add(
         uint256[] storage epochs,
         uint256[] storage values,
-        uint256 nextEpoch,
+        uint256 epoch,
         uint256 value
     ) internal {
-        extend(epochs, values, nextEpoch);
-        values[epochs.length - 1] += value;
+        uint256 length = epochs.length;
+        if (length > 1 && epoch < epochs[length - 1] && epoch < epochs[length - 2]) revert PastEpoch();
+
+        uint256 pos = extend(epochs, values, epoch);
+        length = epochs.length;
+        for (; pos < length; pos++) {
+            values[pos] += value;
+        }
     }
 
     function sub(
         uint256[] storage epochs,
         uint256[] storage values,
-        uint256 nextEpoch,
+        uint256 epoch,
         uint256 value
     ) internal returns (uint256) {
-        extend(epochs, values, nextEpoch);
-
         uint256 length = epochs.length;
-        uint256 balance = values[length - 1];
+        if (length == 0 || epoch < epochs[length - 1]) revert PastEpoch();
+
+        uint256 pos = extend(epochs, values, epoch);
+        uint256 balance = values[pos];
         value = value <= balance ? value : balance;
-        if (value > 0) {
-            values[length - 1] -= value;
-        }
+        if (value > 0) values[pos] -= value;
         return value;
     }
 
@@ -53,6 +50,7 @@ library UpdateHistories {
         uint256 length = epochs.length;
         if (length == 0 || epochs[0] > epoch) return 0;
         if (epochs[length - 1] <= epoch) return values[length - 1];
+        if (length > 1 && epochs[length - 2] <= epoch) return values[length - 2];
         uint256 idx = sBinarySearch(epochs, epoch, 0, length);
         return values[idx];
     }
@@ -64,26 +62,47 @@ library UpdateHistories {
     ) internal pure returns (IEnvironment.EnvironmentValue memory) {
         uint256 length = epochs.length;
         if (epochs[length - 1] <= epoch) return values[length - 1];
+        if (length > 1 && epochs[length - 2] <= epoch) return values[length - 2];
         uint256 idx = mBinarySearch(epochs, epoch, 0, length);
         return values[idx];
     }
 
     function extend(
         uint256[] storage epochs,
         uint256[] storage values,
-        uint256 nextEpoch
-    ) internal {
+        uint256 epoch
+    ) internal returns (uint256 pos) {
         uint256 length = epochs.length;
+
+        // first time
         if (length == 0) {
-            epochs.push(nextEpoch);
-            values.push();
-            return;
+            epochs.push(epoch);
+            values.push(0);
+            return 0;
+        }
+
+        uint256 lastPos = length - 1;
+        uint256 lastEpoch = epochs[lastPos];
+
+        // same as last epoch
+        if (epoch == lastEpoch) return lastPos;
+
+        // future epoch
+        if (epoch > lastEpoch) {
+            epochs.push(epoch);
+            values.push(values[lastPos]);
+            return lastPos + 1;
         }
 
-        uint256 lastEpoch = epochs[length - 1];
-        if (lastEpoch != nextEpoch) {
-            epochs.push(nextEpoch);
-            values.push(values[length - 1]);
+        // previous epoch
+        if (lastPos > 0 && epoch == epochs[lastPos - 1]) {
+            return lastPos - 1;
+        } else {
+            epochs.push(epochs[lastPos]);
+            values.push(values[lastPos]);
+            epochs[lastPos] = epoch;
+            values[lastPos] = lastPos == 0 ? 0 : values[lastPos - 1];
+            return lastPos;
         }
     }
 

test/StakeManager.spec.ts

@@ -936,7 +936,6 @@ describe('StakeManager', () => {
       const tx2 = await staker1.unstakeV2(Token.wOAS, validator1, '2.5')
       await expect(tx1).to.emit(stakeManager, 'UnstakedV2').withArgs(staker1.address, validator1.owner.address, 0)
       await expect(tx2).to.emit(stakeManager, 'UnstakedV2').withArgs(staker1.address, validator1.owner.address, 1)
-      await expect(staker1.unstakeV2(Token.sOAS, validator1, '1')).to.revertedWith('NoAmount')
 
       await expectBalance(stakeManager, '515', '5', '10')
       await expectBalance(staker1.signer, '7985', '995', '990')
@@ -1005,6 +1004,7 @@ describe('StakeManager', () => {
       await staker1.unstakeV2(Token.wOAS, validator1, '9999')
       await staker1.unstakeV2(Token.OAS, validator2, '5')
       await staker1.unstakeV2(Token.sOAS, validator2, '5')
+      await expect(staker1.unstakeV2(Token.wOAS, validator1, '1')).to.revertedWith('NoAmount')
 
       expect(await staker1.getLockedUnstakeCount()).to.equal(10)
 
@@ -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')

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,