@paraswap/dex-lib 4.8.15 → 4.8.16

package/build/dex/ekubo-v3/pools/full-range.js

@@ -1,61 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FullRangePoolState = exports.FullRangePool = void 0;
+exports.FullRangePoolState = exports.FullRangePool = exports.FullRangePoolBase = void 0;
+exports.quoteFullRange = quoteFullRange;
 const pool_1 = require("./pool");
 const sqrt_ratio_1 = require("./math/sqrt-ratio");
 const swap_1 = require("./math/swap");
 const tick_1 = require("./math/tick");
-const utils_1 = require("./utils");
 const delta_1 = require("./math/delta");
 const GAS_COST_OF_ONE_FULL_RANGE_SWAP = 14_774;
-class FullRangePool extends pool_1.EkuboPool {
+class FullRangePoolBase extends pool_1.EkuboPool {
     quoteDataFetcher;
     constructor(parentName, dexHelper, logger, contracts, initBlockNumber, key) {
         const { contract: { address }, interface: iface, quoteDataFetcher, } = contracts.core;
-        super(parentName, dexHelper, logger, initBlockNumber, key, {
-            [address]: new pool_1.NamedEventHandlers(iface, {
-                PositionUpdated: (args, oldState) => FullRangePoolState.fromPositionUpdatedEvent(oldState, args.liquidityDelta.toBigInt()),
-            }),
-        }, {
-            [address]: data => FullRangePoolState.fromSwappedEvent((0, utils_1.parseSwappedEvent)(data)),
-        });
+        super(parentName, dexHelper, logger, initBlockNumber, key, address, iface);
         this.quoteDataFetcher = quoteDataFetcher;
     }
+    _quote(amount, isToken1, state, sqrtRatioLimit) {
+        return quoteFullRange(this.key, amount, isToken1, state, sqrtRatioLimit);
+    }
+    _computeTvl(state) {
+        return FullRangePoolState.computeTvl(state);
+    }
+}
+exports.FullRangePoolBase = FullRangePoolBase;
+function quoteFullRange(key, amount, isToken1, state, sqrtRatioLimit) {
+    const isIncreasing = (0, swap_1.isPriceIncreasing)(amount, isToken1);
+    let sqrtRatio = state.sqrtRatio;
+    const liquidity = state.liquidity;
+    sqrtRatioLimit ??= isIncreasing ? tick_1.MAX_SQRT_RATIO : tick_1.MIN_SQRT_RATIO;
+    const step = (0, swap_1.computeStep)({
+        fee: key.config.fee,
+        sqrtRatio,
+        liquidity,
+        isToken1,
+        sqrtRatioLimit,
+        amount,
+    });
+    return {
+        consumedAmount: step.consumedAmount,
+        calculatedAmount: step.calculatedAmount,
+        gasConsumed: GAS_COST_OF_ONE_FULL_RANGE_SWAP,
+        skipAhead: 0,
+        stateAfter: {
+            sqrtRatio: step.sqrtRatioNext,
+            liquidity,
+        },
+    };
+}
+class FullRangePool extends FullRangePoolBase {
     async generateState(blockNumber) {
         const data = await this.quoteDataFetcher.getQuoteData([this.key.toAbi()], 0, {
             blockTag: blockNumber,
         });
         return FullRangePoolState.fromQuoter(data[0]);
     }
-    _quote(amount, isToken1, state, sqrtRatioLimit) {
-        return this.quoteFullRange(amount, isToken1, state, sqrtRatioLimit);
-    }
-    quoteFullRange(amount, isToken1, state, sqrtRatioLimit) {
-        const isIncreasing = (0, swap_1.isPriceIncreasing)(amount, isToken1);
-        let sqrtRatio = state.sqrtRatio;
-        const liquidity = state.liquidity;
-        sqrtRatioLimit ??= isIncreasing ? tick_1.MAX_SQRT_RATIO : tick_1.MIN_SQRT_RATIO;
-        const step = (0, swap_1.computeStep)({
-            fee: this.key.config.fee,
-            sqrtRatio,
-            liquidity,
-            isToken1,
-            sqrtRatioLimit,
-            amount,
-        });
-        return {
-            consumedAmount: step.consumedAmount,
-            calculatedAmount: step.calculatedAmount,
-            gasConsumed: GAS_COST_OF_ONE_FULL_RANGE_SWAP,
-            skipAhead: 0,
-            stateAfter: {
-                sqrtRatio: step.sqrtRatioNext,
-                liquidity,
-            },
-        };
+    handlePositionUpdated(args, oldState) {
+        return FullRangePoolState.fromPositionUpdatedEvent(oldState, args.liquidityDelta.toBigInt());
     }
-    _computeTvl(state) {
-        return FullRangePoolState.computeTvl(state);
+    handleSwappedEvent(ev, _oldState) {
+        return FullRangePoolState.fromSwappedEvent(ev);
     }
 }
 exports.FullRangePool = FullRangePool;

package/build/dex/ekubo-v3/pools/full-range.js.map

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

package/build/dex/ekubo-v3/pools/mev-capture.d.ts

@@ -1,8 +1,12 @@
+import { Result } from '@ethersproject/abi';
 import { DeepReadonly } from 'ts-essentials';
-import { PoolKeyed, Quote } from './pool';
-import { BasePool, BasePoolState } from './base';
-import { ConcentratedPoolTypeConfig } from './utils';
-export declare class MevCapturePool extends BasePool {
-    protected _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<BasePoolState.Object>, sqrtRatioLimit?: bigint): Quote;
-    quoteMevCapture(this: PoolKeyed<ConcentratedPoolTypeConfig>, amount: bigint, isToken1: boolean, state: DeepReadonly<BasePoolState.Object>, sqrtRatioLimit?: bigint): Quote<Pick<BasePoolState.Object, 'activeTickIndex' | 'sqrtRatio' | 'liquidity'>>;
+import { Quote } from './pool';
+import { ConcentratedPoolBase, ConcentratedPoolState } from './concentrated';
+import { ConcentratedPoolTypeConfig, PoolKey, SwappedEvent } from './utils';
+export declare class MevCapturePool extends ConcentratedPoolBase<ConcentratedPoolState.Object> {
+    generateState(blockNumber: number): Promise<DeepReadonly<ConcentratedPoolState.Object>>;
+    protected _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<ConcentratedPoolState.Object>, sqrtRatioLimit?: bigint): Quote;
+    protected handlePositionUpdated(args: Result, oldState: DeepReadonly<ConcentratedPoolState.Object>): DeepReadonly<ConcentratedPoolState.Object> | null;
+    protected handleSwappedEvent(ev: SwappedEvent, oldState: DeepReadonly<ConcentratedPoolState.Object>): DeepReadonly<ConcentratedPoolState.Object> | null;
 }
+export declare function quoteMevCapture(key: PoolKey<ConcentratedPoolTypeConfig>, amount: bigint, isToken1: boolean, state: DeepReadonly<ConcentratedPoolState.Object>, sqrtRatioLimit?: bigint): Quote<Pick<ConcentratedPoolState.Object, 'activeTickIndex' | 'sqrtRatio' | 'liquidity'>>;

package/build/dex/ekubo-v3/pools/mev-capture.js

@@ -1,42 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MevCapturePool = void 0;
-const base_1 = require("./base");
+exports.quoteMevCapture = quoteMevCapture;
+const concentrated_1 = require("./concentrated");
 const tick_1 = require("./math/tick");
 const bigint_constants_1 = require("../../../bigint-constants");
 const swap_1 = require("./math/swap");
-// TODO
-const EXTRA_BASE_GAS_COST_OF_ONE_MEV_CAPTURE_SWAP = 33_500;
-class MevCapturePool extends base_1.BasePool {
+const ethers_1 = require("ethers");
+const utils_1 = require("ethers/lib/utils");
+// This assumes fees are always accumulated
+const EXTRA_BASE_GAS_COST_OF_ONE_MEV_CAPTURE_SWAP = 32_258;
+class MevCapturePool extends concentrated_1.ConcentratedPoolBase {
+    async generateState(blockNumber) {
+        const data = await this.quoteDataFetcher.getQuoteData([this.key.toAbi()], 10, {
+            blockTag: blockNumber,
+        });
+        return concentrated_1.ConcentratedPoolState.fromQuoter(data[0]);
+    }
     _quote(amount, isToken1, state, sqrtRatioLimit) {
-        return this.quoteMevCapture(amount, isToken1, state, sqrtRatioLimit);
+        return quoteMevCapture(this.key, amount, isToken1, state, sqrtRatioLimit);
+    }
+    handlePositionUpdated(args, oldState) {
+        const [lower, upper] = [
+            ethers_1.BigNumber.from((0, utils_1.hexDataSlice)(args.positionId, 24, 28))
+                .fromTwos(32)
+                .toNumber(),
+            ethers_1.BigNumber.from((0, utils_1.hexDataSlice)(args.positionId, 28, 32))
+                .fromTwos(32)
+                .toNumber(),
+        ];
+        return concentrated_1.ConcentratedPoolState.fromPositionUpdatedEvent(oldState, [lower, upper], args.liquidityDelta.toBigInt());
     }
-    quoteMevCapture(amount, isToken1, state, sqrtRatioLimit) {
-        const quote = base_1.BasePool.prototype.quoteBase.call(this, amount, isToken1, state, sqrtRatioLimit);
-        const tickAfterSwap = (0, tick_1.approximateSqrtRatioToTick)(quote.stateAfter.sqrtRatio);
-        const poolConfig = this.key.config;
-        const approximateFeeMultiplier = (Math.abs(tickAfterSwap - state.activeTick) + 1) /
-            poolConfig.poolTypeConfig.tickSpacing;
-        let fixedPointAdditionalFee = BigInt(Math.round(approximateFeeMultiplier * Number(poolConfig.fee)));
-        if (fixedPointAdditionalFee > bigint_constants_1.BI_MAX_UINT64) {
-            fixedPointAdditionalFee = bigint_constants_1.BI_MAX_UINT64;
-        }
-        let calculatedAmount = quote.calculatedAmount;
-        if (amount >= 0n) {
-            // Exact input, remove the additional fee from the output
-            calculatedAmount -= (0, swap_1.computeFee)(calculatedAmount, fixedPointAdditionalFee);
-        }
-        else {
-            const inputAmountFee = (0, swap_1.computeFee)(calculatedAmount, poolConfig.fee);
-            const inputAmount = calculatedAmount - inputAmountFee;
-            const bf = (0, swap_1.amountBeforeFee)(inputAmount, fixedPointAdditionalFee);
-            const fee = bf - inputAmount;
-            calculatedAmount += fee;
-        }
-        quote.gasConsumed += EXTRA_BASE_GAS_COST_OF_ONE_MEV_CAPTURE_SWAP;
-        quote.calculatedAmount = calculatedAmount;
-        return quote;
+    handleSwappedEvent(ev, oldState) {
+        return concentrated_1.ConcentratedPoolState.fromSwappedEvent(oldState, ev);
     }
 }
 exports.MevCapturePool = MevCapturePool;
+function quoteMevCapture(key, amount, isToken1, state, sqrtRatioLimit) {
+    const quote = (0, concentrated_1.quoteConcentrated)(key, amount, isToken1, state, sqrtRatioLimit);
+    const tickAfterSwap = (0, tick_1.approximateSqrtRatioToTick)(quote.stateAfter.sqrtRatio);
+    const poolConfig = key.config;
+    const approximateFeeMultiplier = (Math.abs(tickAfterSwap - state.activeTick) + 1) /
+        poolConfig.poolTypeConfig.tickSpacing;
+    let fixedPointAdditionalFee = BigInt(Math.round(approximateFeeMultiplier * Number(poolConfig.fee)));
+    if (fixedPointAdditionalFee > bigint_constants_1.BI_MAX_UINT64) {
+        fixedPointAdditionalFee = bigint_constants_1.BI_MAX_UINT64;
+    }
+    let calculatedAmount = quote.calculatedAmount;
+    if (amount >= 0n) {
+        // Exact input, remove the additional fee from the output
+        calculatedAmount -= (0, swap_1.computeFee)(calculatedAmount, fixedPointAdditionalFee);
+    }
+    else {
+        const inputAmountFee = (0, swap_1.computeFee)(calculatedAmount, poolConfig.fee);
+        const inputAmount = calculatedAmount - inputAmountFee;
+        const bf = (0, swap_1.amountBeforeFee)(inputAmount, fixedPointAdditionalFee);
+        const fee = bf - inputAmount;
+        calculatedAmount += fee;
+    }
+    quote.gasConsumed += EXTRA_BASE_GAS_COST_OF_ONE_MEV_CAPTURE_SWAP;
+    quote.calculatedAmount = calculatedAmount;
+    return quote;
+}
 //# sourceMappingURL=mev-capture.js.map

package/build/dex/ekubo-v3/pools/mev-capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"mev-capture.js","sourceRoot":"","sources":["../../../../src/dex/ekubo-v3/pools/mev-capture.ts"],"names":[],"mappings":";;;AAEA,iCAAiD;AACjD,sCAAyD;AACzD,gEAA0D;AAC1D,sCAA0D;AAG1D,OAAO;AACP,MAAM,2CAA2C,GAAG,MAAM,CAAC;AAE3D,MAAa,cAAe,SAAQ,eAAQ;IACvB,MAAM,CACvB,MAAc,EACd,QAAiB,EACjB,KAAyC,EACzC,cAAuB;QAEvB,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;IAEM,eAAe,CAEpB,MAAc,EACd,QAAiB,EACjB,KAAyC,EACzC,cAAuB;QAIvB,MAAM,KAAK,GAAG,eAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAC7C,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,cAAc,CACf,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,iCAA0B,EAC9C,KAAK,CAAC,UAAU,CAAC,SAAS,CAC3B,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QACnC,MAAM,wBAAwB,GAC5B,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAChD,UAAU,CAAC,cAAc,CAAC,WAAW,CAAC;QAExC,IAAI,uBAAuB,GAAG,MAAM,CAClC,IAAI,CAAC,KAAK,CAAC,wBAAwB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC9D,CAAC;QAEF,IAAI,uBAAuB,GAAG,gCAAa,EAAE,CAAC;YAC5C,uBAAuB,GAAG,gCAAa,CAAC;QAC1C,CAAC;QAED,IAAI,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAE9C,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC;YACjB,yDAAyD;YACzD,gBAAgB,IAAI,IAAA,iBAAU,EAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,GAAG,IAAA,iBAAU,EAAC,gBAAgB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,gBAAgB,GAAG,cAAc,CAAC;YAEtD,MAAM,EAAE,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;YACjE,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,CAAC;YAC7B,gBAAgB,IAAI,GAAG,CAAC;QAC1B,CAAC;QAED,KAAK,CAAC,WAAW,IAAI,2CAA2C,CAAC;QACjE,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAE1C,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA9DD,wCA8DC"}
+{"version":3,"file":"mev-capture.js","sourceRoot":"","sources":["../../../../src/dex/ekubo-v3/pools/mev-capture.ts"],"names":[],"mappings":"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"}

package/build/dex/ekubo-v3/pools/oracle.d.ts

@@ -1,8 +1,12 @@
 import { DeepReadonly } from 'ts-essentials';
-import { FullRangePool, FullRangePoolState } from './full-range';
-import { PoolKeyed, Quote } from './pool';
-import { StableswapPoolTypeConfig } from './utils';
-export declare class OraclePool extends FullRangePool {
+import { Result } from '@ethersproject/abi';
+import { FullRangePoolBase, FullRangePoolState } from './full-range';
+import { Quote } from './pool';
+import { PoolKey, StableswapPoolTypeConfig, SwappedEvent } from './utils';
+export declare class OraclePool extends FullRangePoolBase<FullRangePoolState.Object> {
+    generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<FullRangePoolState.Object>>;
     protected _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<FullRangePoolState.Object>, sqrtRatioLimit?: bigint): Quote;
-    quoteOracle(this: PoolKeyed<StableswapPoolTypeConfig>, amount: bigint, isToken1: boolean, state: DeepReadonly<FullRangePoolState.Object>, sqrtRatioLimit?: bigint): Quote;
+    protected handlePositionUpdated(args: Result, oldState: DeepReadonly<FullRangePoolState.Object>): DeepReadonly<FullRangePoolState.Object> | null;
+    protected handleSwappedEvent(ev: SwappedEvent, _oldState: DeepReadonly<FullRangePoolState.Object>): DeepReadonly<FullRangePoolState.Object> | null;
 }
+export declare function quoteOracle(key: PoolKey<StableswapPoolTypeConfig>, amount: bigint, isToken1: boolean, state: DeepReadonly<FullRangePoolState.Object>, sqrtRatioLimit?: bigint): Quote;

package/build/dex/ekubo-v3/pools/oracle.js

@@ -1,18 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OraclePool = void 0;
+exports.quoteOracle = quoteOracle;
 const full_range_1 = require("./full-range");
-// TODO
-const BASE_GAS_COST_OF_ONE_ORACLE_SWAP = 32_000;
-class OraclePool extends full_range_1.FullRangePool {
+// This assumes a snapshot is always inserted
+const GAS_COST_OF_ONE_ORACLE_SWAP = 23_828;
+class OraclePool extends full_range_1.FullRangePoolBase {
+    async generateState(blockNumber) {
+        const data = await this.quoteDataFetcher.getQuoteData([this.key.toAbi()], 0, {
+            blockTag: blockNumber,
+        });
+        return full_range_1.FullRangePoolState.fromQuoter(data[0]);
+    }
     _quote(amount, isToken1, state, sqrtRatioLimit) {
-        return this.quoteOracle(amount, isToken1, state, sqrtRatioLimit);
+        return quoteOracle(this.key, amount, isToken1, state, sqrtRatioLimit);
+    }
+    handlePositionUpdated(args, oldState) {
+        return full_range_1.FullRangePoolState.fromPositionUpdatedEvent(oldState, args.liquidityDelta.toBigInt());
     }
-    quoteOracle(amount, isToken1, state, sqrtRatioLimit) {
-        const fullRangeQuote = full_range_1.FullRangePool.prototype.quoteFullRange.call(this, amount, isToken1, state, sqrtRatioLimit);
-        fullRangeQuote.gasConsumed = BASE_GAS_COST_OF_ONE_ORACLE_SWAP;
-        return fullRangeQuote;
+    handleSwappedEvent(ev, _oldState) {
+        return full_range_1.FullRangePoolState.fromSwappedEvent(ev);
     }
 }
 exports.OraclePool = OraclePool;
+function quoteOracle(key, amount, isToken1, state, sqrtRatioLimit) {
+    const quote = (0, full_range_1.quoteFullRange)(key, amount, isToken1, state, sqrtRatioLimit);
+    quote.gasConsumed = GAS_COST_OF_ONE_ORACLE_SWAP;
+    return quote;
+}
 //# sourceMappingURL=oracle.js.map

package/build/dex/ekubo-v3/pools/oracle.js.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/dex/ekubo-v3/pools/oracle.ts"],"names":[],"mappings":";;;AACA,6CAAiE;AAIjE,OAAO;AACP,MAAM,gCAAgC,GAAG,MAAM,CAAC;AAEhD,MAAa,UAAW,SAAQ,0BAAa;IACxB,MAAM,CACvB,MAAc,EACd,QAAiB,EACjB,KAA8C,EAC9C,cAAuB;QAEvB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC;IAEM,WAAW,CAEhB,MAAc,EACd,QAAiB,EACjB,KAA8C,EAC9C,cAAuB;QAEvB,MAAM,cAAc,GAAG,0BAAa,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAChE,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,cAAc,CACf,CAAC;QAEF,cAAc,CAAC,WAAW,GAAG,gCAAgC,CAAC;QAE9D,OAAO,cAAc,CAAC;IACxB,CAAC;CACF;AA7BD,gCA6BC"}
+{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/dex/ekubo-v3/pools/oracle.ts"],"names":[],"mappings":";;;AAsDA,kCAYC;AAhED,6CAIsB;AAItB,6CAA6C;AAC7C,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAE3C,MAAa,UAAW,SAAQ,8BAA4C;IAC1D,KAAK,CAAC,aAAa,CACjC,WAA+B;QAE/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CACnD,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAClB,CAAC,EACD;YACE,QAAQ,EAAE,WAAW;SACtB,CACF,CAAC;QACF,OAAO,+BAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAEkB,MAAM,CACvB,MAAc,EACd,QAAiB,EACjB,KAA8C,EAC9C,cAAuB;QAEvB,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IAEkB,qBAAqB,CACtC,IAAY,EACZ,QAAiD;QAEjD,OAAO,+BAAkB,CAAC,wBAAwB,CAChD,QAAQ,EACR,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAC/B,CAAC;IACJ,CAAC;IAEkB,kBAAkB,CACnC,EAAgB,EAChB,SAAkD;QAElD,OAAO,+BAAkB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;CACF;AAvCD,gCAuCC;AAED,SAAgB,WAAW,CACzB,GAAsC,EACtC,MAAc,EACd,QAAiB,EACjB,KAA8C,EAC9C,cAAuB;IAEvB,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAE3E,KAAK,CAAC,WAAW,GAAG,2BAA2B,CAAC;IAEhD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/build/dex/ekubo-v3/pools/pool.d.ts

@@ -4,7 +4,7 @@ import { DeepReadonly } from 'ts-essentials';
 import { IDexHelper } from '../../../dex-helper/idex-helper';
 import { StatefulEventSubscriber } from '../../../stateful-event-subscriber';
 import { BlockHeader, Log } from '../../../types';
-import { PoolKey, PoolTypeConfig } from './utils';
+import { PoolKey, PoolTypeConfig, SwappedEvent } from './utils';
 import { EventSubscriber } from '../../../dex-helper';
 export type Quote<StateAfter = undefined> = {
     consumedAmount: bigint;
@@ -14,10 +14,8 @@ export type Quote<StateAfter = undefined> = {
 } & (StateAfter extends undefined ? {} : {
     stateAfter: StateAfter;
 });
-export interface PoolKeyed<C extends PoolTypeConfig> {
+export interface IEkuboPool<C extends PoolTypeConfig> extends EventSubscriber {
     key: PoolKey<C>;
-}
-export interface IEkuboPool<C extends PoolTypeConfig> extends PoolKeyed<C>, EventSubscriber {
     initializationBlockNumber(): number;
     quote(amount: bigint, token: bigint, blockNumber: number): Quote;
     updateState(blockNumber: number): Promise<void>;
@@ -26,17 +24,17 @@ export interface IEkuboPool<C extends PoolTypeConfig> extends PoolKeyed<C>, Even
 export type NamedEventHandler<State> = (args: Result, oldState: DeepReadonly<State>, blockHeader: Readonly<BlockHeader>) => DeepReadonly<State> | null;
 export type AnonymousEventHandler<State> = (data: string, oldState: DeepReadonly<State>, blockHeader: Readonly<BlockHeader>) => DeepReadonly<State> | null;
 export declare class NamedEventHandlers<State> {
-    private readonly iface;
-    private readonly handlers;
+    readonly iface: Interface;
+    readonly handlers: Record<string, NamedEventHandler<State>>;
     constructor(iface: Interface, handlers: Record<string, NamedEventHandler<State>>);
     parseLog(log: Readonly<Log>, oldState: DeepReadonly<State>, blockHeader: Readonly<BlockHeader>): DeepReadonly<State> | null;
 }
 export declare abstract class EkuboPool<C extends PoolTypeConfig, S> extends StatefulEventSubscriber<S> implements IEkuboPool<C> {
     private readonly initBlockNumber;
     readonly key: PoolKey<C>;
+    protected constructor(parentName: string, dexHelper: IDexHelper, logger: Logger, initBlockNumber: number, key: PoolKey<C>, coreAddress: string, coreIface: Interface, extraNamedEventHandlers?: Record<string, NamedEventHandlers<S>>, extraAnonymousEventHandlers?: Record<string, AnonymousEventHandler<S>>);
     private readonly namedEventHandlers;
     private readonly anonymousEventHandlers;
-    protected constructor(parentName: string, dexHelper: IDexHelper, logger: Logger, initBlockNumber: number, key: PoolKey<C>, namedEventHandlers: Record<string, NamedEventHandlers<S>>, anonymousEventHandlers: Record<string, AnonymousEventHandler<S>>);
     initializationBlockNumber(): number;
     updateState(blockNumber: number): Promise<void>;
     quote(amount: bigint, token: bigint, blockNumber: number): Quote;
@@ -53,4 +51,6 @@ export declare abstract class EkuboPool<C extends PoolTypeConfig, S> extends Sta
     protected processLog(state: DeepReadonly<S>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): DeepReadonly<S> | null;
     protected abstract _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<S>, sqrtRatioLimit?: bigint): Quote;
     protected abstract _computeTvl(state: DeepReadonly<S>): [bigint, bigint];
+    protected abstract handlePositionUpdated(args: Result, oldState: DeepReadonly<S>): DeepReadonly<S> | null;
+    protected abstract handleSwappedEvent(ev: SwappedEvent, oldState: DeepReadonly<S>): DeepReadonly<S> | null;
 }

package/build/dex/ekubo-v3/pools/pool.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EkuboPool = exports.NamedEventHandlers = void 0;
 const stateful_event_subscriber_1 = require("../../../stateful-event-subscriber");
+const utils_1 = require("./utils");
 class NamedEventHandlers {
     iface;
     handlers;
@@ -18,18 +19,28 @@ exports.NamedEventHandlers = NamedEventHandlers;
 class EkuboPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
     initBlockNumber;
     key;
-    namedEventHandlers;
-    anonymousEventHandlers;
-    constructor(parentName, dexHelper, logger, initBlockNumber, key, namedEventHandlers, anonymousEventHandlers) {
+    constructor(parentName, dexHelper, logger, initBlockNumber, key, coreAddress, coreIface, extraNamedEventHandlers = {}, extraAnonymousEventHandlers = {}) {
         super(parentName, key.stringId, dexHelper, logger);
         this.initBlockNumber = initBlockNumber;
         this.key = key;
-        this.namedEventHandlers = namedEventHandlers;
-        this.anonymousEventHandlers = anonymousEventHandlers;
+        const coreNamedHandlers = extraNamedEventHandlers[coreAddress]?.handlers ?? {};
+        this.namedEventHandlers = {
+            ...extraNamedEventHandlers,
+            [coreAddress]: new NamedEventHandlers(coreIface, {
+                ...coreNamedHandlers,
+                PositionUpdated: (args, oldState) => this.handlePositionUpdated(args, oldState),
+            }),
+        };
+        this.anonymousEventHandlers = {
+            ...extraAnonymousEventHandlers,
+            [coreAddress]: (data, oldState) => this.handleSwappedEvent((0, utils_1.parseSwappedEvent)(data), oldState),
+        };
         this.addressesSubscribed = [
-            ...new Set(Object.keys(namedEventHandlers).concat(Object.keys(anonymousEventHandlers))),
+            ...new Set(Object.keys(this.namedEventHandlers).concat(Object.keys(this.anonymousEventHandlers))),
         ];
     }
+    namedEventHandlers;
+    anonymousEventHandlers;
     initializationBlockNumber() {
         return this.initBlockNumber;
     }

package/build/dex/ekubo-v3/pools/pool.js.map

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

package/build/dex/ekubo-v3/pools/stableswap.d.ts

@@ -1,19 +1,23 @@
 import { DeepReadonly } from 'ts-essentials';
+import { Result } from '@ethersproject/abi';
 import { IDexHelper } from '../../../dex-helper/idex-helper';
 import { Logger } from '../../../types';
 import { EkuboContracts } from '../types';
-import { EkuboPool, PoolKeyed, Quote } from './pool';
-import { PoolKey, StableswapPoolTypeConfig } from './utils';
+import { EkuboPool, Quote } from './pool';
+import { PoolKey, StableswapPoolTypeConfig, SwappedEvent } from './utils';
 import { FullRangePoolState } from './full-range';
-export declare class StableswapPool extends EkuboPool<StableswapPoolTypeConfig, FullRangePoolState.Object> {
-    readonly lowerPrice: bigint;
-    readonly upperPrice: bigint;
-    private readonly quoteDataFetcher;
+export declare abstract class StableswapPoolBase<S extends FullRangePoolState.Object> extends EkuboPool<StableswapPoolTypeConfig, S> {
+    private readonly bounds;
+    protected readonly quoteDataFetcher: import("ethers").Contract;
     constructor(parentName: string, dexHelper: IDexHelper, logger: Logger, contracts: EkuboContracts, initBlockNumber: number, key: PoolKey<StableswapPoolTypeConfig>);
+    protected _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<S>, sqrtRatioLimit?: bigint): Quote;
+    protected _computeTvl(state: DeepReadonly<S>): [bigint, bigint];
+}
+export declare function quoteStableswap(fee: bigint, { lowerPrice, upperPrice }: StableswapBounds, amount: bigint, isToken1: boolean, state: DeepReadonly<Pick<FullRangePoolState.Object, 'sqrtRatio' | 'liquidity'>>, sqrtRatioLimit?: bigint): Quote<Pick<FullRangePoolState.Object, 'sqrtRatio' | 'liquidity'>>;
+export declare class StableswapPool extends StableswapPoolBase<FullRangePoolState.Object> {
     generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<FullRangePoolState.Object>>;
-    protected _quote(amount: bigint, isToken1: boolean, state: DeepReadonly<FullRangePoolState.Object>, sqrtRatioLimit?: bigint): Quote;
-    quoteStableswap(this: PoolKeyed<StableswapPoolTypeConfig> & StableswapBounds, amount: bigint, isToken1: boolean, state: DeepReadonly<FullRangePoolState.Object>, sqrtRatioLimit?: bigint): Quote<FullRangePoolState.Object>;
-    protected _computeTvl(state: FullRangePoolState.Object): [bigint, bigint];
+    protected handlePositionUpdated(args: Result, oldState: DeepReadonly<FullRangePoolState.Object>): DeepReadonly<FullRangePoolState.Object> | null;
+    protected handleSwappedEvent(ev: SwappedEvent, _oldState: DeepReadonly<FullRangePoolState.Object>): DeepReadonly<FullRangePoolState.Object> | null;
 }
 export interface StableswapBounds {
     lowerPrice: bigint;