@rosen-bridge/abstract-extractor 2.0.1 → 2.0.3-52fc0239

package/dist/vitest.config.d.ts

@@ -0,0 +1,3 @@
+declare const _default: import("vite").UserConfig;
+export default _default;
+//# sourceMappingURL=vitest.config.d.ts.map

package/dist/vitest.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":";AAEA,wBAcG"}

package/dist/vitest.config.js

@@ -0,0 +1,17 @@
+import { defineConfig } from 'vitest/config';
+export default defineConfig({
+    test: {
+        coverage: {
+            all: true,
+            provider: 'istanbul',
+            reporter: 'cobertura',
+        },
+        passWithNoTests: true,
+        poolOptions: {
+            threads: {
+                singleThread: true,
+            },
+        },
+    },
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZXN0LmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3ZpdGVzdC5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxlQUFlLFlBQVksQ0FBQztJQUMxQixJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUU7WUFDUixHQUFHLEVBQUUsSUFBSTtZQUNULFFBQVEsRUFBRSxVQUFVO1lBQ3BCLFFBQVEsRUFBRSxXQUFXO1NBQ3RCO1FBQ0QsZUFBZSxFQUFFLElBQUk7UUFDckIsV0FBVyxFQUFFO1lBQ1gsT0FBTyxFQUFFO2dCQUNQLFlBQVksRUFBRSxJQUFJO2FBQ25CO1NBQ0Y7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gJ3ZpdGVzdC9jb25maWcnO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xuICB0ZXN0OiB7XG4gICAgY292ZXJhZ2U6IHtcbiAgICAgIGFsbDogdHJ1ZSxcbiAgICAgIHByb3ZpZGVyOiAnaXN0YW5idWwnLFxuICAgICAgcmVwb3J0ZXI6ICdjb2JlcnR1cmEnLFxuICAgIH0sXG4gICAgcGFzc1dpdGhOb1Rlc3RzOiB0cnVlLFxuICAgIHBvb2xPcHRpb25zOiB7XG4gICAgICB0aHJlYWRzOiB7XG4gICAgICAgIHNpbmdsZVRocmVhZDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19

package/lib/ergo/AbstractErgoExtractor.ts

@@ -140,7 +140,9 @@ export abstract class AbstractErgoExtractor<
    * @param tx
    * @returns
    */
-  getTransactionExtraData = (tx: Transaction): TxExtra => {
+  getTransactionExtraData = (
+    tx: Transaction // eslint-disable-line @typescript-eslint/no-unused-vars
+  ): TxExtra => {
     return {};
   };
 

package/lib/ergo/AbstractErgoExtractorAction.ts

@@ -6,7 +6,7 @@ import {
   EntityTarget,
   FindOptionsWhere,
   QueryRunner,
-} from 'typeorm';
+} from '@rosen-bridge/extended-typeorm';
 import { chunk, difference, pick } from 'lodash-es';
 import { AbstractLogger, DummyLogger } from '@rosen-bridge/abstract-logger';
 import JsonBigInt from '@rosen-bridge/json-bigint';
@@ -18,7 +18,7 @@ import { AbstractErgoExtractorEntity } from './AbstractErgoExtractorEntity';
 
 export abstract class AbstractErgoExtractorAction<
   ExtractedData extends AbstractBoxData,
-  ExtractorEntity extends AbstractErgoExtractorEntity
+  ExtractorEntity extends AbstractErgoExtractorEntity,
 > {
   private readonly datasource: DataSource;
   readonly logger: AbstractLogger;
@@ -28,7 +28,7 @@ export abstract class AbstractErgoExtractorAction<
   constructor(
     dataSource: DataSource,
     repo: EntityTarget<ExtractorEntity>,
-    logger?: AbstractLogger
+    logger?: AbstractLogger,
   ) {
     this.datasource = dataSource;
     this.logger = logger ? logger : new DummyLogger();
@@ -40,12 +40,12 @@ export abstract class AbstractErgoExtractorAction<
    * create the database entity from extracted data and block information
    */
   protected createEntity = (
-    data: ExtractedData[],
-    block: BlockInfo,
-    extractor: string
+    data: ExtractedData[], // eslint-disable-line @typescript-eslint/no-unused-vars
+    block: BlockInfo, // eslint-disable-line @typescript-eslint/no-unused-vars
+    extractor: string, // eslint-disable-line @typescript-eslint/no-unused-vars
   ): Array<Omit<ExtractorEntity, 'id'>> => {
     throw Error(
-      'You must implement `createEntity` or override `insertEntities` and `updateEntities`'
+      'You must implement `createEntity` or override `insertEntities` and `updateEntities`',
     );
   };
 
@@ -53,10 +53,10 @@ export abstract class AbstractErgoExtractorAction<
    * convert the database entity back to raw data
    */
   protected convertEntityToData = (
-    entities: ExtractorEntity[]
+    entities: ExtractorEntity[], // eslint-disable-line @typescript-eslint/no-unused-vars
   ): ExtractedData[] => {
     throw Error(
-      'You must implement `convertEntityToData` or override `deleteBlockEntities`'
+      'You must implement `convertEntityToData` or override `deleteBlockEntities`',
     );
   };
 
@@ -71,11 +71,11 @@ export abstract class AbstractErgoExtractorAction<
     queryRunner: QueryRunner,
     boxesToInsert: Array<ExtractedData>,
     block: BlockInfo,
-    extractor: string
+    extractor: string,
   ) => {
     const repository = queryRunner.manager.getRepository(this.repo);
     await repository.insert(
-      this.createEntity(boxesToInsert, block, extractor) as any
+      this.createEntity(boxesToInsert, block, extractor) as any, // eslint-disable-line @typescript-eslint/no-explicit-any
     );
   };
 
@@ -88,9 +88,9 @@ export abstract class AbstractErgoExtractorAction<
    */
   protected updateEntity = async (
     queryRunner: QueryRunner,
-    updateBox: ExtractedData,
-    block: BlockInfo,
-    extractor: string
+    updateBox: ExtractedData, // eslint-disable-line @typescript-eslint/no-unused-vars
+    block: BlockInfo, // eslint-disable-line @typescript-eslint/no-unused-vars
+    extractor: string,
   ) => {
     const repository = queryRunner.manager.getRepository(this.repo);
     const box = this.createEntity([updateBox], block, extractor)[0];
@@ -99,7 +99,7 @@ export abstract class AbstractErgoExtractorAction<
         boxId: box.boxId,
         extractor: extractor,
       } as FindOptionsWhere<ExtractorEntity>,
-      box as any
+      box as any, // eslint-disable-line @typescript-eslint/no-explicit-any
     );
   };
 
@@ -113,16 +113,19 @@ export abstract class AbstractErgoExtractorAction<
   protected deleteBlockEntities = async (
     queryRunner: QueryRunner,
     extractor: string,
-    block: string
+    block: string,
   ): Promise<ExtractedData[]> => {
     const repository = queryRunner.manager.getRepository(this.repo);
     const deletedData = await repository.find({
-      where: { extractor: extractor, block: block } as any,
+      where: {
+        extractor: extractor,
+        block: block,
+      } as FindOptionsWhere<ExtractorEntity>,
     });
     await repository.delete({
       extractor: extractor,
       block: block,
-    } as any);
+    } as unknown as FindOptionsWhere<ExtractorEntity>);
     return this.convertEntityToData(deletedData);
   };
 
@@ -134,26 +137,31 @@ export abstract class AbstractErgoExtractorAction<
    * @returns
    */
   protected updateBlockEntities = async (
-    queryRunner: QueryRunner,
+    queryRunner: QueryRunner, // eslint-disable-line @typescript-eslint/no-unused-vars
     extractor: string,
-    block: string
+    block: string,
   ): Promise<ExtractorEntity[]> => {
-    const repository = queryRunner.manager.getRepository(this.repo);
+    const repository = this.datasource.getRepository(
+      this.repo as EntityTarget<new () => ExtractorEntity>,
+    );
     const updatedData = await repository.find({
       where: {
         extractor: extractor,
         spendBlock: block,
         block: Not(block),
-      } as any,
+      } as unknown as FindOptionsWhere<ExtractorEntity>,
     });
     await repository.update(
       {
         spendBlock: block,
         extractor: extractor,
-      } as FindOptionsWhere<ExtractorEntity>,
-      { spendBlock: null, spendHeight: 0 } as any
+      } as unknown as FindOptionsWhere<ExtractorEntity>,
+      {
+        spendBlock: null,
+        spendHeight: 0,
+      },
     );
-    return updatedData;
+    return updatedData as unknown as ExtractorEntity[];
   };
 
   /**
@@ -168,7 +176,7 @@ export abstract class AbstractErgoExtractorAction<
   storeBoxes = async (
     boxes: Array<ExtractedData>,
     block: BlockInfo,
-    extractor: string
+    extractor: string,
   ): Promise<boolean> => {
     let boxesToInsert: ExtractedData[] = [],
       boxesToUpdate: ExtractedData[] = [];
@@ -197,11 +205,11 @@ export abstract class AbstractErgoExtractorAction<
         this.logger.info(
           `Updating boxes with following Ids in the database: [${boxesToUpdate
             .map((col) => col.boxId)
-            .join(', ')}]`
+            .join(', ')}]`,
         );
       for (const box of boxesToUpdate) {
         this.logger.debug(
-          `Updating boxes in database [${JsonBigInt.stringify(box)}]`
+          `Updating boxes in database [${JsonBigInt.stringify(box)}]`,
         );
         await this.updateEntity(queryRunner, box, block, extractor);
       }
@@ -230,7 +238,7 @@ export abstract class AbstractErgoExtractorAction<
   spendBoxes = async (
     spendInfos: Array<SpendInfo>,
     block: BlockInfo,
-    extractor: string
+    extractor: string,
   ): Promise<BoxInfo[]> => {
     const spentData = [];
     const spendInfoChunks = chunk(spendInfos, DB_CHUNK_SIZE);
@@ -241,7 +249,10 @@ export abstract class AbstractErgoExtractorAction<
           boxId: In(boxIds),
           extractor: extractor,
         } as FindOptionsWhere<ExtractorEntity>,
-        { spendBlock: block.hash, spendHeight: block.height } as any
+        {
+          spendBlock: block.hash,
+          spendHeight: block.height,
+        } as any, // eslint-disable-line @typescript-eslint/no-explicit-any
       );
 
       if (updateResult.affected && updateResult.affected > 0) {
@@ -252,7 +263,7 @@ export abstract class AbstractErgoExtractorAction<
         spentData.push(...spentRows);
         for (const row of spentRows) {
           this.logger.debug(
-            `Spent box with boxId [${row.boxId}] at height ${block.height}`
+            `Spent box with boxId [${row.boxId}] at height ${block.height}`,
           );
         }
       }
@@ -270,24 +281,24 @@ export abstract class AbstractErgoExtractorAction<
    */
   deleteBlockBoxes = async (
     block: string,
-    extractor: string
+    extractor: string,
   ): Promise<{ deletedData: ExtractedData[]; updatedData: BoxInfo[] }> => {
     const queryRunner = this.datasource.createQueryRunner();
     await queryRunner.connect();
     await queryRunner.startTransaction();
     try {
       this.logger.info(
-        `Deleting boxes in block ${block} and extractor ${extractor}`
+        `Deleting boxes in block ${block} and extractor ${extractor}`,
       );
       const updatedData = await this.updateBlockEntities(
         queryRunner,
         extractor,
-        block
+        block,
       );
       const deletedData = await this.deleteBlockEntities(
         queryRunner,
         extractor,
-        block
+        block,
       );
       await queryRunner.commitTransaction();
       return {
@@ -298,7 +309,7 @@ export abstract class AbstractErgoExtractorAction<
       await queryRunner.rollbackTransaction();
       this.logger.error(
         `An error occurred while deleting data extracted from block ${block}`,
-        error
+        error,
       );
       throw error;
     } finally {

package/lib/ergo/AbstractErgoExtractorEntity.ts

@@ -1,4 +1,4 @@
-import { Column, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import { Column, PrimaryGeneratedColumn, Unique } from '@rosen-bridge/extended-typeorm';
 
 @Unique(['boxId', 'extractor'])
 export abstract class AbstractErgoExtractorEntity {

package/lib/ergo/initializable/AbstractInitializableAction.ts

@@ -1,4 +1,4 @@
-import { DataSource, EntityTarget } from 'typeorm';
+import { DataSource, EntityTarget, FindOptionsWhere } from '@rosen-bridge/extended-typeorm';
 import { AbstractLogger } from '@rosen-bridge/abstract-logger';
 
 import { AbstractErgoExtractorAction } from '../AbstractErgoExtractorAction';
@@ -22,6 +22,8 @@ export abstract class AbstractInitializableErgoExtractorAction<
    * @param extractorId
    */
   removeAllData = async (extractorId: string) => {
-    await this.repository.delete({ extractor: extractorId } as any);
+    await this.repository.delete({
+      extractor: extractorId,
+    } as FindOptionsWhere<ExtractorEntity>);
   };
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@rosen-bridge/abstract-extractor",
-  "version": "2.0.1",
+  "version": "2.0.3-52fc0239",
   "description": "Rosen Bridge extractor interfaces to work with scanner",
   "repository": "",
-  "license": "GPL-3.0",
+  "license": "MIT",
   "author": "Rosen Team",
   "type": "module",
   "main": "dist/index.js",
@@ -19,30 +19,25 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.11.9",
+    "@types/node": "^22.18.0",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
-    "@vitest/coverage-istanbul": "^1.2.2",
     "await-semaphore": "^0.1.3",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
     "extensionless": "^1.9.6",
-    "prettier": "^3.2.4",
     "typescript": "^5.3.3",
+    "@vitest/coverage-istanbul": "^1.2.2",
     "vitest": "^1.2.2"
   },
   "engines": {
-    "node": ">=20.11.0"
+    "node": ">=22.18.0"
   },
   "dependencies": {
     "@rosen-bridge/abstract-logger": "^2.0.1",
     "@rosen-bridge/json-bigint": "^0.1.0",
-    "@rosen-bridge/scanner-interfaces": "^0.1.0",
-    "@rosen-clients/ergo-explorer": "^1.1.4",
-    "@rosen-clients/ergo-node": "^1.2.2",
+    "@rosen-bridge/scanner-interfaces": "^0.1.1-52fc0239",
+    "@rosen-clients/ergo-explorer": "^1.1.5",
+    "@rosen-clients/ergo-node": "^1.2.3",
     "lodash-es": "^4.17.21",
-    "typeorm": "^0.3.20",
+    "@rosen-bridge/extended-typeorm": "^0.2.1",
     "uuid": "^9.0.0"
   }
 }

package/tests/AbstractErgoExtractor.mock.ts

@@ -21,10 +21,12 @@ export class MockedErgoExtractor extends AbstractErgoExtractor<
 
   initializeBoxes: (initialBlock: BlockInfo) => Promise<void>;
 
-  hasData = (box: V1.OutputInfo | OutputBox) => false;
+  hasData = (
+    box: V1.OutputInfo | OutputBox // eslint-disable-line @typescript-eslint/no-unused-vars
+  ) => false;
 
   extractBoxData = (
-    box: V1.OutputInfo | OutputBox
+    box: V1.OutputInfo | OutputBox // eslint-disable-line @typescript-eslint/no-unused-vars
   ): AbstractBoxData | undefined => {
     return undefined;
   };

package/tests/AbstractErgoExtractorAction.mock.ts

@@ -1,4 +1,4 @@
-import { DataSource } from 'typeorm';
+import { DataSource } from '@rosen-bridge/extended-typeorm';
 import { pick } from 'lodash-es';
 import { BlockInfo } from '@rosen-bridge/scanner-interfaces';
 

package/tests/AbstractErgoExtractorAction.spec.ts

@@ -1,4 +1,4 @@
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@rosen-bridge/extended-typeorm';
 import { describe, it, expect, beforeEach } from 'vitest';
 import { pick } from 'lodash-es';
 

package/tests/initializable/AbstractInitializable.mock.ts

@@ -19,17 +19,26 @@ export class MockedInitializableErgoExtractor extends AbstractInitializableErgoE
 
   getId = () => 'Test';
 
-  hasData = (box: V1.OutputInfo | OutputBox) => false;
+  hasData = (
+    box: V1.OutputInfo | OutputBox // eslint-disable-line @typescript-eslint/no-unused-vars
+  ) => false;
 
-  getTxBlock = async (txId: string): Promise<BlockInfo> => {
+  getTxBlock = async (
+    txId: string // eslint-disable-line @typescript-eslint/no-unused-vars
+  ): Promise<BlockInfo> => {
     return { hash: 'hash', height: 100 };
   };
 
-  getBoxesWithOffsetLimit = (offset: number, limit: number) => {
+  getBoxesWithOffsetLimit = (
+    offset: number, // eslint-disable-line @typescript-eslint/no-unused-vars
+    limit: number // eslint-disable-line @typescript-eslint/no-unused-vars
+  ) => {
     return Promise.resolve({ boxes: ergoBoxes, hasNextBatch: true });
   };
 
-  extractBoxData = (box: V1.OutputInfo | OutputBox) => {
+  extractBoxData = (
+    box: V1.OutputInfo | OutputBox // eslint-disable-line @typescript-eslint/no-unused-vars
+  ) => {
     return undefined;
   };
 }

package/tests/initializable/AbstractInitializable.spec.ts

@@ -1,6 +1,5 @@
-import { beforeAll, describe, expect, it, vi, vitest } from 'vitest';
+import { describe, expect, it, vi, vitest } from 'vitest';
 import { ErgoNetworkType } from '@rosen-bridge/scanner-interfaces';
-import axios from '@rosen-bridge/rate-limited-axios';
 
 import {
   NodeNetwork,
@@ -14,13 +13,6 @@ import { RETRIAL_COUNT } from '../../lib/constants';
 import { AbstractInitializableErgoExtractorAction } from '../../lib/ergo/initializable';
 
 describe('AbstractInitializableErgoExtractor', () => {
-  beforeAll(() => {
-    axios.initConfigs({
-      apiLimitRateRangeAsSeconds: 10,
-      apiLimitRules: [],
-    });
-  });
-
   describe('getTotalTxCount', () => {
     /**
      * @target getTotalTxCount should return the total tx count

package/tests/initializable/AbstractInitializableAction.mock.ts

@@ -1,4 +1,4 @@
-import { DataSource } from 'typeorm';
+import { DataSource } from '@rosen-bridge/extended-typeorm';
 import { pick } from 'lodash-es';
 import { BlockInfo } from '@rosen-bridge/scanner-interfaces';
 

package/tests/initializable/AbstractInitializableAction.spec.ts

@@ -1,4 +1,4 @@
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, Repository } from '@rosen-bridge/extended-typeorm';
 import { describe, it, expect, beforeEach } from 'vitest';
 
 import { TestInitializableErgoExtractorAction } from './AbstractInitializableAction.mock';

package/tests/testUtils.ts

@@ -1,4 +1,4 @@
-import { DataSource, Entity } from 'typeorm';
+import { DataSource, Entity } from '@rosen-bridge/extended-typeorm';
 import { AbstractErgoExtractorEntity } from '../lib';
 
 @Entity('test_entity')