@paraswap/dex-lib 2.42.28 → 2.42.29

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._reduceTicks = exports._reduceTickBitmap = exports._gt = exports._lt = exports._mulmod = void 0;
+const utils_1 = require("../../../utils");
+function _mulmod(x, y, m) {
+    return m === 0n ? 0n : (x * y) % m;
+}
+exports._mulmod = _mulmod;
+function _lt(x, y) {
+    return x < y ? 1n : 0n;
+}
+exports._lt = _lt;
+function _gt(x, y) {
+    return x > y ? 1n : 0n;
+}
+exports._gt = _gt;
+function _reduceTickBitmap(tickBitmap, tickBitmapToReduce) {
+    return tickBitmapToReduce.reduce((acc, curr) => {
+        const { index, value } = curr;
+        acc[index] = (0, utils_1.bigIntify)(value);
+        return acc;
+    }, tickBitmap);
+}
+exports._reduceTickBitmap = _reduceTickBitmap;
+function _reduceTicks(ticks, ticksToReduce) {
+    return ticksToReduce.reduce((acc, curr) => {
+        const { index, value } = curr;
+        if (value.initialized) {
+            acc[index] = {
+                liquidityGross: (0, utils_1.bigIntify)(value.liquidityGross),
+                liquidityNet: (0, utils_1.bigIntify)(value.liquidityNet),
+                initialized: value.initialized,
+            };
+        }
+        return acc;
+    }, ticks);
+}
+exports._reduceTicks = _reduceTicks;
+//# sourceMappingURL=utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/dex/solidly-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,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC;AAfD,oCAeC"}

package/build/dex/solidly-v3/solidly-v3-factory.d.ts

@@ -0,0 +1,26 @@
+import { Interface } from '@ethersproject/abi';
+import { DeepReadonly } from 'ts-essentials';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
+import { Address, Log, Logger } from '../../types';
+import { LogDescription } from 'ethers/lib/utils';
+import { FactoryState } from './types';
+export declare type OnPoolCreatedCallback = ({ token0, token1, tickSpacing, }: {
+    token0: string;
+    token1: string;
+    tickSpacing: bigint;
+}) => Promise<void>;
+export declare class SolidlyV3Factory extends StatefulEventSubscriber<FactoryState> {
+    readonly dexHelper: IDexHelper;
+    protected readonly factoryAddress: Address;
+    protected readonly onPoolCreated: OnPoolCreatedCallback;
+    handlers: {
+        [event: string]: (event: any) => Promise<void>;
+    };
+    logDecoder: (log: Log) => any;
+    readonly factoryIface: Interface;
+    constructor(dexHelper: IDexHelper, parentName: string, factoryAddress: Address, logger: Logger, onPoolCreated: OnPoolCreatedCallback, mapKey?: string);
+    generateState(): FactoryState;
+    protected processLog(_: DeepReadonly<FactoryState>, log: Readonly<Log>): Promise<FactoryState>;
+    handleNewPool(event: LogDescription): Promise<void>;
+}

package/build/dex/solidly-v3/solidly-v3-factory.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolidlyV3Factory = void 0;
+const abi_1 = require("@ethersproject/abi");
+const UniswapV3Factory_abi_json_1 = __importDefault(require("../../abi/uniswap-v3/UniswapV3Factory.abi.json"));
+const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
+/*
+ * "Stateless" event subscriber in order to capture "PoolCreated" event on new pools created.
+ * State is present, but it's a placeholder to actually make the events reach handlers (if there's no previous state - `processBlockLogs` is not called)
+ */
+class SolidlyV3Factory extends stateful_event_subscriber_1.StatefulEventSubscriber {
+    constructor(dexHelper, parentName, factoryAddress, logger, onPoolCreated, mapKey = '') {
+        super(parentName, `${parentName} Factory`, dexHelper, logger, true, mapKey);
+        this.dexHelper = dexHelper;
+        this.factoryAddress = factoryAddress;
+        this.onPoolCreated = onPoolCreated;
+        this.handlers = {};
+        this.factoryIface = new abi_1.Interface(UniswapV3Factory_abi_json_1.default);
+        this.addressesSubscribed = [factoryAddress];
+        this.logDecoder = (log) => this.factoryIface.parseLog(log);
+        this.handlers['PoolCreated'] = this.handleNewPool.bind(this);
+    }
+    generateState() {
+        return {};
+    }
+    async processLog(_, log) {
+        const event = this.logDecoder(log);
+        if (event.name in this.handlers) {
+            await this.handlers[event.name](event);
+        }
+        return {};
+    }
+    async handleNewPool(event) {
+        const token0 = event.args.token0.toLowerCase();
+        const token1 = event.args.token1.toLowerCase();
+        const tickSpacing = BigInt(event.args.tickSpacing);
+        await this.onPoolCreated({ token0, token1, tickSpacing });
+    }
+}
+exports.SolidlyV3Factory = SolidlyV3Factory;
+//# sourceMappingURL=solidly-v3-factory.js.map

package/build/dex/solidly-v3/solidly-v3-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solidly-v3-factory.js","sourceRoot":"","sources":["../../../src/dex/solidly-v3/solidly-v3-factory.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAE/C,+GAAwE;AAExE,+EAA0E;AAe1E;;;GAGG;AACH,MAAa,gBAAiB,SAAQ,mDAAqC;IASzE,YACW,SAAqB,EAC9B,UAAkB,EACC,cAAuB,EAC1C,MAAc,EACK,aAAoC,EACvD,SAAiB,EAAE;QAEnB,KAAK,CAAC,UAAU,EAAE,GAAG,UAAU,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAPnE,cAAS,GAAT,SAAS,CAAY;QAEX,mBAAc,GAAd,cAAc,CAAS;QAEvB,kBAAa,GAAb,aAAa,CAAuB;QAbzD,aAAQ,GAEJ,EAAE,CAAC;QAIS,iBAAY,GAAG,IAAI,eAAS,CAAC,mCAAU,CAAC,CAAC;QAYvD,IAAI,CAAC,mBAAmB,GAAG,CAAC,cAAc,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,aAAa;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,CAA6B,EAC7B,GAAkB;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;SACxC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAqB;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAjDD,4CAiDC"}

package/build/dex/{algebra/algebra-pool.d.ts → solidly-v3/solidly-v3-pool.d.ts}

@@ -1,46 +1,44 @@
+import { Contract } from 'web3-eth-contract';
 import { Interface } from '@ethersproject/abi';
 import { DeepReadonly } from 'ts-essentials';
-import { Address, BlockHeader, Log, Logger } from '../../types';
+import { Log, Logger, BlockHeader, Address } from '../../types';
 import { InitializeStateOptions, StatefulEventSubscriber } from '../../stateful-event-subscriber';
 import { IDexHelper } from '../../dex-helper/idex-helper';
-import { PoolState } from './types';
-import { Contract } from 'web3-eth-contract';
-import { DecodedStateMultiCallResultWithRelativeBitmaps } from './types';
-export declare class AlgebraEventPool extends StatefulEventSubscriber<PoolState> {
+import { PoolState, DecodeStateMultiCallFunc } from './types';
+export declare class SolidlyV3EventPool extends StatefulEventSubscriber<PoolState> {
     readonly dexHelper: IDexHelper;
     readonly stateMultiContract: Contract;
+    readonly decodeStateMultiCallResultWithRelativeBitmaps: DecodeStateMultiCallFunc | undefined;
     readonly erc20Interface: Interface;
     protected readonly factoryAddress: Address;
+    readonly tickSpacing: bigint;
     readonly poolInitCodeHash: string;
-    readonly poolDeployer: string;
     handlers: {
-        [event: string]: (event: any, state: DeepReadonly<PoolState>, log: Readonly<Log>, blockHeader: BlockHeader) => DeepReadonly<PoolState> | null;
+        [event: string]: (event: any, pool: PoolState, log: Log, blockHeader: Readonly<BlockHeader>) => PoolState;
     };
     logDecoder: (log: Log) => any;
-    addressesSubscribed: string[];
-    private _poolAddress?;
     readonly token0: Address;
     readonly token1: Address;
+    _poolAddress?: Address;
+    private _stateRequestCallData?;
     readonly poolIface: Interface;
     initFailed: boolean;
     initRetryAttemptCount: number;
-    constructor(dexHelper: IDexHelper, parentName: string, stateMultiContract: Contract, erc20Interface: Interface, factoryAddress: Address, token0: Address, token1: Address, logger: Logger, mapKey: string | undefined, poolInitCodeHash: string, poolDeployer: string);
+    readonly tickSpacingAsString: string;
+    constructor(dexHelper: IDexHelper, parentName: string, stateMultiContract: Contract, decodeStateMultiCallResultWithRelativeBitmaps: DecodeStateMultiCallFunc | undefined, erc20Interface: Interface, factoryAddress: Address, tickSpacing: bigint, token0: Address, token1: Address, logger: Logger, mapKey: string | undefined, poolInitCodeHash: string);
     get poolAddress(): Address;
     set poolAddress(address: Address);
     initialize(blockNumber: number, options?: InitializeStateOptions<PoolState>): Promise<void>;
     protected processBlockLogs(state: DeepReadonly<PoolState>, logs: Readonly<Log>[], blockHeader: Readonly<BlockHeader>): Promise<DeepReadonly<PoolState> | null>;
     protected processLog(state: DeepReadonly<PoolState>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): DeepReadonly<PoolState> | null;
+    private _getStateRequestCallData;
     getBitmapRangeToRequest(): bigint;
-    private _fetchPoolStateSingleStep;
-    private _fetchPoolStateMultiStep;
-    _fetchInitStateMultiStrategies(blockNumber: number): Promise<[bigint, bigint, DecodedStateMultiCallResultWithRelativeBitmaps]>;
     generateState(blockNumber: number): Promise<Readonly<PoolState>>;
     handleSwapEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
-    handleMintEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
     handleBurnEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
-    handleNewFee(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
+    handleMintEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
     handleCollectEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
     handleFlashEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
-    handleCommunityFee(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
+    handleSetFeeEvent(event: any, pool: PoolState, log: Log, blockHeader: BlockHeader): PoolState;
     private _computePoolAddress;
 }

package/build/dex/{algebra/algebra-pool.js → solidly-v3/solidly-v3-pool.js}

@@ -3,50 +3,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlgebraEventPool = void 0;
+exports.SolidlyV3EventPool = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const abi_1 = require("@ethersproject/abi");
+const ethers_1 = require("ethers");
 const ts_essentials_1 = require("ts-essentials");
-const utils_1 = require("../../utils");
 const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
-const ethers_1 = require("ethers");
-const AlgebraPool_abi_json_1 = __importDefault(require("../../abi/algebra/AlgebraPool.abi.json"));
-const constants_1 = require("../uniswap-v3/constants");
+const SolidlyV3Pool_abi_json_1 = __importDefault(require("../../abi/solidly-v3/SolidlyV3Pool.abi.json"));
+const utils_1 = require("../../utils");
+const uniswap_v3_math_1 = require("./contract-math/uniswap-v3-math");
+const constants_1 = require("./constants");
+const TickBitMap_1 = require("./contract-math/TickBitMap");
 const decoders_1 = require("../../lib/decoders");
 const utils_2 = require("./utils");
-const AlgebraMath_1 = require("./lib/AlgebraMath");
-const TickBitMap_1 = require("../uniswap-v3/contract-math/TickBitMap");
-const utils_3 = require("../uniswap-v3/contract-math/utils");
-const Constants_1 = require("./lib/Constants");
-const constants_2 = require("../../constants");
-class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
-    constructor(dexHelper, parentName, stateMultiContract, erc20Interface, factoryAddress, token0, token1, logger, mapKey = '', poolInitCodeHash, poolDeployer) {
-        super(parentName, `${token0}_${token1}`, dexHelper, logger, true, mapKey);
+const utils_3 = require("./contract-math/utils");
+const FEES_TO_TICK_SPACING = {
+    500: 10n,
+};
+class SolidlyV3EventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
+    constructor(dexHelper, parentName, stateMultiContract, decodeStateMultiCallResultWithRelativeBitmaps, erc20Interface, factoryAddress, tickSpacing, token0, token1, logger, mapKey = '', poolInitCodeHash) {
+        super(parentName, `${token0}_${token1}_${tickSpacing}`, dexHelper, logger, true, mapKey);
         this.dexHelper = dexHelper;
         this.stateMultiContract = stateMultiContract;
+        this.decodeStateMultiCallResultWithRelativeBitmaps = decodeStateMultiCallResultWithRelativeBitmaps;
         this.erc20Interface = erc20Interface;
         this.factoryAddress = factoryAddress;
+        this.tickSpacing = tickSpacing;
         this.poolInitCodeHash = poolInitCodeHash;
-        this.poolDeployer = poolDeployer;
         this.handlers = {};
-        this.poolIface = new abi_1.Interface(AlgebraPool_abi_json_1.default);
+        this.poolIface = new abi_1.Interface(SolidlyV3Pool_abi_json_1.default);
         this.initFailed = false;
         this.initRetryAttemptCount = 0;
+        // this.feeCodeAsString = feeCode.toString();
+        this.tickSpacingAsString = tickSpacing.toString();
         this.token0 = token0.toLowerCase();
         this.token1 = token1.toLowerCase();
         this.logDecoder = (log) => this.poolIface.parseLog(log);
         this.addressesSubscribed = new Array(1);
-        this.handlers['Fee'] = this.handleNewFee.bind(this);
+        // Add handlers
         this.handlers['Swap'] = this.handleSwapEvent.bind(this);
-        this.handlers['Mint'] = this.handleMintEvent.bind(this);
         this.handlers['Burn'] = this.handleBurnEvent.bind(this);
-        this.handlers['Flash'] = this.handleFlashEvent.bind(this);
+        this.handlers['Mint'] = this.handleMintEvent.bind(this);
+        // Wen need them to keep balance of the pool up to date
         this.handlers['Collect'] = this.handleCollectEvent.bind(this);
-        this.handlers['CommunityFee'] = this.handleCommunityFee.bind(this);
+        // Almost the same as Collect, but for pool owners
+        this.handlers['CollectProtocol'] = this.handleCollectEvent.bind(this);
+        this.handlers['Flash'] = this.handleFlashEvent.bind(this);
+        this.handlers['SetFee'] = this.handleSetFeeEvent.bind(this);
     }
     get poolAddress() {
         if (this._poolAddress === undefined) {
-            this._poolAddress = this._computePoolAddress(this.token0, this.token1);
+            this._poolAddress = this._computePoolAddress(this.token0, this.token1, this.tickSpacing);
         }
         return this._poolAddress;
     }
@@ -66,14 +73,19 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
     processLog(state, log, blockHeader) {
         try {
             const event = this.logDecoder(log);
+            const uniswapV3EventLoggingSampleRate = this.dexHelper.config.data.uniswapV3EventLoggingSampleRate;
+            if (!this.dexHelper.config.isSlave &&
+                uniswapV3EventLoggingSampleRate &&
+                (0, utils_1.isSampled)(uniswapV3EventLoggingSampleRate)) {
+                this.logger.info(`event=${event.name} - block=${blockHeader.number}. Log sampled at rate ${uniswapV3EventLoggingSampleRate * 100}%`);
+            }
             if (event.name in this.handlers) {
                 // Because we have observations in array which is mutable by nature, there is a
                 // ts compile error: https://stackoverflow.com/questions/53412934/disable-allowing-assigning-readonly-types-to-non-readonly-types
                 // And there is no good workaround, so turn off the type checker for this line
                 const _state = lodash_1.default.cloneDeep(state);
                 try {
-                    const newState = this.handlers[event.name](event, _state, log, blockHeader);
-                    return newState;
+                    return this.handlers[event.name](event, _state, log, blockHeader);
                 }
                 catch (e) {
                     if (e instanceof Error &&
@@ -84,7 +96,7 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
                         this.logger.error(`${this.parentName}: Pool ${this.poolAddress}, ` +
                             `network=${this.dexHelper.config.data.network}: Unexpected ` +
                             `error while handling event on blockNumber=${blockHeader.number}, ` +
-                            `blockHash=${blockHeader.hash} and parentHash=${blockHeader.parentHash} for QuickSwapV3, ${JSON.stringify(event)}`, e);
+                            `blockHash=${blockHeader.hash} and parentHash=${blockHeader.parentHash} for UniswapV3, ${JSON.stringify(event)}`, e);
                     }
                     _state.isValid = false;
                     return _state;
@@ -96,135 +108,87 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
         }
         return null; // ignore unrecognized event
     }
+    _getStateRequestCallData() {
+        if (!this._stateRequestCallData) {
+            const callData = [
+                {
+                    target: this.token0,
+                    callData: this.erc20Interface.encodeFunctionData('balanceOf', [
+                        this.poolAddress,
+                    ]),
+                    decodeFunction: decoders_1.uint256ToBigInt,
+                },
+                {
+                    target: this.token1,
+                    callData: this.erc20Interface.encodeFunctionData('balanceOf', [
+                        this.poolAddress,
+                    ]),
+                    decodeFunction: decoders_1.uint256ToBigInt,
+                },
+                {
+                    target: this.stateMultiContract.options.address,
+                    callData: this.stateMultiContract.methods
+                        .getFullStateWithRelativeBitmaps(this.factoryAddress, this.token0, this.token1, this.tickSpacing, this.getBitmapRangeToRequest(), this.getBitmapRangeToRequest())
+                        .encodeABI(),
+                    decodeFunction: this.decodeStateMultiCallResultWithRelativeBitmaps !== undefined
+                        ? this.decodeStateMultiCallResultWithRelativeBitmaps
+                        : utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
+                },
+            ];
+            this._stateRequestCallData = callData;
+        }
+        return this._stateRequestCallData;
+    }
     getBitmapRangeToRequest() {
         return constants_1.TICK_BITMAP_TO_USE + constants_1.TICK_BITMAP_BUFFER;
     }
-    async _fetchPoolStateSingleStep(blockNumber) {
-        const callData = [
-            {
-                target: this.token0,
-                callData: this.erc20Interface.encodeFunctionData('balanceOf', [
-                    this.poolAddress,
-                ]),
-                decodeFunction: decoders_1.uint256ToBigInt,
-            },
-            {
-                target: this.token1,
-                callData: this.erc20Interface.encodeFunctionData('balanceOf', [
-                    this.poolAddress,
-                ]),
-                decodeFunction: decoders_1.uint256ToBigInt,
-            },
-            {
-                target: this.stateMultiContract.options.address,
-                callData: this.stateMultiContract.methods
-                    .getFullStateWithRelativeBitmaps(this.factoryAddress, this.token0, this.token1, this.getBitmapRangeToRequest(), this.getBitmapRangeToRequest())
-                    .encodeABI(),
-                decodeFunction: utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
-            },
-        ];
+    async generateState(blockNumber) {
+        const callData = this._getStateRequestCallData();
         const [resBalance0, resBalance1, resState] = await this.dexHelper.multiWrapper.tryAggregate(false, callData, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize, false);
+        // Quite ugly solution, but this is the one that fits to current flow.
+        // I think UniswapV3 callbacks subscriptions are complexified for no reason.
+        // Need to be revisited later
         (0, ts_essentials_1.assert)(resState.success, 'Pool does not exist');
         const [balance0, balance1, _state] = [
             resBalance0.returnData,
             resBalance1.returnData,
             resState.returnData,
         ];
-        return [balance0, balance1, _state];
-    }
-    async _fetchPoolStateMultiStep(blockNumber) {
-        const balancesAndGlobalStateCalldata = [
-            {
-                target: this.token0,
-                callData: this.erc20Interface.encodeFunctionData('balanceOf', [
-                    this.poolAddress,
-                ]),
-                decodeFunction: decoders_1.uint256ToBigInt,
-            },
-            {
-                target: this.token1,
-                callData: this.erc20Interface.encodeFunctionData('balanceOf', [
-                    this.poolAddress,
-                ]),
-                decodeFunction: decoders_1.uint256ToBigInt,
-            },
-            {
-                target: this.stateMultiContract.options.address,
-                callData: this.stateMultiContract.methods
-                    .getFullStateWithoutTicks(this.factoryAddress, this.token0, this.token1, 0, 0)
-                    .encodeABI(),
-                decodeFunction: utils_2.decodeStateMultiCallResultWithRelativeBitmaps,
-            },
-        ];
-        const [resBalance0, resBalance1, stateWithoutTicksAndTickBitmap] = await this.dexHelper.multiWrapper.tryAggregate(false, balancesAndGlobalStateCalldata, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize, false);
-        (0, ts_essentials_1.assert)(stateWithoutTicksAndTickBitmap.success, 'Pool does not exist');
-        const [balance0, balance1, _stateWithoutTicksAndTickBitmap] = [
-            resBalance0.returnData,
-            resBalance1.returnData,
-            stateWithoutTicksAndTickBitmap.returnData,
-        ];
-        const { globalState: { tick }, } = _stateWithoutTicksAndTickBitmap;
-        const currentBitmapIndex = (0, utils_1.int16)((BigInt(tick) / Constants_1.Constants.TICK_SPACING) >> 8n);
-        const buffer = this.getBitmapRangeToRequest();
-        const startBitMapIndex = currentBitmapIndex - buffer;
-        const endBitMapIndex = currentBitmapIndex + buffer;
-        const allBitMapIndices = Array.from({ length: 2 * Number(buffer) + 1 }, () => startBitMapIndex + endBitMapIndex);
-        const ticksAndBitMaps = await Promise.all(allBitMapIndices.map(relativeTick => {
-            return this.stateMultiContract.methods
-                .getAdditionalBitmapWithTicks(this.factoryAddress, this.token0, this.token1, relativeTick, relativeTick)
-                .call();
-        }));
-        const _state = {
-            ..._stateWithoutTicksAndTickBitmap,
-            tickBitmap: ticksAndBitMaps.flatMap(v => v[0]),
-            ticks: ticksAndBitMaps.flatMap(v => v[1]),
-        };
-        return [balance0, balance1, _state];
-    }
-    async _fetchInitStateMultiStrategies(blockNumber) {
-        try {
-            return await this._fetchPoolStateSingleStep(blockNumber);
-        }
-        catch (e) {
-            if (e instanceof Error && e.message.includes('Pool does not exist'))
-                throw e;
-            if (this.dexHelper.config.data.network != constants_2.Network.ZKEVM)
-                throw e;
-            return this._fetchPoolStateMultiStep(blockNumber);
-        }
-    }
-    async generateState(blockNumber) {
-        const [balance0, balance1, _state] = await this._fetchInitStateMultiStrategies(blockNumber);
         const tickBitmap = {};
         const ticks = {};
         (0, utils_3._reduceTickBitmap)(tickBitmap, _state.tickBitmap);
         (0, utils_3._reduceTicks)(ticks, _state.ticks);
-        const globalState = {
-            communityFeeToken0: (0, utils_1.bigIntify)(_state.globalState.communityFeeToken0),
-            communityFeeToken1: (0, utils_1.bigIntify)(_state.globalState.communityFeeToken1),
-            fee: (0, utils_1.bigIntify)(_state.globalState.fee),
-            price: (0, utils_1.bigIntify)(_state.globalState.price),
-            tick: (0, utils_1.bigIntify)(_state.globalState.tick),
-        };
-        const currentTick = globalState.tick;
-        const startTickBitmap = TickBitMap_1.TickBitMap.position(BigInt(currentTick) / Constants_1.Constants.TICK_SPACING)[0];
+        const currentTick = (0, utils_1.bigIntify)(_state.slot0.tick);
+        const tickSpacing = (0, utils_1.bigIntify)(_state.tickSpacing);
+        const fee = (0, utils_1.bigIntify)(_state.slot0.fee);
+        const startTickBitmap = TickBitMap_1.TickBitMap.position(currentTick / tickSpacing)[0];
+        const requestedRange = this.getBitmapRangeToRequest();
         return {
             pool: _state.pool,
             blockTimestamp: (0, utils_1.bigIntify)(_state.blockTimestamp),
-            globalState,
+            slot0: {
+                sqrtPriceX96: (0, utils_1.bigIntify)(_state.slot0.sqrtPriceX96),
+                tick: currentTick,
+                fee: (0, utils_1.bigIntify)(_state.slot0.fee),
+            },
             liquidity: (0, utils_1.bigIntify)(_state.liquidity),
-            tickSpacing: Constants_1.Constants.TICK_SPACING,
-            maxLiquidityPerTick: Constants_1.Constants.MAX_LIQUIDITY_PER_TICK,
+            tickSpacing,
+            maxLiquidityPerTick: (0, utils_1.bigIntify)(_state.maxLiquidityPerTick),
             tickBitmap,
             ticks,
-            startTickBitmap,
             isValid: true,
+            startTickBitmap,
+            lowestKnownTick: (BigInt.asIntN(24, startTickBitmap - requestedRange) << 8n) *
+                tickSpacing,
+            highestKnownTick: ((BigInt.asIntN(24, startTickBitmap + requestedRange) << 8n) +
+                BigInt.asIntN(24, 255n)) *
+                tickSpacing,
             balance0,
             balance1,
         };
     }
     handleSwapEvent(event, pool, log, blockHeader) {
-        const newSqrtPriceX96 = (0, utils_1.bigIntify)(event.args.price);
+        const newSqrtPriceX96 = (0, utils_1.bigIntify)(event.args.sqrtPriceX96);
         const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
         const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
         const newTick = (0, utils_1.bigIntify)(event.args.tick);
@@ -238,7 +202,7 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
         }
         else {
             const zeroForOne = amount0 > 0n;
-            const [, , , , , communityFee] = AlgebraMath_1.AlgebraMath._calculateSwapAndLock(pool, zeroForOne, newSqrtPriceX96, newTick, newLiquidity);
+            uniswap_v3_math_1.uniswapV3Math.swapFromEvent(pool, newSqrtPriceX96, newTick, newLiquidity, zeroForOne);
             if (zeroForOne) {
                 if (amount1 < 0n) {
                     pool.balance1 -= BigInt.asUintN(256, -amount1);
@@ -261,45 +225,43 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
                 }
                 pool.balance1 += BigInt.asUintN(256, amount1);
             }
-            if (communityFee > 0n) {
-                // _payCommunityFee
-                if (zeroForOne) {
-                    pool.balance0 -= communityFee;
-                }
-                else {
-                    pool.balance1 -= communityFee;
-                }
-            }
             return pool;
         }
     }
+    handleBurnEvent(event, pool, log, blockHeader) {
+        const amount = (0, utils_1.bigIntify)(event.args.amount);
+        const tickLower = (0, utils_1.bigIntify)(event.args.tickLower);
+        const tickUpper = (0, utils_1.bigIntify)(event.args.tickUpper);
+        pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
+        uniswap_v3_math_1.uniswapV3Math._modifyPosition(pool, {
+            tickLower,
+            tickUpper,
+            liquidityDelta: -BigInt.asIntN(128, BigInt.asIntN(256, amount)),
+        });
+        // From this transaction I conclude that there is no balance change from
+        // Burn event: https://dashboard.tenderly.co/tx/mainnet/0xfccf5341147ac3ad0e66452273d12dfc3219e81f8fb369a6cdecfb24b9b9d078/logs
+        // And it aligns with UniswapV3 doc:
+        // https://github.com/Uniswap/v3-core/blob/05c10bf6d547d6121622ac51c457f93775e1df09/contracts/interfaces/pool/IUniswapV3PoolActions.sol#L59
+        // It just updates positions and tokensOwed which may be requested calling collect
+        // So, we don't need to update pool.balances0 and pool.balances1 here
+        return pool;
+    }
     handleMintEvent(event, pool, log, blockHeader) {
-        const bottomTick = (0, utils_1.bigIntify)(event.args.bottomTick);
-        const topTick = (0, utils_1.bigIntify)(event.args.topTick);
-        const liquidityActual = (0, utils_1.bigIntify)(event.args.liquidityAmount);
+        const amount = (0, utils_1.bigIntify)(event.args.amount);
+        const tickLower = (0, utils_1.bigIntify)(event.args.tickLower);
+        const tickUpper = (0, utils_1.bigIntify)(event.args.tickUpper);
         const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
         const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
         pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
-        AlgebraMath_1.AlgebraMath._updatePositionTicksAndFees(pool, bottomTick, topTick, liquidityActual);
+        uniswap_v3_math_1.uniswapV3Math._modifyPosition(pool, {
+            tickLower,
+            tickUpper,
+            liquidityDelta: amount,
+        });
         pool.balance0 += amount0;
         pool.balance1 += amount1;
         return pool;
     }
-    handleBurnEvent(event, pool, log, blockHeader) {
-        const bottomTick = (0, utils_1.bigIntify)(event.args.bottomTick);
-        const topTick = (0, utils_1.bigIntify)(event.args.topTick);
-        const amount = (0, utils_1.bigIntify)(event.args.liquidityAmount);
-        pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
-        AlgebraMath_1.AlgebraMath._updatePositionTicksAndFees(pool, bottomTick, topTick, -BigInt.asIntN(128, BigInt.asIntN(256, amount)));
-        // no balance change
-        return pool;
-    }
-    handleNewFee(event, pool, log, blockHeader) {
-        const fee = (0, utils_1.bigIntify)(event.args.fee);
-        pool.globalState.fee = fee;
-        pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
-        return pool;
-    }
     handleCollectEvent(event, pool, log, blockHeader) {
         const amount0 = (0, utils_1.bigIntify)(event.args.amount0);
         const amount1 = (0, utils_1.bigIntify)(event.args.amount1);
@@ -316,21 +278,21 @@ class AlgebraEventPool extends stateful_event_subscriber_1.StatefulEventSubscrib
         pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
         return pool;
     }
-    handleCommunityFee(event, pool, log, blockHeader) {
-        const communityFeeToken0 = (0, utils_1.bigIntify)(event.ags.communityFee0New);
-        const communityFeeToken1 = (0, utils_1.bigIntify)(event.ags.communityFee1New);
-        pool.globalState.communityFeeToken0 = communityFeeToken0;
-        pool.globalState.communityFeeToken1 = communityFeeToken1;
+    handleSetFeeEvent(event, pool, log, blockHeader) {
+        const feeNew = (0, utils_1.bigIntify)(event.args.feeNew);
+        pool.slot0.fee = feeNew;
         pool.blockTimestamp = (0, utils_1.bigIntify)(blockHeader.timestamp);
         return pool;
     }
-    _computePoolAddress(token0, token1) {
+    _computePoolAddress(token0, token1, tickSpacing) {
         // https://github.com/Uniswap/v3-periphery/blob/main/contracts/libraries/PoolAddress.sol
         if (token0 > token1)
             [token0, token1] = [token1, token0];
-        const encodedKey = ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address'], [token0, token1]));
-        return ethers_1.ethers.utils.getCreate2Address(this.poolDeployer, encodedKey, this.poolInitCodeHash);
+        const encodedKey = ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'int24'], 
+        // [token0, token1, BigInt.asUintN(24, fee)],
+        [token0, token1, BigInt.asUintN(24, tickSpacing)]));
+        return ethers_1.ethers.utils.getCreate2Address(this.factoryAddress, encodedKey, this.poolInitCodeHash);
     }
 }
-exports.AlgebraEventPool = AlgebraEventPool;
-//# sourceMappingURL=algebra-pool.js.map
+exports.SolidlyV3EventPool = SolidlyV3EventPool;
+//# sourceMappingURL=solidly-v3-pool.js.map

package/build/dex/solidly-v3/solidly-v3-pool.js.map

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