@paraswap/dex-lib 2.28.7 → 2.28.9-take-surplus.0

package/build/router/megaswap.d.ts

@@ -10,6 +10,6 @@ export declare class MegaSwap extends PayloadEncoder implements IRouter<MegaSwap
     contractMethodName: string;
     constructor(dexAdapterService: DexAdapterService);
     getContractMethodName(): string;
-    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, positiveSlippageToUser: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): TxInfo<MegaSwapParam>;
+    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): TxInfo<MegaSwapParam>;
 }
 export {};

package/build/router/megaswap.js

@@ -18,7 +18,7 @@ class MegaSwap extends payload_encoder_1.PayloadEncoder {
     getContractMethodName() {
         return this.contractMethodName;
     }
-    build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, beneficiary, permit, deadline, uuid) {
+    build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, beneficiary, permit, deadline, uuid) {
         const { megaSwapPaths, networkFee } = this.getMegaSwapPathsWithNetworkFee(priceRoute.bestRoute);
         const [partner, feePercent] = referrerAddress
             ? [referrerAddress, (0, payload_encoder_1.encodeFeePercentForReferrer)(constants_1.SwapSide.SELL)]
@@ -26,9 +26,9 @@ class MegaSwap extends payload_encoder_1.PayloadEncoder {
                 (0, payload_encoder_1.encodePartnerAddressForFeeLogic)({
                     partnerAddress,
                     partnerFeePercent,
-                    positiveSlippageToUser,
+                    takeSurplus,
                 }),
-                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, positiveSlippageToUser, constants_1.SwapSide.SELL),
+                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, takeSurplus, constants_1.SwapSide.SELL),
             ];
         const sellData = {
             fromToken: priceRoute.srcToken,

package/build/router/megaswap.js.map

@@ -1 +1 @@
-{"version":3,"file":"megaswap.js","sourceRoot":"","sources":["../../src/router/megaswap.ts"],"names":[],"mappings":";;;;;;AACA,uDAK2B;AAQ3B,2EAAiD;AACjD,4CAA+C;AAE/C,oCAAyC;AACzC,4CAAwC;AAIxC,MAAa,QAAS,SAAQ,gCAAc;IAK1C,YAAY,iBAAoC;QAC9C,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAS,CAAC,wBAAY,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC;IACvC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,KAAK,CACH,UAAuB,EACvB,YAAoB,EACpB,WAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,sBAA+B,EAC/B,WAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,IAAY;QAEZ,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,8BAA8B,CACvE,UAAU,CAAC,SAAS,CACrB,CAAC;QAEF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe;YAC3C,CAAC,CAAC,CAAC,eAAe,EAAE,IAAA,6CAA2B,EAAC,oBAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,CAAC;gBACE,IAAA,iDAA+B,EAAC;oBAC9B,cAAc;oBACd,iBAAiB;oBACjB,sBAAsB;iBACvB,CAAC;gBACF,IAAA,kCAAgB,EACd,iBAAiB,EACjB,sBAAsB,EACtB,oBAAQ,CAAC,IAAI,CACd;aACF,CAAC;QAEN,MAAM,QAAQ,GAA6B;YACzC,SAAS,EAAE,UAAU,CAAC,QAAQ;YAC9B,UAAU,EAAE,UAAU,CAAC,SAAS;YAChC,QAAQ,EAAE,YAAY;YACtB,cAAc,EAAE,UAAU,CAAC,UAAU;YACrC,WAAW;YACX,IAAI,EAAE,aAAa;YACnB,OAAO;YACP,UAAU;YACV,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,IAAA,qBAAa,EAAC,IAAI,CAAC;SAC1B,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,MAAa,EAAE,EAAE,CACnC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChE,wBAAwB;QACxB,OAAO;YACL,OAAO;YACP,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;SAClC,CAAC;IACJ,CAAC;;AApEH,4BAqEC;AApEQ,cAAK,GAAG,KAAK,CAAC"}
+{"version":3,"file":"megaswap.js","sourceRoot":"","sources":["../../src/router/megaswap.ts"],"names":[],"mappings":";;;;;;AACA,uDAK2B;AAQ3B,2EAAiD;AACjD,4CAA+C;AAE/C,oCAAyC;AACzC,4CAAwC;AAIxC,MAAa,QAAS,SAAQ,gCAAc;IAK1C,YAAY,iBAAoC;QAC9C,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAS,CAAC,wBAAY,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC;IACvC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,KAAK,CACH,UAAuB,EACvB,YAAoB,EACpB,WAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,WAAoB,EACpB,WAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,IAAY;QAEZ,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,8BAA8B,CACvE,UAAU,CAAC,SAAS,CACrB,CAAC;QAEF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe;YAC3C,CAAC,CAAC,CAAC,eAAe,EAAE,IAAA,6CAA2B,EAAC,oBAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,CAAC;gBACE,IAAA,iDAA+B,EAAC;oBAC9B,cAAc;oBACd,iBAAiB;oBACjB,WAAW;iBACZ,CAAC;gBACF,IAAA,kCAAgB,EAAC,iBAAiB,EAAE,WAAW,EAAE,oBAAQ,CAAC,IAAI,CAAC;aAChE,CAAC;QAEN,MAAM,QAAQ,GAA6B;YACzC,SAAS,EAAE,UAAU,CAAC,QAAQ;YAC9B,UAAU,EAAE,UAAU,CAAC,SAAS;YAChC,QAAQ,EAAE,YAAY;YACtB,cAAc,EAAE,UAAU,CAAC,UAAU;YACrC,WAAW;YACX,IAAI,EAAE,aAAa;YACnB,OAAO;YACP,UAAU;YACV,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,IAAA,qBAAa,EAAC,IAAI,CAAC;SAC1B,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,MAAa,EAAE,EAAE,CACnC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChE,wBAAwB;QACxB,OAAO;YACL,OAAO;YACP,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;SAClC,CAAC;IACJ,CAAC;;AAhEH,4BAiEC;AAhEQ,cAAK,GAAG,KAAK,CAAC"}

package/build/router/multiswap.d.ts

@@ -10,6 +10,6 @@ export declare class MultiSwap extends PayloadEncoder implements IRouter<MultiSw
     contractMethodName: string;
     constructor(dexAdapterService: DexAdapterService);
     getContractMethodName(): string;
-    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, positiveSlippageToUser: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): TxInfo<MultiSwapParam>;
+    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): TxInfo<MultiSwapParam>;
 }
 export {};

package/build/router/multiswap.js

@@ -18,7 +18,7 @@ class MultiSwap extends payload_encoder_1.PayloadEncoder {
     getContractMethodName() {
         return this.contractMethodName;
     }
-    build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, beneficiary, permit, deadline, uuid) {
+    build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, beneficiary, permit, deadline, uuid) {
         if (priceRoute.bestRoute.length !== 1 ||
             priceRoute.bestRoute[0].percent !== 100)
             throw new Error(`Multiswap invalid bestRoute`);
@@ -29,9 +29,9 @@ class MultiSwap extends payload_encoder_1.PayloadEncoder {
                 (0, payload_encoder_1.encodePartnerAddressForFeeLogic)({
                     partnerAddress,
                     partnerFeePercent,
-                    positiveSlippageToUser,
+                    takeSurplus,
                 }),
-                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, positiveSlippageToUser, constants_1.SwapSide.SELL),
+                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, takeSurplus, constants_1.SwapSide.SELL),
             ];
         const sellData = {
             fromToken: priceRoute.srcToken,

package/build/router/multiswap.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiswap.js","sourceRoot":"","sources":["../../src/router/multiswap.ts"],"names":[],"mappings":";;;;;;AACA,uDAK2B;AAQ3B,2EAAiD;AACjD,4CAA+C;AAE/C,oCAAyC;AACzC,4CAAwC;AAIxC,MAAa,SACX,SAAQ,gCAAc;IAOtB,YAAY,iBAAoC;QAC9C,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAS,CAAC,wBAAY,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;IACxC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,KAAK,CACH,UAAuB,EACvB,YAAoB,EACpB,WAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,sBAA+B,EAC/B,WAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,IAAY;QAEZ,IACE,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YACjC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG;YAEvC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,8BAA8B,CAC/D,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAC9B,CAAC;QAEF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe;YAC3C,CAAC,CAAC,CAAC,eAAe,EAAE,IAAA,6CAA2B,EAAC,oBAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,CAAC;gBACE,IAAA,iDAA+B,EAAC;oBAC9B,cAAc;oBACd,iBAAiB;oBACjB,sBAAsB;iBACvB,CAAC;gBACF,IAAA,kCAAgB,EACd,iBAAiB,EACjB,sBAAsB,EACtB,oBAAQ,CAAC,IAAI,CACd;aACF,CAAC;QAEN,MAAM,QAAQ,GAAqB;YACjC,SAAS,EAAE,UAAU,CAAC,QAAQ;YAC9B,UAAU,EAAE,UAAU,CAAC,SAAS;YAChC,QAAQ,EAAE,YAAY;YACtB,cAAc,EAAE,UAAU,CAAC,UAAU;YACrC,WAAW;YACX,IAAI,EAAE,KAAK;YACX,OAAO;YACP,UAAU;YACV,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,IAAA,qBAAa,EAAC,IAAI,CAAC;SAC1B,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,MAAa,EAAE,EAAE,CACnC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,OAAO;YACL,OAAO;YACP,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;SAClC,CAAC;IACJ,CAAC;;AA5EH,8BA6EC;AAzEQ,eAAK,GAAG,KAAK,CAAC"}
+{"version":3,"file":"multiswap.js","sourceRoot":"","sources":["../../src/router/multiswap.ts"],"names":[],"mappings":";;;;;;AACA,uDAK2B;AAQ3B,2EAAiD;AACjD,4CAA+C;AAE/C,oCAAyC;AACzC,4CAAwC;AAIxC,MAAa,SACX,SAAQ,gCAAc;IAOtB,YAAY,iBAAoC;QAC9C,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,IAAI,eAAS,CAAC,wBAAY,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;IACxC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,KAAK,CACH,UAAuB,EACvB,YAAoB,EACpB,WAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,WAAoB,EACpB,WAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,IAAY;QAEZ,IACE,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YACjC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG;YAEvC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,8BAA8B,CAC/D,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAC9B,CAAC;QAEF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAe;YAC3C,CAAC,CAAC,CAAC,eAAe,EAAE,IAAA,6CAA2B,EAAC,oBAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,CAAC;gBACE,IAAA,iDAA+B,EAAC;oBAC9B,cAAc;oBACd,iBAAiB;oBACjB,WAAW;iBACZ,CAAC;gBACF,IAAA,kCAAgB,EAAC,iBAAiB,EAAE,WAAW,EAAE,oBAAQ,CAAC,IAAI,CAAC;aAChE,CAAC;QAEN,MAAM,QAAQ,GAAqB;YACjC,SAAS,EAAE,UAAU,CAAC,QAAQ;YAC9B,UAAU,EAAE,UAAU,CAAC,SAAS;YAChC,QAAQ,EAAE,YAAY;YACtB,cAAc,EAAE,UAAU,CAAC,UAAU;YACrC,WAAW;YACX,IAAI,EAAE,KAAK;YACX,OAAO;YACP,UAAU;YACV,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,IAAA,qBAAa,EAAC,IAAI,CAAC;SAC1B,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,MAAa,EAAE,EAAE,CACnC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,OAAO;YACL,OAAO;YACP,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;SAClC,CAAC;IACJ,CAAC;;AAxEH,8BAyEC;AArEQ,eAAK,GAAG,KAAK,CAAC"}

package/build/router/payload-encoder.d.ts

@@ -1,12 +1,12 @@
 import { ContractRoute, ContractPath, ContractAdapter, OptimalSwap, OptimalRoute, ContractMegaSwapPath, OptimalSwapExchange, Address } from '../types';
 import { SwapSide } from '../constants';
 import { DexAdapterService } from '../dex';
-export declare function encodePartnerAddressForFeeLogic({ partnerAddress, partnerFeePercent, positiveSlippageToUser, }: {
+export declare function encodePartnerAddressForFeeLogic({ partnerAddress, partnerFeePercent, takeSurplus, }: {
     partnerAddress: string;
     partnerFeePercent: string;
-    positiveSlippageToUser: boolean;
+    takeSurplus: boolean;
 }): string;
-export declare function encodeFeePercent(partnerFeePercent: string, positiveSlippageToUser: boolean, side: SwapSide): string;
+export declare function encodeFeePercent(partnerFeePercent: string, takeSurplus: boolean, side: SwapSide): string;
 export declare function encodeFeePercentForReferrer(side: SwapSide): string;
 export declare class PayloadEncoder {
     protected dexAdapterService: DexAdapterService;

package/build/router/payload-encoder.js

@@ -12,8 +12,8 @@ const OneShift248 = 1n << 248n;
 // Set 16th bit to indicate referral program
 const REFERRER_FEE = 2500n | OneShift14 | OneShift16 | OneShift248;
 const HALF_SPLIT = '5000';
-function encodePartnerAddressForFeeLogic({ partnerAddress, partnerFeePercent, positiveSlippageToUser, }) {
-    const isPartnerTakeNoFeeNoPos = +partnerFeePercent === 0 && positiveSlippageToUser == true;
+function encodePartnerAddressForFeeLogic({ partnerAddress, partnerFeePercent, takeSurplus, }) {
+    const isPartnerTakeNoFeeNoPos = +partnerFeePercent === 0 && takeSurplus == false;
     // nullify partner address to fallback default circuit contract without partner/referrer (no harm as no fee taken at all)
     const partner = isPartnerTakeNoFeeNoPos ? constants_1.NULL_ADDRESS : partnerAddress;
     // invariant checks
@@ -23,8 +23,8 @@ function encodePartnerAddressForFeeLogic({ partnerAddress, partnerFeePercent, po
     return partner;
 }
 exports.encodePartnerAddressForFeeLogic = encodePartnerAddressForFeeLogic;
-function encodeFeePercent(partnerFeePercent, positiveSlippageToUser, side) {
-    const isNoFeeAndPositiveSlippageToPartner = positiveSlippageToUser === false && BigInt(partnerFeePercent) === 0n;
+function encodeFeePercent(partnerFeePercent, takeSurplus, side) {
+    const isNoFeeAndPositiveSlippageToPartner = takeSurplus === true && BigInt(partnerFeePercent) === 0n;
     let fee = isNoFeeAndPositiveSlippageToPartner
         ? BigInt(HALF_SPLIT)
         : BigInt(partnerFeePercent);
@@ -36,9 +36,9 @@ function encodeFeePercent(partnerFeePercent, positiveSlippageToUser, side) {
         fee |= OneShift16;
         fee |= OneShift17;
     }
-    // Set 14th bit if positiveSlippageToUser is true
+    // Set 14th bit if takeSurplus is false
     // Upd: not used onchain anymore but better to keep to prevent collisions and ensure continuity of analytics
-    if (positiveSlippageToUser)
+    if (!takeSurplus)
         fee |= OneShift14;
     // Set 15th bit to take fee from srcToken
     if (side === constants_1.SwapSide.BUY && !isNoFeeAndPositiveSlippageToPartner)

package/build/router/payload-encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"payload-encoder.js","sourceRoot":"","sources":["../../src/router/payload-encoder.ts"],"names":[],"mappings":";;;AAWA,4CAAsD;AAEtD,oCAAgD;AAGhD,MAAM,UAAU,GAAG,EAAE,IAAI,GAAG,CAAC;AAC7B,MAAM,UAAU,GAAG,EAAE,IAAI,GAAG,CAAC;AAC7B,MAAM,UAAU,GAAG,EAAE,IAAI,GAAG,CAAC;AAC7B,MAAM,UAAU,GAAG,EAAE,IAAI,GAAG,CAAC;AAC7B,MAAM,WAAW,GAAG,EAAE,IAAI,IAAI,CAAC;AAE/B,yCAAyC;AACzC,4CAA4C;AAC5C,MAAM,YAAY,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,CAAC;AAEnE,MAAM,UAAU,GAAG,MAAM,CAAC;AAE1B,SAAgB,+BAA+B,CAAC,EAC9C,cAAc,EACd,iBAAiB,EACjB,sBAAsB,GAKvB;IACC,MAAM,uBAAuB,GAC3B,CAAC,iBAAiB,KAAK,CAAC,IAAI,sBAAsB,IAAI,IAAI,CAAC;IAE7D,yHAAyH;IACzH,MAAM,OAAO,GAAG,uBAAuB,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,cAAc,CAAC;IAExE,mBAAmB;IACnB,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,OAAO,KAAK,cAAc,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AArBD,0EAqBC;AAED,SAAgB,gBAAgB,CAC9B,iBAAyB,EACzB,sBAA+B,EAC/B,IAAc;IAEd,MAAM,mCAAmC,GACvC,sBAAsB,KAAK,KAAK,IAAI,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAEvE,IAAI,GAAG,GAAG,mCAAmC;QAC3C,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;QACpB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE9B,IAAI,GAAG,GAAG,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAEtE,+EAA+E;IAC/E,+DAA+D;IAC/D,IAAI,mCAAmC,EAAE;QACvC,GAAG,IAAI,UAAU,CAAC;QAClB,GAAG,IAAI,UAAU,CAAC;KACnB;IAED,iDAAiD;IACjD,4GAA4G;IAC5G,IAAI,sBAAsB;QAAE,GAAG,IAAI,UAAU,CAAC;IAE9C,yCAAyC;IACzC,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG,IAAI,CAAC,mCAAmC;QAC/D,GAAG,IAAI,UAAU,CAAC;IAEpB,sCAAsC;IACtC,mBAAmB;IACnB,GAAG,IAAI,WAAW,CAAC;IAEnB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAlCD,4CAkCC;AAED,SAAgB,2BAA2B,CAAC,IAAc;IACxD,IAAI,GAAG,GAAG,YAAY,CAAC;IAEvB,yCAAyC;IACzC,gGAAgG;IAEhG,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAPD,kEAOC;AAED,oDAAoD;AACpD,8BAA8B;AAC9B,MAAa,cAAc;IACzB,YAAsB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAC9D,2DAA2D;IAC3D,8BAA8B,CAAC,KAAoB;QAIjD,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAC/B,CAAC,CAAC,QAAQ,EACV,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,aAAa,CAChB,CAAC;YACF,MAAM,mBAAmB,GAAG,QAAQ,CAAC,MAAM,CACzC,CAAC,GAAW,EAAE,CAAkB,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/D,EAAE,CACH,CAAC;YACF,eAAe,IAAI,mBAAmB,CAAC;YACvC,OAAO;gBACL,EAAE,EAAE,CAAC,CAAC,SAAS;gBACf,eAAe,EAAE,mBAAmB,CAAC,QAAQ,EAAE;gBAC/C,QAAQ;aACT,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAChD,CAAC;IAED,8BAA8B,CAAC,MAAsB;QAInD,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACnC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,8BAA8B,CAC/D,CAAC,CAAC,KAAK,CACR,CAAC;YACF,eAAe,IAAI,UAAU,CAAC;YAC9B,OAAO;gBACL,iBAAiB,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC/C,IAAI,EAAE,KAAK;aACZ,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IACxD,CAAC;IAED,wBAAwB,CACtB,QAAiB,EACjB,SAAkB,EAClB,aAAyC,EACzC,SAAiB,EACjB,cAAsB;QAEtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,4BAA4B,CAC1D,aAAa,EACb,oBAAQ,CAAC,GAAG,CACb,CAAC;QACF,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,KAAK,GAAoB,EAAE,CAAC;QAChC,aAAa,CAAC,OAAO,CAAC,CAAC,EAA4B,EAAE,EAAE;YACrD,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,GAC3B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;YAChD,OAAO,GAAG,cAAc,CAAC,CAAC,4CAA4C;YACtE,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB;iBACxC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC;iBACjC,eAAe,CACd,QAAQ,EACR,SAAS,EACT,CACE,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC1C,MAAM,CAAC,cAAc,CAAC,CACvB,CAAC,QAAQ,EAAE,EACZ,EAAE,CAAC,UAAU,EACb,EAAE,CAAC,IAAI,EACP,oBAAQ,CAAC,GAAG,CACb,CAAC;YACJ,UAAU,IAAI,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC;gBACT,GAAG,YAAY;gBACf,KAAK;gBACL,OAAO,EAAE,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;aACvC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IACxC,CAAC;IAED,WAAW,CACT,QAAiB,EACjB,SAAkB,EAClB,aAAyC;QAEzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QAC5E,IAAI,WAAW,GAA2C,EAAE,CAAC;QAC7D,aAAa,CAAC,OAAO,CAAC,CAAC,EAA4B,EAAE,EAAE;YACrD,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,GAC3B,kBAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC,CAAC,cAAc,IAAI,WAAW,CAAC,EAAE;gBACpC,WAAW,CAAC,cAAc,CAAC,GAAG;oBAC5B,OAAO,EAAE,cAAc;oBACvB,OAAO,EAAE,GAAG;oBACZ,UAAU,EAAE,GAAG;oBACf,KAAK,EAAE,EAAE;iBACV,CAAC;aACH;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB;iBACxC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC;iBACjC,eAAe,CACd,QAAQ,EACR,SAAS,EACT,EAAE,CAAC,SAAS,EACZ,EAAE,CAAC,UAAU,EACb,EAAE,CAAC,IAAI,EACP,oBAAQ,CAAC,IAAI,CACd,CAAC;YACJ,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,GAAG,CACpC,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;gBAC/C,EAAE,CAAC,OAAO,GAAG,GAAG,CACjB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,WAAW,CAAC,cAAc,CAAC,CAAC,UAAU,GAAG,CACvC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC;gBAC9C,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAChC,CAAC,QAAQ,EAAE,CAAC;YACb,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACrC,GAAG,YAAY;gBACf,KAAK;gBACL,OAAO,EAAE,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;aACvC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACzC,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACxD,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC5D,CAAC,CAAC,OAAO,EAAE,CACZ,CAAC;YACF,MAAM,qBAAqB,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC;gBACJ,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;aACzB,CAAC,CAAC,CAAC;YACJ,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gFAAgF;IAChF,2EAA2E;IAC3E,6EAA6E;IAC7E,4BAA4B,CAC1B,aAAyC,EACzC,OAAiB,oBAAQ,CAAC,IAAI;QAI9B,IAAI,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAErC,MAAM,aAAa,GAAkC,EAAE,CAAC;QACxD,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACtE,IAAI,CAAC,QAAQ,CAAC,MAAM;gBAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACnB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBACxC,IAAI,CAAC,CAAC,OAAO,IAAI,aAAa,CAAC;oBAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC5D,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC7D,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC;QACF,qCAAqC;QACrC,IAAI,eAAe,GAEf,EAAE,CAAC;QACP,MAAM,gBAAgB,GAA+B,EAAE,CAAC;QAExD,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACzB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB;iBACzC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC;iBAC7B,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,CAAC;YAChE,IAAI,aAAa,EAAE;gBACjB,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG;oBAC3C,aAAa,CAAC,OAAO;oBACrB,aAAa,CAAC,KAAK;iBACpB,CAAC;aACH;iBAAM;gBACL,IAAI,IAAI,KAAK,oBAAQ,CAAC,GAAG;oBACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,GAAG,eAAe;YAClB,GAAG,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC;SACvD,CAAC;IACJ,CAAC;CACF;AAlMD,wCAkMC"}
+{"version":3,"file":"payload-encoder.js","sourceRoot":"","sources":["../../src/router/payload-encoder.ts"],"names":[],"mappings":"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"}

package/build/router/simpleswap.d.ts

@@ -18,13 +18,13 @@ export declare abstract class SimpleRouterBase<RouterParam> implements IRouter<R
         partialContractSimpleData: PartialContractSimpleData;
         networkFee: string;
     }>;
-    abstract build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, positiveSlippageToUser: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<RouterParam>>;
+    abstract build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<RouterParam>>;
     protected getDepositWithdrawWethCallData(srcAmountWeth: bigint, destAmountWeth: bigint): import("../dex/weth/types").DepositWithdrawReturn | undefined;
 }
 export declare abstract class SimpleRouter extends SimpleRouterBase<SimpleSwapParam> {
     constructor(dexAdapterService: DexAdapterService, side: SwapSide, contractMethodName: string);
     protected validateBestRoute(priceRoute: OptimalRate): boolean;
-    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, positiveSlippageToUser: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<SimpleSwapParam>>;
+    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<SimpleSwapParam>>;
 }
 export declare class SimpleSwap extends SimpleRouter {
     static isBuy: boolean;

package/build/router/simpleswap.js

@@ -142,7 +142,7 @@ class SimpleRouter extends SimpleRouterBase {
             priceRoute.bestRoute[0].percent === 100 &&
             priceRoute.bestRoute[0].swaps.length === 1);
     }
-    async build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, beneficiary, permit, deadline, uuid) {
+    async build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, beneficiary, permit, deadline, uuid) {
         if (!this.validateBestRoute(priceRoute))
             throw new Error(`${this.contractMethodName} invalid bestRoute`);
         const { partialContractSimpleData, networkFee } = await this.buildCalls(priceRoute, minMaxAmount);
@@ -152,9 +152,9 @@ class SimpleRouter extends SimpleRouterBase {
                 (0, payload_encoder_1.encodePartnerAddressForFeeLogic)({
                     partnerAddress,
                     partnerFeePercent,
-                    positiveSlippageToUser,
+                    takeSurplus,
                 }),
-                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, positiveSlippageToUser, this.side),
+                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, takeSurplus, this.side),
             ];
         const sellData = {
             ...partialContractSimpleData,

package/build/router/simpleswap.js.map

@@ -1 +1 @@
-{"version":3,"file":"simpleswap.js","sourceRoot":"","sources":["../../src/router/simpleswap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"simpleswap.js","sourceRoot":"","sources":["../../src/router/simpleswap.ts"],"names":[],"mappings":"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"}

package/build/router/simpleswapnft.d.ts

@@ -6,6 +6,6 @@ export declare class SimpleBuyNFT extends SimpleRouterBase<SimpleBuyNFTParam> {
     static isBuy: boolean;
     constructor(dexAdapterService: DexAdapterService);
     protected validateBestRoute(priceRoute: OptimalRate): boolean;
-    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, positiveSlippageToUser: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<SimpleBuyNFTParam>>;
+    build(priceRoute: OptimalRate, minMaxAmount: string, userAddress: Address, referrerAddress: Address | undefined, partnerAddress: Address, partnerFeePercent: string, takeSurplus: boolean, beneficiary: Address, permit: string, deadline: string, uuid: string): Promise<TxInfo<SimpleBuyNFTParam>>;
 }
 export {};

package/build/router/simpleswapnft.js

@@ -31,7 +31,7 @@ class SimpleBuyNFT extends simpleswap_1.SimpleRouterBase {
                         !se.data.makerAssetId ||
                         !se.data.takerAssetId))));
     }
-    async build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, beneficiary, permit, deadline, uuid) {
+    async build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, beneficiary, permit, deadline, uuid) {
         if (!this.validateBestRoute(priceRoute))
             throw new Error(`${this.contractMethodName} invalid bestRoute`);
         const { partialContractSimpleData, networkFee } = await this.buildCalls(priceRoute, minMaxAmount);
@@ -62,9 +62,9 @@ class SimpleBuyNFT extends simpleswap_1.SimpleRouterBase {
                 (0, payload_encoder_1.encodePartnerAddressForFeeLogic)({
                     partnerAddress,
                     partnerFeePercent,
-                    positiveSlippageToUser,
+                    takeSurplus,
                 }),
-                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, positiveSlippageToUser, constants_1.SwapSide.BUY),
+                (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, takeSurplus, constants_1.SwapSide.BUY),
             ];
         const buyData = {
             ...partialContractSimpleData,

package/build/router/simpleswapnft.js.map

@@ -1 +1 @@
-{"version":3,"file":"simpleswapnft.js","sourceRoot":"","sources":["../../src/router/simpleswapnft.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"simpleswapnft.js","sourceRoot":"","sources":["../../src/router/simpleswapnft.ts"],"names":[],"mappings":"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"}

package/build/transaction-builder.d.ts

@@ -5,14 +5,14 @@ export declare class TransactionBuilder {
     protected dexAdapterService: DexAdapterService;
     routerService: RouterService;
     constructor(dexAdapterService: DexAdapterService);
-    build({ priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, gasPrice, maxFeePerGas, maxPriorityFeePerGas, permit, deadline, uuid, beneficiary, onlyParams, }: {
+    build({ priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, gasPrice, maxFeePerGas, maxPriorityFeePerGas, permit, deadline, uuid, beneficiary, onlyParams, }: {
         priceRoute: OptimalRate;
         minMaxAmount: string;
         userAddress: Address;
         referrerAddress?: Address;
         partnerAddress: Address;
         partnerFeePercent: string;
-        positiveSlippageToUser?: boolean;
+        takeSurplus?: boolean;
         gasPrice?: string;
         maxFeePerGas?: string;
         maxPriorityFeePerGas?: string;

package/build/transaction-builder.js

@@ -8,11 +8,11 @@ class TransactionBuilder {
         this.dexAdapterService = dexAdapterService;
         this.routerService = new router_1.RouterService(this.dexAdapterService);
     }
-    async build({ priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser, gasPrice, maxFeePerGas, maxPriorityFeePerGas, permit, deadline, uuid, beneficiary, onlyParams = false, }) {
+    async build({ priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, gasPrice, maxFeePerGas, maxPriorityFeePerGas, permit, deadline, uuid, beneficiary, onlyParams = false, }) {
         const _beneficiary = beneficiary || userAddress;
         const { encoder, params, networkFee } = await this.routerService
             .getRouterByContractMethod(priceRoute.contractMethod)
-            .build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, positiveSlippageToUser ?? true, _beneficiary, permit || '0x', deadline, uuid);
+            .build(priceRoute, minMaxAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus ?? false, _beneficiary, permit || '0x', deadline, uuid);
         if (onlyParams)
             return params;
         const value = (priceRoute.srcToken.toLowerCase() === constants_1.ETHER_ADDRESS.toLowerCase()

package/build/transaction-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-builder.js","sourceRoot":"","sources":["../src/transaction-builder.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AACtD,qCAAyC;AAGzC,MAAa,kBAAkB;IAG7B,YAAsB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,sBAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,sBAAsB,EACtB,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,EACX,UAAU,GAAG,KAAK,GAiBnB;QACC,MAAM,YAAY,GAAG,WAAW,IAAI,WAAW,CAAC;QAChD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa;aAC7D,yBAAyB,CAAC,UAAU,CAAC,cAAc,CAAC;aACpD,KAAK,CACJ,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,sBAAsB,IAAI,IAAI,EAC9B,YAAY,EACZ,MAAM,IAAI,IAAI,EACd,QAAQ,EACR,IAAI,CACL,CAAC;QAEJ,IAAI,UAAU;YAAE,OAAO,MAAM,CAAC;QAE9B,MAAM,KAAK,GAAG,CACZ,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,yBAAa,CAAC,WAAW,EAAE;YAC/D,CAAC,CAAC,MAAM,CACJ,UAAU,CAAC,IAAI,KAAK,oBAAQ,CAAC,IAAI;gBAC/B,CAAC,CAAC,UAAU,CAAC,SAAS;gBACtB,CAAC,CAAC,YAAY,CACjB,GAAG,MAAM,CAAC,UAAU,CAAC;YACxB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACvB,CAAC,QAAQ,EAAE,CAAC;QAEb,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,UAAU,CAAC,eAAe;YAC9B,KAAK;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;YACjC,QAAQ;YACR,YAAY;YACZ,oBAAoB;SACrB,CAAC;IACJ,CAAC;CACF;AA/ED,gDA+EC"}
+{"version":3,"file":"transaction-builder.js","sourceRoot":"","sources":["../src/transaction-builder.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AACtD,qCAAyC;AAGzC,MAAa,kBAAkB;IAG7B,YAAsB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,sBAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,EACjB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,EACX,UAAU,GAAG,KAAK,GAiBnB;QACC,MAAM,YAAY,GAAG,WAAW,IAAI,WAAW,CAAC;QAChD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa;aAC7D,yBAAyB,CAAC,UAAU,CAAC,cAAc,CAAC;aACpD,KAAK,CACJ,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,WAAW,IAAI,KAAK,EACpB,YAAY,EACZ,MAAM,IAAI,IAAI,EACd,QAAQ,EACR,IAAI,CACL,CAAC;QAEJ,IAAI,UAAU;YAAE,OAAO,MAAM,CAAC;QAE9B,MAAM,KAAK,GAAG,CACZ,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,yBAAa,CAAC,WAAW,EAAE;YAC/D,CAAC,CAAC,MAAM,CACJ,UAAU,CAAC,IAAI,KAAK,oBAAQ,CAAC,IAAI;gBAC/B,CAAC,CAAC,UAAU,CAAC,SAAS;gBACtB,CAAC,CAAC,YAAY,CACjB,GAAG,MAAM,CAAC,UAAU,CAAC;YACxB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CACvB,CAAC,QAAQ,EAAE,CAAC;QAEb,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,UAAU,CAAC,eAAe;YAC9B,KAAK;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;YACjC,QAAQ;YACR,YAAY;YACZ,oBAAoB;SACrB,CAAC;IACJ,CAAC;CACF;AA/ED,gDA+EC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.28.7",
+  "version": "2.28.9-take-surplus.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/balancer-v2/balancer-v2.ts

@@ -826,6 +826,8 @@ export class BalancerV2
             prices: resOut.prices,
             data: {
               poolId: pool.id,
+              tokenIn: _from.address.toLowerCase(),
+              tokenOut: _to.address.toLowerCase(),
             },
             poolAddresses: [poolAddress],
             exchange: this.dexKey,

package/src/dex/balancer-v2/optimizer.ts

@@ -1,70 +1,83 @@
-import { UnoptimizedRate, OptimalSwapExchange } from '../../types';
-import { BalancerSwapV2 } from './types';
+import _ from 'lodash';
+import { UnoptimizedRate } from '../../types';
 import { SwapSide } from '../../constants';
 import { BalancerConfig } from './config';
-
-const MAX_UINT256 =
-  '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-
-const AllBalancerV2Forks = Object.keys(BalancerConfig);
+import { OptimalSwap } from '@paraswap/core';
 
 export function balancerV2Merge(or: UnoptimizedRate): UnoptimizedRate {
-  const fixSwap = (
-    rawSwap: OptimalSwapExchange<any>[],
-    side: SwapSide,
-  ): OptimalSwapExchange<any>[] => {
-    const newBalancers: { [key: string]: OptimalSwapExchange<any> } = {};
-    let optimizedSwap = new Array<OptimalSwapExchange<any>>();
-    rawSwap.forEach((s: OptimalSwapExchange<any>) => {
-      const exchangeKey = s.exchange.toLowerCase();
-      if (AllBalancerV2Forks.some(d => d.toLowerCase() === exchangeKey)) {
-        if (!(exchangeKey in newBalancers)) {
-          newBalancers[exchangeKey] = {
-            exchange: s.exchange,
-            srcAmount: '0',
-            destAmount: '0',
-            percent: 0,
-            poolAddresses: [],
-            data: {
-              swaps: new Array<BalancerSwapV2>(),
-              gasUSD: '0',
-            },
-          };
-        }
-        newBalancers[exchangeKey].srcAmount = (
-          BigInt(newBalancers[exchangeKey].srcAmount) + BigInt(s.srcAmount)
+  const balancerForksList = Object.keys(BalancerConfig).map(b =>
+    b.toLowerCase(),
+  );
+  const fixSwap = (rawRate: OptimalSwap[], side: SwapSide): OptimalSwap[] => {
+    let lastExchange: false | OptimalSwap = false;
+    let optimizedRate = new Array<OptimalSwap>();
+    rawRate.forEach((s: OptimalSwap) => {
+      if (
+        s.swapExchanges.length !== 1 ||
+        !balancerForksList.includes(s.swapExchanges[0].exchange.toLowerCase())
+      ) {
+        lastExchange = false;
+        optimizedRate.push(s);
+      } else if (
+        lastExchange &&
+        lastExchange.swapExchanges[0].exchange.toLowerCase() ===
+          s.swapExchanges[0].exchange.toLowerCase() &&
+        _.last(
+          <any[]>lastExchange.swapExchanges[0].data.swaps,
+        )!.tokenOut.toLowerCase() ===
+          s.swapExchanges[0].data.tokenIn.toLowerCase()
+      ) {
+        const [lastExchangeSwap] = lastExchange.swapExchanges;
+        const [currentSwap] = s.swapExchanges;
+        lastExchangeSwap.srcAmount = (
+          BigInt(lastExchangeSwap.srcAmount) + BigInt(currentSwap.srcAmount)
         ).toString();
 
-        newBalancers[exchangeKey].destAmount = (
-          BigInt(newBalancers[exchangeKey].destAmount) + BigInt(s.destAmount)
+        lastExchangeSwap.destAmount = (
+          BigInt(lastExchangeSwap.destAmount) + BigInt(currentSwap.destAmount)
         ).toString();
 
-        newBalancers[exchangeKey].percent += s.percent;
-        newBalancers[exchangeKey].data.exchangeProxy = s.data.exchangeProxy;
-        newBalancers[exchangeKey].data.gasUSD = (
-          parseFloat(newBalancers[exchangeKey].data.gasUSD) +
-          parseFloat(s.data.gasUSD)
+        lastExchangeSwap.percent += currentSwap.percent;
+        lastExchangeSwap.data.gasUSD = (
+          parseFloat(lastExchangeSwap.data.gasUSD) +
+          parseFloat(currentSwap.data.gasUSD)
         ).toFixed(6);
 
-        newBalancers[exchangeKey].data.swaps.push({
-          poolId: s.data.poolId,
-          amount: side === SwapSide.SELL ? s.srcAmount : s.destAmount,
+        lastExchangeSwap.data.swaps.push({
+          poolId: currentSwap.data.poolId,
+          amount:
+            side === SwapSide.SELL
+              ? currentSwap.srcAmount
+              : currentSwap.destAmount,
+          tokenIn: currentSwap.data.tokenIn,
+          tokenOut: currentSwap.data.tokenOut,
         });
-        newBalancers[exchangeKey].poolAddresses!.push(s.poolAddresses![0]);
+        lastExchangeSwap.poolAddresses!.push(currentSwap.poolAddresses![0]);
       } else {
-        optimizedSwap.push(s);
+        lastExchange = _.cloneDeep(s);
+        lastExchange.swapExchanges[0].data = {};
+        lastExchange.swapExchanges[0].data.gasUSD =
+          s.swapExchanges[0].data.gasUSD;
+        lastExchange.swapExchanges[0].data.swaps = [
+          {
+            poolId: s.swapExchanges[0].data.poolId,
+            amount:
+              side === SwapSide.SELL
+                ? s.swapExchanges[0].srcAmount
+                : s.swapExchanges[0].destAmount,
+            tokenIn: s.swapExchanges[0].data.tokenIn,
+            tokenOut: s.swapExchanges[0].data.tokenOut,
+          },
+        ];
+        optimizedRate.push(lastExchange);
       }
     });
-    optimizedSwap = optimizedSwap.concat(Object.values(newBalancers));
-    return optimizedSwap;
+    return optimizedRate;
   };
 
   or.bestRoute = or.bestRoute.map(r => ({
     ...r,
-    swaps: r.swaps.map(s => ({
-      ...s,
-      swapExchanges: fixSwap(s.swapExchanges, or.side),
-    })),
+    swaps: fixSwap(r.swaps, or.side),
   }));
   return or;
 }

package/src/dex/balancer-v2/types.ts

@@ -82,6 +82,8 @@ export interface SubgraphPoolBase {
 export type BalancerSwapV2 = {
   poolId: string;
   amount: string;
+  tokenIn: string;
+  tokenOut: string;
 };
 
 export type OptimizedBalancerV2Data = {
@@ -139,6 +141,8 @@ export type BalancerV2DirectParam = [
 
 export type BalancerV2Data = {
   poolId: string;
+  tokenIn: string;
+  tokenOut: string;
 };
 
 export type DexParams = {

package/src/dex/curve-v1-factory/price-handlers/functions/calc_token_amount.ts

@@ -35,6 +35,38 @@ const customPlain3CoinThree: calc_token_amount = (
   return (diff * token_amount) / D0;
 };
 
+const factoryPlain2Basic: calc_token_amount = (
+  self: IPoolContext,
+  state: PoolState,
+  amounts: bigint[],
+  is_deposit: boolean,
+) => {
+  const { N_COINS } = self.constants;
+  const amp = state.A;
+  const balances = [...state.balances];
+  const D0 = self.get_D(self, balances, amp);
+  for (const i of _.range(N_COINS)) {
+    if (is_deposit) balances[i] += amounts[i];
+    else balances[i] -= amounts[i];
+  }
+  const D1 = self.get_D(self, balances, amp);
+
+  if (state.totalSupply === undefined) {
+    throw new Error(
+      `${self.IMPLEMENTATION_NAME} customPlain3CoinThree: totalSupply is not provided`,
+    );
+  }
+
+  const token_amount = state.totalSupply;
+  let diff = 0n;
+  if (is_deposit) {
+    diff = D1 - D0;
+  } else {
+    diff = D0 - D1;
+  }
+  return (diff * token_amount) / D0;
+};
+
 const customAvalanche3CoinLending: calc_token_amount = (
   self: IPoolContext,
   state: PoolState,
@@ -114,7 +146,7 @@ const implementations: Record<ImplementationNames, calc_token_amount> = {
   [ImplementationNames.FACTORY_META_USD_BALANCES_FRAX_USDC]: notImplemented,
 
   [ImplementationNames.FACTORY_PLAIN_2_BALANCES]: notImplemented,
-  [ImplementationNames.FACTORY_PLAIN_2_BASIC]: notImplemented,
+  [ImplementationNames.FACTORY_PLAIN_2_BASIC]: factoryPlain2Basic,
   [ImplementationNames.FACTORY_PLAIN_2_ETH]: notImplemented,
   [ImplementationNames.FACTORY_PLAIN_2_OPTIMIZED]: notImplemented,
 

package/src/dex/uniswap-v3/uniswap-v3.ts

@@ -276,7 +276,7 @@ export class UniswapV3
           e,
         );
       } else {
-        // on unkown error mark as failed and increase retryCount for retry init strategy
+        // on unknown error mark as failed and increase retryCount for retry init strategy
         // note: state would be null by default which allows to fallback
         this.logger.warn(
           `${this.dexKey}: Can not generate pool state for srcAddress=${srcAddress}, destAddress=${destAddress}, fee=${fee} pool fallback to rpc and retry every ${this.config.initRetryFrequency} times, initRetryAttemptCount=${pool.initRetryAttemptCount}`,

package/src/router/buy.ts

@@ -42,7 +42,7 @@ export class Buy extends PayloadEncoder implements IRouter<BuyParam> {
     referrerAddress: Address | undefined,
     partnerAddress: Address,
     partnerFeePercent: string,
-    positiveSlippageToUser: boolean,
+    takeSurplus: boolean,
     beneficiary: Address,
     permit: string,
     deadline: string,
@@ -69,13 +69,9 @@ export class Buy extends PayloadEncoder implements IRouter<BuyParam> {
           encodePartnerAddressForFeeLogic({
             partnerAddress,
             partnerFeePercent,
-            positiveSlippageToUser,
+            takeSurplus,
           }),
-          encodeFeePercent(
-            partnerFeePercent,
-            positiveSlippageToUser,
-            SwapSide.BUY,
-          ),
+          encodeFeePercent(partnerFeePercent, takeSurplus, SwapSide.BUY),
         ];
 
     const buyData: ContractBuyData = {