@paraswap/dex-lib 3.8.28-fm.2 → 3.8.28

package/build/dex/zerox/order.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZeroXOrder = void 0;
+class ZeroXOrder {
+    static formatOrderV4(order, version) {
+        return {
+            makerToken: order.makerToken,
+            takerToken: order.takerToken,
+            makerAmount: order.makerAmount,
+            takerAmount: order.takerAmount,
+            maker: order.maker,
+            taker: order.taker,
+            txOrigin: order.txOrigin,
+            pool: order.pool,
+            expiry: order.expiry,
+            salt: order.salt,
+        };
+    }
+    static formatOrderV23(order, version) {
+        const feeAssetData = version === 3
+            ? {
+                makerFeeAssetData: order.makerFeeAssetData,
+                takerFeeAssetData: order.takerFeeAssetData,
+            }
+            : {};
+        return {
+            makerAddress: order.makerAddress,
+            takerAddress: order.takerAddress,
+            feeRecipientAddress: order.feeRecipientAddress,
+            senderAddress: order.senderAddress,
+            makerAssetAmount: order.makerAssetAmount,
+            takerAssetAmount: order.takerAssetAmount,
+            makerFee: order.makerFee,
+            takerFee: order.takerFee,
+            expirationTimeSeconds: order.expirationTimeSeconds,
+            salt: order.salt,
+            makerAssetData: order.makerAssetData,
+            takerAssetData: order.takerAssetData,
+            ...feeAssetData,
+        };
+    }
+    static formatOrders(order, version = 2) {
+        if (isV4Order(order, version)) {
+            return ZeroXOrder.formatOrderV4(order, version);
+        }
+        return ZeroXOrder.formatOrderV23(order, version);
+    }
+}
+exports.ZeroXOrder = ZeroXOrder;
+function isV4Order(order, version = 2) {
+    return version === 4;
+}
+//# sourceMappingURL=order.js.map

package/build/dex/zerox/order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"order.js","sourceRoot":"","sources":["../../../src/dex/zerox/order.ts"],"names":[],"mappings":";;;AAMA,MAAa,UAAU;IACrB,MAAM,CAAC,aAAa,CAAC,KAAyB,EAAE,OAAe;QAC7D,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAAyB,EAAE,OAAe;QAC9D,MAAM,YAAY,GAChB,OAAO,KAAK,CAAC;YACX,CAAC,CAAC;gBACE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;aAC3C;YACH,CAAC,CAAC,EAAE,CAAC;QAET,OAAO;YACL,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;YAClD,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,GAAG,YAAY;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAuB,EAAE,UAAkB,CAAC;QAC9D,IAAI,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;YAC7B,OAAO,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACjD;QACD,OAAO,UAAU,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACF;AAhDD,gCAgDC;AAED,SAAS,SAAS,CAChB,KAAuB,EACvB,UAAkB,CAAC;IAEnB,OAAO,OAAO,KAAK,CAAC,CAAC;AACvB,CAAC"}

package/build/dex/zerox/types.d.ts

@@ -0,0 +1,73 @@
+import { Address } from '@paraswap/sdk';
+import { NumberAsString } from '../../types';
+export declare enum OrderStatus {
+    INVALID = 0,
+    INVALID_MAKER_ASSET_AMOUNT = 1,
+    INVALID_TAKER_ASSET_AMOUNT = 2,
+    FILLABLE = 3,
+    EXPIRED = 4,
+    FULLY_FILLED = 5,
+    CANCELLED = 6
+}
+declare type Value = NumberAsString | number;
+export interface ZeroXSignedOrderV2 {
+    senderAddress: string;
+    makerAddress: string;
+    takerAddress: string;
+    makerFee: Value;
+    takerFee: Value;
+    makerAssetAmount: Value;
+    takerAssetAmount: Value;
+    makerAssetData: string;
+    takerAssetData: string;
+    salt: Value;
+    exchangeAddress: string;
+    feeRecipientAddress: string;
+    expirationTimeSeconds: Value;
+    makerFeeAssetData: string;
+    takerFeeAssetData: string;
+    signature: string;
+}
+export interface ZeroXSignedOrderV4 {
+    makerToken: string;
+    takerToken: string;
+    makerAmount: Value;
+    takerAmount: Value;
+    maker: string;
+    taker: string;
+    txOrigin: string;
+    pool: string;
+    expiry: Value;
+    salt: Value;
+    signature: any;
+}
+export declare type ZeroXSignedOrder = ZeroXSignedOrderV2 | ZeroXSignedOrderV4;
+export declare enum ZeroXFunctions {
+    swapOnZeroXv2 = "swapOnZeroXv2",
+    swapOnZeroXv4 = "swapOnZeroXv4",
+    swapOnZeroXv2WithPermit = "swapOnZeroXv2WithPermit",
+    swapOnZeroXv4WithPermit = "swapOnZeroXv4WithPermit"
+}
+export declare type ZeroXData = {
+    version: number;
+    order: ZeroXSignedOrder;
+};
+export declare type SwapOnZeroXParam = [
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    exchange: Address,
+    payload: string
+];
+export declare type SwapOnZeroXWithPermitParam = [
+    srcToken: Address,
+    destToken: Address,
+    srcAmount: NumberAsString,
+    destAmount: NumberAsString,
+    exchange: Address,
+    payload: string,
+    permit: string
+];
+export declare type ZeroXParam = SwapOnZeroXParam | SwapOnZeroXWithPermitParam;
+export {};

package/build/dex/zerox/types.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZeroXFunctions = exports.OrderStatus = void 0;
+var OrderStatus;
+(function (OrderStatus) {
+    OrderStatus[OrderStatus["INVALID"] = 0] = "INVALID";
+    OrderStatus[OrderStatus["INVALID_MAKER_ASSET_AMOUNT"] = 1] = "INVALID_MAKER_ASSET_AMOUNT";
+    OrderStatus[OrderStatus["INVALID_TAKER_ASSET_AMOUNT"] = 2] = "INVALID_TAKER_ASSET_AMOUNT";
+    OrderStatus[OrderStatus["FILLABLE"] = 3] = "FILLABLE";
+    OrderStatus[OrderStatus["EXPIRED"] = 4] = "EXPIRED";
+    OrderStatus[OrderStatus["FULLY_FILLED"] = 5] = "FULLY_FILLED";
+    OrderStatus[OrderStatus["CANCELLED"] = 6] = "CANCELLED";
+})(OrderStatus = exports.OrderStatus || (exports.OrderStatus = {}));
+var ZeroXFunctions;
+(function (ZeroXFunctions) {
+    ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
+    ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
+    ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
+    ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
+})(ZeroXFunctions = exports.ZeroXFunctions || (exports.ZeroXFunctions = {}));
+//# sourceMappingURL=types.js.map

package/build/dex/zerox/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,yFAA0B,CAAA;IAC1B,yFAA0B,CAAA;IAC1B,qDAAQ,CAAA;IACR,mDAAO,CAAA;IACP,6DAAY,CAAA;IACZ,uDAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAuCD,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iDAA+B,CAAA;IAC/B,iDAA+B,CAAA;IAC/B,qEAAmD,CAAA;IACnD,qEAAmD,CAAA;AACrD,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}

package/build/executor/types.d.ts

@@ -22,7 +22,9 @@ export declare enum SpecialDex {
     SWAP_ON_DYSTOPIA_UNISWAP_V2_FORK_WITH_FEE = 8,
     SWAP_ON_AUGUSTUS_RFQ = 9,
     EXECUTE_VERTICAL_BRANCHING = 10,
-    BUY_ON_SOLIDLY_V3 = 11
+    BUY_ON_SOLIDLY_V3 = 11,
+    SWAP_ON_DEXALOT = 12,
+    SWAP_ON_HASHFLOW = 13
 }
 export declare enum Executors {
     WETH = "WETH",

package/build/executor/types.js

@@ -29,6 +29,8 @@ var SpecialDex;
     SpecialDex[SpecialDex["SWAP_ON_AUGUSTUS_RFQ"] = 9] = "SWAP_ON_AUGUSTUS_RFQ";
     SpecialDex[SpecialDex["EXECUTE_VERTICAL_BRANCHING"] = 10] = "EXECUTE_VERTICAL_BRANCHING";
     SpecialDex[SpecialDex["BUY_ON_SOLIDLY_V3"] = 11] = "BUY_ON_SOLIDLY_V3";
+    SpecialDex[SpecialDex["SWAP_ON_DEXALOT"] = 12] = "SWAP_ON_DEXALOT";
+    SpecialDex[SpecialDex["SWAP_ON_HASHFLOW"] = 13] = "SWAP_ON_HASHFLOW";
 })(SpecialDex = exports.SpecialDex || (exports.SpecialDex = {}));
 var Executors;
 (function (Executors) {

package/build/executor/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/executor/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,IAWX;AAXD,WAAY,IAAI;IACd,8LAAwF,CAAA;IACxF,wMAA6F,CAAA;IAC7F,kIAA0D,CAAA;IAC1D,6IAA+D,CAAA;IAC/D,2IAA8D,CAAA;IAC9D,qHAAmD,CAAA;IACnD,uJAAoE,CAAA;IACpE,+HAAwD,CAAA;IACxD,uHAAoD,CAAA;IACpD,iIAAyD,CAAA;AAC3D,CAAC,EAXW,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAWf;AAED,IAAY,UAcX;AAdD,WAAY,UAAU;IACpB,iDAAW,CAAA;IACX,iFAA2B,CAAA;IAC3B,yCAAyC;IACzC,yEAAuB,CAAA;IACvB,qEAAqB,CAAA;IACrB,yDAAe,CAAA;IACf,yEAAuB,CAAA;IACvB,iFAA2B,CAAA;IAC3B,mGAAoC,CAAA;IACpC,qHAA6C,CAAA;IAC7C,2EAAwB,CAAA;IACxB,wFAA+B,CAAA;IAC/B,sEAAsB,CAAA;AACxB,CAAC,EAdW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAcrB;AAED,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,+BAAkB,CAAA;IAClB,+BAAkB,CAAA;IAClB,iCAAoB,CAAA;AACtB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB;AAED,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,yEAAe,CAAA;IACf,yFAAuB,CAAA;IACvB,iFAAmB,CAAA;IACnB,yHAAuC,CAAA;IACvC,uIAA8C,CAAA;AAChD,CAAC,EANW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAM7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/executor/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,IAWX;AAXD,WAAY,IAAI;IACd,8LAAwF,CAAA;IACxF,wMAA6F,CAAA;IAC7F,kIAA0D,CAAA;IAC1D,6IAA+D,CAAA;IAC/D,2IAA8D,CAAA;IAC9D,qHAAmD,CAAA;IACnD,uJAAoE,CAAA;IACpE,+HAAwD,CAAA;IACxD,uHAAoD,CAAA;IACpD,iIAAyD,CAAA;AAC3D,CAAC,EAXW,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAWf;AAED,IAAY,UAgBX;AAhBD,WAAY,UAAU;IACpB,iDAAW,CAAA;IACX,iFAA2B,CAAA;IAC3B,yCAAyC;IACzC,yEAAuB,CAAA;IACvB,qEAAqB,CAAA;IACrB,yDAAe,CAAA;IACf,yEAAuB,CAAA;IACvB,iFAA2B,CAAA;IAC3B,mGAAoC,CAAA;IACpC,qHAA6C,CAAA;IAC7C,2EAAwB,CAAA;IACxB,wFAA+B,CAAA;IAC/B,sEAAsB,CAAA;IACtB,kEAAoB,CAAA;IACpB,oEAAqB,CAAA;AACvB,CAAC,EAhBW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAgBrB;AAED,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,+BAAkB,CAAA;IAClB,+BAAkB,CAAA;IAClB,iCAAoB,CAAA;AACtB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB;AAED,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,yEAAe,CAAA;IACf,yFAAuB,CAAA;IACvB,iFAAmB,CAAA;IACnB,yHAAuC,CAAA;IACvC,uIAA8C,CAAA;AAChD,CAAC,EANW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAM7B"}

package/build/pricing-helper.d.ts

@@ -13,11 +13,11 @@ export declare class PricingHelper {
     initialize(blockNumber: number, dexKeys: string[]): Promise<void[]>;
     releaseResources(dexKeys: string[]): Promise<void[]>;
     private releaseDexResources;
-    getPoolIdentifiers(from: Token, to: Token, side: SwapSide, blockNumber: number, dexKeys: string[], filterConstantPricePool?: boolean, overrideTimeout?: number): Promise<{
+    getPoolIdentifiers(from: Token, to: Token, side: SwapSide, blockNumber: number, dexKeys: string[], filterConstantPricePool?: boolean): Promise<{
         [dexKey: string]: string[] | null;
     }>;
     getDexsSupportingFeeOnTransfer(): string[];
     getPoolPrices(from: Token, to: Token, amounts: bigint[], side: SwapSide, blockNumber: number, dexKeys: string[], limitPoolsMap: {
         [key: string]: string[] | null;
-    } | null, transferFees?: TransferFeeParams, rollupL1ToL2GasRatio?: number, overrideTimeout?: number, fmode?: boolean): Promise<PoolPrices<any>[]>;
+    } | null, transferFees?: TransferFeeParams, rollupL1ToL2GasRatio?: number): Promise<PoolPrices<any>[]>;
 }

package/build/pricing-helper.js

@@ -62,13 +62,11 @@ class PricingHelper {
             setTimeout(() => this.releaseDexResources(dexKey), constants_1.SETUP_RETRY_TIMEOUT);
         }
     }
-    async getPoolIdentifiers(from, to, side, blockNumber, dexKeys, filterConstantPricePool = false, overrideTimeout) {
+    async getPoolIdentifiers(from, to, side, blockNumber, dexKeys, filterConstantPricePool = false) {
         const poolIdentifiers = await Promise.all(dexKeys.map(async (key) => {
             try {
                 return await new Promise((resolve, reject) => {
-                    const now = Date.now();
-                    const timeout = overrideTimeout ?? constants_1.FETCH_POOL_IDENTIFIER_TIMEOUT;
-                    const timer = setTimeout(() => reject(new Error(`Timeout of ${timeout}ms breached after ${Date.now() - now}ms for ${key}`)), timeout);
+                    const timer = setTimeout(() => reject(new Error(`Timeout`)), constants_1.FETCH_POOL_IDENTIFIER_TIMEOUT);
                     const dexInstance = this.dexAdapterService.getDexByKey(key);
                     if (filterConstantPricePool &&
                         dexInstance.hasConstantPriceLargeAmounts) {
@@ -116,16 +114,14 @@ class PricingHelper {
         destFee: 0,
         srcDexFee: 0,
         destDexFee: 0,
-    }, rollupL1ToL2GasRatio, overrideTimeout, fmode) {
+    }, rollupL1ToL2GasRatio) {
         const dexPoolPrices = await Promise.all(dexKeys.map(async (key) => {
             try {
                 const limitPools = limitPoolsMap ? limitPoolsMap[key] : null;
                 if (limitPools && !limitPools.length)
                     return [];
                 return await new Promise((resolve, reject) => {
-                    const now = Date.now();
-                    const timeout = overrideTimeout ?? constants_1.FETCH_POOL_PRICES_TIMEOUT;
-                    const timer = setTimeout(() => reject(new Error(`Timeout of ${timeout}ms breached after ${Date.now() - now}ms for ${key}`)), timeout);
+                    const timer = setTimeout(() => reject(new Error(`Timeout`)), constants_1.FETCH_POOL_PRICES_TIMEOUT);
                     const dexInstance = this.dexAdapterService.getDexByKey(key);
                     if ((0, utils_1.isSrcTokenTransferFeeToBeExchanged)(transferFees) &&
                         !dexInstance.isFeeOnTransferSupported) {
@@ -133,7 +129,7 @@ class PricingHelper {
                         return resolve(null);
                     }
                     dexInstance
-                        .getPricesVolume(from, to, amounts, side, blockNumber, limitPools ? limitPools : undefined, transferFees, false, fmode)
+                        .getPricesVolume(from, to, amounts, side, blockNumber, limitPools ? limitPools : undefined, transferFees)
                         .then(poolPrices => {
                         try {
                             if (!poolPrices || !rollupL1ToL2GasRatio) {

package/build/pricing-helper.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.8.28-fm.2",
+  "version": "3.8.28",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/config.ts

@@ -53,9 +53,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     privateHttpProvider: process.env.HTTP_PROVIDER_1,
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     adapterAddresses: {
       Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
@@ -146,9 +146,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     privateHttpProvider: process.env.HTTP_PROVIDER_56,
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
@@ -181,9 +181,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     privateHttpProvider: process.env.HTTP_PROVIDER_137,
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     hashFlowDisabledMMs:
@@ -222,9 +222,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     adapterAddresses: {
       AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
@@ -291,9 +291,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     adapterAddresses: {
@@ -325,9 +325,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     privateHttpProvider: process.env.HTTP_PROVIDER_10,
     augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
     executorsAddresses: {
-      Executor01: '0x5f0000d4780a00d2dce0a00004000800cb0e5041',
-      Executor02: '0xd08d0006f00040b400180f9500b00c5026ac0900',
-      Executor03: '0x5006860a0906b0d8c9c050200947000030081006',
+      Executor01: '0xa600910B670804230E00A100000D28000AE005C0',
+      Executor02: '0x3800091020a00290f20606b000000000E38c33Ef',
+      Executor03: '0x20004f017a0bC0050bc004d9C500a7A089800000',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',

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

@@ -11,7 +11,6 @@ import {
   PoolPrices,
   SimpleExchangeParam,
   Token,
-  TransferFeeParams,
 } from '../../types';
 import { Network, SUBGRAPH_TIMEOUT } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
@@ -185,9 +184,6 @@ export class BalancerV1
     side: SwapSide,
     blockNumber: number,
     limitPools?: string[],
-    transferFees?: TransferFeeParams,
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<null | ExchangePrices<BalancerV1Data>> {
     if (!this.poolsInfo) return null;
 
@@ -214,7 +210,7 @@ export class BalancerV1
       }
     }
 
-    if (!fmode && poolsMissingState.length) {
+    if (poolsMissingState.length) {
       const poolStates = await generatePoolStates(
         poolsMissingState,
         this.balancerMulticall,

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

@@ -14,7 +14,6 @@ import {
   PreprocessTransactionOptions,
   SimpleExchangeParam,
   Token,
-  TransferFeeParams,
   TxInfo,
 } from '../../types';
 import {
@@ -845,9 +844,6 @@ export class BalancerV2
     side: SwapSide,
     blockNumber: number,
     limitPools?: string[],
-    transferFees?: TransferFeeParams,
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<null | ExchangePrices<BalancerV2Data>> {
     try {
       const _from = this.dexHelper.config.wrapETH(from);
@@ -896,7 +892,7 @@ export class BalancerV2
       );
 
       // Retrieve onchain state for any missing pools
-      if (!fmode && missingPools.length > 0) {
+      if (missingPools.length > 0) {
         const missingPoolsStateMap = await this.eventPools.getOnChainState(
           missingPools,
           blockNumber,

package/src/dex/camelot/camelot.ts

@@ -446,11 +446,7 @@ export class Camelot
     }
   }
 
-  async batchCatchUpPairs(
-    pairs: [Token, Token][],
-    blockNumber: number,
-    fmode?: boolean,
-  ) {
+  async batchCatchUpPairs(pairs: [Token, Token][], blockNumber: number) {
     if (!blockNumber) return;
     const pairsToFetch: CamelotPair[] = [];
     for (const _pair of pairs) {
@@ -458,7 +454,7 @@ export class Camelot
       if (!(pair && pair.exchange)) continue;
       if (!pair.pool) {
         pairsToFetch.push(pair);
-      } else if (!fmode && !pair.pool.getState(blockNumber)) {
+      } else if (!pair.pool.getState(blockNumber)) {
         pairsToFetch.push(pair);
       }
     }
@@ -572,8 +568,6 @@ export class Camelot
       srcDexFee: 0,
       destDexFee: 0,
     },
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<ExchangePrices<SolidlyData> | null> {
     try {
       const from = this.dexHelper.config.wrapETH(_from);
@@ -588,7 +582,7 @@ export class Camelot
       if (limitPools && limitPools.every(p => p !== poolIdentifier))
         return null;
 
-      await this.batchCatchUpPairs([[from, to]], blockNumber, fmode);
+      await this.batchCatchUpPairs([[from, to]], blockNumber);
       const isSell = side === SwapSide.SELL;
       const pairParam = await this.getPairOrderedParams(
         from,

package/src/dex/curve-v1/curve-v1.ts

@@ -623,8 +623,6 @@ export class CurveV1
       srcDexFee: 0,
       destDexFee: 0,
     },
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<ExchangePrices<CurveV1Data> | null> {
     try {
       if (side === SwapSide.BUY) {
@@ -723,7 +721,7 @@ export class CurveV1
       const onChainPoolIndexes = onChainPools.map(op => indexesByAddress[op]);
 
       // onChainPools are only supported for pools with linear price chunks
-      if (!fmode && onChainPools.length) {
+      if (onChainPools.length) {
         const pricesOnChain = await this.getRatesOnChain(
           _from,
           _to,

package/src/dex/curve-v1-factory/curve-v1-factory.ts

@@ -760,8 +760,6 @@ export class CurveV1Factory
       srcDexFee: 0,
       destDexFee: 0,
     },
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<null | ExchangePrices<CurveV1FactoryData>> {
     try {
       const _isSrcTokenTransferFeeToBeExchanged =
@@ -844,17 +842,18 @@ export class CurveV1Factory
         pools.map(
           async (pool): Promise<PoolPrices<CurveV1FactoryData> | null> => {
             let state = pool.getState();
-            if (!fmode && !state) {
+            if (!state) {
               await this.poolManager.updateManuallyPollingPools(
                 pool.baseStatePoolPolling
                   ? [pool.baseStatePoolPolling, pool]
                   : [pool],
               );
               state = pool.getState();
+              if (!state) {
+                return null;
+              }
             }
 
-            if (!state) return null;
-
             if (state.balances.every(b => b === 0n)) {
               this.logger.trace(
                 `${this.dexKey} on ${this.dexHelper.config.data.network}: State balances equal to 0 in pool ${pool.address}`,

package/src/dex/dexalot/dexalot.ts

@@ -68,6 +68,7 @@ import { BI_MAX_UINT256 } from '../../bigint-constants';
 import { ethers } from 'ethers';
 import BigNumber from 'bignumber.js';
 import { Method } from '../../dex-helper/irequest-wrapper';
+import { SpecialDex } from '../../executor/types';
 
 export class Dexalot extends SimpleExchange implements IDex<DexalotData> {
   readonly isStatePollingDex = true;
@@ -1022,6 +1023,9 @@ export class Dexalot extends SimpleExchange implements IDex<DexalotData> {
       dexFuncHasRecipient: false,
       targetExchange: this.mainnetRFQAddress,
       returnAmountPos: undefined,
+      specialDexFlag: SpecialDex.SWAP_ON_DEXALOT,
+      // cannot modify amount due to signature checks
+      specialDexSupportsInsertFromAmount: false,
     };
   }
 

package/src/dex/gmx/gmx.ts

@@ -10,7 +10,6 @@ import {
   Logger,
   NumberAsString,
   DexExchangeParam,
-  TransferFeeParams,
 } from '../../types';
 import { SwapSide, Network } from '../../constants';
 import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
@@ -122,9 +121,6 @@ export class GMX extends SimpleExchange implements IDex<GMXData> {
     side: SwapSide,
     blockNumber: number,
     limitPools?: string[],
-    transferFees?: TransferFeeParams,
-    isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<null | ExchangePrices<GMXData>> {
     if (side === SwapSide.BUY || !this.pool) return null;
     const srcAddress = this.dexHelper.config
@@ -152,7 +148,6 @@ export class GMX extends SimpleExchange implements IDex<GMXData> {
       destAddress,
       [unitVolume, ...amounts],
       blockNumber,
-      fmode,
     );
 
     if (!prices) return null;

package/src/dex/gmx/pool.ts

@@ -98,13 +98,9 @@ export class GMXEventPool extends ComposedEventSubscriber<PoolState> {
     );
   }
 
-  async getStateOrGenerate(
-    blockNumber: number,
-    fmode?: boolean,
-  ): Promise<Readonly<PoolState | null>> {
+  async getStateOrGenerate(blockNumber: number): Promise<Readonly<PoolState>> {
     const evenState = this.getState(blockNumber);
     if (evenState) return evenState;
-    if (fmode) return null;
     const onChainState = await this.generateState(blockNumber);
     this.setState(onChainState, blockNumber);
     return onChainState;
@@ -138,11 +134,9 @@ export class GMXEventPool extends ComposedEventSubscriber<PoolState> {
     _tokenOut: Address,
     _amountsIn: bigint[],
     blockNumber: number,
-    fmode?: boolean,
   ): Promise<bigint[] | null> {
     const maxAmountIn = await this.getMaxAmountIn(_tokenIn, _tokenOut);
-    const state = await this.getStateOrGenerate(blockNumber, fmode);
-    if (!state) return null;
+    const state = await this.getStateOrGenerate(blockNumber);
     const priceIn = this.vault.getMinPrice(state, _tokenIn);
     const priceOut = this.vault.getMaxPrice(state, _tokenOut);
 

package/src/dex/hashflow/hashflow.ts

@@ -64,6 +64,7 @@ import {
   RfqError,
   SlippageCheckError,
 } from './types';
+import { SpecialDex } from '../../executor/types';
 
 export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
   readonly isStatePollingDex = true;
@@ -1040,6 +1041,9 @@ export class Hashflow extends SimpleExchange implements IDex<HashflowData> {
       exchangeData,
       targetExchange: this.routerAddress,
       returnAmountPos: undefined,
+      specialDexFlag: SpecialDex.SWAP_ON_HASHFLOW,
+      // cannot modify amount due to signature checks
+      specialDexSupportsInsertFromAmount: false,
     };
   }
 

package/src/dex/idex.ts

@@ -180,7 +180,6 @@ export interface IDexPricing<ExchangeData> {
     // across all integrations, done it like this
     transferFees?: TransferFeeParams,
     isFirstSwap?: boolean,
-    fmode?: boolean,
   ): Promise<ExchangePrices<ExchangeData> | null>;
 
   // Returns estimated gas cost for calldata for DEX when used in multiSwap.