@pendle/core-v2 0.8.0-beta-11 → 0.8.1-beta

package/build/artifacts/contracts/periphery/PendleGovernanceManager.sol/PendleGovernanceManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/bc0acb3641076a281bea6ddc48f72287.json"
+  "buildInfo": "../../../build-info/3ba02805035109c4541b635a816d445a.json"
 }

package/build/artifacts/contracts/periphery/PendleGovernanceManager.sol/PendleGovernanceManager.json

@@ -80,8 +80,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161036238038061036283398101604081905261002f9161009d565b6001600160a01b0381166100785760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b604482015260640160405180910390fd5b600080546001600160a01b0319166001600160a01b03929092169190911790556100cd565b6000602082840312156100af57600080fd5b81516001600160a01b03811681146100c657600080fd5b9392505050565b610286806100dc6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610220565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b6001600160a01b0381166101fe5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561023257600080fd5b81356001600160a01b038116811461024957600080fd5b939250505056fea264697066735822122067e6304d55f193f4ca1a731f794e79e96922132a50cf62e9de37826d9c4514a764736f6c634300080d0033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610220565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b6001600160a01b0381166101fe5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561023257600080fd5b81356001600160a01b038116811461024957600080fd5b939250505056fea264697066735822122067e6304d55f193f4ca1a731f794e79e96922132a50cf62e9de37826d9c4514a764736f6c634300080d0033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161036238038061036283398101604081905261002f9161009d565b6001600160a01b0381166100785760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b604482015260640160405180910390fd5b600080546001600160a01b0319166001600160a01b03929092169190911790556100cd565b6000602082840312156100af57600080fd5b81516001600160a01b03811681146100c657600080fd5b9392505050565b610286806100dc6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610220565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b6001600160a01b0381166101fe5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561023257600080fd5b81356001600160a01b038116811461024957600080fd5b939250505056fea26469706673582212203083b29bac58d69ca2c3b85c73ccf222186a27dcfb339c1a201b7247172f296464736f6c634300080f0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610220565b61016d565b600154610064906001600160a01b031681565b6001546001600160a01b031633146100fb5760405162461bcd60e51b81526020600482015260096024820152682327a92124a22222a760b91b60448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101b95760405162461bcd60e51b815260206004820152600f60248201526e4f4e4c595f474f5645524e414e434560881b60448201526064016100f2565b6001600160a01b0381166101fe5760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b60448201526064016100f2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60006020828403121561023257600080fd5b81356001600160a01b038116811461024957600080fd5b939250505056fea26469706673582212203083b29bac58d69ca2c3b85c73ccf222186a27dcfb339c1a201b7247172f296464736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/periphery/PermissionsV2Upg.sol/PermissionsV2Upg.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/3b83d9911e204e5de66c32a50a55a4fa.json"
+  "buildInfo": "../../../build-info/5288c52e2bad622975ca99f52d1a47ff.json"
 }

package/contracts/SuperComposableYield/SCY-implementations/AaveV3/PendleAaveV3SCY.sol

@@ -127,14 +127,24 @@ contract PendleAaveV3SCY is SCYBaseWithRewards {
         amountTokenOut = _scaledBalanceToAToken(amountSharesToRedeem);
     }
 
-    function getBaseTokens() public view virtual override returns (address[] memory res) {
+    function getTokensIn() public view virtual override returns (address[] memory res) {
         res = new address[](2);
         res[0] = underlying;
         res[1] = aToken;
     }
 
-    function isValidBaseToken(address token) public view virtual override returns (bool res) {
-        res = (token == underlying || token == aToken);
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = underlying;
+        res[1] = aToken;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == underlying || token == aToken;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
+        return token == underlying || token == aToken;
     }
 
     function assetInfo()

package/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenSCY.sol

@@ -166,20 +166,24 @@ contract PendleQiTokenSCY is SCYBaseWithRewards, PendleQiTokenHelper {
         else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-getBaseTokens}
-     */
-    function getBaseTokens() public view override returns (address[] memory res) {
+    function getTokensIn() public view virtual override returns (address[] memory res) {
         res = new address[](2);
         res[0] = qiToken;
         res[1] = underlying;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-isValidBaseToken}
-     */
-    function isValidBaseToken(address token) public view override returns (bool res) {
-        res = (token == underlying || token == qiToken);
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = qiToken;
+        res[1] = underlying;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == qiToken || token == underlying;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
+        return token == qiToken || token == underlying;
     }
 
     function assetInfo()

package/contracts/SuperComposableYield/SCY-implementations/PendleERC4626SCY.sol

@@ -95,13 +95,23 @@ contract PendleERC4626SCY is SCYBase {
         else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
     }
 
-    function getBaseTokens() public view virtual override returns (address[] memory res) {
+    function getTokensIn() public view virtual override returns (address[] memory res) {
         res = new address[](2);
         res[0] = underlying;
         res[1] = yieldToken;
     }
 
-    function isValidBaseToken(address token) public view virtual override returns (bool) {
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = underlying;
+        res[1] = yieldToken;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == underlying || token == yieldToken;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
         return token == underlying || token == yieldToken;
     }
 

package/contracts/SuperComposableYield/SCY-implementations/PendleStargateSCY.sol

@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.15;
+import "../base-implementations/SCYBaseWithRewards.sol";
+import "../../interfaces/IStargateRouter.sol";
+import "../../interfaces/IStargatePool.sol";
+import "../../interfaces/IStargateLPStaking.sol";
+
+contract PendleStargateSCY is SCYBaseWithRewards {
+    address public immutable stgRouter;
+    uint16 public immutable stgRouterPoolId;
+
+    address public immutable stgStakingLP;
+    uint256 public immutable pid;
+
+    address public immutable underlying;
+    address public immutable stgPool;
+    address public immutable stgToken;
+
+    constructor(
+        string memory _name,
+        string memory _symbol,
+        address _stgRouter,
+        address _stgStakingLP,
+        uint256 _pid,
+        address _stgPool
+    ) SCYBaseWithRewards(_name, _symbol, _stgPool) {
+        stgRouter = _stgRouter;
+
+        // I dont think we need safecast for a trusted call like this
+        stgRouterPoolId = uint16(IStargatePool(_stgPool).poolId());
+
+        stgStakingLP = _stgStakingLP;
+        pid = _pid;
+
+        stgPool = _stgPool;
+        stgToken = IStargateLPStaking(_stgStakingLP).stargate();
+        underlying = IStargatePool(stgPool).token();
+
+        // verify _pid
+        require(
+            IStargateLPStaking(_stgStakingLP).poolInfo(_pid).lpToken == _stgPool,
+            "invalid pid"
+        );
+
+        _safeApprove(underlying, _stgRouter, type(uint256).max);
+        // There is not a need to approve LP for router since stargate uses direct burn
+        // _safeApprove(stgPool, _stgRouter, type(uint256).max);
+        _safeApprove(stgPool, _stgStakingLP, type(uint256).max);
+    }
+
+    /*///////////////////////////////////////////////////////////////
+                    DEPOSIT/REDEEM USING BASE TOKENS
+    //////////////////////////////////////////////////////////////*/
+
+    /**
+     * @dev See {SCYBase-_deposit}
+     *
+     * The underlying yield token is stargateLP. If the base token deposited is underlying, the function addLiquidity
+     * using stargateRouter first. Then the amount of LP out will be taken into calculation.
+     *
+     * The exchange rate of stargateLP to shares is 1:1
+     */
+    function _deposit(address tokenIn, uint256 amountDeposited)
+        internal
+        virtual
+        override
+        returns (uint256 amountSharesOut)
+    {
+        if (tokenIn == stgPool) {
+            amountSharesOut = amountDeposited;
+        } else {
+            uint256 preBalanceStgPool = _selfBalance(stgPool);
+            IStargateRouter(stgRouter).addLiquidity(
+                stgRouterPoolId,
+                amountDeposited,
+                address(this)
+            );
+            amountSharesOut = _selfBalance(stgPool) - preBalanceStgPool;
+        }
+        IStargateLPStaking(stgStakingLP).deposit(pid, amountSharesOut);
+    }
+
+    /**
+     * @dev See {SCYBase-_redeem}
+     *
+     * The staked tokens are firstly withdraw from staking
+     *
+     * The shares are redeemed into underlying using router if necessary.
+     */
+    function _redeem(address tokenOut, uint256 amountSharesToRedeem)
+        internal
+        virtual
+        override
+        returns (uint256 amountTokenOut)
+    {
+        IStargateLPStaking(stgStakingLP).withdraw(pid, amountSharesToRedeem);
+        if (tokenOut == stgPool) {
+            amountTokenOut = amountSharesToRedeem;
+        } else {
+            uint256 preBalanceStgLp = IERC20(stgPool).balanceOf(address(this));
+            amountTokenOut = IStargateRouter(stgRouter).instantRedeemLocal(
+                stgRouterPoolId,
+                amountSharesToRedeem,
+                address(this)
+            );
+
+            uint256 amountLpUsed = preBalanceStgLp - IERC20(stgPool).balanceOf(address(this));
+
+            // Since stargate is a bridge, sometime there might not be enough fund in the pool to redeem
+            // In this case, stargate contract doesn't revert
+            require(amountLpUsed == amountSharesToRedeem, "insufficient fund to redeem");
+        }
+    }
+
+    /*///////////////////////////////////////////////////////////////
+                               EXCHANGE-RATE
+    //////////////////////////////////////////////////////////////*/
+
+    /**
+     * @notice Calculates and updates the exchange rate of shares to underlying asset token
+     * @dev It is the exchange rate of stgPool to underlying
+     */
+    function exchangeRate() public view virtual override returns (uint256 currentRate) {
+        return IStargatePool(stgPool).amountLPtoLD(SCYUtils.ONE);
+    }
+
+    /*///////////////////////////////////////////////////////////////
+                MISC FUNCTIONS FOR METADATA
+    //////////////////////////////////////////////////////////////*/
+
+    function getTokensIn() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = stgPool;
+        res[1] = underlying;
+    }
+
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = stgPool;
+        res[1] = underlying;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == stgPool || token == underlying;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
+        return token == stgPool || token == underlying;
+    }
+
+    function _previewDeposit(address tokenIn, uint256 amountTokenToDeposit)
+        internal
+        view
+        override
+        returns (uint256 amountSharesOut)
+    {
+        if (tokenIn == stgPool) amountSharesOut = amountTokenToDeposit;
+        else amountSharesOut = (amountTokenToDeposit * SCYUtils.ONE) / exchangeRate();
+    }
+
+    function _previewRedeem(address tokenOut, uint256 amountSharesToRedeem)
+        internal
+        view
+        override
+        returns (uint256 amountTokenOut)
+    {
+        if (tokenOut == stgPool) amountTokenOut = amountSharesToRedeem;
+        else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / SCYUtils.ONE;
+    }
+
+    function assetInfo()
+        external
+        view
+        returns (
+            AssetType assetType,
+            address assetAddress,
+            uint8 assetDecimals
+        )
+    {
+        return (AssetType.TOKEN, stgPool, IERC20Metadata(stgPool).decimals());
+    }
+
+    function _redeemExternalReward() internal override {
+        IStargateLPStaking(stgStakingLP).withdraw(pid, 0);
+    }
+
+    /**
+     * @dev See {ISuperComposableYield-getRewardTokens}
+     */
+    function _getRewardTokens() internal view override returns (address[] memory res) {
+        res = new address[](1);
+        res[0] = stgToken;
+    }
+}

package/contracts/SuperComposableYield/SCY-implementations/PendleWstEthSCY.sol

@@ -97,19 +97,23 @@ contract PendleWstEthSCY is SCYBase {
         else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-getBaseTokens}
-     */
-    function getBaseTokens() public view virtual override returns (address[] memory res) {
+    function getTokensIn() public view virtual override returns (address[] memory res) {
         res = new address[](2);
         res[0] = stETH;
         res[1] = wstETH;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-isValidBaseToken}
-     */
-    function isValidBaseToken(address token) public view virtual override returns (bool) {
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = stETH;
+        res[1] = wstETH;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == stETH || token == wstETH;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
         return token == stETH || token == wstETH;
     }
 

package/contracts/SuperComposableYield/SCY-implementations/PendleYearnVaultScy.sol

@@ -121,19 +121,23 @@ contract PendleYearnVaultSCY is SCYBase {
         else amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-getBaseTokens}
-     */
-    function getBaseTokens() public view virtual override returns (address[] memory res) {
+    function getTokensIn() public view virtual override returns (address[] memory res) {
         res = new address[](2);
         res[0] = underlying;
         res[1] = yvToken;
     }
 
-    /**
-     * @dev See {ISuperComposableYield-isValidBaseToken}
-     */
-    function isValidBaseToken(address token) public view virtual override returns (bool) {
+    function getTokensOut() public view virtual override returns (address[] memory res) {
+        res = new address[](2);
+        res[0] = underlying;
+        res[1] = yvToken;
+    }
+
+    function isValidTokenIn(address token) public view virtual override returns (bool) {
+        return token == underlying || token == yvToken;
+    }
+
+    function isValidTokenOut(address token) public view virtual override returns (bool) {
         return token == underlying || token == yvToken;
     }
 

package/contracts/SuperComposableYield/base-implementations/SCYBase.sol

@@ -38,7 +38,7 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
         uint256 amountTokenToDeposit,
         uint256 minSharesOut
     ) external payable nonReentrant returns (uint256 amountSharesOut) {
-        require(isValidBaseToken(tokenIn), "SCY: Invalid tokenIn");
+        require(isValidTokenIn(tokenIn), "SCY: Invalid tokenIn");
         require(amountTokenToDeposit != 0, "SCY: amountTokenToDeposit cannot be 0");
 
         if (tokenIn == NATIVE) require(msg.value == amountTokenToDeposit, "SCY: eth mismatch");
@@ -80,7 +80,7 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
         address tokenOut,
         uint256 minTokenOut
     ) internal returns (uint256 amountTokenOut) {
-        require(isValidBaseToken(tokenOut), "SCY: invalid tokenOut");
+        require(isValidTokenOut(tokenOut), "SCY: invalid tokenOut");
         require(amountSharesToRedeem != 0, "SCY: amountSharesToRedeem cannot be 0");
 
         amountTokenOut = _redeem(tokenOut, amountSharesToRedeem);
@@ -181,7 +181,7 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
         virtual
         returns (uint256 amountSharesOut)
     {
-        require(isValidBaseToken(tokenIn), "SCY: Invalid tokenIn");
+        require(isValidTokenIn(tokenIn), "SCY: Invalid tokenIn");
         return _previewDeposit(tokenIn, amountTokenToDeposit);
     }
 
@@ -191,7 +191,7 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
         virtual
         returns (uint256 amountTokenOut)
     {
-        require(isValidBaseToken(tokenOut), "SCY: Invalid tokenOut");
+        require(isValidTokenOut(tokenOut), "SCY: Invalid tokenOut");
         return _previewRedeem(tokenOut, amountSharesToRedeem);
     }
 
@@ -207,13 +207,11 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
         virtual
         returns (uint256 amountTokenOut);
 
-    /**
-     * @notice See {ISuperComposableYield-getBaseTokens}
-     */
-    function getBaseTokens() external view virtual override returns (address[] memory res);
+    function getTokensIn() public view virtual returns (address[] memory res);
 
-    /**
-     * @dev See {ISuperComposableYield-isValidBaseToken}
-     */
-    function isValidBaseToken(address token) public view virtual override returns (bool);
+    function getTokensOut() public view virtual returns (address[] memory res);
+
+    function isValidTokenIn(address token) public view virtual returns (bool);
+
+    function isValidTokenOut(address token) public view virtual returns (bool);
 }

package/contracts/SuperComposableYield/base-implementations/SCYBaseWithRewards.sol

@@ -6,8 +6,7 @@ import "./SCYBase.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "../../libraries/math/Math.sol";
 
-/// This contract makes an important assumption that yieldToken is never a rewardToken
-/// Please make sure that assumption always holds
+/// NOTE: yieldToken MUST NEVER BE a rewardToken, else the rewardManager will behave erroneously
 abstract contract SCYBaseWithRewards is SCYBase, RewardManager {
     using Math for uint256;
     using ArrayLib for address[];

package/contracts/core/LiquidityMining/CelerAbstracts/CelerSenderUpg.sol

@@ -29,6 +29,7 @@ abstract contract CelerSenderUpg is PermissionsV2Upg {
         assert(sidechainContracts.contains(chainId));
         address toAddr = sidechainContracts.get(chainId);
         uint256 fee = celerMessageBus.calcFee(message);
+        require(msg.value >= fee, "Insufficient celer fee");
         celerMessageBus.sendMessage{ value: fee }(toAddr, chainId, message);
     }
 

package/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol

@@ -101,7 +101,7 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, Permissions
         epochRewardReceived[wTime] = true;
 
         for (uint256 i = 0; i < markets.length; ++i) {
-            _addRewardsToMarket(markets[i], uint128(pendleAmounts[i]));
+            _addRewardsToMarket(markets[i], pendleAmounts[i].Uint128());
         }
 
         emit ReceiveVotingResults(wTime, markets, pendleAmounts);

package/contracts/core/LiquidityMining/VotingController/PendleVotingControllerUpg.sol

@@ -73,6 +73,7 @@ contract PendleVotingControllerUpg is
         require(vePendle.balanceOf(user) > 0, "zero vependle balance");
 
         UserData storage uData = userData[user];
+        LockedPosition memory userPosition = _getUserVePendlePosition(user);
 
         for (uint256 i = 0; i < pools.length; ++i) {
             if (_isPoolActive(pools[i])) applyPoolSlopeChanges(pools[i]);
@@ -80,12 +81,12 @@ contract PendleVotingControllerUpg is
 
         for (uint256 i = 0; i < pools.length; ++i) {
             if (uData.voteForPools[pools[i]].weight <= weights[i])
-                _modifyVoteWeight(user, pools[i], weights[i]);
+                _modifyVoteWeight(user, pools[i], userPosition, weights[i]);
         }
 
         for (uint256 i = 0; i < pools.length; ++i) {
             if (uData.voteForPools[pools[i]].weight > weights[i])
-                _modifyVoteWeight(user, pools[i], weights[i]);
+                _modifyVoteWeight(user, pools[i], userPosition, weights[i]);
         }
     }
 
@@ -157,6 +158,8 @@ contract PendleVotingControllerUpg is
      * @dev state changes expected:
         - add to allActivePools & chainPools
         - set params in poolData
+     * @dev NOTE TO GOV: previous week's results should have been broadcasted prior to calling
+      this function
      */
     function addPool(uint64 chainId, address pool) external onlyGovernance {
         require(!_isPoolActive(pool), "pool already added");
@@ -173,6 +176,8 @@ contract PendleVotingControllerUpg is
         - update weekData (if any)
         - remove from allActivePools & chainPools
         - clear data in poolData
+     * @dev NOTE TO GOV: previous week's results should have been broadcasted prior to calling
+      this function
      */
     function removePool(address pool) external onlyGovernance {
         require(_isPoolActive(pool), "invalid pool");
@@ -205,6 +210,8 @@ contract PendleVotingControllerUpg is
      * @notice set new pendlePerSec
      * @dev no zero checks because gov may want to stop liquidity mining
      * @dev state changes expected: pendlePerSec is updated
+     * @dev NOTE TO GOV: This should be done mid-week, well before the next broadcast to avoid
+        race condition
      */
     function setPendlePerSec(uint128 newPendlePerSec) external onlyGovernance {
         pendlePerSec = newPendlePerSec;
@@ -237,12 +244,12 @@ contract PendleVotingControllerUpg is
 
         for (uint256 i = 0; i < length; ++i) {
             uint256 poolVotes = weekData[wTime].poolVotes[pools[i]];
-            uint256 pendlePerSec = (uint256(totalPendlePerSec) * poolVotes) / totalVotes;
+            uint256 pendlePerSec = (totalPendlePerSec * poolVotes) / totalVotes;
             totalPendleAmounts[i] = pendlePerSec * WEEK;
         }
 
         if (chainId == block.chainid) {
-            address gaugeController = sidechainContracts.get(uint256(chainId));
+            address gaugeController = sidechainContracts.get(chainId);
             IPGaugeControllerMainchain(gaugeController).updateVotingResults(
                 wTime,
                 pools,
@@ -255,32 +262,19 @@ contract PendleVotingControllerUpg is
         emit BroadcastResults(chainId, wTime, totalPendlePerSec);
     }
 
-    /**
-     * @notice return the corresponding voting power of an user given the weight. Basically his voting power
-        will be vePendle * weight / USER_VOTE_MAX_WEIGHT
-     * @notice governance will always has the vePendle equivalent to 1M PENDLE locked for MAX_LOCK_TIME
-     */
-    function _getVotingPowerByWeight(address user, uint64 weight)
+    function _getUserVePendlePosition(address user)
         internal
         view
-        virtual
-        override
-        returns (VeBalance memory res)
+        returns (LockedPosition memory userPosition)
     {
-        uint128 amount;
-        uint128 expiry;
-
         if (user == _governance()) {
-            amount = GOVERNANCE_PENDLE_VOTE;
-            expiry = WeekMath.getWeekStartTimestamp(uint128(block.timestamp) + MAX_LOCK_TIME);
+            (userPosition.amount, userPosition.expiry) = (
+                GOVERNANCE_PENDLE_VOTE,
+                WeekMath.getWeekStartTimestamp(uint128(block.timestamp) + MAX_LOCK_TIME)
+            );
         } else {
-            (amount, expiry) = vePendle.positionData(user);
+            (userPosition.amount, userPosition.expiry) = vePendle.positionData(user);
         }
-
-        (res.bias, res.slope) = VeBalanceLib.convertToVeBalance(
-            uint128((uint256(amount) * weight) / USER_VOTE_MAX_WEIGHT),
-            expiry
-        );
     }
 
     function _authorizeUpgrade(address newImplementation) internal override onlyGovernance {}

package/contracts/core/LiquidityMining/VotingController/VotingControllerStorageUpg.sol

@@ -14,6 +14,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 /// - it inherits only upgradable contract
 abstract contract VotingControllerStorageUpg {
     using VeBalanceLib for VeBalance;
+    using VeBalanceLib for LockedPosition;
     using EnumerableSet for EnumerableSet.AddressSet;
     using Checkpoints for Checkpoints.History;
 
@@ -42,7 +43,6 @@ abstract contract VotingControllerStorageUpg {
     }
 
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint64 public constant USER_VOTE_MAX_WEIGHT = 10**18;
     uint128 public constant WEEK = 1 weeks;
     uint128 public constant GOVERNANCE_PENDLE_VOTE = 10**24;
 
@@ -181,6 +181,7 @@ abstract contract VotingControllerStorageUpg {
     function _modifyVoteWeight(
         address user,
         address pool,
+        LockedPosition memory userPosition,
         uint64 weight
     ) internal returns (VeBalance memory newVote) {
         UserData storage uData = userData[user];
@@ -202,14 +203,17 @@ abstract contract VotingControllerStorageUpg {
         if (weight != 0) {
             require(_isPoolActive(pool), "pool not active");
 
-            newVote = _getVotingPowerByWeight(user, weight);
+            newVote = userPosition.convertToVeBalance(weight);
 
             pData.totalVote = pData.totalVote.add(newVote);
             pData.slopeChanges[newVote.getExpiry()] += newVote.slope;
 
             uData.voteForPools[pool] = UserPoolData(weight, newVote);
             uData.totalVotedWeight += weight;
-            require(uData.totalVotedWeight <= USER_VOTE_MAX_WEIGHT, "exceeded max weight");
+            require(
+                uData.totalVotedWeight <= VeBalanceLib.USER_VOTE_MAX_WEIGHT,
+                "exceeded max weight"
+            );
         }
 
         userPoolHistory[user][pool].push(newVote);
@@ -217,7 +221,7 @@ abstract contract VotingControllerStorageUpg {
 
     function _setAllPastEpochsAsFinalized() internal {
         uint128 wTime = WeekMath.getCurrentWeekStart();
-        while (wTime >= deployedWTime && weekData[wTime].isEpochFinalized == false) {
+        while (wTime > deployedWTime && weekData[wTime].isEpochFinalized == false) {
             weekData[wTime].isEpochFinalized = true;
             wTime -= WEEK;
         }
@@ -232,10 +236,4 @@ abstract contract VotingControllerStorageUpg {
     function _isVoteActive(VeBalance memory vote) internal view returns (bool) {
         return vote.slope != 0 && !MiniHelpers.isCurrentlyExpired(vote.getExpiry());
     }
-
-    function _getVotingPowerByWeight(address user, uint64 weight)
-        internal
-        view
-        virtual
-        returns (VeBalance memory res);
 }