@paraswap/dex-lib 5.0.2-native-dex-math.0 → 5.0.2-native-dex-math.2

package/build/abi/pancakeswap-infinity/cl-pool-manager.json

@@ -0,0 +1,80 @@
+[
+    {
+        "inputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "Currency",
+                        "name": "currency0",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "Currency",
+                        "name": "currency1",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "contract IHooks",
+                        "name": "hooks",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "contract IPoolManager",
+                        "name": "poolManager",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "uint24",
+                        "name": "fee",
+                        "type": "uint24"
+                    },
+                    {
+                        "internalType": "bytes32",
+                        "name": "parameters",
+                        "type": "bytes32"
+                    }
+                ],
+                "internalType": "struct PoolKey",
+                "name": "key",
+                "type": "tuple"
+            },
+            {
+                "components": [
+                    {
+                        "internalType": "bool",
+                        "name": "zeroForOne",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "int256",
+                        "name": "amountSpecified",
+                        "type": "int256"
+                    },
+                    {
+                        "internalType": "uint160",
+                        "name": "sqrtPriceLimitX96",
+                        "type": "uint160"
+                    }
+                ],
+                "internalType": "struct ICLPoolManager.SwapParams",
+                "name": "params",
+                "type": "tuple"
+            },
+            {
+                "internalType": "bytes",
+                "name": "hookData",
+                "type": "bytes"
+            }
+        ],
+        "name": "swap",
+        "outputs": [
+            {
+                "internalType": "BalanceDelta",
+                "name": "delta",
+                "type": "int256"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+]

package/build/config.js

@@ -20,8 +20,8 @@ const baseConfigs = {
         privateHttpProvider: process.env.HTTP_PROVIDER_1,
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         adapterAddresses: {
@@ -117,8 +117,8 @@ const baseConfigs = {
         bebopAuthName: process.env.API_KEY_BEBOP_AUTH_NAME || '',
         bebopAuthToken: process.env.API_KEY_BEBOP_AUTH_TOKEN || '',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
@@ -152,8 +152,8 @@ const baseConfigs = {
         privateHttpProvider: process.env.HTTP_PROVIDER_137,
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         bebopAuthName: process.env.API_KEY_BEBOP_AUTH_NAME || '',
@@ -194,8 +194,8 @@ const baseConfigs = {
         dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         adapterAddresses: {
@@ -227,8 +227,8 @@ const baseConfigs = {
         hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_146`]?.split(',') || [],
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x67dd00d00d000003a383b096091f0a3060000d08',
-            Executor02: '0x700602C7b720200a09000f38B0d00Ee00c54f000',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         adapterAddresses: {},
@@ -257,8 +257,8 @@ const baseConfigs = {
         hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
@@ -293,8 +293,8 @@ const baseConfigs = {
         privateHttpProvider: process.env.HTTP_PROVIDER_10,
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
@@ -330,8 +330,8 @@ const baseConfigs = {
         augustusRFQAddress: '0x92EaD5bACf6F0E995FA46Ad8215A9b11f67ca241',
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036c0190e009a000d0fc3541100a07380a',
-            Executor02: '0x00c600b30fb0400701010f4b080409018b9006e0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         rpcPollingMaxAllowedStateDelayInBlocks: 0,
@@ -364,8 +364,8 @@ const baseConfigs = {
         hashFlowDisabledMMs: [],
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         adapterAddresses: {
@@ -396,8 +396,8 @@ const baseConfigs = {
         augustusRFQAddress: '0x92EaD5bACf6F0E995FA46Ad8215A9b11f67ca241',
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         rpcPollingMaxAllowedStateDelayInBlocks: 0,
@@ -426,8 +426,8 @@ const baseConfigs = {
         rfqConfigs: {},
         hashFlowDisabledMMs: [],
         executorsAddresses: {
-            Executor01: '0x000010036c0190e009a000d0fc3541100a07380a',
-            Executor02: '0x00c600b30fb0400701010f4b080409018b9006e0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         uniswapV2ExchangeRouterAddress: '0x0000000000000000000000000000000000000000',
@@ -452,8 +452,8 @@ const baseConfigs = {
         augustusRFQAddress: '0x92EaD5bACf6F0E995FA46Ad8215A9b11f67ca241',
         augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
         executorsAddresses: {
-            Executor01: '0x000010036C0190E009a000d0fc3541100A07380A',
-            Executor02: '0x00C600b30fb0400701010F4b080409018B9006E0',
+            Executor01: '0x8faa0000c10015610005ca010ee000d006e0e820',
+            Executor02: '0x6f0538001f90d0a5f0000060d01d34c002030900',
             Executor03: '0xa000b020c290d000020aac04026b5306d60050f0',
         },
         rpcPollingMaxAllowedStateDelayInBlocks: 0,

package/build/dex/fluid-dex/scripts/measure-calc-time.js

@@ -0,0 +1,178 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+
+Measures real calculation time for FluidDex swap math.
+Uses performance.now() for sub-millisecond precision.
+
+*/
+const dotenv = __importStar(require("dotenv"));
+const log4js_1 = require("../../../lib/log4js");
+dotenv.config();
+const constants_1 = require("../../../constants");
+const dex_helper_1 = require("../../../dex-helper");
+const fluid_dex_1 = require("../fluid-dex");
+const perf_hooks_1 = require("perf_hooks");
+const logger = (0, log4js_1.getLogger)('FluidDexMeasureScript');
+const runsNumber = 1000;
+const printFrequency = 100;
+const network = constants_1.Network.MAINNET;
+const dexHelper = new dex_helper_1.DummyDexHelper(network);
+const fluidDex = new fluid_dex_1.FluidDex(network, 'FluidDex', dexHelper);
+const side = constants_1.SwapSide.SELL;
+// USDC
+const srcToken = {
+    address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    decimals: 6,
+};
+// ETH
+const destToken = {
+    address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+    decimals: 18,
+};
+// 50 amounts from 0 to 1,000,000 USDC
+const amounts = [0n];
+{
+    const min = 0.001;
+    const max = 1_000_000;
+    const steps = 49;
+    const seen = new Set([0n]);
+    for (let i = 0; i < steps; i++) {
+        const value = min * Math.pow(max / min, i / (steps - 1));
+        const raw = BigInt(Math.round(value * 1e6));
+        if (!seen.has(raw)) {
+            seen.add(raw);
+            amounts.push(raw);
+        }
+    }
+}
+const aggregateAndPrintMeasures = (measures, label) => {
+    const sorted = [...measures].sort((a, b) => a - b);
+    const sum = sorted.reduce((a, b) => a + b);
+    const avg = sum / sorted.length;
+    const p50 = sorted[Math.floor(sorted.length * 0.5)];
+    const p95 = sorted[Math.floor(sorted.length * 0.95)];
+    const p99 = sorted[Math.floor(sorted.length * 0.99)];
+    const max = sorted[sorted.length - 1];
+    logger.info(`  ${label ? `[${label}] ` : ''}n=${measures.length} | avg=${avg.toFixed(3)}ms | p50=${p50.toFixed(3)}ms | ` +
+        `p95=${p95.toFixed(3)}ms | p99=${p99.toFixed(3)}ms | max=${max.toFixed(3)}ms`);
+};
+const executeGetPricesVolume = async (blockNumber, limitPools) => {
+    return fluidDex.getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools);
+};
+const executeSwapInDirect = (poolData) => {
+    const syncTime = Math.floor(Date.now() / 1000);
+    for (const amount of amounts) {
+        fluidDex.swapIn(poolData.swap0To1, amount, poolData.colReserves, poolData.debtReserves, poolData.inDecimals, poolData.outDecimals, poolData.fee, poolData.dexLimits, poolData.centerPrice, syncTime);
+    }
+};
+(async function main() {
+    logger.info(`Started FluidDex benchmark (${runsNumber} runs, ${amounts.length} amounts)\n`);
+    const blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
+    logger.info(`Block: ${blockNumber}`);
+    await fluidDex.initializePricing(blockNumber);
+    // Warm-up: fetch state & discover pools
+    const warmupResult = await executeGetPricesVolume(blockNumber);
+    if (!warmupResult || warmupResult.length === 0) {
+        logger.error('No pools found for USDC -> ETH on FluidDex');
+        process.exit(1);
+    }
+    const poolIds = warmupResult.map(p => p.poolIdentifiers[0]);
+    logger.info(`Found ${poolIds.length} pool(s): ${poolIds.join(', ')}\n`);
+    // === Benchmark 1: Full getPricesVolume (all pools) ===
+    logger.info(`\n${'='.repeat(60)}`);
+    logger.info('BENCHMARK: Full getPricesVolume (all pools)');
+    logger.info(`${'='.repeat(60)}\n`);
+    {
+        const measures = [];
+        for (let i = 0; i < runsNumber; i++) {
+            const start = perf_hooks_1.performance.now();
+            await executeGetPricesVolume(blockNumber);
+            measures.push(perf_hooks_1.performance.now() - start);
+            if (measures.length % printFrequency === 0) {
+                aggregateAndPrintMeasures(measures);
+            }
+        }
+        logger.info('');
+        aggregateAndPrintMeasures(measures, 'FINAL - all pools');
+    }
+    // === Benchmark 2: getPricesVolume per pool ===
+    logger.info(`\n${'='.repeat(60)}`);
+    logger.info('BENCHMARK: getPricesVolume per pool');
+    logger.info(`${'='.repeat(60)}\n`);
+    for (const poolId of poolIds) {
+        const measures = [];
+        for (let i = 0; i < runsNumber; i++) {
+            const start = perf_hooks_1.performance.now();
+            await executeGetPricesVolume(blockNumber, [poolId]);
+            measures.push(perf_hooks_1.performance.now() - start);
+        }
+        aggregateAndPrintMeasures(measures, poolId);
+    }
+    // === Benchmark 3: Pure sync swapIn (no async overhead) ===
+    logger.info(`\n${'='.repeat(60)}`);
+    logger.info('BENCHMARK: Pure sync swapIn per pool');
+    logger.info(`${'='.repeat(60)}\n`);
+    const liquidityProxyState = await fluidDex.liquidityProxy.getState();
+    if (liquidityProxyState) {
+        for (const pool of fluidDex.pools) {
+            const reserves = liquidityProxyState.poolsReserves.find((r) => r.pool.toLowerCase() === pool.address.toLowerCase());
+            if (!reserves)
+                continue;
+            const swap0To1 = srcToken.address.toLowerCase() === pool.token0.toLowerCase();
+            const poolData = {
+                swap0To1,
+                colReserves: reserves.collateralReserves,
+                debtReserves: reserves.debtReserves,
+                fee: BigInt(reserves.fee),
+                dexLimits: reserves.dexLimits,
+                centerPrice: BigInt(reserves.centerPrice),
+                inDecimals: srcToken.decimals,
+                outDecimals: destToken.decimals,
+            };
+            const measures = [];
+            for (let i = 0; i < runsNumber; i++) {
+                const start = perf_hooks_1.performance.now();
+                executeSwapInDirect(poolData);
+                measures.push(perf_hooks_1.performance.now() - start);
+            }
+            aggregateAndPrintMeasures(measures, `sync ${pool.address.slice(0, 10)}`);
+        }
+    }
+    logger.info(`\nBenchmark complete.`);
+    process.exit(0);
+})();
+//# sourceMappingURL=measure-calc-time.js.map

package/build/dex/fluid-dex/scripts/measure-calc-time.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-calc-time.js","sourceRoot":"","sources":["../../../../src/dex/fluid-dex/scripts/measure-calc-time.ts"],"names":[],"mappings":"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"}

package/build/dex/idex.d.ts

@@ -1,5 +1,5 @@
 import { AsyncOrSync } from 'ts-essentials';
-import { Address, SimpleExchangeParam, AdapterExchangeParam, DexExchangeParam, TxInfo, NumberAsString, Token, ExchangePrices, PoolPrices, PoolLiquidity, OptimalSwapExchange, ExchangeTxInfo, PreprocessTransactionOptions, TransferFeeParams, Config } from '../types';
+import { Address, SimpleExchangeParam, AdapterExchangeParam, DexExchangeParam, TxInfo, NumberAsString, Token, ExchangePrices, PoolPrices, PoolLiquidity, OptimalSwapExchange, ExchangeTxInfo, PreprocessTransactionOptions, TransferFeeParams, Config, GetDexParamOptions } from '../types';
 import { SwapSide, Network } from '../constants';
 import { IDexHelper } from '../dex-helper/idex-helper';
 import { OptimalRate, OptimalSwap } from '@paraswap/core';
@@ -11,7 +11,7 @@ export interface IDexTxBuilderV5<ExchangeData, DirectParam = null> {
     getDirectParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, expectedAmount: NumberAsString, data: ExchangeData, side: SwapSide, permit: string, uuid: string, feePercent: NumberAsString, deadline: NumberAsString, partner: string, beneficiary: string, contractMethod: string): TxInfo<DirectParam>;
 }
 export interface IDexTxBuilderV6<ExchangeData, DirectParam = null> {
-    getDexParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: ExchangeData, side: SwapSide, executorAddress: Address): AsyncOrSync<DexExchangeParam>;
+    getDexParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: ExchangeData, side: SwapSide, executorAddress: Address, options?: GetDexParamOptions): AsyncOrSync<DexExchangeParam>;
     getDirectParamV6?(srcToken: Address, destToken: Address, fromAmount: NumberAsString, toAmount: NumberAsString, quotedAmount: NumberAsString, data: ExchangeData, side: SwapSide, permit: string, uuid: string, partnerAndFee: string, beneficiary: string, blockNumber: number, contractMethod: string): TxInfo<DirectParam>;
 }
 export interface IDexTxBuilder<ExchangeData, DirectParam = null> extends IDexTxBuilderV5<ExchangeData, DirectParam>, IDexTxBuilderV6<ExchangeData, DirectParam> {

package/build/dex/metric/metric.d.ts

@@ -1,6 +1,6 @@
 import { Interface } from '@ethersproject/abi';
 import { SwapSide } from '../../constants';
-import { AdapterExchangeParam, Address, DexExchangeParam, NumberAsString } from '../../types';
+import { AdapterExchangeParam, Address, DexExchangeParam, GetDexParamOptions, NumberAsString } from '../../types';
 import { IDexTxBuilder } from '../idex';
 import { SimpleExchange } from '../simple-exchange';
 import { IDexHelper } from '../../dex-helper';
@@ -14,5 +14,5 @@ export declare class Metric extends SimpleExchange implements IDexTxBuilder<Metr
     constructor(dexHelper: IDexHelper);
     private getPriceLimit;
     getAdapterParam(): AdapterExchangeParam;
-    getDexParam(_srcToken: Address, _destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: MetricData, side: SwapSide): DexExchangeParam;
+    getDexParam(_srcToken: Address, _destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: MetricData, side: SwapSide, _executorAddress?: Address, options?: GetDexParamOptions): DexExchangeParam;
 }

package/build/dex/metric/metric.js

@@ -32,8 +32,8 @@ class Metric extends simple_exchange_1.SimpleExchange {
     getAdapterParam() {
         throw new Error('Metric: V5 not supported');
     }
-    getDexParam(_srcToken, _destToken, srcAmount, destAmount, recipient, data, side) {
-        const deadline = (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)();
+    getDexParam(_srcToken, _destToken, srcAmount, destAmount, recipient, data, side, _executorAddress, options) {
+        const deadline = (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(options?.nowTimestampMs);
         const priceLimit = this.getPriceLimit(data.zeroForOne);
         const swapFunction = side === constants_1.SwapSide.SELL ? 'swapExactInput' : 'swapExactOutput';
         const swapData = this.routerInterface.encodeFunctionData(swapFunction, [

package/build/dex/metric/metric.js.map

@@ -1 +1 @@
-{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../../src/dex/metric/metric.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAC7D,+CAA2C;AAQ3C,wDAG4B;AAC5B,yGAA+E;AAG/E,qCAIkB;AAClB,gDAAmE;AAEnE,MAAa,MACX,SAAQ,gCAAc;IASD;IANrB,MAAM,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5B,cAAc,GAAG,IAAI,CAAC;IAEb,eAAe,CAAY;IAC3B,aAAa,CAAU;IAEhC,YAAqB,SAAqB;QACxC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QADR,cAAS,GAAT,SAAS,CAAY;QAExC,IAAI,CAAC,eAAe,GAAG,IAAI,eAAS,CAClC,kCAAwC,CACzC,CAAC;QAEF,MAAM,MAAM,GAAG,qBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAC5C,CAAC;IAEO,aAAa,CAAC,UAAmB;QACvC,OAAO,UAAU,CAAC,CAAC,CAAC,iCAAwB,CAAC,CAAC,CAAC,iCAAwB,CAAC;IAC1E,CAAC;IAED,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,SAAyB,EACzB,UAA0B,EAC1B,SAAkB,EAClB,IAAgB,EAChB,IAAc;QAEd,MAAM,QAAQ,GAAG,IAAA,uDAAqC,GAAE,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvD,MAAM,YAAY,GAChB,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QAEhE,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACrE,IAAI,CAAC,IAAI;YACT,SAAS;YACT,IAAI,CAAC,UAAU;YACf,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;YAC/C,UAAU;YACV,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACxC,QAAQ;SACT,CAAC,CAAC;QAEH,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,IAAI;YACzB,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,IAAI,CAAC,aAAa;YAClC,eAAe,EACb,IAAI,KAAK,oBAAQ,CAAC,IAAI;gBACpB,CAAC,CAAC,IAAA,mCAA2B,EACzB,IAAI,CAAC,eAAe,EACpB,gBAAgB,EAChB,WAAW,CACZ;gBACH,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;;AAtEH,wBAuEC"}
+{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../../src/dex/metric/metric.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAC7D,+CAA2C;AAS3C,wDAG4B;AAC5B,yGAA+E;AAG/E,qCAIkB;AAClB,gDAAmE;AAEnE,MAAa,MACX,SAAQ,gCAAc;IASD;IANrB,MAAM,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5B,cAAc,GAAG,IAAI,CAAC;IAEb,eAAe,CAAY;IAC3B,aAAa,CAAU;IAEhC,YAAqB,SAAqB;QACxC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QADR,cAAS,GAAT,SAAS,CAAY;QAExC,IAAI,CAAC,eAAe,GAAG,IAAI,eAAS,CAClC,kCAAwC,CACzC,CAAC;QAEF,MAAM,MAAM,GAAG,qBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAC5C,CAAC;IAEO,aAAa,CAAC,UAAmB;QACvC,OAAO,UAAU,CAAC,CAAC,CAAC,iCAAwB,CAAC,CAAC,CAAC,iCAAwB,CAAC;IAC1E,CAAC;IAED,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,WAAW,CACT,SAAkB,EAClB,UAAmB,EACnB,SAAyB,EACzB,UAA0B,EAC1B,SAAkB,EAClB,IAAgB,EAChB,IAAc,EACd,gBAA0B,EAC1B,OAA4B;QAE5B,MAAM,QAAQ,GAAG,IAAA,uDAAqC,EACpD,OAAO,EAAE,cAAc,CACxB,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvD,MAAM,YAAY,GAChB,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QAEhE,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACrE,IAAI,CAAC,IAAI;YACT,SAAS;YACT,IAAI,CAAC,UAAU;YACf,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;YAC/C,UAAU;YACV,IAAI,KAAK,oBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACxC,QAAQ;SACT,CAAC,CAAC;QAEH,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,mBAAmB,EAAE,IAAI;YACzB,YAAY,EAAE,QAAQ;YACtB,cAAc,EAAE,IAAI,CAAC,aAAa;YAClC,eAAe,EACb,IAAI,KAAK,oBAAQ,CAAC,IAAI;gBACpB,CAAC,CAAC,IAAA,mCAA2B,EACzB,IAAI,CAAC,eAAe,EACpB,gBAAgB,EAChB,WAAW,CACZ;gBACH,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;;AA1EH,wBA2EC"}

package/build/dex/simple-exchange.d.ts

@@ -5,7 +5,7 @@ import { Address, SimpleExchangeParam, NumberAsString } from '../types';
 import { IDexHelper } from '../dex-helper';
 import { NeedWrapNativeFunc } from './idex';
 export declare const FRIENDLY_LOCAL_DEADLINE: number;
-export declare const getLocalDeadlineAsFriendlyPlaceholder: () => string;
+export declare const getLocalDeadlineAsFriendlyPlaceholder: (nowTimestampMs?: number) => string;
 export declare class SimpleExchange {
     protected readonly dexHelper: IDexHelper;
     dexKey: string;

package/build/dex/simple-exchange.js

@@ -22,7 +22,7 @@ const ABI_json_1 = __importDefault(require("../abi/augustus-v6/ABI.json"));
  * Here we decide to go with a high enough default so that the local deadline rarely supersedes the global router deadline.
  */
 exports.FRIENDLY_LOCAL_DEADLINE = 7 * 24 * 60 * 60;
-const getLocalDeadlineAsFriendlyPlaceholder = () => String(Math.floor(new Date().getTime() / 1000) + exports.FRIENDLY_LOCAL_DEADLINE);
+const getLocalDeadlineAsFriendlyPlaceholder = (nowTimestampMs) => String(Math.floor((nowTimestampMs ?? Date.now()) / 1000) + exports.FRIENDLY_LOCAL_DEADLINE);
 exports.getLocalDeadlineAsFriendlyPlaceholder = getLocalDeadlineAsFriendlyPlaceholder;
 class SimpleExchange {
     dexHelper;

package/build/dex/simple-exchange.js.map

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

package/build/dex/uniswap-v3/uniswap-v3.d.ts

@@ -1,5 +1,5 @@
 import { Interface } from '@ethersproject/abi';
-import { AdapterExchangeParam, Address, DexExchangeParam, ExchangePrices, ExchangeTxInfo, Logger, NumberAsString, PoolLiquidity, PoolPrices, PreprocessTransactionOptions, SimpleExchangeParam, Token, TransferFeeParams, TxInfo } from '../../types';
+import { AdapterExchangeParam, Address, DexExchangeParam, ExchangePrices, ExchangeTxInfo, GetDexParamOptions, Logger, NumberAsString, PoolLiquidity, PoolPrices, PreprocessTransactionOptions, SimpleExchangeParam, Token, TransferFeeParams, TxInfo } from '../../types';
 import { Network, SwapSide } from '../../constants';
 import { IDex } from '../idex';
 import { IDexHelper } from '../../dex-helper';
@@ -79,7 +79,7 @@ export declare class UniswapV3 extends SimpleExchange implements IDex<UniswapV3D
     };
     static getDirectFunctionNameV6(): string[];
     getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: UniswapV3Data, side: SwapSide): AdapterExchangeParam;
-    getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: UniswapV3Data, side: SwapSide): DexExchangeParam;
+    getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: UniswapV3Data, side: SwapSide, _executorAddress?: Address, options?: GetDexParamOptions): DexExchangeParam;
     getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: UniswapV3Data, side: SwapSide): Promise<SimpleExchangeParam>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
     protected _getPoolBalances(pools: [pool: string, token0: string, token1: string][]): Promise<[balanceToken0: bigint | null, balanceToken1: bigint | null][]>;

package/build/dex/uniswap-v3/uniswap-v3.js

@@ -719,7 +719,8 @@ class UniswapV3 extends simple_exchange_1.SimpleExchange {
             networkFee: '0',
         };
     }
-    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
+    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side, _executorAddress, options) {
+        const deadline = (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(options?.nowTimestampMs);
         const swapFunction = side === constants_1.SwapSide.SELL
             ? types_1.UniswapV3Functions.exactInput
             : types_1.UniswapV3Functions.exactOutput;
@@ -727,14 +728,14 @@ class UniswapV3 extends simple_exchange_1.SimpleExchange {
         const swapFunctionParams = side === constants_1.SwapSide.SELL
             ? {
                 recipient,
-                deadline: (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+                deadline,
                 amountIn: srcAmount,
                 amountOutMinimum: destAmount,
                 path,
             }
             : {
                 recipient,
-                deadline: (0, simple_exchange_1.getLocalDeadlineAsFriendlyPlaceholder)(),
+                deadline,
                 amountOut: destAmount,
                 amountInMaximum: srcAmount,
                 path,