@pendle/core-v2 0.11.0-testnet → 0.11.1-testnet

package/build/artifacts/contracts/interfaces/IPVotingEscrow.sol/IPVotingEscrow.json

@@ -97,6 +97,73 @@
       "name": "Withdraw",
       "type": "event"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "user",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "index",
+          "type": "uint256"
+        }
+      ],
+      "name": "getUserHistoryAt",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "uint128",
+              "name": "timestamp",
+              "type": "uint128"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "uint128",
+                  "name": "bias",
+                  "type": "uint128"
+                },
+                {
+                  "internalType": "uint128",
+                  "name": "slope",
+                  "type": "uint128"
+                }
+              ],
+              "internalType": "struct VeBalance",
+              "name": "value",
+              "type": "tuple"
+            }
+          ],
+          "internalType": "struct Checkpoint",
+          "name": "",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "user",
+          "type": "address"
+        }
+      ],
+      "name": "getUserHistoryLength",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -121,6 +188,25 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint128",
+          "name": "timestamp",
+          "type": "uint128"
+        }
+      ],
+      "name": "totalSupplyAt",
+      "outputs": [
+        {
+          "internalType": "uint128",
+          "name": "",
+          "type": "uint128"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "withdraw",

package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IQiAvax.sol/IQiAvax.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IQiErc20.sol/IQiErc20.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IQiToken.sol/IQiToken.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IRewardManager.sol/IRewardManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/ISAvax.sol/ISAvax.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/ISJoe.sol/ISJoe.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IStETH.sol/IStETH.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IStargateLPStaking.sol/IStargateLPStaking.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IStargatePool.sol/IStargatePool.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IStargateRouter.sol/IStargateRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/ISuperComposableYield.sol/ISuperComposableYield.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IWAvax.sol/IWAvax.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IWETH.sol/IWETH.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IWstETH.sol/IWstETH.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/interfaces/IYearnVault.sol/IYearnVault.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/OracleLib.sol/OracleLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/RewardManager.sol/RewardManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/RewardManagerAbstract.sol/RewardManagerAbstract.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/SCY/SCYUtils.sol/SCYUtils.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/VeBalanceLib.sol/VeBalanceLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/VeHistoryLib.sol/Checkpoints.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/VeHistoryLib.sol/Checkpoints.json

@@ -3,8 +3,8 @@
   "contractName": "Checkpoints",
   "sourceName": "contracts/libraries/VeHistoryLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220954ba157665eb6da065a8b029e557191a74018b9b1dcc35a4f36f8d652c7c5ba64736f6c634300080f0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220954ba157665eb6da065a8b029e557191a74018b9b1dcc35a4f36f8d652c7c5ba64736f6c634300080f0033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122059abf4679dbabe2731e7c535e441fae48a4f62bcb49d4c84711ed960194566e164736f6c634300080f0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122059abf4679dbabe2731e7c535e441fae48a4f62bcb49d4c84711ed960194566e164736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/libraries/helpers/ArrayLib.sol/ArrayLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/helpers/ExpiryUtilsLib.sol/ExpiryUtils.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/helpers/MiniHelpers.sol/MiniHelpers.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/helpers/PYIndex.sol/PYIndexLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/helpers/SSTORE2Deployer.sol/SSTORE2Deployer.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/helpers/TokenHelper.sol/TokenHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/kyberswap/KyberSwapHelper.sol/KyberSwapHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/LogExpMath.sol/LogExpMath.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/MarketApproxLib.sol/MarketApproxPtInLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/MarketApproxLib.sol/MarketApproxPtOutLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/MarketMathCore.sol/MarketMathCore.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/Math.sol/Math.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/WeekMath.sol/WeekMath.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/libraries/math/WeekMath.sol/WeekMath.json

@@ -3,8 +3,8 @@
   "contractName": "WeekMath",
   "sourceName": "contracts/libraries/math/WeekMath.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220feca72209eabdab60f47bf50f564a07b586488d6335fdb8a157af50a67f20f1f64736f6c634300080f0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220feca72209eabdab60f47bf50f564a07b586488d6335fdb8a157af50a67f20f1f64736f6c634300080f0033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220548e053af2291f293c6be42b33522def7ba9f2cc91d81bfd7aa06dd63e5d2e0f64736f6c634300080f0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220548e053af2291f293c6be42b33522def7ba9f2cc91d81bfd7aa06dd63e5d2e0f64736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/libraries/solmate/SSTORE2.sol/SSTORE2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/offchain-helpers/MarketMathStatic.sol/MarketMathStatic.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2702b906f892994ea36461e9f3e86f89.json"
+  "buildInfo": "../../../build-info/680fcfa2ffdc1307cb9af365e9ab480a.json"
 }

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

@@ -62,7 +62,7 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnab
         - rewardData[market] is updated with the data up to now
         - all accumulatedPendle is transferred out & the accumulatedPendle is set to 0
      */
-    function claimMarketReward() external onlyPendleMarket {
+    function redeemMarketReward() external onlyPendleMarket {
         address market = msg.sender;
         rewardData[market] = _getUpdatedMarketReward(market);
 

package/contracts/core/LiquidityMining/PendleGauge.sol

@@ -97,7 +97,7 @@ abstract contract PendleGauge is RewardManager, IPGauge {
 
     function _redeemExternalReward() internal virtual override {
         ISuperComposableYield(SCY).claimRewards(address(this));
-        IPGaugeController(gaugeController).claimMarketReward();
+        IPGaugeController(gaugeController).redeemMarketReward();
     }
 
     function _stakedBalance(address user) internal view virtual returns (uint256);

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

@@ -7,8 +7,7 @@ import "../../../libraries/VeBalanceLib.sol";
 import "../../../libraries/math/Math.sol";
 import "../../../interfaces/IPGaugeControllerMainchain.sol";
 import "../../../interfaces/IPVotingController.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 
 /*
 Voting accounting:

package/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol

@@ -23,9 +23,9 @@ abstract contract VotingEscrowTokenBase is IPVeToken {
     using VeBalanceLib for VeBalance;
     using VeBalanceLib for LockedPosition;
 
-    uint128 public constant WEEK = 1 weeks;
+    uint128 public constant WEEK = 2 hours;
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint128 public constant MIN_LOCK_TIME = 1 weeks;
+    uint128 public constant MIN_LOCK_TIME = 1 hours;
 
     VeBalance internal _totalSupply;
     uint128 public lastSlopeChangeAppliedAt;

package/contracts/core/Market/PendleMarketFactory.sol

@@ -17,52 +17,47 @@ contract PendleMarketFactory is BoringOwnableUpgradeable, IPMarketFactory {
 
     struct MarketConfig {
         address treasury;
-        uint96 lnFeeRateRoot;
-        // 1 SLOT = 256 bits
+        uint88 lnFeeRateRoot;
         uint8 reserveFeePercent;
-        // 1 SLOT = 8 bits
+        // 1 SLOT = 256 bits
     }
 
-    uint256 private constant MIN_RATE_ORACLE_TIME_WINDOW = 300 seconds;
-
     address public immutable yieldContractFactory;
-    address public marketCreationCodePointer;
+    address public immutable marketCreationCodePointer;
     uint256 public immutable maxLnFeeRateRoot;
 
     // PT -> scalarRoot -> initialAnchor
     mapping(address => mapping(int256 => mapping(int256 => address))) internal markets;
     EnumerableSet.AddressSet internal allMarkets;
-
     address public vePendle;
     address public gaugeController;
 
     MarketConfig public marketConfig;
 
-    constructor(
-        address _yieldContractFactory
-    ) {
+    constructor(address _yieldContractFactory, address _marketCreationCodePointer) {
         require(_yieldContractFactory != address(0), "zero address");
         yieldContractFactory = _yieldContractFactory;
         maxLnFeeRateRoot = uint256(LogExpMath.ln(int256((105 * Math.IONE) / 100))); // ln(1.05)
+
+        marketCreationCodePointer = _marketCreationCodePointer;
     }
 
     function initialize(
         address _treasury,
-        uint96 _lnFeeRateRoot,
+        uint88 _lnFeeRateRoot,
         uint8 _reserveFeePercent,
         address newVePendle,
-        address newGaugeController,
-        bytes memory _marketCreationCode
+        address newGaugeController
     ) external initializer {
+        require(newVePendle != address(0) && newGaugeController != address(0), "zero address");
+
         __BoringOwnable_init();
         setTreasury(_treasury);
         setlnFeeRateRoot(_lnFeeRateRoot);
         setReserveFeePercent(_reserveFeePercent);
 
-        require(newVePendle != address(0) && newGaugeController != address(0), "zero address");
         vePendle = newVePendle;
         gaugeController = newGaugeController;
-        marketCreationCodePointer = SSTORE2Deployer.setCreationCode(_marketCreationCode);
     }
 
     /**
@@ -106,7 +101,7 @@ contract PendleMarketFactory is BoringOwnableUpgradeable, IPMarketFactory {
         _emitNewMarketConfigEvent();
     }
 
-    function setlnFeeRateRoot(uint96 newlnFeeRateRoot) public onlyOwner {
+    function setlnFeeRateRoot(uint88 newlnFeeRateRoot) public onlyOwner {
         require(newlnFeeRateRoot <= maxLnFeeRateRoot, "invalid fee rate root");
         marketConfig.lnFeeRateRoot = newlnFeeRateRoot;
         _emitNewMarketConfigEvent();

package/contracts/core/PendleRouter.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.15;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/proxy/Proxy.sol";
 import "../interfaces/IPAllAction.sol";
 import "../interfaces/IPMarketSwapCallback.sol";
@@ -38,7 +37,6 @@ contract PendleRouter is Proxy, Initializable, UUPSUpgradeable, BoringOwnableUpg
     }
 
     function initialize() external initializer {
-        __UUPSUpgradeable_init();
         __BoringOwnable_init();
     }
 

package/contracts/core/YieldContracts/PendlePrincipalToken.sol

@@ -6,7 +6,7 @@ import "../../interfaces/IPYieldToken.sol";
 
 import "../PendleERC20.sol";
 import "../../libraries/helpers/MiniHelpers.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 contract PendlePrincipalToken is PendleERC20, Initializable, IPPrincipalToken {
     address public immutable SCY;

package/contracts/core/YieldContracts/PendleYieldContractFactory.sol

@@ -44,7 +44,7 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
     string private constant PT_PREFIX = "PT";
     string private constant YT_PREFIX = "YT";
 
-    address public pendleYtCreationCodePointer;
+    address public immutable pendleYtCreationCodePointer;
 
     // 1 SLOT
     uint128 public interestFeeRate; // a fixed point number
@@ -60,21 +60,21 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeable, IPYieldContract
     mapping(address => bool) public isPT;
     mapping(address => bool) public isYT;
 
-    constructor() {}
+    constructor(address _pendleYtCreationCodePointer) {
+        pendleYtCreationCodePointer = _pendleYtCreationCodePointer;
+    }
 
     function initialize(
         uint96 _expiryDivisor,
         uint128 _interestFeeRate,
         uint128 _rewardFeeRate,
-        address _treasury,
-        bytes memory _pendleYtCreationCode
+        address _treasury
     ) external initializer {
         __BoringOwnable_init();
         setExpiryDivisor(_expiryDivisor);
         setInterestFeeRate(_interestFeeRate);
         setRewardFeeRate(_rewardFeeRate);
         setTreasury(_treasury);
-        pendleYtCreationCodePointer = SSTORE2Deployer.setCreationCode(_pendleYtCreationCode);
     }
 
     /**

package/contracts/interfaces/IPGauge.sol

@@ -3,4 +3,6 @@ pragma solidity 0.8.15;
 
 interface IPGauge {
     function totalActiveSupply() external view returns (uint256);
+
+    function activeBalance(address user) external view returns (uint256);
 }

package/contracts/interfaces/IPGaugeController.sol

@@ -12,7 +12,7 @@ interface IPGaugeController {
 
     function pendle() external returns (address);
 
-    function claimMarketReward() external;
+    function redeemMarketReward() external;
 
     function rewardData(address pool)
         external