@pendle/core-v2 4.5.1-beta-3 → 4.5.1-beta-5

package/contracts/router/ActionMiscV3.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.17;
 
 import "./base/ActionBase.sol";
 import "../interfaces/IPActionMiscV3.sol";
-import "./Reflector.sol";
+import "../interfaces/IPReflector.sol";
 
 contract ActionMiscV3 is IPActionMiscV3, ActionBase {
     function mintSyFromToken(
@@ -117,8 +117,6 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         netTokenOut = IStandardizedYield(SY).redeem(receiver, netSyInterm, tokenRedeemSy, minTokenOut, true);
     }
 
-    // double check event orders
-
     function exitPreExpToToken(
         address receiver,
         address market,
@@ -251,17 +249,6 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         p.totalSyOut = p.netSyFromRemove + p.netSyFromRedeem;
     }
 
-    function multicallAlpha(
-        address payable reflector,
-        bytes calldata selfCall,
-        bytes calldata reflectCall
-    ) external payable returns (bytes memory selfRes, bytes memory reflectRes) {
-        (, selfRes) = _delegateToSelf(selfCall, false);
-        reflectRes = _callToReflector(reflector, reflectCall);
-
-        // ? We don't need to check balance here, can trust SDK?
-    }
-
     // ----------------- MISC FUNCTIONS -----------------
 
     function boostMarkets(address[] memory markets) external {
@@ -279,6 +266,17 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         }
     }
 
+    function callAndReflect(
+        address payable reflector,
+        bytes calldata selfCall1,
+        bytes calldata selfCall2,
+        bytes calldata reflectCall
+    ) external payable returns (bytes memory selfRes1, bytes memory selfRes2, bytes memory reflectRes) {
+        (, selfRes1) = _delegateToSelf(selfCall1, false);
+        if (selfCall2.length > 0) (, selfRes2) = _delegateToSelf(selfCall2, false);
+        reflectRes = _callToReflector(reflector, reflectCall);
+    }
+
     function simulate(address target, bytes calldata data) external payable {
         (bool success, bytes memory result) = target.delegatecall(data);
         revert Errors.SimulationResults(success, result);
@@ -298,18 +296,7 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         }
     }
 
-    function _callToReflector(address payable reflector, bytes memory data) internal returns (bytes memory result) {
-        // TODO: should we allow arbitrary passing?
-        // TODO: is the payable necessary?
-
-        bool success;
-        (success, result) = Reflector(reflector).reflect(data);
-
-        if (!success) {
-            assembly {
-                // We use Yul's revert() to bubble up errors from the target contract.
-                revert(add(32, result), mload(result))
-            }
-        }
+    function _callToReflector(address payable reflector, bytes memory data) internal returns (bytes memory) {
+        return IPReflector(reflector).reflect(data);
     }
 }

package/contracts/router/Reflector.sol

@@ -2,25 +2,33 @@
 pragma solidity ^0.8.17;
 
 import "../interfaces/IPAllActionV3.sol";
+import "../interfaces/IPReflector.sol";
 import "../core/libraries/TokenHelper.sol";
 
-contract Reflector is TokenHelper {
+contract Reflector is TokenHelper, IPReflector {
     using SafeERC20 for IERC20;
 
     mapping(address => bool) internal approved;
 
     receive() external payable {}
 
-    function reflect(bytes calldata inputData) external returns (bool success, bytes memory result) {
-        (uint256 value, bytes memory newCalldata) = _process1(inputData);
+    function reflect(bytes calldata inputData) external returns (bytes memory result) {
+        (uint256 value, bytes memory newCalldata) = _getNewCalldata(inputData);
+        bool success;
+
         (success, result) = msg.sender.call{value: value}(newCalldata);
+        if (!success) {
+            assembly {
+                // We use Yul's revert() to bubble up errors from the target contract.
+                revert(add(32, result), mload(result))
+            }
+        }
     }
 
-    function _process1(bytes calldata inputData) internal returns (uint256 value, bytes memory newCalldata) {
+    function _getNewCalldata(bytes calldata inputData) internal returns (uint256 value, bytes memory newCalldata) {
         bytes4 selector = bytes4(inputData[:4]);
         bytes calldata data = inputData[4:];
 
-        // TODO: can we do nicer here?
         if (selector == IPActionAddRemoveLiqV3.addLiquiditySingleToken.selector) {
             (
                 address v1,
@@ -31,30 +39,30 @@ contract Reflector is TokenHelper {
                 LimitOrderData memory v6
             ) = abi.decode(data, (address, address, uint256, ApproxParams, TokenInput, LimitOrderData));
 
-            value = _process2(v5);
+            value = _scaleTokenInputAndGetValue(v5);
             newCalldata = abi.encodeWithSelector(selector, v1, v2, v3, v4, v5, v6);
-            _safeApproveInf(v5.tokenIn, msg.sender);
         } else if (selector == IPActionAddRemoveLiqV3.addLiquiditySingleTokenKeepYt.selector) {
             (address v1, address v2, uint256 v3, uint256 v4, TokenInput memory v5) = abi.decode(
                 data,
                 (address, address, uint256, uint256, TokenInput)
             );
 
-            value = _process2(v5);
+            value = _scaleTokenInputAndGetValue(v5);
             newCalldata = abi.encodeWithSelector(selector, v1, v2, v3, v4, v5);
         } else {
             revert("UNSUPPORTED_SELECTOR");
         }
     }
 
-    function _process2(TokenInput memory inp) internal returns (uint256 ethValue) {
-        assert(inp.swapData.swapType == SwapType.NONE);
+    function _scaleTokenInputAndGetValue(TokenInput memory inp) internal returns (uint256 ethValue) {
+        require(inp.swapData.swapType == SwapType.NONE, "SWAP_NOT_ALLOWED"); // the exit call should already swap
 
         inp.netTokenIn = _selfBalance(inp.tokenIn);
-        ethValue = inp.tokenIn == NATIVE ? inp.netTokenIn : 0;
 
-        if (inp.tokenIn != NATIVE && !approved[inp.tokenIn]) {
-            IERC20(inp.tokenIn).safeApprove(msg.sender, type(uint256).max);
+        if (inp.tokenIn == NATIVE) {
+            ethValue = inp.netTokenIn;
+        } else if (!approved[inp.tokenIn]) {
+            IERC20(inp.tokenIn).forceApprove(msg.sender, type(uint256).max);
             approved[inp.tokenIn] = true;
         }
     }

package/deployments/1-core.json

@@ -35,5 +35,6 @@
     "votingController": "0x44087E105137a5095c008AaB6a6530182821F2F0",
     "gaugeController": "0x47D74516B33eD5D70ddE7119A40839f6Fcc24e57",
     "feeDistributor": "0xd7b34a6fDCb2A7ceD2115FF7f5fdD72aa6aA4dE2",
-    "feeDistributorV2": "0x8C237520a8E14D658170A633D96F8e80764433b9"
+    "feeDistributorV2": "0x8C237520a8E14D658170A633D96F8e80764433b9",
+    "reflector": "0x0AAa61F1024543e8E764Db981A9F27C12c9Ab8A4"
 }

package/deployments/10-core.json

@@ -31,5 +31,6 @@
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "receiverEndpoint": "0xED18de5442297a4Ec1ce59C7c7d9427Adc2A012b",
     "vePendle": "0xd5C47D2383Fddc19596489280C0A33AC42b2bB18",
-    "gaugeController": "0x6875e4A945E498FE1B90BbB13CFbAF0b68658C9C"
+    "gaugeController": "0x6875e4A945E498FE1B90BbB13CFbAF0b68658C9C",
+    "reflector": "0x0AAa61F1024543e8E764Db981A9F27C12c9Ab8A4"
 }

package/deployments/42161-core.json

@@ -33,5 +33,6 @@
     "vePendle": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
     "gaugeController": "0x1e56299ebc8a1010cec26005d12e3e5c5cc2db00",
     "arbMerkleDistribution": "0x23a102e78D1FF1645a3666691495174764a5FCAF",
-    "linearDistributor": "0x83d85AEDD308261d847C3eb8d7146457bD8F38E8"
+    "linearDistributor": "0x83d85AEDD308261d847C3eb8d7146457bD8F38E8",
+    "reflector": "0x0AAa61F1024543e8E764Db981A9F27C12c9Ab8A4"
 }

package/deployments/5000-core.json

@@ -27,5 +27,6 @@
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "receiverEndpoint": "0xf799E4c029d14f41Dc1918C9A4C67242F565710e",
     "vePendle": "0x30c6d4e892871220B5Ab66c10db577da96Fb974b",
-    "gaugeController": "0x428f2f93afAc3F96B0DE59854038c585e06165C8"
+    "gaugeController": "0x428f2f93afAc3F96B0DE59854038c585e06165C8",
+    "reflector": "0x0AAa61F1024543e8E764Db981A9F27C12c9Ab8A4"
 }

package/deployments/56-core.json

@@ -31,5 +31,6 @@
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
     "receiverEndpoint": "0x998CF52b2585e05494BF9F2bF502351a9C7FdA8f",
     "vePendle": "0x8A09574b0401A856d89d1b583eE22E8cb0C5530B",
-    "gaugeController": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0"
+    "gaugeController": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
+    "reflector": "0x0AAa61F1024543e8E764Db981A9F27C12c9Ab8A4"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "4.5.1-beta-3",
+  "version": "4.5.1-beta-5",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",
@@ -49,4 +49,4 @@
     "@openzeppelin/contracts": "4.9.3",
     "@openzeppelin/contracts-upgradeable": "4.9.3"
   }
-}
+}

package/typechain-types/ActionMiscV3.ts

@@ -234,6 +234,7 @@ export interface ActionMiscV3Interface extends utils.Interface {
   contractName: "ActionMiscV3";
   functions: {
     "boostMarkets(address[])": FunctionFragment;
+    "callAndReflect(address,bytes,bytes,bytes)": FunctionFragment;
     "exitPostExpToSy(address,address,uint256,uint256,uint256)": FunctionFragment;
     "exitPostExpToToken(address,address,uint256,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "exitPreExpToSy(address,address,uint256,uint256,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
@@ -242,7 +243,6 @@ export interface ActionMiscV3Interface extends utils.Interface {
     "mintPyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "mintSyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "multicall((bool,bytes)[])": FunctionFragment;
-    "multicallAlpha(address,bytes,bytes)": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
     "redeemPyToToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
@@ -256,6 +256,10 @@ export interface ActionMiscV3Interface extends utils.Interface {
     functionFragment: "boostMarkets",
     values: [string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "callAndReflect",
+    values: [string, BytesLike, BytesLike, BytesLike]
+  ): string;
   encodeFunctionData(
     functionFragment: "exitPostExpToSy",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
@@ -304,10 +308,6 @@ export interface ActionMiscV3Interface extends utils.Interface {
     functionFragment: "multicall",
     values: [IPActionMiscV3.Call3Struct[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "multicallAlpha",
-    values: [string, BytesLike, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
@@ -341,6 +341,10 @@ export interface ActionMiscV3Interface extends utils.Interface {
     functionFragment: "boostMarkets",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "callAndReflect",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "exitPostExpToSy",
     data: BytesLike
@@ -370,10 +374,6 @@ export interface ActionMiscV3Interface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "multicall", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "multicallAlpha",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
@@ -628,6 +628,14 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -697,13 +705,6 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -764,6 +765,14 @@ export interface ActionMiscV3 extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  callAndReflect(
+    reflector: string,
+    selfCall1: BytesLike,
+    selfCall2: BytesLike,
+    reflectCall: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   exitPostExpToSy(
     receiver: string,
     market: string,
@@ -833,13 +842,6 @@ export interface ActionMiscV3 extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  multicallAlpha(
-    reflector: string,
-    selfCall: BytesLike,
-    reflectCall: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   redeemDueInterestAndRewards(
     user: string,
     sys: string[],
@@ -897,6 +899,20 @@ export interface ActionMiscV3 extends BaseContract {
   callStatic: {
     boostMarkets(markets: string[], overrides?: CallOverrides): Promise<void>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<
+      [string, string, string] & {
+        selfRes1: string;
+        selfRes2: string;
+        reflectRes: string;
+      }
+    >;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -978,13 +994,6 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IPActionMiscV3.ResultStructOutput[]>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { selfRes: string; reflectRes: string }>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1228,6 +1237,14 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -1297,13 +1314,6 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1365,6 +1375,14 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -1434,13 +1452,6 @@ export interface ActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],

package/typechain-types/IPActionMiscV3.ts

@@ -234,6 +234,7 @@ export interface IPActionMiscV3Interface extends utils.Interface {
   contractName: "IPActionMiscV3";
   functions: {
     "boostMarkets(address[])": FunctionFragment;
+    "callAndReflect(address,bytes,bytes,bytes)": FunctionFragment;
     "exitPostExpToSy(address,address,uint256,uint256,uint256)": FunctionFragment;
     "exitPostExpToToken(address,address,uint256,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "exitPreExpToSy(address,address,uint256,uint256,uint256,uint256,(address,uint256,((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],((uint256,uint256,uint256,uint8,address,address,address,address,uint256,uint256,uint256,bytes),bytes,uint256)[],bytes))": FunctionFragment;
@@ -242,7 +243,6 @@ export interface IPActionMiscV3Interface extends utils.Interface {
     "mintPyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "mintSyFromToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
     "multicall((bool,bytes)[])": FunctionFragment;
-    "multicallAlpha(address,bytes,bytes)": FunctionFragment;
     "redeemDueInterestAndRewards(address,address[],address[],address[])": FunctionFragment;
     "redeemPyToSy(address,address,uint256,uint256)": FunctionFragment;
     "redeemPyToToken(address,address,uint256,(address,uint256,address,address,(uint8,address,bytes,bool)))": FunctionFragment;
@@ -256,6 +256,10 @@ export interface IPActionMiscV3Interface extends utils.Interface {
     functionFragment: "boostMarkets",
     values: [string[]]
   ): string;
+  encodeFunctionData(
+    functionFragment: "callAndReflect",
+    values: [string, BytesLike, BytesLike, BytesLike]
+  ): string;
   encodeFunctionData(
     functionFragment: "exitPostExpToSy",
     values: [string, string, BigNumberish, BigNumberish, BigNumberish]
@@ -304,10 +308,6 @@ export interface IPActionMiscV3Interface extends utils.Interface {
     functionFragment: "multicall",
     values: [IPActionMiscV3.Call3Struct[]]
   ): string;
-  encodeFunctionData(
-    functionFragment: "multicallAlpha",
-    values: [string, BytesLike, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "redeemDueInterestAndRewards",
     values: [string, string[], string[], string[]]
@@ -341,6 +341,10 @@ export interface IPActionMiscV3Interface extends utils.Interface {
     functionFragment: "boostMarkets",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "callAndReflect",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "exitPostExpToSy",
     data: BytesLike
@@ -370,10 +374,6 @@ export interface IPActionMiscV3Interface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "multicall", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "multicallAlpha",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "redeemDueInterestAndRewards",
     data: BytesLike
@@ -628,6 +628,14 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -697,13 +705,6 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -764,6 +765,14 @@ export interface IPActionMiscV3 extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  callAndReflect(
+    reflector: string,
+    selfCall1: BytesLike,
+    selfCall2: BytesLike,
+    reflectCall: BytesLike,
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   exitPostExpToSy(
     receiver: string,
     market: string,
@@ -833,13 +842,6 @@ export interface IPActionMiscV3 extends BaseContract {
     overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
-  multicallAlpha(
-    reflector: string,
-    selfCall: BytesLike,
-    reflectCall: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
   redeemDueInterestAndRewards(
     user: string,
     sys: string[],
@@ -897,6 +899,20 @@ export interface IPActionMiscV3 extends BaseContract {
   callStatic: {
     boostMarkets(markets: string[], overrides?: CallOverrides): Promise<void>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<
+      [string, string, string] & {
+        selfRes1: string;
+        selfRes2: string;
+        reflectRes: string;
+      }
+    >;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -978,13 +994,6 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: CallOverrides
     ): Promise<IPActionMiscV3.ResultStructOutput[]>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { selfRes: string; reflectRes: string }>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1228,6 +1237,14 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -1297,13 +1314,6 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],
@@ -1365,6 +1375,14 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    callAndReflect(
+      reflector: string,
+      selfCall1: BytesLike,
+      selfCall2: BytesLike,
+      reflectCall: BytesLike,
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     exitPostExpToSy(
       receiver: string,
       market: string,
@@ -1434,13 +1452,6 @@ export interface IPActionMiscV3 extends BaseContract {
       overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
-    multicallAlpha(
-      reflector: string,
-      selfCall: BytesLike,
-      reflectCall: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
     redeemDueInterestAndRewards(
       user: string,
       sys: string[],