@pendle/core-v2 0.11.2-testnet → 0.11.4-testnet

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

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

package/build/artifacts/contracts/offchain-helpers/SSTORE2DeployerContract.sol/SSTORE2DeployerContract.json

@@ -0,0 +1,134 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "SSTORE2DeployerContract",
+  "sourceName": "contracts/offchain-helpers/SSTORE2DeployerContract.sol",
+  "abi": [
+    {
+      "inputs": [],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "Deployed",
+      "type": "event"
+    },
+    {
+      "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": [
+        {
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
+        },
+        {
+          "internalType": "bytes",
+          "name": "creationCode",
+          "type": "bytes"
+        }
+      ],
+      "name": "deploy",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "res",
+          "type": "address"
+        }
+      ],
+      "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": "0x608060405234801561001057600080fd5b50600154600160a81b900460ff1661003557600154600160a01b900460ff161561003d565b61003d6100f1565b6100a55760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600154600160a81b900460ff161580156100cf576001805461ffff60a01b191661010160a01b1790555b6100d761010c565b80156100eb576001805460ff60a81b191690555b5061019c565b60006101063061018d60201b61032b1760201c565b15905090565b600154600160a81b900460ff166101795760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b606482015260840161009c565b600080546001600160a01b03191633179055565b6001600160a01b03163b151590565b610725806101ab6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c8063078dfbe71461005c5780634e71e0c8146100715780638da5cb5b14610079578063be3397e9146100a8578063e30c3978146100bb575b600080fd5b61006f61006a366004610443565b6100ce565b005b61006f6101d4565b60005461008c906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61008c6100b63660046104f2565b61027f565b60015461008c906001600160a01b031681565b6000546001600160a01b031633146101015760405162461bcd60e51b81526004016100f8906105cc565b60405180910390fd5b81156101b2576001600160a01b03831615158061011b5750805b61015f5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016100f8565b600080546040516001600160a01b03808716939216916000805160206106d083398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461022f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016100f8565b600080546040516001600160a01b03808516939216916000805160206106d083398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b600080546001600160a01b031633146102aa5760405162461bcd60e51b81526004016100f8906105cc565b6102e983838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061033a92505050565b90507f2009540abb31a9afba343443e75c244a4fc7cf4348628c3dcfce844220e5eaf3848260405161031c929190610631565b60405180910390a19392505050565b6001600160a01b03163b151590565b60008082511161037a5760405162461bcd60e51b815260206004820152600b60248201526a0f4cae4de40d8cadccee8d60ab1b60448201526064016100f8565b61038382610389565b92915050565b6000808260405160200161039d9190610675565b60405160208183030381529060405290506000816040516020016103c1919061069b565b60405160208183030381529060405290508051602082016000f092506001600160a01b0383166104275760405162461bcd60e51b81526020600482015260116024820152701111541313d65351539517d19052531151607a1b60448201526064016100f8565b5050919050565b8035801515811461043e57600080fd5b919050565b60008060006060848603121561045857600080fd5b83356001600160a01b038116811461046f57600080fd5b925061047d6020850161042e565b915061048b6040850161042e565b90509250925092565b634e487b7160e01b600052604160045260246000fd5b60008083601f8401126104bc57600080fd5b5081356001600160401b038111156104d357600080fd5b6020830191508360208285010111156104eb57600080fd5b9250929050565b60008060006040848603121561050757600080fd5b83356001600160401b038082111561051e57600080fd5b818601915086601f83011261053257600080fd5b81358181111561054457610544610494565b604051601f8201601f19908116603f0116810190838211818310171561056c5761056c610494565b8160405282815289602084870101111561058557600080fd5b8260208601602083013760006020848301015280975050505060208601359150808211156105b257600080fd5b506105bf868287016104aa565b9497909650939450505050565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b60005b8381101561061c578181015183820152602001610604565b8381111561062b576000848401525b50505050565b6040815260008351806040840152610650816060850160208801610601565b6001600160a01b0393909316602083015250601f91909101601f191601606001919050565b600081526000825161068e816001850160208701610601565b9190910160010192915050565b6a600b5981380380925939f360a81b815281516000906106c281600b850160208701610601565b91909101600b019291505056fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122018e961e6ffea6e4766cfb887a7790ff3956958a9c83d8f871ed4562dc9f4325864736f6c634300080f0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c8063078dfbe71461005c5780634e71e0c8146100715780638da5cb5b14610079578063be3397e9146100a8578063e30c3978146100bb575b600080fd5b61006f61006a366004610443565b6100ce565b005b61006f6101d4565b60005461008c906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61008c6100b63660046104f2565b61027f565b60015461008c906001600160a01b031681565b6000546001600160a01b031633146101015760405162461bcd60e51b81526004016100f8906105cc565b60405180910390fd5b81156101b2576001600160a01b03831615158061011b5750805b61015f5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016100f8565b600080546040516001600160a01b03808716939216916000805160206106d083398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461022f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016100f8565b600080546040516001600160a01b03808516939216916000805160206106d083398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b600080546001600160a01b031633146102aa5760405162461bcd60e51b81526004016100f8906105cc565b6102e983838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061033a92505050565b90507f2009540abb31a9afba343443e75c244a4fc7cf4348628c3dcfce844220e5eaf3848260405161031c929190610631565b60405180910390a19392505050565b6001600160a01b03163b151590565b60008082511161037a5760405162461bcd60e51b815260206004820152600b60248201526a0f4cae4de40d8cadccee8d60ab1b60448201526064016100f8565b61038382610389565b92915050565b6000808260405160200161039d9190610675565b60405160208183030381529060405290506000816040516020016103c1919061069b565b60405160208183030381529060405290508051602082016000f092506001600160a01b0383166104275760405162461bcd60e51b81526020600482015260116024820152701111541313d65351539517d19052531151607a1b60448201526064016100f8565b5050919050565b8035801515811461043e57600080fd5b919050565b60008060006060848603121561045857600080fd5b83356001600160a01b038116811461046f57600080fd5b925061047d6020850161042e565b915061048b6040850161042e565b90509250925092565b634e487b7160e01b600052604160045260246000fd5b60008083601f8401126104bc57600080fd5b5081356001600160401b038111156104d357600080fd5b6020830191508360208285010111156104eb57600080fd5b9250929050565b60008060006040848603121561050757600080fd5b83356001600160401b038082111561051e57600080fd5b818601915086601f83011261053257600080fd5b81358181111561054457610544610494565b604051601f8201601f19908116603f0116810190838211818310171561056c5761056c610494565b8160405282815289602084870101111561058557600080fd5b8260208601602083013760006020848301015280975050505060208601359150808211156105b257600080fd5b506105bf868287016104aa565b9497909650939450505050565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b60005b8381101561061c578181015183820152602001610604565b8381111561062b576000848401525b50505050565b6040815260008351806040840152610650816060850160208801610601565b6001600160a01b0393909316602083015250601f91909101601f191601606001919050565b600081526000825161068e816001850160208701610601565b9190910160010192915050565b6a600b5981380380925939f360a81b815281516000906106c281600b850160208701610601565b91909101600b019291505056fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122018e961e6ffea6e4766cfb887a7790ff3956958a9c83d8f871ed4562dc9f4325864736f6c634300080f0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

@@ -79,8 +79,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610349806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063078dfbe7146100515780634e71e0c8146100665780638da5cb5b1461006e578063e30c39781461009d575b600080fd5b61006461005f3660046102a2565b6100b0565b005b6100646101e2565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b600154610081906001600160a01b031681565b6000546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b81156101c0576001600160a01b0383161515806101295750805b61016d5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610106565b600080546040516001600160a01b03808716939216916000805160206102f483398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461023d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610106565b600080546040516001600160a01b03808516939216916000805160206102f483398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b8035801515811461029d57600080fd5b919050565b6000806000606084860312156102b757600080fd5b83356001600160a01b03811681146102ce57600080fd5b92506102dc6020850161028d565b91506102ea6040850161028d565b9050925092509256fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122037e9efeed25db56e2246dd9c1ed17d806cc69d8ee958a6529f57b44e748be7ce64736f6c634300080f0033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c8063078dfbe7146100515780634e71e0c8146100665780638da5cb5b1461006e578063e30c39781461009d575b600080fd5b61006461005f3660046102a2565b6100b0565b005b6100646101e2565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b600154610081906001600160a01b031681565b6000546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b81156101c0576001600160a01b0383161515806101295750805b61016d5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610106565b600080546040516001600160a01b03808716939216916000805160206102f483398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0385166001600160a01b0319909116179055505050565b6001546001600160a01b031633811461023d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610106565b600080546040516001600160a01b03808516939216916000805160206102f483398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b8035801515811461029d57600080fd5b919050565b6000806000606084860312156102b757600080fd5b83356001600160a01b03811681146102ce57600080fd5b92506102dc6020850161028d565b91506102ea6040850161028d565b9050925092509256fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122037e9efeed25db56e2246dd9c1ed17d806cc69d8ee958a6529f57b44e748be7ce64736f6c634300080f0033",
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -30,8 +30,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6080604052348015600f57600080fd5b5060ad8061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220803cd87cbcfbd2eb2588b597af5f32cd7788dfbf5e4a039fd21501fbef36d99c64736f6c634300080f0033",
-  "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220803cd87cbcfbd2eb2588b597af5f32cd7788dfbf5e4a039fd21501fbef36d99c64736f6c634300080f0033",
+  "bytecode": "0x6080604052348015600f57600080fd5b5060ad8061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220849c3281d75d7ca017c0090d78db468137746b020f50b2b935e8d509719c9d0064736f6c634300080f0033",
+  "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c80638da5cb5b146037578063e30c3978146065575b600080fd5b6000546049906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6001546049906001600160a01b03168156fea2646970667358221220849c3281d75d7ca017c0090d78db468137746b020f50b2b935e8d509719c9d0064736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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/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/core/actions/ActionMintRedeem.sol

@@ -120,5 +120,146 @@ contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
         for (uint256 i = 0; i < markets.length; ++i) {
             marketRewards[i] = IPMarket(markets[i]).redeemRewards(user);
         }
+        emit RedeemDueInterestAndRewards(
+            user,
+            scys,
+            yts,
+            markets,
+            scyRewards,
+            ytInterests,
+            ytRewards,
+            marketRewards
+        );
+    }
+
+    struct RouterTokenAmounts {
+        address[] tokens;
+        uint256[] amounts;
+    }
+
+    function redeemDueInterestAndRewardsThenSwapAll(
+        address[] calldata scys,
+        RouterYtRedeemStruct calldata dataYT,
+        address[] calldata markets,
+        RouterSwapAllStruct calldata dataSwap
+    ) external returns (uint256 netTokenOut, uint256[] memory amountsSwapped) {
+        require(dataSwap.tokens.length == dataSwap.kybercalls.length, "invalid dataSwap");
+        require(dataYT.tokenRedeemScys.length == dataYT.scyAddrs.length, "invalid dataYT");
+
+        RouterTokenAmounts memory tokensOut = _newRouterTokenAmounts(dataSwap.tokens);
+        RouterTokenAmounts memory scysOut = _newRouterTokenAmounts(dataYT.scyAddrs);
+
+        // redeem SCY
+        for (uint256 i = 0; i < scys.length; ++i) {
+            ISuperComposableYield SCY = ISuperComposableYield(scys[i]);
+
+            address[] memory rewardTokens = SCY.getRewardTokens();
+            uint256[] memory rewardAmounts = SCY.claimRewards(msg.sender);
+            _addTokenAmounts(tokensOut, rewardTokens, rewardAmounts);
+        }
+
+        // redeem YT
+        for (uint256 i = 0; i < dataYT.yts.length; ++i) {
+            IPYieldToken YT = IPYieldToken(dataYT.yts[i]);
+
+            (uint256 interestAmount, uint256[] memory rewardAmounts) = YT
+                .redeemDueInterestAndRewards(msg.sender, true, true);
+
+            address scyAddr = YT.SCY();
+            address[] memory rewardTokens = YT.getRewardTokens();
+
+            _addTokenAmount(scysOut, scyAddr, interestAmount);
+            _addTokenAmounts(tokensOut, rewardTokens, rewardAmounts);
+        }
+
+        // redeem market
+        for (uint256 i = 0; i < markets.length; ++i) {
+            IPMarket market = IPMarket(markets[i]);
+
+            address[] memory rewardTokens = market.getRewardTokens();
+            uint256[] memory rewardAmounts = market.redeemRewards(msg.sender);
+            _addTokenAmounts(tokensOut, rewardTokens, rewardAmounts);
+        }
+
+        // guaranteed no ETH, all rewards are ERC20
+        _transferFrom(tokensOut.tokens, msg.sender, address(this), tokensOut.amounts);
+        _redeemAllScys(scysOut, dataYT.tokenRedeemScys, tokensOut);
+
+        // now swap all to outputToken
+        netTokenOut = _swapAllToOutputToken(tokensOut, dataSwap);
+        amountsSwapped = tokensOut.amounts;
+
+        emit RedeemDueInterestAndRewardsThenSwapAll(
+            msg.sender,
+            scys,
+            dataYT.yts,
+            markets,
+            dataSwap.outputToken,
+            netTokenOut
+        );
+    }
+
+    function _newRouterTokenAmounts(address[] memory tokens)
+        internal
+        pure
+        returns (RouterTokenAmounts memory)
+    {
+        return RouterTokenAmounts(tokens, new uint256[](tokens.length));
+    }
+
+    /// @dev pull SCYs from users & redeem them, then add to tokensOut
+    function _redeemAllScys(
+        RouterTokenAmounts memory scys,
+        address[] calldata tokenRedeemScys,
+        RouterTokenAmounts memory tokensOut
+    ) internal {
+        for (uint256 i = 0; i < scys.tokens.length; ++i) {
+            if (scys.amounts[i] == 0) continue;
+
+            _transferFrom(scys.tokens[i], msg.sender, scys.tokens[i], scys.amounts[i]);
+            uint256 amountOut = ISuperComposableYield(scys.tokens[i]).redeemAfterTransfer(
+                address(this),
+                tokenRedeemScys[i],
+                1
+            );
+
+            _addTokenAmount(tokensOut, tokenRedeemScys[i], amountOut);
+        }
+    }
+
+    function _swapAllToOutputToken(
+        RouterTokenAmounts memory tokens,
+        RouterSwapAllStruct memory dataSwap
+    ) internal returns (uint256 netTokenOut) {
+        for (uint256 i = 0; i < tokens.tokens.length; ++i) {
+            if (tokens.amounts[i] == 0) continue;
+            _kyberswap(tokens.tokens[i], tokens.amounts[i], dataSwap.kybercalls[i]);
+        }
+        netTokenOut = _selfBalance(dataSwap.outputToken);
+        _transferOut(dataSwap.outputToken, msg.sender, netTokenOut);
+    }
+
+    function _addTokenAmount(
+        RouterTokenAmounts memory data,
+        address token,
+        uint256 amount
+    ) internal pure {
+        for (uint256 j = 0; j < data.tokens.length; j++) {
+            if (data.tokens[j] == token) {
+                data.amounts[j] += amount;
+                return;
+            }
+        }
+        revert("token not found");
+    }
+
+    function _addTokenAmounts(
+        RouterTokenAmounts memory data,
+        address[] memory tokens,
+        uint256[] memory amounts
+    ) internal pure {
+        for (uint256 i = 0; i < tokens.length; i++) {
+            _addTokenAmount(data, tokens[i], amounts[i]);
+        }
     }
 }

package/contracts/core/actions/base/ActionBaseMintRedeem.sol

@@ -68,7 +68,6 @@ abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {
                 output.tokenRedeemScy,
                 1
             );
-            _safeApproveInf(output.tokenRedeemScy, SCY);
             _kyberswap(output.tokenRedeemScy, netTokenRedeemed, output.kybercall);
 
             netTokenOut = _selfBalance(output.tokenOut);

package/contracts/interfaces/IPActionMintRedeem.sol

@@ -57,6 +57,26 @@ interface IPActionMintRedeem {
         uint256 netTokenOut
     );
 
+    event RedeemDueInterestAndRewards(
+        address indexed user,
+        address[] scys,
+        address[] yts,
+        address[] markets,
+        uint256[][] scyRewards,
+        uint256[] ytInterests,
+        uint256[][] ytRewards,
+        uint256[][] marketRewards
+    );
+
+    event RedeemDueInterestAndRewardsThenSwapAll(
+        address indexed user,
+        address[] scys,
+        address[] yts,
+        address[] markets,
+        address indexed tokenOut,
+        uint256 netTokenOut
+    );
+
     function mintScyFromToken(
         address receiver,
         address SCY,
@@ -112,4 +132,27 @@ interface IPActionMintRedeem {
             uint256[][] memory ytRewards,
             uint256[][] memory marketRewards
         );
+
+    struct RouterYtRedeemStruct {
+        address[] yts;
+        // key-value pair
+        address[] scyAddrs;
+        address[] tokenRedeemScys;
+        //
+    }
+
+    struct RouterSwapAllStruct {
+        // key-value pair
+        address[] tokens;
+        bytes[] kybercalls;
+        //
+        address outputToken;
+    }
+
+    function redeemDueInterestAndRewardsThenSwapAll(
+        address[] calldata scys,
+        RouterYtRedeemStruct calldata dataYT,
+        address[] calldata markets,
+        RouterSwapAllStruct calldata dataSwap
+    ) external returns (uint256 netTokenOut, uint256[] memory amountsSwapped);
 }

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

package/contracts/interfaces/IPMarketFactory.sol

@@ -21,7 +21,7 @@ interface IPMarketFactory {
         view
         returns (
             address treasury,
-            uint96 lnFeeRateRoot,
+            uint88 lnFeeRateRoot,
             uint8 reserveFeePercent
         );
 }

package/contracts/interfaces/ISJoe.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.15;
 
-import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 interface ISJoe {
     function joe() external view returns (address);
@@ -23,7 +23,7 @@ interface ISJoe {
      * @return The amount of JOE user has deposited
      * @return The reward debt for the chosen token
      */
-    function getUserInfo(address _user, IERC20Upgradeable _rewardToken)
+    function getUserInfo(address _user, IERC20 _rewardToken)
         external
         view
         returns (uint256, uint256);
@@ -42,10 +42,7 @@ interface ISJoe {
      * @param _token The address of the token
      * @return `_user`'s pending reward token
      */
-    function pendingReward(address _user, IERC20Upgradeable _token)
-        external
-        view
-        returns (uint256);
+    function pendingReward(address _user, IERC20 _token) external view returns (uint256);
 
     /**
      * @notice Withdraw JOE and harvest the rewards

package/contracts/libraries/helpers/PYIndex.sol

@@ -66,4 +66,13 @@ library PYIndexLib {
         return sign * (SCYUtils.assetToScy(PYIndex.unwrap(index), assetAmount.abs())).Int();
     }
 
+    function assetToScyUp(PYIndex index, int256 assetAmount)
+        internal
+        pure
+        returns (int256)
+    {
+        int256 sign = assetAmount < 0 ? int256(-1) : int256(1);
+        return sign * (SCYUtils.assetToScyUp(PYIndex.unwrap(index), assetAmount.abs())).Int();
+    }
+
 }