@pendle/core-v2 0.9.3-beta → 0.10.1-beta

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

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/492a77e993ce31b17542cf37561d3792.json"
+}

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

@@ -0,0 +1,86 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "BoringOwnableUpgradeable",
+  "sourceName": "contracts/periphery/BoringOwnableUpgradeable.sol",
+  "abi": [
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferred",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "claimOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "pendingOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "direct",
+          "type": "bool"
+        },
+        {
+          "internalType": "bool",
+          "name": "renounce",
+          "type": "bool"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b50610349806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063078dfbe7146100515780634e71e0c8146100665780638da5cb5b1461006e578063e30c39781461009d575b600080fd5b61006461005f3660046102a2565b6100b0565b005b6100646101e2565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b600154610081906001600160a01b031681565b6000546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b81156101c0576001600160a01b0383161515806101295750805b61016d5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610106565b600080546040516001600160a01b03808716939216916000805160206102f483398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461023d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610106565b600080546040516001600160a01b03808516939216916000805160206102f483398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b8035801515811461029d57600080fd5b919050565b6000806000606084860312156102b757600080fd5b83356001600160a01b03811681146102ce57600080fd5b92506102dc6020850161028d565b91506102ea6040850161028d565b9050925092509256fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122037e9efeed25db56e2246dd9c1ed17d806cc69d8ee958a6529f57b44e748be7ce64736f6c634300080f0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c8063078dfbe7146100515780634e71e0c8146100665780638da5cb5b1461006e578063e30c39781461009d575b600080fd5b61006461005f3660046102a2565b6100b0565b005b6100646101e2565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b600154610081906001600160a01b031681565b6000546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b81156101c0576001600160a01b0383161515806101295750805b61016d5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610106565b600080546040516001600160a01b03808716939216916000805160206102f483398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461023d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610106565b600080546040516001600160a01b03808516939216916000805160206102f483398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b8035801515811461029d57600080fd5b919050565b6000806000606084860312156102b757600080fd5b83356001600160a01b03811681146102ce57600080fd5b92506102dc6020850161028d565b91506102ea6040850161028d565b9050925092509256fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122037e9efeed25db56e2246dd9c1ed17d806cc69d8ee958a6529f57b44e748be7ce64736f6c634300080f0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/artifacts/contracts/periphery/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeableData.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/492a77e993ce31b17542cf37561d3792.json"
+}

package/build/artifacts/contracts/periphery/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeableData.json

@@ -0,0 +1,37 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "BoringOwnableUpgradeableData",
+  "sourceName": "contracts/periphery/BoringOwnableUpgradeable.sol",
+  "abi": [
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "pendingOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x6080604052348015600f57600080fd5b5060ad8061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220803cd87cbcfbd2eb2588b597af5f32cd7788dfbf5e4a039fd21501fbef36d99c64736f6c634300080f0033",
+  "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220803cd87cbcfbd2eb2588b597af5f32cd7788dfbf5e4a039fd21501fbef36d99c64736f6c634300080f0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66b9e4a73d84ceb078aec43d05a41359.json"
+  "buildInfo": "../../../build-info/c415c6bd021d077cd9f9da24cb137654.json"
 }

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

@@ -139,6 +139,14 @@ contract PendleQiTokenSCY is SCYBaseWithRewards, PendleQiTokenHelper {
         IBenQiComptroller(comptroller).claimReward(0, holders, qiTokens, false, true);
         IBenQiComptroller(comptroller).claimReward(1, holders, qiTokens, false, true);
 
+        require(
+            Math.max(
+                IBenQiComptroller(comptroller).rewardAccrued(0, address(this)),
+                IBenQiComptroller(comptroller).rewardAccrued(1, address(this))
+            ) == 0,
+            "BENQI: redeem reward failed"
+        );
+
         if (address(this).balance != 0) IWETH(WAVAX).deposit{ value: address(this).balance }();
     }
 

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

@@ -35,7 +35,7 @@ contract PendleSAvaxSCY is SCYBase {
     /**
      * @dev See {SCYBase-_deposit}
      *
-     * The underlying yield token is sAvax. Tokens accepted for deposit are NATIVE, WVAX, and sAVAX.
+     * The underlying yield token is sAvax. Tokens accepted for deposit are NATIVE, WAVAX, and sAVAX.
      *
      *If the base token deposited is native AVAX, the function converts it into sAVAX first. Then the corresponding amount of shares is returned.
      *

package/contracts/SuperComposableYield/SCY-implementations/Euler/PendleEulerSCY.sol

@@ -18,7 +18,8 @@ contract PendleEulerSCY is SCYBase {
         string memory _name,
         string memory _symbol,
         address _eToken,
-        address _eulerMarkets // pass eulerMarkets to double check both eToken & underlying
+        address _eulerMarkets, // pass eulerMarkets to double check both eToken & underlying
+        address _euler // need to approve spending by euler
     ) SCYBase(_name, _symbol, _eToken) {
         require(_eToken != address(0), "zero address");
         require(_eulerMarkets != address(0), "zero address");
@@ -27,7 +28,7 @@ contract PendleEulerSCY is SCYBase {
 
         underlying = IEulerMarkets(_eulerMarkets).eTokenToUnderlying(eToken);
 
-        _safeApprove(underlying, eToken, type(uint256).max);
+        _safeApprove(underlying, _euler, type(uint256).max);
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -86,7 +87,10 @@ contract PendleEulerSCY is SCYBase {
             uint256 preBalanceUnderlying = _selfBalance(underlying);
 
             // Swap EToken for underlying base tokens
-            IEulerEToken(eToken).withdraw(0, amountSharesToRedeem);
+            IEulerEToken(eToken).withdraw(
+                0,
+                IEulerEToken(eToken).convertBalanceToUnderlying(amountSharesToRedeem)
+            );
 
             // Since 'withdraw' function doesn't return the amount of underlying tokens swapped from eTokens, calculate change in underlying balance to find the amount of shares out
             amountTokenOut = _selfBalance(underlying) - preBalanceUnderlying;
@@ -118,7 +122,9 @@ contract PendleEulerSCY is SCYBase {
         if (tokenIn == eToken) {
             amountSharesOut = amountTokenToDeposit;
         } else {
-            amountSharesOut = (amountTokenToDeposit * 1e18) / exchangeRate();
+            amountSharesOut = IEulerEToken(eToken).convertUnderlyingToBalance(
+                amountTokenToDeposit
+            );
         }
     }
 
@@ -131,7 +137,7 @@ contract PendleEulerSCY is SCYBase {
         if (tokenOut == eToken) {
             amountTokenOut = amountSharesToRedeem;
         } else {
-            amountTokenOut = (amountSharesToRedeem * exchangeRate()) / 1e18;
+            amountTokenOut = IEulerEToken(eToken).convertBalanceToUnderlying(amountSharesToRedeem);
         }
     }
 

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

@@ -26,7 +26,6 @@ contract PendleStargateSCY is SCYBaseWithRewards {
     ) 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;

package/contracts/SuperComposableYield/SCY-implementations/TraderJoe/PendleSJoeSCY.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 import "../../base-implementations/SCYBaseWithRewards.sol";
 import "../../../interfaces/ISJoe.sol";
+import "hardhat/console.sol";
 
 /*
 sJOE Staking

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

@@ -149,7 +149,7 @@ abstract contract SCYBase is ISuperComposableYield, PendleERC20, TokenHelper {
     }
 
     /**
-     * @dev See {ISuperComposableYield-accruredRewards}
+     * @dev See {ISuperComposableYield-accruedRewards}
      */
     function accruedRewards(
         address /*user*/

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

@@ -65,7 +65,7 @@ abstract contract SCYBaseWithRewards is SCYBase, RewardManager {
         address[] memory rewardTokens = _getRewardTokens();
         rewardAmounts = new uint256[](rewardTokens.length);
         for (uint256 i = 0; i < rewardTokens.length; ) {
-            rewardAmounts[i] = userReward[user][rewardTokens[i]].accrued;
+            rewardAmounts[i] = userReward[rewardTokens[i]][user].accrued;
             unchecked {
                 i++;
             }

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

@@ -2,36 +2,36 @@
 pragma solidity 0.8.15;
 
 import "../../../interfaces/ICelerMessageReceiverApp.sol";
-import "../../../periphery/PermissionsV2Upg.sol";
+import "../../../periphery/BoringOwnableUpgradeable.sol";
 
 // solhint-disable no-empty-blocks
 /// This contract is upgradable because
 /// - its constructor only sets immutable variables
 /// - it has storage gaps for safe addition of future variables
 /// - it inherits only upgradable contract
-abstract contract CelerReceiverUpg is ICelerMessageReceiverApp, PermissionsV2Upg {
+abstract contract CelerReceiverUpg is ICelerMessageReceiverApp, BoringOwnableUpgradeable {
     address public celerMessageBus;
     address public originAddress;
     uint256 public originChainId;
 
     uint256[100] private __gap;
 
-    constructor(address _governanceManager) PermissionsV2Upg(_governanceManager) {}
+    constructor() {}
 
     modifier onlyCelerOrGov() {
         require(
-            msg.sender == celerMessageBus || msg.sender == _governance(),
+            msg.sender == celerMessageBus || msg.sender == owner,
             "only celer message bus or gov"
         );
         _;
     }
 
-    function setOrigin(address _addr, uint256 _chainId) external onlyGovernance {
+    function setOrigin(address _addr, uint256 _chainId) external onlyOwner {
         originAddress = _addr;
         originChainId = _chainId;
     }
 
-    function setCelerMessageBus(address _celerMessageBus) external onlyGovernance {
+    function setCelerMessageBus(address _celerMessageBus) external onlyOwner {
         celerMessageBus = _celerMessageBus;
     }
 
@@ -41,7 +41,7 @@ abstract contract CelerReceiverUpg is ICelerMessageReceiverApp, PermissionsV2Upg
         bytes calldata _message,
         address /* executor */
     ) external payable onlyCelerOrGov returns (ExecutionStatus) {
-        // if the message sender is not celer bus, there is no harm to have the transcation failed
+        // if the message sender is not celer bus, there is no harm to have the transaction failed
         if (_sender != originAddress || _srcChainId != originChainId) {
             return ExecutionStatus.Fail;
         }

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

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import "../../../interfaces/ICelerMessageBus.sol";
-import "../../../periphery/PermissionsV2Upg.sol";
+import "../../../periphery/BoringOwnableUpgradeable.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 
@@ -11,7 +11,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 /// - its constructor only sets immutable variables
 /// - it has storage gaps for safe addition of future variables
 /// - it inherits only upgradable contract
-abstract contract CelerSenderUpg is PermissionsV2Upg {
+abstract contract CelerSenderUpg is BoringOwnableUpgradeable {
     using EnumerableMap for EnumerableMap.UintToAddressMap;
 
     ICelerMessageBus public celerMessageBus;
@@ -28,9 +28,9 @@ abstract contract CelerSenderUpg is PermissionsV2Upg {
         }
     }
 
-    constructor(address _governanceManager) PermissionsV2Upg(_governanceManager) {}
+    constructor() {}
 
-    function setCelerMessageBus(address _celerMessageBus) external onlyGovernance {
+    function setCelerMessageBus(address _celerMessageBus) external onlyOwner {
         celerMessageBus = ICelerMessageBus(_celerMessageBus);
     }
 
@@ -38,7 +38,8 @@ abstract contract CelerSenderUpg is PermissionsV2Upg {
         assert(destinationContracts.contains(chainId));
         address toAddr = destinationContracts.get(chainId);
         uint256 fee = celerMessageBus.calcFee(message);
-        require(msg.value >= fee, "Insufficient celer fee");
+        // LM contracts won't hold ETH on its own so this is fine
+        require(address(this).balance >= fee, "Insufficient celer fee");
         celerMessageBus.sendMessage{ value: fee }(toAddr, chainId, message);
     }
 
@@ -47,7 +48,7 @@ abstract contract CelerSenderUpg is PermissionsV2Upg {
     function addDestinationContract(address _address, uint256 _chainId)
         external
         payable
-        onlyGovernance
+        onlyOwner
     {
         destinationContracts.set(_chainId, _address);
         _afterAddDestinationContract(_address, _chainId);

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

@@ -8,7 +8,7 @@ import "../../../libraries/math/WeekMath.sol";
 import "../../../interfaces/IPGaugeController.sol";
 import "../../../interfaces/IPMarketFactory.sol";
 import "../../../interfaces/IPMarket.sol";
-import "../../../periphery/PermissionsV2Upg.sol";
+import "../../../periphery/BoringOwnableUpgradeable.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 /**
@@ -17,17 +17,16 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
  * set it directly to contract state
  *
  * @dev All of the core data in this function will be set to private to prevent unintended assignments
- * on inheritting contracts
+ * on inheriting contracts
  */
 
 /// This contract is upgradable because
 /// - its constructor only sets immutable variables
 /// - it has storage gaps for safe addition of future variables
 /// - it inherits only upgradable contract
-abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, PermissionsV2Upg {
+abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnableUpgradeable {
     using SafeERC20 for IERC20;
     using Math for uint256;
-    using EnumerableSet for EnumerableSet.AddressSet;
 
     struct MarketRewardData {
         uint128 pendlePerSec;
@@ -80,7 +79,7 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, Permissions
         IERC20(pendle).safeTransferFrom(msg.sender, address(this), amount);
     }
 
-    function withdrawPendle(uint256 amount) external onlyGovernance {
+    function withdrawPendle(uint256 amount) external onlyOwner {
         IERC20(pendle).safeTransfer(msg.sender, amount);
     }
 

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

@@ -17,12 +17,15 @@ contract PendleGaugeControllerMainchainUpg is PendleGaugeControllerBaseUpg {
     constructor(
         address _votingController,
         address _pendle,
-        address _marketFactory,
-        address _governanceManager
-    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory) PermissionsV2Upg(_governanceManager) {
+        address _marketFactory
+    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory) initializer {
         votingController = _votingController;
     }
 
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
     function updateVotingResults(
         uint128 wTime,
         address[] memory markets,

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

@@ -12,9 +12,12 @@ import "../CelerAbstracts/CelerReceiverUpg.sol";
 contract PendleGaugeControllerSidechainUpg is PendleGaugeControllerBaseUpg, CelerReceiverUpg {
     constructor(
         address _pendle,
-        address _marketFactory,
-        address _governanceManager
-    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory) CelerReceiverUpg(_governanceManager) {}
+        address _marketFactory
+    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory) initializer {}
+
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
 
     function _executeMessage(bytes memory message) internal virtual override {
         (uint128 wTime, address[] memory markets, uint256[] memory pendleAmounts) = abi.decode(

package/contracts/core/LiquidityMining/PendleGauge.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.15;
 
+import "../../interfaces/IPGauge.sol";
 import "../../interfaces/IPGaugeController.sol";
 import "../../interfaces/IPVeToken.sol";
 import "../../interfaces/ISuperComposableYield.sol";
@@ -13,7 +14,7 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 Invariants to maintain:
 - before any changes to active balance, updateAndDistributeRewards() must be called
  */
-abstract contract PendleGauge is RewardManager {
+abstract contract PendleGauge is RewardManager, IPGauge {
     using Math for uint256;
     using SafeERC20 for IERC20;
     using ArrayLib for address[];
@@ -80,7 +81,7 @@ abstract contract PendleGauge is RewardManager {
         virtual
         returns (uint256)
     {
-        (uint256 vePendleBalance, uint256 vePendleSupply) = vePENDLE.totalSupplyAndBlanaceCurrent(
+        (uint256 vePendleSupply, uint256 vePendleBalance) = vePENDLE.totalSupplyAndBalanceCurrent(
             user
         );
         // Inspired by Curve's Gauge

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

@@ -49,11 +49,15 @@ contract PendleVotingControllerUpg is
     using EnumerableMap for EnumerableMap.UintToAddressMap;
     using EnumerableSet for EnumerableSet.AddressSet;
 
-    constructor(address _vePendle, address _governanceManager)
+    constructor(address _vePendle)
         VotingControllerStorageUpg(_vePendle) // constructor only set immutable variables
-        CelerSenderUpg(_governanceManager) // constructor only set immutable variables
+        initializer
     {}
 
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
     /*///////////////////////////////////////////////////////////////
                 FUNCTIONS CAN BE CALLED BY ANYONE
     //////////////////////////////////////////////////////////////*/
@@ -69,26 +73,16 @@ contract PendleVotingControllerUpg is
     function vote(address[] calldata pools, uint64[] calldata weights) external {
         address user = msg.sender;
 
-        require(weights.length == pools.length, "invaid array length");
-        require(vePendle.balanceOf(user) > 0, "zero vependle balance");
+        require(weights.length == pools.length, "invalid array length");
+        require(vePendle.balanceOf(user) > 0 || user == owner, "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]);
-        }
-
-        // Process weight-decrease pools first
-        for (uint256 i = 0; i < pools.length; ++i) {
-            if (uData.voteForPools[pools[i]].weight > weights[i])
-                _modifyVoteWeight(user, pools[i], userPosition, weights[i]);
-        }
-
-        // Process weight-increase pools
-        for (uint256 i = 0; i < pools.length; ++i) {
-            if (uData.voteForPools[pools[i]].weight <= weights[i])
-                _modifyVoteWeight(user, pools[i], userPosition, weights[i]);
+            VeBalance memory newVote = _modifyVoteWeight(user, pools[i], userPosition, weights[i]);
+            emit Vote(user, pools[i], weights[i], newVote);
         }
 
         require(
@@ -163,12 +157,12 @@ contract PendleVotingControllerUpg is
      * @dev pre-condition: pool must not have been added before
      * @dev assumption: chainId is valid, pool does exist on the chain (guaranteed by gov)
      * @dev state changes expected:
-        - add to allActivePools & chainPools
+        - add to allActivePools & activeChainPools
         - 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 {
+    function addPool(uint64 chainId, address pool) external onlyOwner {
         require(!_isPoolActive(pool), "pool already added");
         require(!allRemovedPools.contains(pool), "not allowed to add a removed pool");
 
@@ -181,12 +175,12 @@ contract PendleVotingControllerUpg is
      * @dev pre-condition: pool must have been added before
      * @dev state changes expected:
         - update weekData (if any)
-        - remove from allActivePools & chainPools
+        - remove from allActivePools & activeChainPools
         - 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 {
+    function removePool(address pool) external onlyOwner {
         require(_isPoolActive(pool), "invalid pool");
 
         uint64 chainId = poolData[pool].chainId;
@@ -200,7 +194,7 @@ contract PendleVotingControllerUpg is
     /**
      * @notice use the gov-privilege to force broadcast a message in case there are issues with Celer
      * @dev it's intentional for this function to have minimal checks since we assume gov has done the
-        due dilligence
+        due diligence
      * @dev gov should always call finalizeEpoch beforehand
      * @dev state changes expected:
         - the gaugeController receives the new pendle allocation
@@ -209,7 +203,7 @@ contract PendleVotingControllerUpg is
         uint64 chainId,
         uint128 wTime,
         uint128 forcedPendlePerSec
-    ) external payable onlyGovernance refundUnusedEth {
+    ) external payable onlyOwner refundUnusedEth {
         _broadcastResults(chainId, wTime, forcedPendlePerSec);
     }
 
@@ -220,7 +214,7 @@ contract PendleVotingControllerUpg is
      * @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 {
+    function setPendlePerSec(uint128 newPendlePerSec) external onlyOwner {
         pendlePerSec = newPendlePerSec;
         emit SetPendlePerSec(newPendlePerSec);
     }
@@ -228,7 +222,7 @@ contract PendleVotingControllerUpg is
     function getBroadcastResultFee(uint64 chainId) external view returns (uint256) {
         if (chainId == block.chainid) return 0; // Mainchain broadcast
 
-        uint256 length = chainPools[chainId].length();
+        uint256 length = activeChainPools[chainId].length();
         if (length == 0) return 0;
 
         address[] memory pools = new address[](length);
@@ -255,10 +249,10 @@ contract PendleVotingControllerUpg is
         uint256 totalVotes = weekData[wTime].totalVotes;
         if (totalVotes == 0) return;
 
-        uint256 length = chainPools[chainId].length();
+        uint256 length = activeChainPools[chainId].length();
         if (length == 0) return;
 
-        address[] memory pools = chainPools[chainId].values();
+        address[] memory pools = activeChainPools[chainId].values();
         uint256[] memory totalPendleAmounts = new uint256[](length);
 
         for (uint256 i = 0; i < length; ++i) {
@@ -285,7 +279,7 @@ contract PendleVotingControllerUpg is
         view
         returns (LockedPosition memory userPosition)
     {
-        if (user == _governance()) {
+        if (user == owner) {
             (userPosition.amount, userPosition.expiry) = (
                 GOVERNANCE_PENDLE_VOTE,
                 WeekMath.getWeekStartTimestamp(uint128(block.timestamp) + MAX_LOCK_TIME)
@@ -295,5 +289,5 @@ contract PendleVotingControllerUpg is
         }
     }
 
-    function _authorizeUpgrade(address newImplementation) internal override onlyGovernance {}
+    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 }