[VEN-1214][VEN-1150]: integrate ACM and automatic reduce reserves in VToken

contracts/Tokens/VTokens/VBep20.sol

@@ -179,9 +179,8 @@ contract VBep20 is VToken, VBep20Interface {
      *            See here: https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca
      */
     function doTransferIn(address from, uint amount) internal returns (uint) {
-        EIP20NonStandardInterface token = EIP20NonStandardInterface(underlying);
         uint balanceBefore = EIP20Interface(underlying).balanceOf(address(this));
-        token.transferFrom(from, address(this), amount);
+        EIP20NonStandardInterface(underlying).transferFrom(from, address(this), amount);
 
         bool success;
         assembly {
@@ -218,8 +217,7 @@ contract VBep20 is VToken, VBep20Interface {
      *            See here: https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca
      */
     function doTransferOut(address payable to, uint amount) internal {
-        EIP20NonStandardInterface token = EIP20NonStandardInterface(underlying);
-        token.transfer(to, amount);
+        EIP20NonStandardInterface(underlying).transfer(to, amount);
 
         bool success;
         assembly {
@@ -247,7 +245,6 @@ contract VBep20 is VToken, VBep20Interface {
      * @return The quantity of underlying tokens owned by this contract
      */
     function getCashPrior() internal view returns (uint) {
-        EIP20Interface token = EIP20Interface(underlying);
-        return token.balanceOf(address(this));
+        return EIP20Interface(underlying).balanceOf(address(this));
     }
 }

contracts/Tokens/VTokens/VTokenInterfaces.sol

@@ -3,7 +3,16 @@ pragma solidity ^0.5.16;
 import "../../Comptroller/ComptrollerInterface.sol";
 import "../../InterestRateModels/InterestRateModel.sol";
 
-contract VTokenStorage {
+interface IProtocolShareReserve {
+    enum IncomeType {
+        SPREAD,
+        LIQUIDATION
+    }
+
+    function updateAssetsState(address comptroller, address asset, IncomeType kind) external;
+}
+
+contract VTokenStorageBase {
     /**
      * @notice Container for borrow balance information
      * @member principal Total balance (with accrued interest), after applying the most recent balance-changing action
@@ -114,6 +123,46 @@ contract VTokenStorage {
      * @notice Mapping of account addresses to outstanding borrow balances
      */
     mapping(address => BorrowSnapshot) internal accountBorrows;
+
+    /**
+     * @notice Underlying asset for this VToken
+     */
+    address public underlying;
+
+    /**
+     * @notice Implementation address for this contract
+     */
+    address public implementation;
+
+    /**
+     * @notice delta block after which reserves will be reduced
+     */
+    uint public reduceReservesBlockDelta;
+
+    /**
+     * @notice last block number at which reserves were reduced
+     */
+    uint public reduceReservesBlockNumber;
+
+    /**
+     * @notice address of protocol share reserve contract
+     */
+    address payable public protocolShareReserve;
+
+    /**
+     * @notice address of accessControlManager
+     */
+
+    address public accessControlManager;
+}
+
+contract VTokenStorage is VTokenStorageBase {
+    /**
+     * @dev This empty reserved space is put in place to allow future versions to add new
+     * variables without shifting down storage in the inheritance chain.
+     * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
+     */
+    uint256[50] private __gap;
 }
 
 contract VTokenInterface is VTokenStorage {
@@ -217,11 +266,24 @@ contract VTokenInterface is VTokenStorage {
      */
     event Approval(address indexed owner, address indexed spender, uint amount);
 
+    /**
+     * @notice Event emitted when block delta for reduce reserves get updated
+     */
+    event NewReduceReservesBlockDelta(uint256 oldReduceReservesBlockDelta, uint256 newReduceReservesBlockDelta);
+
+    /**
+     * @notice Event emitted when address of ProtocolShareReserve contract get updated
+     */
+    event NewProtocolShareReserve(address indexed oldProtocolShareReserve, address indexed newProtocolShareReserve);
+
     /**
      * @notice Failure event
      */
     event Failure(uint error, uint info, uint detail);
 
+    /// @notice Emitted when access control address is changed by admin
+    event NewAccessControlManager(address oldAccessControlAddress, address newAccessControlAddress);
+
     /*** User Interface ***/
 
     function transfer(address dst, uint amount) external returns (bool);
@@ -277,14 +339,7 @@ contract VTokenInterface is VTokenStorage {
     function exchangeRateStored() public view returns (uint);
 }
 
-contract VBep20Storage {
-    /**
-     * @notice Underlying asset for this VToken
-     */
-    address public underlying;
-}
-
-contract VBep20Interface is VBep20Storage {
+contract VBep20Interface {
     /*** User Interface ***/
 
     function mint(uint mintAmount) external returns (uint);
@@ -312,14 +367,7 @@ contract VBep20Interface is VBep20Storage {
     function _addReserves(uint addAmount) external returns (uint);
 }
 
-contract VDelegationStorage {
-    /**
-     * @notice Implementation address for this contract
-     */
-    address public implementation;
-}
-
-contract VDelegatorInterface is VDelegationStorage {
+contract VDelegatorInterface {
     /**
      * @notice Emitted when implementation is changed
      */
@@ -338,7 +386,7 @@ contract VDelegatorInterface is VDelegationStorage {
     ) public;
 }
 
-contract VDelegateInterface is VDelegationStorage {
+contract VDelegateInterface {
     /**
      * @notice Called by the delegator on a delegate to initialize it for duty
      * @dev Should revert if any issues arise which make it unfit for delegation

contracts/Utils/ErrorReporter.sol

@@ -168,6 +168,7 @@ contract TokenErrorReporter {
         SET_COLLATERAL_FACTOR_OWNER_CHECK,
         SET_COLLATERAL_FACTOR_VALIDATION,
         SET_COMPTROLLER_OWNER_CHECK,
+        SET_ACCESS_CONTROL_OWNER_CHECK,
         SET_INTEREST_RATE_MODEL_ACCRUE_INTEREST_FAILED,
         SET_INTEREST_RATE_MODEL_FRESH_CHECK,
         SET_INTEREST_RATE_MODEL_OWNER_CHECK,
@@ -178,6 +179,8 @@ contract TokenErrorReporter {
         SET_RESERVE_FACTOR_ADMIN_CHECK,
         SET_RESERVE_FACTOR_FRESH_CHECK,
         SET_RESERVE_FACTOR_BOUNDS_CHECK,
+        SET_REDUCE_RESERVES_BLOCK_DELTA_OWNER_CHECK,
+        SET_PROTOCOL_SHARE_RESERVES_OWNER_CHECK,
         TRANSFER_COMPTROLLER_REJECTION,
         TRANSFER_NOT_ALLOWED,
         TRANSFER_NOT_ENOUGH,

tests/hardhat/EvilXToken.ts

@@ -3,7 +3,7 @@ import chai from "chai";
 import { ethers } from "hardhat";
 
 import { convertToUnit } from "../../helpers/utils";
-import { ComptrollerHarness__factory, IAccessControlManager } from "../../typechain";
+import { ComptrollerHarness__factory, IAccessControlManager, IProtocolShareReserve } from "../../typechain";
 
 const { expect } = chai;
 
@@ -168,8 +168,15 @@ describe("Evil Token test", async () => {
     await unitroller.connect(user).enterMarkets([vToken1.address, vToken2.address, vToken3.address]);
     await underlying1.harnessSetBalance(user.address, convertToUnit(1, 8));
     await underlying1.connect(user).approve(vToken1.address, convertToUnit(1, 10));
+    await vToken1.setReduceReservesBlockDelta(10000);
     await vToken1.connect(user).mint(convertToUnit(1, 4));
     await underlying3.harnessSetBalance(vToken3.address, convertToUnit(1, 8));
+
+    const protocolShareReserve = await smock.fake<IProtocolShareReserve>("IProtocolShareReserve");
+    protocolShareReserve.updateAssetsState.returns(true);
+    await vToken1.setProtcolShareReserve(protocolShareReserve.address);
+    await vToken2.setProtcolShareReserve(protocolShareReserve.address);
+    await vToken3.setProtcolShareReserve(protocolShareReserve.address);
   });
 
   it("Check the updated vToken states after transfer out", async () => {