@rosen-bridge/address-extractor 0.1.3-alpha → 0.1.4-alpha

package/dist/actions/db.js

@@ -1,4 +1,5 @@
 import { BoxEntity } from "../entities/boxEntity";
+import { In } from "typeorm";
 export class BoxEntityAction {
     datasource;
     constructor(dataSource) {
@@ -12,26 +13,42 @@ export class BoxEntityAction {
      * @param extractor
      */
     storeBox = async (boxes, spendBoxes, block, extractor) => {
-        const boxEntities = boxes.map((box) => {
-            const row = new BoxEntity();
-            row.address = box.address;
-            row.boxId = box.boxId;
-            row.createBlock = block.hash;
-            row.creationHeight = block.height;
-            row.serialized = box.serialized;
-            row.extractor = extractor;
-            return row;
+        const boxIds = boxes.map(item => item.boxId);
+        const dbBoxes = await this.datasource.getRepository(BoxEntity).findBy({
+            boxId: In(boxIds),
+            extractor: extractor
         });
         let success = true;
         const queryRunner = this.datasource.createQueryRunner();
         await queryRunner.connect();
         await queryRunner.startTransaction();
         try {
-            await queryRunner.manager.save(boxEntities);
+            for (const box of boxes) {
+                const entity = {
+                    address: box.address,
+                    boxId: box.boxId,
+                    createBlock: block.hash,
+                    creationHeight: block.height,
+                    spendBlock: undefined,
+                    serialized: box.serialized,
+                    extractor: extractor
+                };
+                const dbBox = dbBoxes.filter(item => item.boxId === box.boxId);
+                if (dbBox.length > 0) {
+                    await queryRunner.manager.getRepository(BoxEntity).createQueryBuilder()
+                        .update()
+                        .set(entity)
+                        .where({ id: dbBox[0].id })
+                        .execute();
+                }
+                else {
+                    await queryRunner.manager.getRepository(BoxEntity).insert(entity);
+                }
+            }
             await this.datasource.getRepository(BoxEntity).createQueryBuilder()
                 .update()
                 .set({ spendBlock: block.hash })
-                .where("boxId IN (:boxes) AND extractor = :extractor", {
+                .where("boxId IN (:...boxes) AND extractor = :extractor", {
                 boxes: spendBoxes,
                 extractor: extractor
             }).execute();

package/dist/extractor/ergoUtxoExtractor.d.ts

@@ -1,6 +1,6 @@
 import { DataSource } from "typeorm";
 import * as ergoLib from 'ergo-lib-wasm-nodejs';
-import { AbstractExtractor } from "@rosen-bridge/scanner/dist/interfaces";
+import { AbstractExtractor } from "@rosen-bridge/scanner";
 import { BlockEntity } from "@rosen-bridge/scanner";
 export declare class ErgoUTXOExtractor implements AbstractExtractor<ergoLib.Transaction> {
     private readonly dataSource;

package/dist/extractor/ergoUtxoExtractor.js

@@ -49,8 +49,8 @@ export class ErgoUTXOExtractor {
                         }
                         boxes.push({
                             boxId: output.box_id().to_str(),
-                            address: ergoLib.Address.recreate_from_ergo_tree(output.ergo_tree()).to_base58(this.networkType),
-                            serialized: Buffer.from(output.sigma_serialize_bytes()).toString("hex")
+                            address: ergoLib.Address.recreate_from_ergo_tree(ergoLib.ErgoTree.from_base16_bytes(output.ergo_tree().to_base16_bytes())).to_base58(this.networkType),
+                            serialized: Buffer.from(output.sigma_serialize_bytes()).toString("base64")
                         });
                     }
                     for (let index2 = 0; index2 < transaction.inputs().len(); index2++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rosen-bridge/address-extractor",
-  "version": "0.1.3-alpha",
-  "description": "",
+  "version": "0.1.4-alpha",
+  "description": "Utxo box extractor for any address or token.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -17,7 +17,7 @@
   "author": "Vorujack",
   "license": "GPL-3.0",
   "dependencies": {
-    "@rosen-bridge/scanner": "^0.1.7-alpha",
+    "@rosen-bridge/scanner": "^0.1.7-alpha-2",
     "blakejs": "^1.2.1",
     "ergo-lib-wasm-nodejs": "^0.18.0",
     "reflect-metadata": "^0.1.13",