@pendle/core-v2 0.8.0-beta-2 → 0.8.0-beta-5

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

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

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

@@ -80,8 +80,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506040516103c53803806103c583398101604081905261002f9161009d565b6001600160a01b0381166100785760405162461bcd60e51b815260206004820152600c60248201526b7a65726f206164647265737360a01b604482015260640160405180910390fd5b600080546001600160a01b0319166001600160a01b03929092169190911790556100cd565b6000602082840312156100af57600080fd5b81516001600160a01b03811681146100c657600080fd5b9392505050565b6102e9806100dc6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610283565b610199565b600154610064906001600160a01b031681565b6001546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820152600960248201527f464f5242494444454e000000000000000000000000000000000000000000000060448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080547fffffffffffffffffffffffff00000000000000000000000000000000000000009081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101f35760405162461bcd60e51b815260206004820152600f60248201527f4f4e4c595f474f5645524e414e434500000000000000000000000000000000006044820152606401610106565b6001600160a01b0381166102495760405162461bcd60e51b815260206004820152600c60248201527f7a65726f206164647265737300000000000000000000000000000000000000006044820152606401610106565b600180547fffffffffffffffffffffffff0000000000000000000000000000000000000000166001600160a01b0392909216919091179055565b60006020828403121561029557600080fd5b81356001600160a01b03811681146102ac57600080fd5b939250505056fea264697066735822122070891dc356e4afb10a2de687acd4d3b8d14e76674e6e45bdc74072d7d3e9920064736f6c634300080d0033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80635aa6e675146100515780635d36b19014610080578063d38bfff41461008a578063f39c38a01461009d575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100886100b0565b005b610088610098366004610283565b610199565b600154610064906001600160a01b031681565b6001546001600160a01b0316331461010f5760405162461bcd60e51b815260206004820152600960248201527f464f5242494444454e000000000000000000000000000000000000000000000060448201526064015b60405180910390fd5b600154600054604080516001600160a01b0393841681529290911660208301527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a160018054600080547fffffffffffffffffffffffff00000000000000000000000000000000000000009081166001600160a01b03841617909155169055565b6000546001600160a01b031633146101f35760405162461bcd60e51b815260206004820152600f60248201527f4f4e4c595f474f5645524e414e434500000000000000000000000000000000006044820152606401610106565b6001600160a01b0381166102495760405162461bcd60e51b815260206004820152600c60248201527f7a65726f206164647265737300000000000000000000000000000000000000006044820152606401610106565b600180547fffffffffffffffffffffffff0000000000000000000000000000000000000000166001600160a01b0392909216919091179055565b60006020828403121561029557600080fd5b81356001600160a01b03811681146102ac57600080fd5b939250505056fea264697066735822122070891dc356e4afb10a2de687acd4d3b8d14e76674e6e45bdc74072d7d3e9920064736f6c634300080d0033",
+  "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/e23516cf79859ddf49794b9fff76abac.json"
+  "buildInfo": "../../../build-info/7033d6fa08f4d79f81b857af32174eb3.json"
 }

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

@@ -20,6 +20,7 @@ contract PendleQiTokenSCY is SCYBaseWithRewards, PendleQiTokenHelper {
         string memory _name,
         string memory _symbol,
         address _qiToken,
+        bool isUnderlyingNative,
         address _WAVAX,
         uint256 _initialExchangeRateMantissa
     )
@@ -30,7 +31,7 @@ contract PendleQiTokenSCY is SCYBaseWithRewards, PendleQiTokenHelper {
 
         qiToken = _qiToken;
 
-        underlying = _getUnderlyingOfQiToken();
+        underlying = isUnderlyingNative ? NATIVE : IQiErc20(qiToken).underlying();
         comptroller = IQiToken(qiToken).comptroller();
 
         QI = IBenQiComptroller(comptroller).qiAddress();
@@ -41,14 +42,6 @@ contract PendleQiTokenSCY is SCYBaseWithRewards, PendleQiTokenHelper {
         }
     }
 
-    function _getUnderlyingOfQiToken() internal view returns (address) {
-        try IQiErc20(qiToken).underlying() returns (address res) {
-            return res;
-        } catch {
-            return NATIVE;
-        }
-    }
-
     /*///////////////////////////////////////////////////////////////
                     DEPOSIT/REDEEM USING BASE TOKENS
     //////////////////////////////////////////////////////////////*/

package/contracts/core/PendleERC20Permit.sol

@@ -28,7 +28,7 @@ contract PendleERC20Permit is PendleERC20, IERC20Permit, EIP712 {
         string memory name_,
         string memory symbol_,
         uint8 decimals_
-    ) PendleERC20(name_, symbol_, decimals) EIP712(name_, "1") {}
+    ) PendleERC20(name_, symbol_, decimals_) EIP712(name_, "1") {}
 
     /**
      * @dev See {IERC20Permit-permit}.

package/contracts/offchain-helpers/RouterStatic.sol

@@ -13,7 +13,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
-contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, OwnableUpgradeable {
+contract RouterStatic is IPRouterStatic {
     using MarketMathCore for MarketState;
     using MarketApproxLib for MarketState;
     using Math for uint256;
@@ -21,9 +21,9 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
     using LogExpMath for int256;
     using SCYIndexLib for SCYIndex;
 
-    IPYieldContractFactory public immutable yieldContractFactory;
-    IPMarketFactory public immutable marketFactory;
-    ApproxParams public approxParams =
+    IPYieldContractFactory internal immutable yieldContractFactory;
+    IPMarketFactory internal immutable marketFactory;
+    ApproxParams internal approxParams =
         ApproxParams({
             guessMin: 0,
             guessMax: type(uint256).max,
@@ -32,18 +32,11 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
             eps: 1e15
         });
 
-    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory)
-        initializer
-    {
+    constructor(IPYieldContractFactory _yieldContractFactory, IPMarketFactory _marketFactory) {
         yieldContractFactory = _yieldContractFactory;
         marketFactory = _marketFactory;
     }
 
-    function initialize() external initializer {
-        __UUPSUpgradeable_init();
-        __Ownable_init();
-    }
-
     // ============= SYSTEM INFO =============
 
     function getPYInfo(address py)
@@ -176,7 +169,7 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
     }
 
     function swapExactPtForScyStatic(address market, uint256 exactPtIn)
-        external
+        public
         view
         returns (uint256 netScyOut, uint256 netScyFee)
     {
@@ -202,7 +195,7 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
     }
 
     function swapExactScyForPtStatic(address market, uint256 exactScyIn)
-        external
+        public
         view
         returns (uint256 netPtOut, uint256 netScyFee)
     {
@@ -215,6 +208,43 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
         );
     }
 
+    function swapPtForExactScyStatic(address market, uint256 exactScyOut)
+        public
+        view
+        returns (uint256 netPtIn, uint256 netScyFee)
+    {
+        MarketState memory state = IPMarket(market).readState(false);
+
+        (netPtIn, , netScyFee) = state.approxSwapPtForExactScy(
+            scyIndex(market),
+            exactScyOut,
+            block.timestamp,
+            approxParams
+        );
+    }
+
+    function swapExactBaseTokenForPtStatic(
+        address market,
+        address baseToken,
+        uint256 amountBaseToken
+    ) external view returns (uint256 netPtOut, uint256 netScyFee) {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+
+        return swapExactScyForPtStatic(market, SCY.previewDeposit(baseToken, amountBaseToken));
+    }
+
+    function swapExactPtForBaseTokenStatic(
+        address market,
+        uint256 exactYtIn,
+        address baseToken
+    ) external view returns (uint256 netBaseTokenOut, uint256 netScyFee) {
+        uint256 netScyOut;
+        (netScyOut, netScyFee) = swapExactPtForScyStatic(market, exactYtIn);
+
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+        netBaseTokenOut = SCY.previewRedeem(baseToken, netScyOut);
+    }
+
     function swapScyForExactYtStatic(address market, uint256 exactYtOut)
         external
         view
@@ -236,7 +266,7 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
     }
 
     function swapExactScyForYtStatic(address market, uint256 exactScyIn)
-        external
+        public
         view
         returns (uint256 netYtOut, uint256 netScyFee)
     {
@@ -252,7 +282,7 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
     }
 
     function swapExactYtForScyStatic(address market, uint256 exactYtIn)
-        external
+        public
         view
         returns (uint256 netScyOut, uint256 netScyFee)
     {
@@ -286,10 +316,32 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
         );
     }
 
+    function swapExactYtForBaseTokenStatic(
+        address market,
+        uint256 exactYtIn,
+        address baseToken
+    ) external view returns (uint256 netBaseTokenOut, uint256 netScyFee) {
+        uint256 netScyOut;
+        (netScyOut, netScyFee) = swapExactYtForScyStatic(market, exactYtIn);
+
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+        netBaseTokenOut = SCY.previewRedeem(baseToken, netScyOut);
+    }
+
+    function swapExactBaseTokenForYtStatic(
+        address market,
+        address baseToken,
+        uint256 amountBaseToken
+    ) external view returns (uint256 netPtOut, uint256 netScyFee) {
+        (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
+
+        return swapExactScyForYtStatic(market, SCY.previewDeposit(baseToken, amountBaseToken));
+    }
+
     // ============= OTHER HELPERS =============
 
-    function previewMintPY(address YT, uint256 amountScyToMint)
-        external
+    function mintPYFromScyStatic(address YT, uint256 amountScyToMint)
+        public
         returns (uint256 amountPY)
     {
         IPYieldToken _YT = IPYieldToken(YT);
@@ -297,14 +349,32 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
         return amountScyToMint.mulDown(_YT.scyIndexCurrent());
     }
 
-    function previewRedeemPY(address YT, uint256 amountPYToRedeem)
-        external
+    function redeemPYToScyStatic(address YT, uint256 amountPYToRedeem)
+        public
         returns (uint256 amountPY)
     {
         IPYieldToken _YT = IPYieldToken(YT);
         return amountPYToRedeem.divDown(_YT.scyIndexCurrent());
     }
 
+    function mintPYFromBaseStatic(
+        address YT,
+        address baseToken,
+        uint256 amountBaseToken
+    ) external returns (uint256 amountPY) {
+        ISuperComposableYield SCY = ISuperComposableYield(IPYieldToken(YT).SCY());
+        return mintPYFromScyStatic(YT, SCY.previewDeposit(baseToken, amountBaseToken));
+    }
+
+    function redeemPYToBaseStatic(
+        address YT,
+        uint256 amountPYToRedeem,
+        address baseToken
+    ) external returns (uint256 amountBaseToken) {
+        ISuperComposableYield SCY = ISuperComposableYield(IPYieldToken(YT).SCY());
+        return SCY.previewRedeem(baseToken, redeemPYToScyStatic(YT, amountPYToRedeem));
+    }
+
     function scyIndex(address market) public view returns (SCYIndex index) {
         (ISuperComposableYield SCY, , ) = IPMarket(market).readTokens();
 
@@ -406,9 +476,4 @@ contract RouterStatic is IPRouterStatic, Initializable, UUPSUpgradeable, Ownable
             userPYInfo.unclaimedInterest.amount > 0 ||
             userPYInfo.unclaimedRewards.length > 0);
     }
-
-    // ============= UPGRADES =============
-
-    // solhint-disable-next-line no-empty-blocks
-    function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "0.8.0-beta-2",
+  "version": "0.8.0-beta-5",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",

package/typechain-types/ActionCore.ts

@@ -182,25 +182,48 @@ export interface ActionCoreInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "MintScyFromRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)": EventFragment;
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)": EventFragment;
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)": EventFragment;
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)": EventFragment;
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)": EventFragment;
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)": EventFragment;
+    "SwapPtAndScy(address,address,address,int256,int256)": EventFragment;
   };
 
+  getEvent(nameOrSignatureOrTopic: "AddLiquidity"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintPyFromRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "MintScyFromRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemPyToRawToken"): EventFragment;
   getEvent(nameOrSignatureOrTopic: "RedeemScyToRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "RemoveLiquidity"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndRawToken"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "SwapPtAndScy"): EventFragment;
 }
 
+export type AddLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    scyUsed: BigNumber;
+    ptUsed: BigNumber;
+    lpOut: BigNumber;
+  }
+>;
+
+export type AddLiquidityEventFilter = TypedEventFilter<AddLiquidityEvent>;
+
 export type MintPyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
+    YT: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    YT: string;
     netPyOut: BigNumber;
   }
 >;
@@ -209,12 +232,13 @@ export type MintPyFromRawTokenEventFilter =
   TypedEventFilter<MintPyFromRawTokenEvent>;
 
 export type MintScyFromRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, string, BigNumber, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
+    SCY: string;
     rawTokenIn: string;
     netRawTokenIn: BigNumber;
-    SCY: string;
     netScyOut: BigNumber;
   }
 >;
@@ -223,9 +247,10 @@ export type MintScyFromRawTokenEventFilter =
   TypedEventFilter<MintScyFromRawTokenEvent>;
 
 export type RedeemPyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, BigNumber, string, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
     YT: string;
     netPyIn: BigNumber;
     rawTokenOut: string;
@@ -237,9 +262,10 @@ export type RedeemPyToRawTokenEventFilter =
   TypedEventFilter<RedeemPyToRawTokenEvent>;
 
 export type RedeemScyToRawTokenEvent = TypedEvent<
-  [string, string, BigNumber, string, BigNumber],
+  [string, string, string, BigNumber, string, BigNumber],
   {
-    user: string;
+    caller: string;
+    receiver: string;
     SCY: string;
     netScyIn: BigNumber;
     rawTokenOut: string;
@@ -250,6 +276,48 @@ export type RedeemScyToRawTokenEvent = TypedEvent<
 export type RedeemScyToRawTokenEventFilter =
   TypedEventFilter<RedeemScyToRawTokenEvent>;
 
+export type RemoveLiquidityEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    lpIn: BigNumber;
+    amountPTOut: BigNumber;
+    amountSCYOut: BigNumber;
+  }
+>;
+
+export type RemoveLiquidityEventFilter = TypedEventFilter<RemoveLiquidityEvent>;
+
+export type SwapPtAndRawTokenEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    rawToken: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountRawTokenToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndRawTokenEventFilter =
+  TypedEventFilter<SwapPtAndRawTokenEvent>;
+
+export type SwapPtAndScyEvent = TypedEvent<
+  [string, string, string, BigNumber, BigNumber],
+  {
+    caller: string;
+    market: string;
+    receiver: string;
+    amountPtToAccount: BigNumber;
+    amountScyToAccount: BigNumber;
+  }
+>;
+
+export type SwapPtAndScyEventFilter = TypedEventFilter<SwapPtAndScyEvent>;
+
 export interface ActionCore extends BaseContract {
   contractName: "ActionCore";
   connect(signerOrProvider: Signer | Provider | string): this;
@@ -648,65 +716,139 @@ export interface ActionCore extends BaseContract {
   };
 
   filters: {
-    "MintPyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+    "AddLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+    AddLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      scyUsed?: null,
+      ptUsed?: null,
+      lpOut?: null
+    ): AddLiquidityEventFilter;
+
+    "MintPyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netPyOut?: null
     ): MintPyFromRawTokenEventFilter;
     MintPyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netPyOut?: null
     ): MintPyFromRawTokenEventFilter;
 
-    "MintScyFromRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+    "MintScyFromRawToken(address,address,address,address,uint256,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netScyOut?: null
     ): MintScyFromRawTokenEventFilter;
     MintScyFromRawToken(
-      user?: string | null,
-      rawTokenIn?: string | null,
-      netRawTokenIn?: null,
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
+      rawTokenIn?: null,
+      netRawTokenIn?: null,
       netScyOut?: null
     ): MintScyFromRawTokenEventFilter;
 
-    "RedeemPyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
+    "RedeemPyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemPyToRawTokenEventFilter;
     RedeemPyToRawToken(
-      user?: string | null,
+      caller?: string | null,
+      receiver?: string | null,
       YT?: string | null,
       netPyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemPyToRawTokenEventFilter;
 
-    "RedeemScyToRawToken(address,address,uint256,address,uint256)"(
-      user?: string | null,
+    "RedeemScyToRawToken(address,address,address,uint256,address,uint256)"(
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemScyToRawTokenEventFilter;
     RedeemScyToRawToken(
-      user?: string | null,
+      caller?: string | null,
+      receiver?: string | null,
       SCY?: string | null,
       netScyIn?: null,
-      rawTokenOut?: string | null,
+      rawTokenOut?: null,
       netRawTokenOut?: null
     ): RedeemScyToRawTokenEventFilter;
+
+    "RemoveLiquidity(address,address,address,uint256,uint256,uint256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+    RemoveLiquidity(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: null,
+      lpIn?: null,
+      amountPTOut?: null,
+      amountSCYOut?: null
+    ): RemoveLiquidityEventFilter;
+
+    "SwapPtAndRawToken(address,address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+    SwapPtAndRawToken(
+      caller?: string | null,
+      market?: string | null,
+      rawToken?: string | null,
+      receiver?: null,
+      amountPtToAccount?: null,
+      amountRawTokenToAccount?: null
+    ): SwapPtAndRawTokenEventFilter;
+
+    "SwapPtAndScy(address,address,address,int256,int256)"(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
+    SwapPtAndScy(
+      caller?: string | null,
+      market?: string | null,
+      receiver?: string | null,
+      amountPtToAccount?: null,
+      amountScyToAccount?: null
+    ): SwapPtAndScyEventFilter;
   };
 
   estimateGas: {