@rosen-bridge/abstract-extractor 2.0.3 → 2.1.0

package/lib/ergo/network/NodeNetwork.ts

@@ -48,7 +48,7 @@ export class NodeNetwork extends AbstractNetwork {
    * @param tx
    */
   private convertTransaction = (
-    tx: IndexedErgoTransaction
+    tx: IndexedErgoTransaction,
   ): ExtendedTransaction => {
     return {
       id: tx.id || '',
@@ -77,13 +77,13 @@ export class NodeNetwork extends AbstractNetwork {
    */
   getSpendingInfo = async (
     boxId: string,
-    spendTxId: string
+    spendTxId: string,
   ): Promise<BlockInfo & { spendIndex: number }> => {
     const tx = await this.api.getTxById(spendTxId);
     const spendIndex = tx.inputs?.findIndex((box) => box.boxId == boxId);
     if (spendIndex == undefined)
       throw Error(
-        `Impossible behavior, the box [${boxId}] should have been spent in tx [${spendTxId}]`
+        `Impossible behavior, the box [${boxId}] should have been spent in tx [${spendTxId}]`,
       );
     return {
       hash: tx.blockId,
@@ -102,7 +102,7 @@ export class NodeNetwork extends AbstractNetwork {
   getBoxesByAddress = async (
     address: string,
     offset: number,
-    limit: number
+    limit: number,
   ): Promise<{ boxes: ErgoBox[]; hasNextBatch: boolean }> => {
     const boxes = await this.api.getBoxesByAddressUnspent(address, {
       offset: offset,
@@ -112,7 +112,7 @@ export class NodeNetwork extends AbstractNetwork {
     if (!boxes)
       throw new Error('Ergo node BoxesByAddress api expected to have items');
     const ergoBoxes = await Promise.all(
-      boxes.map(async (box) => await this.convertBox(box))
+      boxes.map(async (box) => await this.convertBox(box)),
     );
     return { boxes: ergoBoxes, hasNextBatch: boxes.length > 0 };
   };
@@ -127,7 +127,7 @@ export class NodeNetwork extends AbstractNetwork {
   getBoxesByTokenId = async (
     tokenId: string,
     offset: number,
-    limit: number
+    limit: number,
   ): Promise<{ boxes: ErgoBox[]; hasNextBatch: boolean }> => {
     const boxes = await this.api.getBoxesByTokenId(tokenId, {
       offset: offset,
@@ -136,7 +136,7 @@ export class NodeNetwork extends AbstractNetwork {
     if (!boxes.items)
       throw new Error('Ergo node BoxesByTokenId api expected to have items');
     const ergoBoxes = await Promise.all(
-      boxes.items.map(async (box) => await this.convertBox(box))
+      boxes.items.map(async (box) => await this.convertBox(box)),
     );
     return { boxes: ergoBoxes, hasNextBatch: boxes.items.length > 0 };
   };
@@ -151,7 +151,7 @@ export class NodeNetwork extends AbstractNetwork {
   getAddressTransactionsWithOffsetLimit = async (
     address: string,
     offset: number,
-    limit: number
+    limit: number,
   ): Promise<{ items: Array<ExtendedTransaction>; total: number }> => {
     const txs = await this.api.getTxsByAddress(address, {
       offset,
@@ -159,7 +159,7 @@ export class NodeNetwork extends AbstractNetwork {
     });
     if (!txs.items)
       throw new Error(
-        'Explorer AddressTransactions api expected to have items'
+        'Explorer AddressTransactions api expected to have items',
       );
     return {
       items: txs.items.map((tx) => this.convertTransaction(tx)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosen-bridge/abstract-extractor",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Rosen Bridge extractor interfaces to work with scanner",
   "repository": "",
   "license": "MIT",
@@ -14,35 +14,30 @@
     "lint": "eslint --fix . && npm run prettify",
     "prettify": "prettier --write . --ignore-path ./.gitignore",
     "release": "npm run test -- --run && npm run build && npm publish --access public",
-    "test": "NODE_OPTIONS=--loader=extensionless vitest",
+    "test": "NODE_OPTIONS='--import tsx' vitest",
     "type-check": "tsc --noEmit"
   },
   "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",
+    "@vitest/coverage-istanbul": "^3.1.4",
     "await-semaphore": "^0.1.3",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "extensionless": "^1.9.6",
-    "prettier": "^3.2.4",
+    "tsx": "^4.19.4",
     "typescript": "^5.3.3",
-    "vitest": "^1.2.2"
-  },
-  "engines": {
-    "node": ">=20.11.0"
+    "vitest": "^3.1.4"
   },
   "dependencies": {
     "@rosen-bridge/abstract-logger": "^2.0.1",
+    "@rosen-bridge/extended-typeorm": "^0.2.1",
     "@rosen-bridge/json-bigint": "^0.1.0",
-    "@rosen-bridge/scanner-interfaces": "^0.1.1",
+    "@rosen-bridge/scanner-interfaces": "^0.2.0",
     "@rosen-clients/ergo-explorer": "^1.1.5",
     "@rosen-clients/ergo-node": "^1.2.3",
     "lodash-es": "^4.17.21",
-    "typeorm": "^0.3.20",
     "uuid": "^9.0.0"
+  },
+  "engines": {
+    "node": ">=22.18.0"
   }
 }

package/tests/AbstractErgoExtractor.mock.ts

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

package/tests/AbstractErgoExtractor.spec.ts

@@ -1,5 +1,4 @@
 import { V1 } from '@rosen-clients/ergo-explorer';
-import { describe, it, expect, vitest } from 'vitest';
 import { OutputBox } from '@rosen-bridge/scanner-interfaces';
 
 import {
@@ -52,7 +51,7 @@ describe('AbstractErgoExtractor', () => {
       expect(extractSpy).toBeCalledWith(
         tx.outputs[0],
         [tx.inputs[0].extension, {}],
-        {}
+        {},
       );
       expect(storeSpy).toBeCalledWith([extractedData], block, 'Test');
       expect(result).toEqual(true);
@@ -104,7 +103,7 @@ describe('AbstractErgoExtractor', () => {
           { boxId: tx.inputs[1].boxId, txId: tx.id, index: 2 },
         ],
         block,
-        'Test'
+        'Test',
       );
       expect(result).toEqual(true);
       expect(triggerCallbacks).toBeCalledWith(CallbackType.Spend, [
@@ -204,7 +203,7 @@ describe('AbstractErgoExtractor', () => {
       const insertCallback = vitest.fn();
       const id = await extractor.hook(CallbackType.Insert, insertCallback);
       expect(extractor['callbacks'][CallbackType.Insert]).toEqual(
-        new Map().set(id, insertCallback)
+        new Map().set(id, insertCallback),
       );
     });
   });
@@ -229,7 +228,7 @@ describe('AbstractErgoExtractor', () => {
       const result = await extractor.unhook(CallbackType.Insert, id);
       expect(result).toBeTruthy();
       expect(extractor['callbacks'][CallbackType.Insert].get(id)).toEqual(
-        undefined
+        undefined,
       );
     });
 
@@ -253,10 +252,10 @@ describe('AbstractErgoExtractor', () => {
       const result = await extractor.unhook(CallbackType.Update, id);
       expect(result).toBeFalsy();
       expect(extractor['callbacks'][CallbackType.Insert].get(id)).toEqual(
-        insertCallback
+        insertCallback,
       );
       expect(extractor['callbacks'][CallbackType.Update].get(id)).toEqual(
-        undefined
+        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';
 
@@ -23,7 +23,7 @@ export class TestErgoExtractorAction extends AbstractErgoExtractorAction<
   createEntity = (
     boxes: AbstractBoxData[],
     block: BlockInfo,
-    extractor: string
+    extractor: string,
   ): Omit<AbstractErgoExtractorEntity, 'id'>[] => {
     return boxes.map((box) => ({
       boxId: box.boxId,
@@ -38,7 +38,7 @@ export class TestErgoExtractorAction extends AbstractErgoExtractorAction<
    * convert the database entity back to raw data
    */
   convertEntityToData = (
-    entities: AbstractErgoExtractorEntity[]
+    entities: AbstractErgoExtractorEntity[],
   ): AbstractBoxData[] => {
     return entities.map((data) => pick(data, ['boxId', 'serialized']));
   };

package/tests/AbstractErgoExtractorAction.spec.ts

@@ -1,5 +1,4 @@
-import { DataSource, Repository } from 'typeorm';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { DataSource, Repository } from '@rosen-bridge/extended-typeorm';
 import { pick } from 'lodash-es';
 
 import { TestErgoExtractorAction } from './AbstractErgoExtractorAction.mock';
@@ -31,7 +30,7 @@ describe('AbstractErgoExtractorAction', () => {
       const result = await action.storeBoxes(
         sampleEntities.slice(0, 2),
         block,
-        'extractor1'
+        'extractor1',
       );
 
       const [rows, rowsCount] = await repository.findAndCount();
@@ -85,7 +84,7 @@ describe('AbstractErgoExtractorAction', () => {
       const result = await action.storeBoxes(
         [sampleEntities[0], sampleEntities[1]],
         block,
-        'second-extractor'
+        'second-extractor',
       );
 
       const [insertedRows] = await repository.findAndCount();
@@ -143,7 +142,7 @@ describe('AbstractErgoExtractorAction', () => {
           },
         ],
         block,
-        'extractor'
+        'extractor',
       );
       const [secondInsertRows, secondInsertRowsCount] =
         await repository.findAndCount();
@@ -184,7 +183,7 @@ describe('AbstractErgoExtractorAction', () => {
       const spentBoxIds = await action.spendBoxes(
         spendInfos,
         spendBlock,
-        'extractor1'
+        'extractor1',
       );
 
       const spentBoxes = await repository.findOneBy({
@@ -225,11 +224,11 @@ describe('AbstractErgoExtractorAction', () => {
 
       expect(rowsCount).toEqual(2);
       expect(rows.map((row) => row.boxId)).not.toContain(
-        sampleEntities.slice(2).map((box) => box.boxId)
+        sampleEntities.slice(2).map((box) => box.boxId),
       );
       expect(result).toEqual({
         deletedData: action.convertEntityToData(
-          sampleEntities.slice(2) as TestEntity[]
+          sampleEntities.slice(2) as TestEntity[],
         ),
         updatedData: [],
       });
@@ -258,7 +257,7 @@ describe('AbstractErgoExtractorAction', () => {
 
       expect(rowsCount).toEqual(4);
       expect(rows.map((row) => row.boxId)).not.toContain(
-        sampleEntities.slice(2).map((box) => box.boxId)
+        sampleEntities.slice(2).map((box) => box.boxId),
       );
       expect(result).toEqual({
         deletedData: [],

package/tests/initializable/AbstractInitializable.mock.ts

@@ -20,24 +20,24 @@ export class MockedInitializableErgoExtractor extends AbstractInitializableErgoE
   getId = () => 'Test';
 
   hasData = (
-    box: V1.OutputInfo | OutputBox // eslint-disable-line @typescript-eslint/no-unused-vars
+    box: V1.OutputInfo | OutputBox, // eslint-disable-line @typescript-eslint/no-unused-vars
   ) => false;
 
   getTxBlock = async (
-    txId: string // eslint-disable-line @typescript-eslint/no-unused-vars
+    txId: string, // eslint-disable-line @typescript-eslint/no-unused-vars
   ): Promise<BlockInfo> => {
     return { hash: 'hash', height: 100 };
   };
 
   getBoxesWithOffsetLimit = (
     offset: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-    limit: 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 // eslint-disable-line @typescript-eslint/no-unused-vars
+    box: V1.OutputInfo | OutputBox, // eslint-disable-line @typescript-eslint/no-unused-vars
   ) => {
     return undefined;
   };

package/tests/initializable/AbstractInitializable.spec.ts

@@ -1,4 +1,3 @@
-import { describe, expect, it, vi, vitest } from 'vitest';
 import { ErgoNetworkType } from '@rosen-bridge/scanner-interfaces';
 
 import {
@@ -29,7 +28,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       (
         extractor['network'] as NodeNetwork
@@ -58,7 +57,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       const processSpy = vitest.fn().mockResolvedValue(true);
       extractor.processTransactions = processSpy;
@@ -73,7 +72,7 @@ describe('AbstractInitializableErgoExtractor', () => {
         {
           hash: 'b861e2134821fcf1fcdad7e6edd56c4e4495b42b2fd72762a4c79ed1db78b44b',
           height: 1320705,
-        }
+        },
       );
     });
 
@@ -91,11 +90,11 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       extractor.processTransactions = vitest.fn().mockResolvedValue(false);
       await expect(() =>
-        extractor['processTransactionBatch'](transactionBatch)
+        extractor['processTransactionBatch'](transactionBatch),
       ).rejects.toThrowError();
     });
   });
@@ -120,7 +119,7 @@ describe('AbstractInitializableErgoExtractor', () => {
         'node_url',
         'address',
         undefined,
-        false
+        false,
       );
       const removeSpy = vitest.fn();
       extractor['actions'] = {
@@ -152,7 +151,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       const removeSpy = vitest.fn();
       extractor['actions'] = {
@@ -185,7 +184,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       const removeSpy = vitest.fn();
       extractor['actions'] = {
@@ -196,7 +195,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       >;
       const initSpy = vitest.fn().mockRejectedValue(0);
       await expect(
-        async () => await extractor['initWithRetrial'](initSpy)
+        async () => await extractor['initWithRetrial'](initSpy),
       ).rejects.toThrowError();
       expect(removeSpy).toHaveBeenCalledOnce();
       expect(initSpy).toHaveBeenCalledTimes(RETRIAL_COUNT);
@@ -222,7 +221,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       (
         extractor['network'] as NodeNetwork
@@ -256,7 +255,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Node,
         'node_url',
-        'address'
+        'address',
       );
       (
         extractor['network'] as NodeNetwork
@@ -271,7 +270,7 @@ describe('AbstractInitializableErgoExtractor', () => {
         .mockResolvedValue(4);
       extractor['processTransactionBatch'] = vitest.fn();
       expect(() =>
-        extractor['initializeWithNode']({ hash: 'hash', height: 1320698 })
+        extractor['initializeWithNode']({ hash: 'hash', height: 1320698 }),
       ).rejects.toThrowError();
     });
   });
@@ -300,7 +299,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Explorer,
         'explorer_url',
-        'address'
+        'address',
       );
       extractor['initWithRetrial'] = async (job: () => Promise<void>) => job();
       const addressTxSpy = vitest
@@ -345,7 +344,7 @@ describe('AbstractInitializableErgoExtractor', () => {
       const extractor = new MockedInitializableErgoExtractor(
         ErgoNetworkType.Explorer,
         'explorer_url',
-        'address'
+        'address',
       );
       // mock `initWithRetrial` to run the job once
       extractor['initWithRetrial'] = async (job: () => Promise<void>) => job();
@@ -358,7 +357,7 @@ describe('AbstractInitializableErgoExtractor', () => {
             if (fromHeight <= 1320000 && toHeight >= 1320000)
               return new Array(100).fill(transactionBatch[0]);
             return [];
-          }
+          },
         );
       exNetwork.getAddressTransactionsWithHeight = addressTxSpy;
       // spy all other functions to check the calls

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';
 
@@ -23,7 +23,7 @@ export class TestInitializableErgoExtractorAction extends AbstractInitializableE
   createEntity = (
     boxes: AbstractBoxData[],
     block: BlockInfo,
-    extractor: string
+    extractor: string,
   ): Omit<AbstractErgoExtractorEntity, 'id'>[] => {
     return boxes.map((box) => ({
       boxId: box.boxId,
@@ -38,7 +38,7 @@ export class TestInitializableErgoExtractorAction extends AbstractInitializableE
    * convert the database entity back to raw data
    */
   convertEntityToData = (
-    entities: AbstractErgoExtractorEntity[]
+    entities: AbstractErgoExtractorEntity[],
   ): AbstractBoxData[] => {
     return entities.map((data) => pick(data, ['boxId', 'serialized']));
   };

package/tests/initializable/AbstractInitializableAction.spec.ts

@@ -1,5 +1,4 @@
-import { DataSource, Repository } from 'typeorm';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { DataSource, Repository } from '@rosen-bridge/extended-typeorm';
 
 import { TestInitializableErgoExtractorAction } from './AbstractInitializableAction.mock';
 import { createDatabase, TestEntity } from '../testUtils';
@@ -51,7 +50,7 @@ describe('AbstractErgoExtractorAction', () => {
         sampleEntities.map((entity) => ({
           ...entity,
           extractor: 'extractor-new',
-        }))
+        })),
       );
       const countBefore = await repository.count();
 

package/tests/network/ExplorerNetwork.spec.ts

@@ -1,4 +1,3 @@
-import { describe, expect, it, vitest } from 'vitest';
 import ergoExplorerClientFactory from '@rosen-clients/ergo-explorer';
 import { omit } from 'lodash-es';
 
@@ -66,9 +65,8 @@ describe('ExplorerNetwork', () => {
      */
     it('should properly convert explorer api tx to transaction type', async () => {
       const explorerNetwork = new ExplorerNetwork('explorer_url');
-      const tx = await explorerNetwork['convertBlockTransaction'](
-        explorerBlockTx
-      );
+      const tx =
+        await explorerNetwork['convertBlockTransaction'](explorerBlockTx);
       expect(tx).toEqual(omit(convertedTx, ['blockId', 'inclusionHeight']));
     });
   });

package/tests/network/NodeNetwork.spec.ts

@@ -1,4 +1,3 @@
-import { describe, expect, it, vitest } from 'vitest';
 import ergoNodeClientFactory from '@rosen-clients/ergo-node';
 
 import { NodeNetwork } from '../../lib';

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')