@pendle/core-v2 6.1.3-sweed → 6.1.4-sweedtest

package/contracts/router/base/ActionBase.sol

@@ -19,11 +19,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
     using PYIndexLib for PYIndex;
 
     bytes internal constant EMPTY_BYTES = abi.encode();
-    address internal immutable DUST_RECEIVER;
-
-    constructor(address _dustReceiver) {
-        DUST_RECEIVER = _dustReceiver;
-    }
 
     // ----------------- MINT REDEEM SY PY -----------------
 
@@ -163,10 +158,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         return IPMarket(market).readState(address(this));
     }
 
-    function _sweepDust(address token) internal {
-        _transferOut(token, DUST_RECEIVER, _selfBalance(token));
-    }
-
     // ----------------- PT SWAP -----------------
 
     function _entry_swapExactPtForSy(address market, LimitOrderData calldata limit) internal view returns (address) {
@@ -193,6 +184,8 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             (netPtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, PT, netPtLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(PT), market, netPtLeft);
+            } else {
+                _transferOut(address(PT), receiver, netPtLeft);
             }
         }
 
@@ -207,8 +200,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             netSyFee += netSyFeeMarket;
         }
 
-        _sweepDust(address(PT));
-
         if (netSyOut < minSyOut) revert("Slippage: INSUFFICIENT_SY_OUT");
     }
 
@@ -236,6 +227,8 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             (netSyLeft, netPtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, SY, netSyLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(SY), market, netSyLeft);
+            } else {
+                _transferOut(address(SY), receiver, netSyLeft);
             }
         }
 
@@ -253,8 +246,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             netSyFee += netSyFeeMarket;
         }
 
-        _sweepDust(address(SY));
-
         if (netPtOut < minPtOut) revert("Slippage: INSUFFICIENT_PT_OUT");
     }
 
@@ -284,6 +275,8 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             (netYtLeft, netSyOut, netSyFee, doMarketOrder) = _fillLimit(receiver, YT, netYtLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(YT), address(YT), netYtLeft);
+            } else {
+                _transferOut(address(YT), receiver, netYtLeft);
             }
         }
 
@@ -301,8 +294,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             netSyOut += SY.balanceOf(receiver) - preSyBalance;
         }
 
-        _sweepDust(address(YT));
-
         if (netSyOut < minSyOut) revert("Slippage: INSUFFICIENT_SY_OUT");
     }
 
@@ -331,6 +322,8 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             (netSyLeft, netYtOut, netSyFee, doMarketOrder) = _fillLimit(receiver, SY, netSyLeft, limit);
             if (doMarketOrder) {
                 _transferOut(address(SY), address(YT), netSyLeft);
+            } else {
+                _transferOut(address(SY), receiver, netSyLeft);
             }
         }
 
@@ -351,7 +344,6 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             netYtOut += netYtOutMarket;
             netSyFee += netSyFeeMarket;
         }
-        _sweepDust(address(SY));
 
         if (netYtOut < minYtOut) revert("Slippage: INSUFFICIENT_YT_OUT");
     }

package/contracts/router/base/ActionDelegateBase.sol

@@ -6,8 +6,6 @@ import {IPActionSimple} from "../../interfaces/IPActionSimple.sol";
 import {ApproxParams, TokenInput, LimitOrderData} from "../../interfaces/IPAllActionTypeV3.sol";
 
 contract ActionDelegateBase is ActionBase {
-    constructor(address _dustReceiver) ActionBase(_dustReceiver) {}
-
     function delegateToAddLiquiditySinglePtSimple(
         address receiver,
         address market,

package/package.json

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

package/typechain-types/FixedPricePTAMM.ts

@@ -39,6 +39,8 @@ export interface FixedPricePTAMMInterface extends utils.Interface {
     "setPriceOracle(address,address,address,uint256)": FunctionFragment;
     "swapExactPtForToken(address,address,uint256,address,bytes)": FunctionFragment;
     "swapPtForExactToken(address,address,address,uint256,bytes)": FunctionFragment;
+    "transferInThenSwapExactPtForToken(address,address,uint256,address)": FunctionFragment;
+    "transferInThenSwapPtForExactToken(address,address,address,uint256)": FunctionFragment;
     "transferOwnership(address,bool,bool)": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
@@ -90,6 +92,14 @@ export interface FixedPricePTAMMInterface extends utils.Interface {
     functionFragment: "swapPtForExactToken",
     values: [string, string, string, BigNumberish, BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "transferInThenSwapExactPtForToken",
+    values: [string, string, BigNumberish, string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "transferInThenSwapPtForExactToken",
+    values: [string, string, string, BigNumberish]
+  ): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [string, boolean, boolean]
@@ -140,6 +150,14 @@ export interface FixedPricePTAMMInterface extends utils.Interface {
     functionFragment: "swapPtForExactToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferInThenSwapExactPtForToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferInThenSwapPtForExactToken",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "transferOwnership",
     data: BytesLike
@@ -337,6 +355,22 @@ export interface FixedPricePTAMM extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -429,6 +463,22 @@ export interface FixedPricePTAMM extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  transferInThenSwapExactPtForToken(
+    receiver: string,
+    PT: string,
+    exactPtIn: BigNumberish,
+    token: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  transferInThenSwapPtForExactToken(
+    receiver: string,
+    PT: string,
+    token: string,
+    exactTokenOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   transferOwnership(
     newOwner: string,
     direct: boolean,
@@ -516,6 +566,22 @@ export interface FixedPricePTAMM extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -680,6 +746,22 @@ export interface FixedPricePTAMM extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,
@@ -773,6 +855,22 @@ export interface FixedPricePTAMM extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     transferOwnership(
       newOwner: string,
       direct: boolean,

package/typechain-types/IPFixedPricePTAMM.ts

@@ -34,6 +34,8 @@ export interface IPFixedPricePTAMMInterface extends utils.Interface {
     "setPriceOracle(address,address,address,uint256)": FunctionFragment;
     "swapExactPtForToken(address,address,uint256,address,bytes)": FunctionFragment;
     "swapPtForExactToken(address,address,address,uint256,bytes)": FunctionFragment;
+    "transferInThenSwapExactPtForToken(address,address,uint256,address)": FunctionFragment;
+    "transferInThenSwapPtForExactToken(address,address,address,uint256)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -68,6 +70,14 @@ export interface IPFixedPricePTAMMInterface extends utils.Interface {
     functionFragment: "swapPtForExactToken",
     values: [string, string, string, BigNumberish, BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "transferInThenSwapExactPtForToken",
+    values: [string, string, BigNumberish, string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "transferInThenSwapPtForExactToken",
+    values: [string, string, string, BigNumberish]
+  ): string;
 
   decodeFunctionResult(functionFragment: "addFund", data: BytesLike): Result;
   decodeFunctionResult(
@@ -95,6 +105,14 @@ export interface IPFixedPricePTAMMInterface extends utils.Interface {
     functionFragment: "swapPtForExactToken",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferInThenSwapExactPtForToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "transferInThenSwapPtForExactToken",
+    data: BytesLike
+  ): Result;
 
   events: {
     "PriceOracleUpdated(address,address,address)": EventFragment;
@@ -230,6 +248,22 @@ export interface IPFixedPricePTAMM extends BaseContract {
       data: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
+
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
   };
 
   addFund(
@@ -290,6 +324,22 @@ export interface IPFixedPricePTAMM extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  transferInThenSwapExactPtForToken(
+    receiver: string,
+    PT: string,
+    exactPtIn: BigNumberish,
+    token: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  transferInThenSwapPtForExactToken(
+    receiver: string,
+    PT: string,
+    token: string,
+    exactTokenOut: BigNumberish,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   callStatic: {
     addFund(
       token: string,
@@ -348,6 +398,22 @@ export interface IPFixedPricePTAMM extends BaseContract {
       data: BytesLike,
       overrides?: CallOverrides
     ): Promise<BigNumber>;
+
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
   };
 
   filters: {
@@ -450,6 +516,22 @@ export interface IPFixedPricePTAMM extends BaseContract {
       data: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
+
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
   };
 
   populateTransaction: {
@@ -510,5 +592,21 @@ export interface IPFixedPricePTAMM extends BaseContract {
       data: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
+
+    transferInThenSwapExactPtForToken(
+      receiver: string,
+      PT: string,
+      exactPtIn: BigNumberish,
+      token: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    transferInThenSwapPtForExactToken(
+      receiver: string,
+      PT: string,
+      token: string,
+      exactTokenOut: BigNumberish,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
   };
 }