@paraswap/dex-lib 2.42.30-quickswap-null-state.6 → 2.42.30

package/src/dex/uniswap-v2/uniswap-v2-factory.ts

@@ -0,0 +1,71 @@
+import { Interface } from '@ethersproject/abi';
+import { DeepReadonly } from 'ts-essentials';
+import uniswapV2factoryABI from '../../abi/uniswap-v2/uniswap-v2-factory.json';
+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';
+
+export type FactoryState = Record<string, never>;
+
+export type OnPoolCreatedCallback = ({
+  token0,
+  token1,
+}: {
+  token0: string;
+  token1: string;
+}) => Promise<void>;
+
+/*
+ * "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)
+ */
+export class UniswapV2Factory extends StatefulEventSubscriber<FactoryState> {
+  handlers: {
+    [event: string]: (event: any) => Promise<void>;
+  } = {};
+
+  logDecoder: (log: Log) => any;
+
+  public readonly factoryIface = new Interface(uniswapV2factoryABI);
+
+  constructor(
+    readonly dexHelper: IDexHelper,
+    parentName: string,
+    protected readonly factoryAddress: Address,
+    logger: Logger,
+    protected readonly onPoolCreated: OnPoolCreatedCallback,
+    mapKey: string = '',
+  ) {
+    super(parentName, `${parentName} Factory`, dexHelper, logger, true, mapKey);
+
+    this.addressesSubscribed = [factoryAddress];
+
+    this.logDecoder = (log: Log) => this.factoryIface.parseLog(log);
+
+    this.handlers['PairCreated'] = this.handleNewPool.bind(this);
+  }
+
+  generateState(): FactoryState {
+    return {};
+  }
+
+  protected async processLog(
+    _: DeepReadonly<FactoryState>,
+    log: Readonly<Log>,
+  ): Promise<FactoryState> {
+    const event = this.logDecoder(log);
+    if (event.name in this.handlers) {
+      await this.handlers[event.name](event);
+    }
+
+    return {};
+  }
+
+  async handleNewPool(event: LogDescription) {
+    const token0 = event.args.token0.toLowerCase();
+    const token1 = event.args.token1.toLowerCase();
+
+    await this.onPoolCreated({ token0, token1 });
+  }
+}

package/src/stateful-event-subscriber.ts

@@ -220,9 +220,6 @@ export abstract class StatefulEventSubscriber<State>
       delete this.stateHistory[bn];
     }
     if (this.state && this.stateBlockNumber < blockNumber) {
-      this.logger.info(
-        `${this.parentName} restart: (${this.name})-null: Trying to save null in the state for block ${blockNumber}`,
-      );
       this._setState(null, blockNumber);
     }
   }
@@ -334,14 +331,8 @@ export abstract class StatefulEventSubscriber<State>
       }
 
       if (lastBn) {
-        this.logger.info(
-          `${this.parentName} rollback: (${this.name})-not-null: Trying to save not null in the state for block ${blockNumber}`,
-        );
         this._setState(this.stateHistory[lastBn], lastBn);
       } else {
-        this.logger.info(
-          `${this.parentName} rollback: (${this.name})-null: Trying to save null in the state for block ${blockNumber}`,
-        );
         this._setState(null, blockNumber);
       }
     } else {
@@ -415,32 +406,14 @@ export abstract class StatefulEventSubscriber<State>
     this.state = state;
     this.stateBlockNumber = blockNumber;
 
-    this._logBatchTypicalMessages(
-      `${this.parentName} (${this.name})-: isSlave: ${this.dexHelper.config.isSlave}, !this.masterPoolNeeded: ${this.masterPoolNeeded} for block ${blockNumber}`,
-      'info',
-    );
-
     if (this.dexHelper.config.isSlave || !this.masterPoolNeeded) {
       return;
     }
 
-    if (state === null) {
-      const regex = /at\s+(.*?)\s+\(/;
-      this.logger.info(
-        `${this.parentName} (${
-          this.name
-        })-null: Trying to save null in the state for block ${blockNumber}, trace: ${new Error().stack
-          ?.split('\n')
-          .map(line => regex.exec(line)?.[1])
-          .join(' -> ')}`,
-        'info',
-      );
-    } else {
-      this._logBatchTypicalMessages(
-        `${this.parentName} (${this.name})-not-null: saving state in cache for block ${blockNumber}}`,
-        'info',
-      );
-    }
+    this._logBatchTypicalMessages(
+      `${this.parentName}: saving state in cache`,
+      'info',
+    );
 
     this.dexHelper.cache.hset(
       this.mapKey,
@@ -494,9 +467,6 @@ export abstract class StatefulEventSubscriber<State>
     }
     this.stateHistory[blockNumber] = state;
     if (!this.state || blockNumber >= this.stateBlockNumber) {
-      this.logger.info(
-        `${this.parentName} setState: (${this.name})-: Trying to save state for block ${blockNumber}`,
-      );
       this._setState(state, blockNumber);
       this.invalid = false;
     }

package/.vscode/launch.json

@@ -1,55 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Current",
-      "program": "${file}",
-      "preLaunchTask": "npm: build",
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outFiles": ["${workspaceFolder}/build/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug dex integration",
-      "program": "${workspaceFolder}/node_modules/ts-node/dist/bin.js",
-      "args": [
-        "--project",
-        "tsconfig.json",
-        // "${workspaceFolder}/src/dex/algebra/scripts/validate-state.ts",
-        "${workspaceFolder}/src/dex/solidly-v3/scripts/check-event-pool-event.ts",
-        // "${workspaceFolder}/scripts/dex-integration.ts",
-        "test",
-        "wombat"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeArgs": ["--nolazy"],
-      "sourceMaps": true,
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "Jest file",
-      "request": "launch",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/jest",
-      "args": [
-        "${fileBasenameNoExtension}",
-        "--runInBand",
-        "--watch",
-        "--coverage=false",
-        "--no-cache"
-      ],
-      "cwd": "${workspaceRoot}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "sourceMaps": true
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package/.vscode/tasks.json

@@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "tsc: build - tsconfig.json",
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "problemMatcher": ["$tsc"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}

package/build/dex/solidly-v3/scripts/check-event-pool-event.d.ts

@@ -1 +0,0 @@
-export {};

package/build/dex/solidly-v3/scripts/check-event-pool-event.js

@@ -1,53 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable no-console */
-const dotenv_1 = __importDefault(require("dotenv"));
-dotenv_1.default.config();
-const constants_1 = require("../../../constants");
-const dex_helper_1 = require("../../../dex-helper");
-const config_1 = require("./../config");
-const solidly_v3_1 = require("../solidly-v3");
-const dex = 'SolidlyV3';
-const factory = config_1.SolidlyV3Config[dex][constants_1.Network.MAINNET].factory;
-const blockHeaders = {};
-async function checkForPoolEvents(startBlockNumber, endBlockNumber) {
-    const network = constants_1.Network.MAINNET;
-    const dexHelper = new dex_helper_1.DummyDexHelper(network);
-    const solidlyV3 = new solidly_v3_1.SolidlyV3(network, dex, dexHelper);
-    await solidlyV3.initializePricing(startBlockNumber);
-    const logsToDispatch = await dexHelper.provider.getLogs({
-        fromBlock: startBlockNumber,
-        toBlock: endBlockNumber,
-        address: factory,
-    });
-    const logsByBlockNumber = {};
-    for (let log of logsToDispatch) {
-        if (!logsByBlockNumber[log.blockNumber]) {
-            logsByBlockNumber[log.blockNumber] = [];
-        }
-        logsByBlockNumber[log.blockNumber].push(log);
-    }
-    const sortedBlocks = Object.keys(logsByBlockNumber)
-        .map(Number)
-        .sort((a, b) => Number(a) - Number(b));
-    for (let blockNumber of sortedBlocks) {
-        if (!blockHeaders[blockNumber]) {
-            blockHeaders[blockNumber] = await dexHelper.web3Provider.eth.getBlock(blockNumber);
-        }
-        await solidlyV3.factory?.update(logsByBlockNumber[blockNumber], {
-            [blockNumber]: blockHeaders[blockNumber],
-        });
-    }
-    return true;
-}
-async function main() {
-    // event for https://etherscan.io/tx/0x2bef7c17f3f775525f076aeb20567ee25eb820e92aa8422fbfe4bed652fd2bd3
-    checkForPoolEvents(18758010, 18758019);
-}
-main()
-    .then(() => console.log('Done'))
-    .catch(e => console.error(e));
-//# sourceMappingURL=check-event-pool-event.js.map

package/build/dex/solidly-v3/scripts/check-event-pool-event.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-event-pool-event.js","sourceRoot":"","sources":["../../../../src/dex/solidly-v3/scripts/check-event-pool-event.ts"],"names":[],"mappings":";;;;;AAAA,+BAA+B;AAC/B,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAIhB,kDAA6C;AAC7C,oDAAqD;AACrD,wCAA8C;AAC9C,8CAA0C;AAE1C,MAAM,GAAG,GAAG,WAAW,CAAC;AACxB,MAAM,OAAO,GAAG,wBAAe,CAAC,GAAG,CAAC,CAAC,mBAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAC9D,MAAM,YAAY,GAAgC,EAAE,CAAC;AAErD,KAAK,UAAU,kBAAkB,CAC/B,gBAAwB,EACxB,cAAsB;IAEtB,MAAM,OAAO,GAAG,mBAAO,CAAC,OAAO,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,2BAAc,CAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,SAAS,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAEpD,MAAM,cAAc,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtD,SAAS,EAAE,gBAAgB;QAC3B,OAAO,EAAE,cAAc;QACvB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAA0B,EAAE,CAAC;IACpD,KAAK,IAAI,GAAG,IAAI,cAAc,EAAE;QAC9B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACvC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SACzC;QACD,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9C;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;SAChD,GAAG,CAAC,MAAM,CAAC;SACX,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE;QACpC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YAC9B,YAAY,CAAC,WAAW,CAAC,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CACnE,WAAW,CACZ,CAAC;SACH;QAED,MAAM,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;YAC9D,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC;SACzC,CAAC,CAAC;KACJ;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,uGAAuG;IACvG,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,IAAI,EAAE;KACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;KAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC"}