@rosen-bridge/abstract-extractor 1.0.0 → 1.0.1-967dc6f4

package/lib/ergo/network/ExplorerNetwork.ts

@@ -82,6 +82,7 @@ export class ExplorerNetwork extends AbstractNetwork {
         tx.dataInputs?.map((dataInput) => ({
           boxId: dataInput.boxId,
         })) ?? [],
+      // TODO: Add input extension to explorer local/ergo/rosen-bridge/scanner/-/issues/156
       inputs: tx.inputs?.map((input) => ({ boxId: input.boxId })) ?? [],
       outputs:
         tx.outputs?.map((output) => ({
@@ -113,6 +114,7 @@ export class ExplorerNetwork extends AbstractNetwork {
         tx.dataInputs?.map((dataInput) => ({
           boxId: dataInput.id,
         })) ?? [],
+      // TODO: Add input extension local/ergo/rosen-bridge/scanner/-/issues/156
       inputs: tx.inputs?.map((input) => ({ boxId: input.id })) ?? [],
       outputs:
         tx.outputs?.map((output) => ({

package/lib/ergo/network/NodeNetwork.ts

@@ -64,7 +64,8 @@ export class NodeNetwork extends AbstractNetwork {
         additionalRegisters: output.additionalRegisters,
         boxId: output.boxId || '',
       })),
-      inputs: tx.inputs.map((input) => ({ boxId: input.boxId })) ?? [],
+      // TODO: Add input extension local/ergo/rosen-bridge/scanner/-/issues/156
+      inputs: tx.inputs.map((input) => ({ boxId: input.boxId! })) ?? [],
       dataInputs: tx.dataInputs,
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosen-bridge/abstract-extractor",
-  "version": "1.0.0",
+  "version": "1.0.1-967dc6f4",
   "description": "Rosen Bridge extractor interfaces to work with scanner",
   "repository": "",
   "license": "GPL-3.0",
@@ -36,10 +36,10 @@
     "node": ">=20.11.0"
   },
   "dependencies": {
-    "@rosen-bridge/abstract-logger": "^1.0.0",
+    "@rosen-bridge/abstract-logger": "^2.0.1",
     "@rosen-bridge/json-bigint": "^0.1.0",
     "@rosen-clients/ergo-explorer": "^1.1.2",
-    "@rosen-clients/ergo-node": "^1.1.1",
+    "@rosen-clients/ergo-node": "^1.2.0",
     "lodash-es": "^4.17.21",
     "typeorm": "^0.3.20",
     "uuid": "^9.0.0"

package/tests/AbstractErgoExtractor.mock.ts

@@ -17,6 +17,10 @@ export class MockedErgoExtractor extends AbstractErgoExtractor<
     AbstractErgoExtractorEntity
   >;
 
+  constructor(trackInputExtension = false) {
+    super(undefined, trackInputExtension);
+  }
+
   getId = () => 'Test';
 
   initializeBoxes: (initialBlock: BlockInfo) => Promise<void>;

package/tests/AbstractErgoExtractor.spec.ts

@@ -22,7 +22,7 @@ describe('AbstractErgoExtractor', () => {
      * - spy `extractBoxData` and `storeBoxes`
      * - run test (call `processTransactions`)
      * @expected
-     * - to call `extractBoxData` for the specific box
+     * - to call `extractBoxData` for the specific box and undefined (without input extension)
      * - to insert the extracted box to database
      * - to return true when total procedure is successful
      * - to trigger `INSERT` callbacks with correct data
@@ -49,7 +49,7 @@ describe('AbstractErgoExtractor', () => {
       const result = await extractor.processTransactions([tx], block);
 
       expect(extractSpy).toBeCalledTimes(1);
-      expect(extractSpy).toBeCalledWith(tx.outputs[0]);
+      expect(extractSpy).toBeCalledWith(tx.outputs[0], undefined);
       expect(storeSpy).toBeCalledWith([extractedData], block, 'Test');
       expect(result).toEqual(true);
       expect(triggerCallbacks).toBeCalledWith(CallbackType.Insert, [
@@ -109,6 +109,43 @@ describe('AbstractErgoExtractor', () => {
       ]);
     });
 
+    /**
+     * @target processTransactions should extract input extensions and use in `extractBoxData`
+     * @dependencies
+     * @scenario
+     * - mock extractor with track input extensions
+     * - mock `hasData` to return true for one box
+     * - spy `extractBoxData`, `storeBoxes` and `spendBoxes`
+     * - run test (call `processTransactions`)
+     * @expected
+     * - to call `extractBoxData` for the specific box with all input extensions
+     */
+    it('should extract input extensions and use in `extractBoxData`', async () => {
+      const extractor = new MockedErgoExtractor(true);
+      const triggerCallbacks = vitest.fn();
+      extractor['triggerCallbacks'] = triggerCallbacks;
+      extractor.hasData = (box: V1.OutputInfo | OutputBox) => {
+        if (box.boxId == tx.outputs[0].boxId) return true;
+        return false;
+      };
+      const extractSpy = vitest.fn().mockReturnValue(extractedData);
+      extractor.extractBoxData = extractSpy;
+      extractor['actions'] = {
+        storeBoxes: vitest.fn().mockResolvedValue(true),
+        spendBoxes: vitest.fn().mockResolvedValue([]),
+      } as unknown as AbstractErgoExtractorAction<
+        AbstractBoxData,
+        AbstractErgoExtractorEntity
+      >;
+      await extractor.processTransactions([tx], block);
+
+      expect(extractSpy).toBeCalledTimes(1);
+      expect(extractSpy).toBeCalledWith(tx.outputs[0], [
+        tx.inputs[0].extension,
+        {},
+      ]);
+    });
+
     /**
      * @target processTransactions should return false if data insertion fails
      * @dependencies

package/tests/network/testData.ts

@@ -1240,7 +1240,7 @@ export const nodeTx = {
   timestamp: 1722500537020n,
   index: 3,
   globalIndex: 7582283n,
-  numConfirmations: 0,
+  numConfirmations: 146428,
   inputs: [
     {
       globalIndex: 41863807n,
@@ -1264,17 +1264,11 @@ export const nodeTx = {
       additionalRegisters: {
         R4: '05a686a9ad09',
         R5: '04a299a101',
-      },
+      } as Registers,
       transactionId:
         'c1625b2f26935514d9cc47ce3acedb75e7b51595c1a26cc2fe0b6eadeeb205d8',
       index: 0,
-      spendingProof: {
-        proofBytes:
-          '4ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd1173ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd1173ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd117',
-        extension: {
-          '1': 'a2aed72ff1b139f35d1ad2938cb44c9848a34d4dcfd6d8ab717ebde40a7304f2541cf628ffc8b5c496e6161eba3f169c6dd440704b1719e0',
-        },
-      },
+      spendingHeight: null,
     },
     {
       globalIndex: 41863813n,
@@ -1292,13 +1286,7 @@ export const nodeTx = {
       transactionId:
         'c1625b2f26935514d9cc47ce3acedb75e7b51595c1a26cc2fe0b6eadeeb205d8',
       index: 6,
-      spendingProof: {
-        proofBytes:
-          '4ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd1173ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd1173ab9da11fc216660e974842cc3b7705e62ebb9e0bf5ff78e53f9cd40abadd117',
-        extension: {
-          '1': 'a2aed72ff1b139f35d1ad2938cb44c9848a34d4dcfd6d8ab717ebde40a7304f2541cf628ffc8b5c496e6161eba3f169c6dd440704b1719e0',
-        },
-      },
+      spendingHeight: null,
     },
   ],
   dataInputs: [],
@@ -1308,7 +1296,8 @@ export const nodeTx = {
       inclusionHeight: 1320528,
       address:
         'NTkuk55NdwCXkF1e2nCABxq7bHjtinX3wH13zYPZ6qYT71dCoZBe1gZkh9FAr7GeHo2EpFoibzpNQmoi89atUjKRrhZEYrTapdtXrWU4kq319oY7BEWmtmRU9cMohX69XMuxJjJP5hRM8WQLfFnffbjshhEP3ck9CKVEkFRw1JDYkqVke2JVqoMED5yxLVkScbBUiJJLWq9BSbE1JJmmreNVskmWNxWE6V7ksKPxFMoqh1SVePh3UWAaBgGQRZ7TWf4dTBF5KMVHmRXzmQqEu2Fz2yeSLy23sM3pfqa78VuvoFHnTFXYFFxn3DNttxwq3EU3Zv25SmgrWjLKiZjFcEcqGgH6DJ9FZ1DfucVtTXwyDJutY3ksUBaEStRxoUQyRu4EhDobixL3PUWRcxaRJ8JKA9b64ALErGepRHkAoVmS8DaE6VbroskyMuhkTo7LbrzhTyJbqKurEzoEfhYxus7bMpLTePgKcktgRRyB7MjVxjSpxWzZedvzbjzZaHLZLkWZESk1WtdM25My33wtVLNXiTvficEUbjA23sNd24pv1YQ72nY1aqUHa2',
-      spentTransactionId: null,
+      spentTransactionId:
+        '0ad32fd0423a4d2e551f0ae9be28a650bef4b9420791bd5208c6f35c1b234322',
       boxId: '3729892f2fcd5b05761ab2994bb418947a5e7d6aaeae5c46351b2e6cf29afc34',
       value: 5810250000n,
       ergoTree:
@@ -1329,6 +1318,7 @@ export const nodeTx = {
       transactionId:
         '4e7c782db6525e7d59a28df3b72a16d26fcb64ceae535dfec3936e61d8feddf2',
       index: 0,
+      spendingHeight: null,
     },
     {
       globalIndex: 41864032n,
@@ -1347,12 +1337,14 @@ export const nodeTx = {
       transactionId:
         '4e7c782db6525e7d59a28df3b72a16d26fcb64ceae535dfec3936e61d8feddf2',
       index: 1,
+      spendingHeight: null,
     },
     {
       globalIndex: 41864033n,
       inclusionHeight: 1320528,
       address: '9fzRcctiWfzoJyqGtPWqoXPuxSmFw6zpnjtsQ1B6jSN514XqH4q',
-      spentTransactionId: null,
+      spentTransactionId:
+        'fc362346389ebad8252c19a6489a5c55eb3afbca4b9e21cc1c8aa4583d1aefd3',
       boxId: '918c7a92bf9ab9ba45cb96df067129f3fc0c24b62bf91d7f8c7f1d3062e52426',
       value: 23324978571n,
       ergoTree:
@@ -1363,6 +1355,7 @@ export const nodeTx = {
       transactionId:
         '4e7c782db6525e7d59a28df3b72a16d26fcb64ceae535dfec3936e61d8feddf2',
       index: 2,
+      spendingHeight: null,
     },
   ],
   size: 789,

package/tests/testData.ts

@@ -1,4 +1,4 @@
-import { Block } from '../lib';
+import { Block, InputExtension } from '../lib';
 import { TestEntity } from './testUtils';
 
 export const tx = {
@@ -6,19 +6,11 @@ export const tx = {
   inputs: [
     {
       boxId: '3df73b29204ffa2085c38a958d322c86bee0471a5a1296b031f137236e038c6d',
-      spendingProof: {
-        proofBytes:
-          '06fb1e785d12ac74886c0d3fa0e61db0aa4dfaef6b6a42ab7a908625f3721f35bbce8245876ab14113baf41ff7b479863513462a8b438ec3',
-        extension: {},
-      },
+      extension: { '0': '1101d00f' } as InputExtension,
     },
     {
       boxId: '846f3cedf2fc4242898413558e73a69d057edda1df6f274a1eeea219b6dd62dd',
-      spendingProof: {
-        proofBytes:
-          '2c930f70ba11b35f32e3eb9023634e7a394a8714ebe794fd7134ab4cea9da753303f2f56e6bf4d1b0b0466b29fc8ce8c949ca602edf38895',
-        extension: {},
-      },
+      extension: {},
     },
   ],
   dataInputs: [],