@pendle/core-v2 5.8.2-paraswap-2 → 5.8.2

package/contracts/router/swap-aggregator/ParaswapScaleHelper.sol

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
+
 pragma solidity ^0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -36,7 +37,6 @@ interface IAugustusV6 {
     }
 
     function swapExactAmountInOnUniswapV2(
-        address executor,
         UniswapV2Data calldata uniData,
         uint256 partnerAndFee,
         bytes calldata permit
@@ -55,7 +55,6 @@ interface IAugustusV6 {
     }
 
     function swapExactAmountInOnUniswapV3(
-        address executor,
         UniswapV3Data calldata uniData,
         uint256 partnerAndFee,
         bytes calldata permit
@@ -71,7 +70,6 @@ interface IAugustusV6 {
     }
 
     function swapExactAmountInOnBalancerV2(
-        address executor,
         BalancerV2Data calldata balancerData,
         uint256 partnerAndFee,
         bytes calldata permit,
@@ -92,7 +90,6 @@ interface IAugustusV6 {
     }
 
     function swapExactAmountInOnCurveV1(
-        address executor,
         CurveV1Data calldata curveV1Data,
         uint256 partnerAndFee,
         bytes calldata permit
@@ -114,7 +111,6 @@ interface IAugustusV6 {
     }
 
     function swapExactAmountInOnCurveV2(
-        address executor,
         CurveV2Data calldata curveV2Data,
         uint256 partnerAndFee,
         bytes calldata permit
@@ -134,17 +130,17 @@ interface IAugustusV6 {
         uint256 beneficiaryDirectionApproveFlag;
     }
 
-    function swapExactAmountInOutOnMakerPSM(address executor, MakerPSMData calldata makerPSMData, bytes calldata permit)
-        external
-        returns (uint256 spentAmount, uint256 receivedAmount);
+    function swapExactAmountInOutOnMakerPSM(
+        MakerPSMData calldata makerPSMData,
+        bytes calldata permit
+    ) external returns (uint256 spentAmount, uint256 receivedAmount);
 }
 
 contract ParaswapScaleHelper {
-    function _paraswapScaling(bytes calldata rawCallData, uint256 amountIn)
-        internal
-        pure
-        returns (bytes memory scaledCallData)
-    {
+    function _paraswapScaling(
+        bytes calldata rawCallData,
+        uint256 amountIn
+    ) internal pure returns (bytes memory scaledCallData) {
         bytes4 selector = bytes4(rawCallData[:4]);
         bytes calldata dataToDecode = rawCallData[4:];
 
@@ -159,87 +155,96 @@ contract ParaswapScaleHelper {
             ) = abi.decode(dataToDecode, (address, IAugustusV6.GenericData, uint256, bytes, bytes));
 
             // Direct scaling calculation
-            swapData.toAmount = swapData.toAmount * amountIn / swapData.fromAmount;
-            swapData.quotedAmount = swapData.quotedAmount * amountIn / swapData.fromAmount;
+            swapData.toAmount = (swapData.toAmount * amountIn) / swapData.fromAmount;
+            swapData.quotedAmount = (swapData.quotedAmount * amountIn) / swapData.fromAmount;
             swapData.fromAmount = amountIn;
 
             return abi.encodeWithSelector(selector, executor, swapData, partnerAndFee, permit, executorData);
         }
         // Handle UniswapV2
         else if (selector == IAugustusV6.swapExactAmountInOnUniswapV2.selector) {
-            (address executor, IAugustusV6.UniswapV2Data memory uniData, uint256 partnerAndFee, bytes memory permit) =
-                abi.decode(dataToDecode, (address, IAugustusV6.UniswapV2Data, uint256, bytes));
+            (IAugustusV6.UniswapV2Data memory uniData, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.UniswapV2Data, uint256, bytes)
+            );
 
             // Direct scaling calculation
-            uniData.toAmount = uniData.toAmount * amountIn / uniData.fromAmount;
-            uniData.quotedAmount = uniData.quotedAmount * amountIn / uniData.fromAmount;
+            uniData.toAmount = (uniData.toAmount * amountIn) / uniData.fromAmount;
+            uniData.quotedAmount = (uniData.quotedAmount * amountIn) / uniData.fromAmount;
             uniData.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, uniData, partnerAndFee, permit);
+            return abi.encodeWithSelector(selector, uniData, partnerAndFee, permit);
         }
         // Handle UniswapV3
         else if (selector == IAugustusV6.swapExactAmountInOnUniswapV3.selector) {
-            (address executor, IAugustusV6.UniswapV3Data memory uniV3Data, uint256 partnerAndFee, bytes memory permit) =
-                abi.decode(dataToDecode, (address, IAugustusV6.UniswapV3Data, uint256, bytes));
+            (IAugustusV6.UniswapV3Data memory uniV3Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.UniswapV3Data, uint256, bytes)
+            );
 
             // Direct scaling calculation
-            uniV3Data.toAmount = uniV3Data.toAmount * amountIn / uniV3Data.fromAmount;
-            uniV3Data.quotedAmount = uniV3Data.quotedAmount * amountIn / uniV3Data.fromAmount;
+            uniV3Data.toAmount = (uniV3Data.toAmount * amountIn) / uniV3Data.fromAmount;
+            uniV3Data.quotedAmount = (uniV3Data.quotedAmount * amountIn) / uniV3Data.fromAmount;
             uniV3Data.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, uniV3Data, partnerAndFee, permit);
+            return abi.encodeWithSelector(selector, uniV3Data, partnerAndFee, permit);
         }
         // Handle BalancerV2
         else if (selector == IAugustusV6.swapExactAmountInOnBalancerV2.selector) {
             (
-                address executor,
                 IAugustusV6.BalancerV2Data memory balancerData,
                 uint256 partnerAndFee,
                 bytes memory permit,
                 bytes memory data
-            ) = abi.decode(dataToDecode, (address, IAugustusV6.BalancerV2Data, uint256, bytes, bytes));
+            ) = abi.decode(dataToDecode, (IAugustusV6.BalancerV2Data, uint256, bytes, bytes));
 
             // Direct scaling calculation
-            balancerData.toAmount = balancerData.toAmount * amountIn / balancerData.fromAmount;
-            balancerData.quotedAmount = balancerData.quotedAmount * amountIn / balancerData.fromAmount;
+            balancerData.toAmount = (balancerData.toAmount * amountIn) / balancerData.fromAmount;
+            balancerData.quotedAmount = (balancerData.quotedAmount * amountIn) / balancerData.fromAmount;
             balancerData.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, balancerData, partnerAndFee, permit, data);
+            return abi.encodeWithSelector(selector, balancerData, partnerAndFee, permit, data);
         }
         // Handle CurveV1
         else if (selector == IAugustusV6.swapExactAmountInOnCurveV1.selector) {
-            (address executor, IAugustusV6.CurveV1Data memory curveV1Data, uint256 partnerAndFee, bytes memory permit) =
-                abi.decode(dataToDecode, (address, IAugustusV6.CurveV1Data, uint256, bytes));
+            (IAugustusV6.CurveV1Data memory curveV1Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.CurveV1Data, uint256, bytes)
+            );
 
             // Direct scaling calculation
-            curveV1Data.toAmount = curveV1Data.toAmount * amountIn / curveV1Data.fromAmount;
-            curveV1Data.quotedAmount = curveV1Data.quotedAmount * amountIn / curveV1Data.fromAmount;
+            curveV1Data.toAmount = (curveV1Data.toAmount * amountIn) / curveV1Data.fromAmount;
+            curveV1Data.quotedAmount = (curveV1Data.quotedAmount * amountIn) / curveV1Data.fromAmount;
             curveV1Data.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, curveV1Data, partnerAndFee, permit);
+            return abi.encodeWithSelector(selector, curveV1Data, partnerAndFee, permit);
         }
         // Handle CurveV2
         else if (selector == IAugustusV6.swapExactAmountInOnCurveV2.selector) {
-            (address executor, IAugustusV6.CurveV2Data memory curveV2Data, uint256 partnerAndFee, bytes memory permit) =
-                abi.decode(dataToDecode, (address, IAugustusV6.CurveV2Data, uint256, bytes));
+            (IAugustusV6.CurveV2Data memory curveV2Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.CurveV2Data, uint256, bytes)
+            );
 
             // Direct scaling calculation
-            curveV2Data.toAmount = curveV2Data.toAmount * amountIn / curveV2Data.fromAmount;
-            curveV2Data.quotedAmount = curveV2Data.quotedAmount * amountIn / curveV2Data.fromAmount;
+            curveV2Data.toAmount = (curveV2Data.toAmount * amountIn) / curveV2Data.fromAmount;
+            curveV2Data.quotedAmount = (curveV2Data.quotedAmount * amountIn) / curveV2Data.fromAmount;
             curveV2Data.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, curveV2Data, partnerAndFee, permit);
+            return abi.encodeWithSelector(selector, curveV2Data, partnerAndFee, permit);
         }
         // Handle MakerPSM
         else if (selector == IAugustusV6.swapExactAmountInOutOnMakerPSM.selector) {
-            (address executor, IAugustusV6.MakerPSMData memory makerPSMData, bytes memory permit) =
-                abi.decode(dataToDecode, (address, IAugustusV6.MakerPSMData, bytes));
+            (IAugustusV6.MakerPSMData memory makerPSMData, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.MakerPSMData, bytes)
+            );
 
             // Direct scaling calculation
-            makerPSMData.toAmount = makerPSMData.toAmount * amountIn / makerPSMData.fromAmount;
+            makerPSMData.toAmount = (makerPSMData.toAmount * amountIn) / makerPSMData.fromAmount;
             makerPSMData.fromAmount = amountIn;
 
-            return abi.encodeWithSelector(selector, executor, makerPSMData, permit);
+            return abi.encodeWithSelector(selector, makerPSMData, permit);
         }
 
         revert("ParaswapScaleHelper: Unsupported swap selector");

package/deployments/1-core.json

@@ -32,7 +32,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C",
-    "pendleSwap": "0x02890b1735378d2e8a67DD53304c135EB72CF308",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xdF3601014686674e53d1Fa52F7602525483F9122",
     "marketFactoryV3": "0x1A6fCc85557BC4fB7B534ed835a03EF056552D52",
@@ -47,7 +47,7 @@
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     },

package/deployments/10-core.json

@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xfa6B22FC4c3Ad88B68c16b3061a16b1714F6Bd57",
     "marketFactoryV3": "0x4A2B38b9cBd83c86F261a4d64c243795D4d44aBC",
@@ -47,7 +47,7 @@
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     },

package/deployments/146-core.json

@@ -28,7 +28,7 @@
         "ActionStorageV4": "0xdED51dca2ECED7a0BAab3D9711A87f214769Da0f"
     },
     "routerStatic": "0x0013ACc071f732fd6BF8210AB46A3794a7D8945e",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
@@ -41,7 +41,7 @@
     "receiverEndpoint": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
     "vePendle": "0xE017CCC08505Ac8fbb5a364680e459d9fBaEE74d",
     "gaugeController": "0xeE708FC793a02F1eDd5BB9DBD7fD13010D1F7136",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {

package/deployments/42161-core.json

@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
-    "pendleSwap": "0x02890b1735378d2e8a67DD53304c135EB72CF308",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xEb38531db128EcA928aea1B1CE9E5609B15ba146",
     "marketFactoryV3": "0x2FCb47B58350cD377f94d3821e7373Df60bD9Ced",
@@ -47,7 +47,7 @@
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "beta": {
         "PendleChainlinkOracleFactory": "0x2A73e899389cABa2a2f648BaBA35e67f5C00EFee"
     },

package/deployments/5000-core.json

@@ -29,7 +29,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xCAd502Bb55d1A3F79952F969BFF3f011CF30a94a",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0x964840644B88C583500F473E4B829Ab629aF96A8",
     "marketFactoryV3": "0xD228EC1f7D4313fe321fab511A872475D07F5bA6",
@@ -47,7 +47,7 @@
     "receiverEndpoint": "0xf799E4c029d14f41Dc1918C9A4C67242F565710e",
     "vePendle": "0x30c6d4e892871220B5Ab66c10db577da96Fb974b",
     "gaugeController": "0x428f2f93afAc3F96B0DE59854038c585e06165C8",
-    "sparkLinearDiscountOracleFactory": "0xA9A924A4BB95509F77868E086154C25e934F6171",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {

package/deployments/56-core.json

@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x2700ADB035F82a11899ce1D3f1BF8451c296eABb",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0x40Ae6da2d92aa3DCb7f8d7a7209FD12BDfcb7C85",
     "marketFactoryV3": "0xC40fEbF5A33b8C92B187d9be0fD3fe0ac2E4B07c",
@@ -45,7 +45,7 @@
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {

package/deployments/80094-core.json

@@ -28,7 +28,7 @@
         "ActionStorageV4": "0xdED51dca2ECED7a0BAab3D9711A87f214769Da0f"
     },
     "routerStatic": "0x6813d43782395A1F2AAb42f39aeEDE03ac655e09",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV5": "0x2bEa6BfD8fbFF45aA2a893EB3B6d85D10EFcC70E",
     "marketFactoryV5": "0x8A09574b0401A856d89d1b583eE22E8cb0C5530B",
@@ -38,7 +38,7 @@
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {

package/deployments/8453-core.json

@@ -28,7 +28,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xB4205a645c7e920BD8504181B1D7f2c5C955C3e7",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV5": "0x963ddBB35c1AE44e2a159E3b5fb5177E0B32660d",
     "marketFactoryV5": "0x59968008a703dC13E6beaECed644bdCe4ee45d13",
@@ -38,7 +38,7 @@
     "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x084ceE278DA67F2B0fead8194FFe43C566E4e0B3",
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "beta": {

package/package.json

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

package/typechain-types/IAugustusV6.ts

@@ -252,12 +252,12 @@ export interface IAugustusV6Interface extends utils.Interface {
   contractName: "IAugustusV6";
   functions: {
     "swapExactAmountIn(address,(address,address,uint256,uint256,uint256,bytes32,address),uint256,bytes,bytes)": FunctionFragment;
-    "swapExactAmountInOnBalancerV2(address,(uint256,uint256,uint256,bytes32,uint256),uint256,bytes,bytes)": FunctionFragment;
-    "swapExactAmountInOnCurveV1(address,(uint256,uint256,address,address,uint256,uint256,uint256,bytes32,address),uint256,bytes)": FunctionFragment;
-    "swapExactAmountInOnCurveV2(address,(uint256,uint256,uint256,address,address,address,uint256,uint256,uint256,bytes32,address),uint256,bytes)": FunctionFragment;
-    "swapExactAmountInOnUniswapV2(address,(address,address,uint256,uint256,uint256,bytes32,address,bytes),uint256,bytes)": FunctionFragment;
-    "swapExactAmountInOnUniswapV3(address,(address,address,uint256,uint256,uint256,bytes32,address,bytes),uint256,bytes)": FunctionFragment;
-    "swapExactAmountInOutOnMakerPSM(address,(address,address,uint256,uint256,uint256,uint256,address,address,bytes32,uint256),bytes)": FunctionFragment;
+    "swapExactAmountInOnBalancerV2((uint256,uint256,uint256,bytes32,uint256),uint256,bytes,bytes)": FunctionFragment;
+    "swapExactAmountInOnCurveV1((uint256,uint256,address,address,uint256,uint256,uint256,bytes32,address),uint256,bytes)": FunctionFragment;
+    "swapExactAmountInOnCurveV2((uint256,uint256,uint256,address,address,address,uint256,uint256,uint256,bytes32,address),uint256,bytes)": FunctionFragment;
+    "swapExactAmountInOnUniswapV2((address,address,uint256,uint256,uint256,bytes32,address,bytes),uint256,bytes)": FunctionFragment;
+    "swapExactAmountInOnUniswapV3((address,address,uint256,uint256,uint256,bytes32,address,bytes),uint256,bytes)": FunctionFragment;
+    "swapExactAmountInOutOnMakerPSM((address,address,uint256,uint256,uint256,uint256,address,address,bytes32,uint256),bytes)": FunctionFragment;
   };
 
   encodeFunctionData(
@@ -273,7 +273,6 @@ export interface IAugustusV6Interface extends utils.Interface {
   encodeFunctionData(
     functionFragment: "swapExactAmountInOnBalancerV2",
     values: [
-      string,
       IAugustusV6.BalancerV2DataStruct,
       BigNumberish,
       BytesLike,
@@ -282,23 +281,23 @@ export interface IAugustusV6Interface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactAmountInOnCurveV1",
-    values: [string, IAugustusV6.CurveV1DataStruct, BigNumberish, BytesLike]
+    values: [IAugustusV6.CurveV1DataStruct, BigNumberish, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactAmountInOnCurveV2",
-    values: [string, IAugustusV6.CurveV2DataStruct, BigNumberish, BytesLike]
+    values: [IAugustusV6.CurveV2DataStruct, BigNumberish, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactAmountInOnUniswapV2",
-    values: [string, IAugustusV6.UniswapV2DataStruct, BigNumberish, BytesLike]
+    values: [IAugustusV6.UniswapV2DataStruct, BigNumberish, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactAmountInOnUniswapV3",
-    values: [string, IAugustusV6.UniswapV3DataStruct, BigNumberish, BytesLike]
+    values: [IAugustusV6.UniswapV3DataStruct, BigNumberish, BytesLike]
   ): string;
   encodeFunctionData(
     functionFragment: "swapExactAmountInOutOnMakerPSM",
-    values: [string, IAugustusV6.MakerPSMDataStruct, BytesLike]
+    values: [IAugustusV6.MakerPSMDataStruct, BytesLike]
   ): string;
 
   decodeFunctionResult(
@@ -371,7 +370,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOnBalancerV2(
-      executor: string,
       balancerData: IAugustusV6.BalancerV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -380,7 +378,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOnCurveV1(
-      executor: string,
       curveV1Data: IAugustusV6.CurveV1DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -388,7 +385,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOnCurveV2(
-      executor: string,
       curveV2Data: IAugustusV6.CurveV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -396,7 +392,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOnUniswapV2(
-      executor: string,
       uniData: IAugustusV6.UniswapV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -404,7 +399,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOnUniswapV3(
-      executor: string,
       uniData: IAugustusV6.UniswapV3DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -412,7 +406,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<ContractTransaction>;
 
     swapExactAmountInOutOnMakerPSM(
-      executor: string,
       makerPSMData: IAugustusV6.MakerPSMDataStruct,
       permit: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -429,7 +422,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOnBalancerV2(
-    executor: string,
     balancerData: IAugustusV6.BalancerV2DataStruct,
     partnerAndFee: BigNumberish,
     permit: BytesLike,
@@ -438,7 +430,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOnCurveV1(
-    executor: string,
     curveV1Data: IAugustusV6.CurveV1DataStruct,
     partnerAndFee: BigNumberish,
     permit: BytesLike,
@@ -446,7 +437,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOnCurveV2(
-    executor: string,
     curveV2Data: IAugustusV6.CurveV2DataStruct,
     partnerAndFee: BigNumberish,
     permit: BytesLike,
@@ -454,7 +444,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOnUniswapV2(
-    executor: string,
     uniData: IAugustusV6.UniswapV2DataStruct,
     partnerAndFee: BigNumberish,
     permit: BytesLike,
@@ -462,7 +451,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOnUniswapV3(
-    executor: string,
     uniData: IAugustusV6.UniswapV3DataStruct,
     partnerAndFee: BigNumberish,
     permit: BytesLike,
@@ -470,7 +458,6 @@ export interface IAugustusV6 extends BaseContract {
   ): Promise<ContractTransaction>;
 
   swapExactAmountInOutOnMakerPSM(
-    executor: string,
     makerPSMData: IAugustusV6.MakerPSMDataStruct,
     permit: BytesLike,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -487,7 +474,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<void>;
 
     swapExactAmountInOnBalancerV2(
-      executor: string,
       balancerData: IAugustusV6.BalancerV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -502,7 +488,6 @@ export interface IAugustusV6 extends BaseContract {
     >;
 
     swapExactAmountInOnCurveV1(
-      executor: string,
       curveV1Data: IAugustusV6.CurveV1DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -516,7 +501,6 @@ export interface IAugustusV6 extends BaseContract {
     >;
 
     swapExactAmountInOnCurveV2(
-      executor: string,
       curveV2Data: IAugustusV6.CurveV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -530,7 +514,6 @@ export interface IAugustusV6 extends BaseContract {
     >;
 
     swapExactAmountInOnUniswapV2(
-      executor: string,
       uniData: IAugustusV6.UniswapV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -544,7 +527,6 @@ export interface IAugustusV6 extends BaseContract {
     >;
 
     swapExactAmountInOnUniswapV3(
-      executor: string,
       uniData: IAugustusV6.UniswapV3DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -558,7 +540,6 @@ export interface IAugustusV6 extends BaseContract {
     >;
 
     swapExactAmountInOutOnMakerPSM(
-      executor: string,
       makerPSMData: IAugustusV6.MakerPSMDataStruct,
       permit: BytesLike,
       overrides?: CallOverrides
@@ -583,7 +564,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOnBalancerV2(
-      executor: string,
       balancerData: IAugustusV6.BalancerV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -592,7 +572,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOnCurveV1(
-      executor: string,
       curveV1Data: IAugustusV6.CurveV1DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -600,7 +579,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOnCurveV2(
-      executor: string,
       curveV2Data: IAugustusV6.CurveV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -608,7 +586,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOnUniswapV2(
-      executor: string,
       uniData: IAugustusV6.UniswapV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -616,7 +593,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOnUniswapV3(
-      executor: string,
       uniData: IAugustusV6.UniswapV3DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -624,7 +600,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<BigNumber>;
 
     swapExactAmountInOutOnMakerPSM(
-      executor: string,
       makerPSMData: IAugustusV6.MakerPSMDataStruct,
       permit: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -642,7 +617,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOnBalancerV2(
-      executor: string,
       balancerData: IAugustusV6.BalancerV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -651,7 +625,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOnCurveV1(
-      executor: string,
       curveV1Data: IAugustusV6.CurveV1DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -659,7 +632,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOnCurveV2(
-      executor: string,
       curveV2Data: IAugustusV6.CurveV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -667,7 +639,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOnUniswapV2(
-      executor: string,
       uniData: IAugustusV6.UniswapV2DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -675,7 +646,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOnUniswapV3(
-      executor: string,
       uniData: IAugustusV6.UniswapV3DataStruct,
       partnerAndFee: BigNumberish,
       permit: BytesLike,
@@ -683,7 +653,6 @@ export interface IAugustusV6 extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     swapExactAmountInOutOnMakerPSM(
-      executor: string,
       makerPSMData: IAugustusV6.MakerPSMDataStruct,
       permit: BytesLike,
       overrides?: Overrides & { from?: string | Promise<string> }