@paraswap/dex-lib 2.28.3 → 2.28.4-algebra-events-fix.0

package/build/dex/test-dex/test-dex-pool.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestDexEventPool = void 0;
+const abi_1 = require("@ethersproject/abi");
+const utils_1 = require("../../utils");
+const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
+class TestDexEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
+    constructor(parentName, network, dexHelper, logger, testDexIface = new abi_1.Interface('' /* TODO: Import and put here TestDex ABI */)) {
+        super(parentName, logger);
+        this.parentName = parentName;
+        this.network = network;
+        this.dexHelper = dexHelper;
+        this.testDexIface = testDexIface;
+        this.handlers = {};
+        // TODO: make logDecoder decode logs that
+        this.logDecoder = (log) => this.testDexIface.parseLog(log);
+        this.addressesSubscribed = [
+        /* subscribed addresses */
+        ];
+        // Add handlers
+        this.handlers['myEvent'] = this.handleMyEvent.bind(this);
+    }
+    /**
+     * The function is called every time any of the subscribed
+     * addresses release log. The function accepts the current
+     * state, updates the state according to the log, and returns
+     * the updated state.
+     * @param state - Current state of event subscriber
+     * @param log - Log released by one of the subscribed addresses
+     * @returns Updates state of the event subscriber after the log
+     */
+    processLog(state, log) {
+        try {
+            const event = this.logDecoder(log);
+            if (event.name in this.handlers) {
+                return this.handlers[event.name](event, state, log);
+            }
+        }
+        catch (e) {
+            (0, utils_1.catchParseLogError)(e, this.logger);
+        }
+        return null;
+    }
+    /**
+     * The function generates state using on-chain calls. This
+     * function is called to regenerate state if the event based
+     * system fails to fetch events and the local state is no
+     * more correct.
+     * @param blockNumber - Blocknumber for which the state should
+     * should be generated
+     * @returns state of the event subscriber at blocknumber
+     */
+    async generateState(blockNumber) {
+        // TODO: complete me!
+        return {};
+    }
+    // Its just a dummy example
+    handleMyEvent(event, state, log) {
+        return null;
+    }
+}
+exports.TestDexEventPool = TestDexEventPool;
+//# sourceMappingURL=test-dex-pool.js.map

package/build/dex/test-dex/test-dex-pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-dex-pool.js","sourceRoot":"","sources":["../../../src/dex/test-dex/test-dex-pool.ts"],"names":[],"mappings":";;;AAAA,4CAA+C;AAG/C,uCAAiD;AACjD,+EAA0E;AAI1E,MAAa,gBAAiB,SAAQ,mDAAkC;IAWtE,YACY,UAAkB,EAClB,OAAe,EACf,SAAqB,EAC/B,MAAc,EACJ,eAAe,IAAI,eAAS,CACpC,EAAE,CAAC,2CAA2C,CAC/C;QAED,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QARhB,eAAU,GAAV,UAAU,CAAQ;QAClB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAErB,iBAAY,GAAZ,YAAY,CAErB;QAjBH,aAAQ,GAIJ,EAAE,CAAC;QAiBL,yCAAyC;QACzC,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,CAAC,mBAAmB,GAAG;QACzB,0BAA0B;SAC3B,CAAC;QAEF,eAAe;QACf,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;;;OAQG;IACO,UAAU,CAClB,KAA8B,EAC9B,GAAkB;QAElB,IAAI;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aACrD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,0BAAkB,EAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CAAC,WAAmB;QACrC,qBAAqB;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,2BAA2B;IAC3B,aAAa,CACX,KAAU,EACV,KAA8B,EAC9B,GAAkB;QAElB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA/ED,4CA+EC"}

package/build/dex/test-dex/test-dex.d.ts

@@ -0,0 +1,37 @@
+import { AsyncOrSync } from 'ts-essentials';
+import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger } from '../../types';
+import { SwapSide, Network } from '../../constants';
+import { IDex } from '../../dex/idex';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { TestDexData } from './types';
+import { SimpleExchange } from '../simple-exchange';
+import { TestDexEventPool } from './test-dex-pool';
+export declare class TestDex extends SimpleExchange implements IDex<TestDexData> {
+    readonly network: Network;
+    readonly dexKey: string;
+    readonly dexHelper: IDexHelper;
+    protected adapters: import("../../types").AdapterMappings;
+    protected eventPools: TestDexEventPool;
+    readonly hasConstantPriceLargeAmounts = false;
+    readonly needWrapNative = true;
+    readonly isFeeOnTransferSupported = false;
+    static dexKeysWithNetwork: {
+        key: string;
+        networks: Network[];
+    }[];
+    logger: Logger;
+    constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: import("../../types").AdapterMappings);
+    initializePricing(blockNumber: number): Promise<void>;
+    getAdapters(side: SwapSide): {
+        name: string;
+        index: number;
+    }[] | null;
+    getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
+    getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[]): Promise<null | ExchangePrices<TestDexData>>;
+    getCalldataGasCost(poolPrices: PoolPrices<TestDexData>): number | number[];
+    getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: TestDexData, side: SwapSide): AdapterExchangeParam;
+    getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: TestDexData, side: SwapSide): Promise<SimpleExchangeParam>;
+    updatePoolState(): Promise<void>;
+    getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
+    releaseResources(): AsyncOrSync<void>;
+}

package/build/dex/test-dex/test-dex.js

@@ -0,0 +1,126 @@
+"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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestDex = void 0;
+const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
+const utils_1 = require("../../utils");
+const simple_exchange_1 = require("../simple-exchange");
+const config_1 = require("./config");
+const test_dex_pool_1 = require("./test-dex-pool");
+class TestDex extends simple_exchange_1.SimpleExchange {
+    constructor(network, dexKey, dexHelper, adapters = config_1.Adapters[network] || {}) {
+        super(dexHelper, dexKey);
+        this.network = network;
+        this.dexKey = dexKey;
+        this.dexHelper = dexHelper;
+        this.adapters = adapters;
+        this.hasConstantPriceLargeAmounts = false;
+        // TODO: set true here if protocols works only with wrapped asset
+        this.needWrapNative = true;
+        this.isFeeOnTransferSupported = false;
+        this.logger = dexHelper.getLogger(dexKey);
+        this.eventPools = new test_dex_pool_1.TestDexEventPool(dexKey, network, dexHelper, this.logger);
+    }
+    // Initialize pricing is called once in the start of
+    // pricing service. It is intended to setup the integration
+    // for pricing requests. It is optional for a DEX to
+    // implement this function
+    async initializePricing(blockNumber) {
+        // TODO: complete me!
+    }
+    // Returns the list of contract adapters (name and index)
+    // for a buy/sell. Return null if there are no adapters.
+    getAdapters(side) {
+        return this.adapters[side] ? this.adapters[side] : null;
+    }
+    // Returns list of pool identifiers that can be used
+    // for a given swap. poolIdentifiers must be unique
+    // across DEXes. It is recommended to use
+    // ${dexKey}_${poolAddress} as a poolIdentifier
+    async getPoolIdentifiers(srcToken, destToken, side, blockNumber) {
+        // TODO: complete me!
+        return [];
+    }
+    // Returns pool prices for amounts.
+    // If limitPools is defined only pools in limitPools
+    // should be used. If limitPools is undefined then
+    // any pools can be used.
+    async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
+        // TODO: complete me!
+        return null;
+    }
+    // Returns estimated gas cost of calldata for this DEX in multiSwap
+    getCalldataGasCost(poolPrices) {
+        // TODO: update if there is any payload in getAdapterParam
+        return CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
+    }
+    // Encode params required by the exchange adapter
+    // Used for multiSwap, buy & megaSwap
+    // Hint: abiCoder.encodeParameter() could be useful
+    getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        // TODO: complete me!
+        const { exchange } = data;
+        // Encode here the payload for adapter
+        const payload = '';
+        return {
+            targetExchange: exchange,
+            payload,
+            networkFee: '0',
+        };
+    }
+    // Encode call data used by simpleSwap like routers
+    // Used for simpleSwap & simpleBuy
+    // Hint: this.buildSimpleParamWithoutWETHConversion
+    // could be useful
+    async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
+        // TODO: complete me!
+        const { exchange } = data;
+        // Encode here the transaction arguments
+        const swapData = '';
+        return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, exchange);
+    }
+    // This is called once before getTopPoolsForToken is
+    // called for multiple tokens. This can be helpful to
+    // update common state required for calculating
+    // getTopPoolsForToken. It is optional for a DEX
+    // to implement this
+    async updatePoolState() {
+        // TODO: complete me!
+    }
+    // Returns list of top pools based on liquidity. Max
+    // limit number pools should be returned.
+    async getTopPoolsForToken(tokenAddress, limit) {
+        //TODO: complete me!
+        return [];
+    }
+    // This is optional function in case if your implementation has acquired any resources
+    // you need to release for graceful shutdown. For example, it may be any interval timer
+    releaseResources() {
+        // TODO: complete me!
+    }
+}
+exports.TestDex = TestDex;
+TestDex.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.TestDexConfig);
+//# sourceMappingURL=test-dex.js.map

package/build/dex/test-dex/test-dex.js.map

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

package/build/dex/test-dex/types.d.ts

@@ -0,0 +1,6 @@
+import { Address } from '../../types';
+export declare type PoolState = {};
+export declare type TestDexData = {
+    exchange: Address;
+};
+export declare type DexParams = {};

package/build/dex/{pancakeswap-v3 → test-dex}/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/pancakeswap-v3/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/test-dex/types.ts"],"names":[],"mappings":""}

package/build/dex/uniswap-v3/contract-math/TickBitMap.d.ts

@@ -4,5 +4,4 @@ export declare class TickBitMap {
     static position(tick: bigint): [bigint, bigint];
     static flipTick(state: Pick<PoolState, 'startTickBitmap' | 'tickBitmap'>, tick: bigint, tickSpacing: bigint): void;
     static nextInitializedTickWithinOneWord(state: DeepReadonly<Pick<PoolState, 'startTickBitmap' | 'tickBitmap'>>, tick: bigint, tickSpacing: bigint, lte: boolean, isPriceQuery: boolean): [bigint, boolean];
-    static _putZeroIfUndefined(state: PoolState, tickBitmapValue: bigint | undefined, wordPos: bigint, isPriceQuery?: boolean): bigint;
 }

package/build/dex/uniswap-v3/contract-math/TickBitMap.js

@@ -79,9 +79,6 @@ class TickBitMap {
         }
         return [next, initialized];
     }
-    static _putZeroIfUndefined(state, tickBitmapValue, wordPos, isPriceQuery = false) {
-        return tickBitmapValue === undefined ? 0n : tickBitmapValue;
-    }
 }
 exports.TickBitMap = TickBitMap;
 //# sourceMappingURL=TickBitMap.js.map

package/build/dex/uniswap-v3/contract-math/TickBitMap.js.map

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

package/build/dex/uniswap-v3/contract-math/utils.js

@@ -25,14 +25,16 @@ exports._reduceTickBitmap = _reduceTickBitmap;
 function _reduceTicks(ticks, ticksToReduce) {
     return ticksToReduce.reduce((acc, curr) => {
         const { index, value } = curr;
-        acc[index] = {
-            liquidityGross: (0, utils_1.bigIntify)(value.liquidityGross),
-            liquidityNet: (0, utils_1.bigIntify)(value.liquidityNet),
-            tickCumulativeOutside: (0, utils_1.bigIntify)(value.tickCumulativeOutside),
-            secondsPerLiquidityOutsideX128: (0, utils_1.bigIntify)(value.secondsPerLiquidityOutsideX128),
-            secondsOutside: (0, utils_1.bigIntify)(value.secondsOutside),
-            initialized: value.initialized,
-        };
+        if (value.initialized) {
+            acc[index] = {
+                liquidityGross: (0, utils_1.bigIntify)(value.liquidityGross),
+                liquidityNet: (0, utils_1.bigIntify)(value.liquidityNet),
+                tickCumulativeOutside: (0, utils_1.bigIntify)(value.tickCumulativeOutside),
+                secondsPerLiquidityOutsideX128: (0, utils_1.bigIntify)(value.secondsPerLiquidityOutsideX128),
+                secondsOutside: (0, utils_1.bigIntify)(value.secondsOutside),
+                initialized: value.initialized,
+            };
+        }
         return acc;
     }, ticks);
 }

package/build/dex/uniswap-v3/contract-math/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/dex/uniswap-v3/contract-math/utils.ts"],"names":[],"mappings":";;;AAMA,0CAA2C;AAE3C,SAAgB,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IACrD,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAFD,0BAEC;AAED,SAAgB,GAAG,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACzB,CAAC;AAFD,kBAEC;AAED,SAAgB,GAAG,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACzB,CAAC;AAFD,kBAEC;AAED,SAAgB,iBAAiB,CAC/B,UAA0C,EAC1C,kBAAqD;IAErD,OAAO,kBAAkB,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9B,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC,EACD,UAAU,CACX,CAAC;AACJ,CAAC;AAZD,8CAYC;AAED,SAAgB,YAAY,CAC1B,KAAuC,EACvC,aAA8C;IAE9C,OAAO,aAAa,CAAC,MAAM,CAA2B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAClE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9B,GAAG,CAAC,KAAK,CAAC,GAAG;YACX,cAAc,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,cAAc,CAAC;YAC/C,YAAY,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,YAAY,CAAC;YAC3C,qBAAqB,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,qBAAqB,CAAC;YAC7D,8BAA8B,EAAE,IAAA,iBAAS,EACvC,KAAK,CAAC,8BAA8B,CACrC;YACD,cAAc,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,cAAc,CAAC;YAC/C,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC;AAlBD,oCAkBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/dex/uniswap-v3/contract-math/utils.ts"],"names":[],"mappings":";;;AAMA,0CAA2C;AAE3C,SAAgB,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IACrD,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAFD,0BAEC;AAED,SAAgB,GAAG,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACzB,CAAC;AAFD,kBAEC;AAED,SAAgB,GAAG,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACzB,CAAC;AAFD,kBAEC;AAED,SAAgB,iBAAiB,CAC/B,UAA0C,EAC1C,kBAAqD;IAErD,OAAO,kBAAkB,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9B,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC,EACD,UAAU,CACX,CAAC;AACJ,CAAC;AAZD,8CAYC;AAED,SAAgB,YAAY,CAC1B,KAAuC,EACvC,aAA8C;IAE9C,OAAO,aAAa,CAAC,MAAM,CAA2B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAClE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC9B,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,GAAG,CAAC,KAAK,CAAC,GAAG;gBACX,cAAc,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,cAAc,CAAC;gBAC/C,YAAY,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,YAAY,CAAC;gBAC3C,qBAAqB,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,qBAAqB,CAAC;gBAC7D,8BAA8B,EAAE,IAAA,iBAAS,EACvC,KAAK,CAAC,8BAA8B,CACrC;gBACD,cAAc,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,cAAc,CAAC;gBAC/C,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC;AApBD,oCAoBC"}

package/build/dex/woo-fi-v2/woo-fi-math.d.ts

@@ -0,0 +1,16 @@
+import { PoolState, TokenState } from './types';
+import { Address, Logger } from '../../types';
+export declare class WooFiV2Math {
+    private readonly logger;
+    private readonly _quoteToken;
+    state: PoolState;
+    constructor(logger: Logger, _quoteToken: Address);
+    query(fromToken: Address, toToken: Address, fromAmounts: bigint[]): bigint[] | null;
+    _querySellBase(baseToken: Address, baseAmounts: bigint[]): bigint[] | null;
+    _querySellQuote(baseToken: Address, quoteAmounts: bigint[]): bigint[] | null;
+    _queryBaseToBase(baseToken1: Address, baseToken2: Address, base1Amounts: bigint[]): bigint[] | null;
+    protected _takeFeeAndCheckReserve(amounts: bigint[], feeRate: bigint): bigint[];
+    protected _takeFee(amounts: bigint[], feeRate: bigint): bigint[];
+    protected _calcQuoteAmountSellBase(baseToken: Address, baseAmounts: bigint[], state: TokenState): bigint[];
+    protected _calcBaseAmountSellQuote(baseToken: string, quoteAmounts: bigint[], state: TokenState): bigint[];
+}

package/build/dex/woo-fi-v2/woo-fi-math.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WooFiV2Math = void 0;
+const bigint_constants_1 = require("../../bigint-constants");
+const constants_1 = require("./constants");
+function handleMathError(e, logger) {
+    if (e instanceof Error && e.message.startsWith('WooGuardian:')) {
+        logger.warn('WooFi Guardian check Error:', e);
+        return;
+    }
+    logger.error('Unexpected error in WooFi math:', e);
+}
+function max(a, b) {
+    return a > b ? a : b;
+}
+class WooFiV2Math {
+    constructor(logger, _quoteToken) {
+        this.logger = logger;
+        this._quoteToken = _quoteToken;
+        this.state = constants_1.NULL_STATE;
+    }
+    query(fromToken, toToken, fromAmounts) {
+        try {
+            if (fromToken === this._quoteToken) {
+                return this._querySellQuote(toToken, fromAmounts);
+            }
+            else if (toToken === this._quoteToken) {
+                return this._querySellBase(fromToken, fromAmounts);
+            }
+            else {
+                return this._queryBaseToBase(fromToken, toToken, fromAmounts);
+            }
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _querySellBase(baseToken, baseAmounts) {
+        try {
+            const _state = this.state.tokenStates[baseToken];
+            let quoteAmounts = this._calcQuoteAmountSellBase(baseToken, baseAmounts, _state);
+            quoteAmounts = quoteAmounts.map(amount => {
+                return amount <= this.state.tokenInfos[this._quoteToken].reserve
+                    ? amount
+                    : 0n;
+            });
+            const feeRate = this.state.tokenInfos[baseToken].feeRate;
+            return this._takeFee(quoteAmounts, feeRate);
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _querySellQuote(baseToken, quoteAmounts) {
+        try {
+            const feeRate = this.state.tokenInfos[baseToken].feeRate;
+            quoteAmounts = this._takeFee(quoteAmounts, feeRate);
+            const _state = this.state.tokenStates[baseToken];
+            let toAmounts = this._calcBaseAmountSellQuote(baseToken, quoteAmounts, _state);
+            const baseReserve = this.state.tokenInfos[baseToken].reserve;
+            return toAmounts.map(amount => {
+                return amount >= baseReserve ? amount : 0n;
+            });
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _queryBaseToBase(baseToken1, baseToken2, base1Amounts) {
+        try {
+            let state1 = this.state.tokenStates[baseToken1];
+            let state2 = this.state.tokenStates[baseToken1];
+            const feeRate1 = this.state.tokenInfos[baseToken1].feeRate;
+            const feeRate2 = this.state.tokenInfos[baseToken2].feeRate;
+            const spread = max(state1.spread, state2.spread) / 2n;
+            const feeRate = max(feeRate1, feeRate2);
+            state1.spread = spread;
+            state2.spread = spread;
+            let quoteAmounts = this._calcQuoteAmountSellBase(baseToken1, base1Amounts, state1);
+            quoteAmounts = this._takeFeeAndCheckReserve(quoteAmounts, feeRate);
+            let toAmounts = this._calcBaseAmountSellQuote(baseToken2, quoteAmounts, state2);
+            return toAmounts.map(toAmount => {
+                return toAmount <= this.state.tokenInfos[baseToken2].reserve
+                    ? toAmount
+                    : 0n;
+            });
+        }
+        catch (e) {
+            handleMathError(e, this.logger);
+            return null;
+        }
+    }
+    _takeFeeAndCheckReserve(amounts, feeRate) {
+        return amounts.map(amount => {
+            if (amount === 0n)
+                return 0n;
+            const lpFee = (amount * feeRate) / bigint_constants_1.BI_POWS[5];
+            const reserve = this.state.tokenInfos[this._quoteToken].reserve;
+            return lpFee > reserve ? 0n : amount - lpFee;
+        });
+    }
+    _takeFee(amounts, feeRate) {
+        return amounts.map(amount => {
+            const lpFee = (amount * feeRate) / bigint_constants_1.BI_POWS[5];
+            return amount === 0n ? 0n : amount - lpFee;
+        });
+    }
+    _calcQuoteAmountSellBase(baseToken, baseAmounts, state) {
+        let { priceDec, quoteDec, baseDec } = this.state.decimals[baseToken];
+        return baseAmounts.map(baseAmount => {
+            if (baseAmount === 0n)
+                return 0n;
+            const coef = bigint_constants_1.BI_POWS[18] -
+                (state.coeff * baseAmount * state.price) / baseDec / priceDec -
+                state.spread;
+            return ((((baseAmount * quoteDec * state.price) / priceDec) * coef) /
+                bigint_constants_1.BI_POWS[18] /
+                baseDec);
+        });
+    }
+    _calcBaseAmountSellQuote(baseToken, quoteAmounts, state) {
+        let { priceDec, quoteDec, baseDec } = this.state.decimals[baseToken];
+        return quoteAmounts.map(quoteAmount => {
+            if (quoteAmount === 0n)
+                return 0n;
+            const coef = bigint_constants_1.BI_POWS[18] - (quoteAmount * state.coeff) / quoteDec - state.spread;
+            return ((((quoteAmount * baseDec * priceDec) / state.price) * coef) /
+                bigint_constants_1.BI_POWS[18] /
+                quoteDec);
+        });
+    }
+}
+exports.WooFiV2Math = WooFiV2Math;
+//# sourceMappingURL=woo-fi-math.js.map

package/build/dex/woo-fi-v2/woo-fi-math.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.28.3",
+  "version": "2.28.4-algebra-events-fix.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/algebra/algebra-events.test.ts

@@ -7,12 +7,13 @@ import { AlgebraConfig } from './config';
 import { Network } from '../../constants';
 import { DummyDexHelper } from '../../dex-helper/index';
 import { testEventSubscriber } from '../../../tests/utils-events';
-import { PoolState } from './types';
+import { PoolStateV1_1, PoolState_v1_9 } from './types';
 import { Interface } from '@ethersproject/abi';
 import ERC20ABI from '../../abi/erc20.json';
 import StateMulticallABI from '../../abi/algebra/AlgebraStateMulticall.abi.json';
 import { AbiItem } from 'web3-utils';
-import { AlgebraEventPool } from './algebra-pool';
+import { AlgebraEventPoolV1_1 } from './algebra-pool-v1_1';
+import { AlgebraEventPoolV1_9 } from './algebra-pool-v1_9';
 
 jest.setTimeout(300 * 1000);
 const dexKey = 'QuickSwapV3';
@@ -20,10 +21,10 @@ const network = Network.POLYGON;
 const config = AlgebraConfig[dexKey][network];
 
 async function fetchPoolStateFromContract(
-  algebraPool: AlgebraEventPool,
+  algebraPool: AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9,
   blockNumber: number,
   poolAddress: string,
-): Promise<PoolState> {
+): Promise<PoolStateV1_1 | PoolState_v1_9> {
   const message = `Algebra: ${poolAddress} blockNumber ${blockNumber}`;
   console.log(`Fetching state ${message}`);
   // Be careful to not request state prior to contract deployment
@@ -31,11 +32,76 @@ async function fetchPoolStateFromContract(
   // We had that mechanism, but removed it with this commit
   // You can restore it, but better just to find block after state multicall
   // deployment
-  const state = algebraPool.generateState(blockNumber);
+  const state = await algebraPool.generateState(blockNumber);
   console.log(`Done ${message}`);
   return state;
 }
 
+// To make this test to pass, you need to increase till 1500: TICK_BITMAP_BUFFER=1500
+describe('CamelotV3 Event Edge Case', function () {
+  const poolAddress = '0xaB72b23F347d41e8E993176ecb7CF3b842FBAC8C';
+  const token0 = '0x6bb7a17acc227fd1f6781d1eedeae01b42047ee0';
+  const token1 = '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8';
+  const dexKey = 'CamelotV3';
+  const network = Network.ARBITRUM;
+  const config = AlgebraConfig[dexKey][network];
+
+  const blockNumbers: { [eventName: string]: number[] } = {
+    // topic0 - 0x0c396cd989a39f4459b5fa1aed6a9a8dcdbc45908acfd67e028cd568da98982c
+    ['Burn']: [119409575],
+    // topic0 - 0xbdbdb71d7860376ba52b25a5028beea23581364a40522f6bcfb86bb1f2dca633
+    ['Collect']: [119409575],
+  };
+
+  describe('AlgebraEventPool', function () {
+    Object.keys(blockNumbers).forEach((event: string) => {
+      blockNumbers[event].forEach((blockNumber: number) => {
+        it(`${event}:${blockNumber} - should return correct state`, async function () {
+          const dexHelper = new DummyDexHelper(network);
+          // await dexHelper.init();
+
+          const logger = dexHelper.getLogger(dexKey);
+
+          const algebraPool = new AlgebraEventPoolV1_9(
+            dexHelper,
+            dexKey,
+            new dexHelper.web3Provider.eth.Contract(
+              StateMulticallABI as AbiItem[],
+              config.algebraStateMulticall,
+            ),
+            new Interface(ERC20ABI),
+            config.factory,
+            token0,
+            token1,
+            logger,
+            undefined,
+            config.initHash,
+            config.deployer,
+          );
+
+          // It is done in generateState. But here have to make it manually
+          algebraPool.poolAddress = poolAddress.toLowerCase();
+          algebraPool.addressesSubscribed[0] = poolAddress;
+
+          await testEventSubscriber(
+            algebraPool as any,
+            algebraPool.addressesSubscribed,
+            (_blockNumber: number) =>
+              fetchPoolStateFromContract(
+                algebraPool,
+                _blockNumber,
+                poolAddress,
+              ),
+            blockNumber,
+            `${dexKey}_${poolAddress}`,
+            dexHelper.provider,
+          );
+        });
+      });
+    });
+  });
+});
+
 describe('Algebra Event', function () {
   const poolAddress = '0x5b41eedcfc8e0ae47493d4945aa1ae4fe05430ff';
   const token0 = '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270';
@@ -79,7 +145,7 @@ describe('Algebra Event', function () {
 
           const logger = dexHelper.getLogger(dexKey);
 
-          const algebraPool = new AlgebraEventPool(
+          const algebraPool = new AlgebraEventPoolV1_1(
             dexHelper,
             dexKey,
             new dexHelper.web3Provider.eth.Contract(
@@ -101,7 +167,7 @@ describe('Algebra Event', function () {
           algebraPool.addressesSubscribed[0] = poolAddress;
 
           await testEventSubscriber(
-            algebraPool,
+            algebraPool as any,
             algebraPool.addressesSubscribed,
             (_blockNumber: number) =>
               fetchPoolStateFromContract(

package/src/dex/algebra/algebra.ts

@@ -18,7 +18,7 @@ import * as CALLDATA_GAS_COST from '../../calldata-gas-cost';
 import { getBigIntPow, getDexKeysWithNetwork, interpolate } from '../../utils';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import { AlgebraData, DexParams, PoolStateV1_1, PoolState_v1_9 } from './types';
+import { AlgebraData, DexParams, IAlgebraPoolState } from './types';
 import {
   SimpleExchange,
   getLocalDeadlineAsFriendlyPlaceholder,
@@ -57,7 +57,6 @@ const MAX_STALE_STATE_BLOCK_AGE = {
 };
 
 type IAlgebraEventPool = AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9;
-type IAlgebraPoolState = PoolStateV1_1 | PoolState_v1_9;
 
 export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   readonly isFeeOnTransferSupported: boolean = false;