@rosen-bridge/watcher-data-extractor 0.1.0-alpha-3 → 0.1.2-alpha

package/README.md

@@ -1,92 +1,67 @@
-# rosen-scanner
+# Watcher Data Extractor
 
 
+### Table of Contents
+- [Description](#description)  
+- [Related Projects](#related-projects)
+- [How to Use the Watcher Data Extractor](#how-to-use-the-watcher-data-extractor)
+    - [Install](#install)
+    - [Usage](#usage)
+- [Contributing](#contributing)
+- [License](#license)
 
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+<a name="headers"/>
 
+## Description
+Data extractors are modules that are integrated within a scanner. They drive the required information from the scanned blocks and store them in their own database. The watcher data extractor is responsible for tracking all watcher-related data in the network. These data includes permit, commitment and event trigger boxes; all these boxes are created in the network by the watchers. The watchers use their permits to create new commitments, and need to track created commitments and triggers to continue their procedures. On the other side, guards need to track event trigger boxes to verify the related user payment and start an agreement on the exchange transaction.
+ 
+ 
+## Related Projects
+This module is used within the [Scanner](https://github.com/rosen-bridge/scanner) project. As stated above, this module is used in the [Watcher](https://github.com/rosen-bridge/watcher) service to drive the related boxes. It also used in the [Guard](https://github.com/rosen-bridge/watcher) to track the created event triggers.
+
+
+## How to Use the Watcher Data Extractor
+### Install
+This project is written in node-js using Esnext module and typeorm database. Extractors are not standalone projects and should be used as scanner modules. You can easily install it using npm with the command:
+ 
+```shell
+npm install @rosen-bridge/watcher-data-extractor
 ```
-cd existing_repo
-git remote add origin https://git.ergopool.io/rosen-bridge/scanner/rosen-scanner.git
-git branch -M master
-git push -uf origin master
+ 
+Alternatively, you can build and use it manually by cloning the project and running:
+```shell
+npm install
+npm run build
+```
+ 
+### Usage
+In the first step, you need to create a scanner instance; follow the steps [here](https://github.com/rosen-bridge/scanner) to create a running instance of the scanner. Then, you need to instantiate your desired extractors and register them to your ergo scanner:
+```javascript
+const commitmentExtractor = new CommitmentExtractor(
+    <extractor_name>, 
+    <Array<commitment_address>>,
+    <rwt_id>,
+    dataSource
+)
+const permitExtractor = new PermitExtractor(
+    <extractor_name>, 
+    dataSource, 
+    <permit_address>, 
+    <rwt_id>
+)
+const eventTriggerExtractor = new EventTriggerExtractor(
+    <extractor_name>, 
+    dataSource, 
+    <event_trigger_address>, 
+    <rwt_id>
+)
+ergoScanner.registerExtractor(commitmentExtractor)
+ergoScanner.registerExtractor(permitExtractor)
+ergoScanner.registerExtractor(eventTriggerExtractor)
 ```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://git.ergopool.io/rosen-bridge/scanner/rosen-scanner/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!).  Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
 
 ## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
+TBD
 
 ## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+TBD

package/dist/actions/EventTriggerDB.d.ts

@@ -3,14 +3,15 @@ import { BlockEntity } from "@rosen-bridge/scanner";
 import { ExtractedEventTrigger } from "../interfaces/extractedEventTrigger";
 declare class EventTriggerDB {
     private readonly datasource;
+    private readonly triggerEventRepository;
     constructor(dataSource: DataSource);
     /**
-     * It stores list of wids in the dataSource with block id
-     * @param wids
+     * It stores list of eventTriggers in the dataSource with block id
+     * @param eventTriggers
      * @param block
      * @param extractor
      */
-    storeEventTriggers: (wids: Array<ExtractedEventTrigger>, block: BlockEntity, extractor: string) => Promise<boolean>;
+    storeEventTriggers: (eventTriggers: Array<ExtractedEventTrigger>, block: BlockEntity, extractor: string) => Promise<boolean>;
     /**
      * deleting all permits corresponding to the block(id) and extractor(id)
      * @param block

package/dist/actions/EventTriggerDB.js

@@ -1,46 +1,67 @@
+import { In } from "typeorm";
 import EventTriggerEntity from "../entities/EventTriggerEntity";
 class EventTriggerDB {
     datasource;
+    triggerEventRepository;
     constructor(dataSource) {
         this.datasource = dataSource;
+        this.triggerEventRepository = dataSource.getRepository(EventTriggerEntity);
     }
     /**
-     * It stores list of wids in the dataSource with block id
-     * @param wids
+     * It stores list of eventTriggers in the dataSource with block id
+     * @param eventTriggers
      * @param block
      * @param extractor
      */
-    storeEventTriggers = async (wids, block, extractor) => {
-        const widEntity = wids.map((event) => {
-            const row = new EventTriggerEntity();
-            row.boxId = event.boxId;
-            row.boxSerialized = event.boxSerialized;
-            row.blockId = block.hash;
-            row.height = block.height;
-            row.extractor = extractor;
-            row.WIDs = event.WIDs;
-            row.amount = event.amount;
-            row.bridgeFee = event.bridgeFee;
-            row.fromAddress = event.fromAddress;
-            row.toAddress = event.toAddress;
-            row.fromChain = event.fromChain;
-            row.networkFee = event.networkFee;
-            row.sourceChainTokenId = event.sourceChainTokenId;
-            row.targetChainTokenId = event.targetChainTokenId;
-            row.sourceBlockId = event.sourceBlockId;
-            row.toChain = event.toChain;
-            row.sourceTxId = event.sourceTxId;
-            return row;
+    storeEventTriggers = async (eventTriggers, block, extractor) => {
+        if (eventTriggers.length === 0)
+            return true;
+        const boxIds = eventTriggers.map(trigger => trigger.boxId);
+        const savedTriggers = await this.triggerEventRepository.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(widEntity);
+            for (const event of eventTriggers) {
+                const saved = savedTriggers.some((entity) => {
+                    return entity.boxId === event.boxId;
+                });
+                const entity = {
+                    boxId: event.boxId,
+                    boxSerialized: event.boxSerialized,
+                    block: block.hash,
+                    height: block.height,
+                    extractor: extractor,
+                    WIDs: event.WIDs,
+                    amount: event.amount,
+                    bridgeFee: event.bridgeFee,
+                    fromAddress: event.fromAddress,
+                    toAddress: event.toAddress,
+                    fromChain: event.fromChain,
+                    networkFee: event.networkFee,
+                    sourceChainTokenId: event.sourceChainTokenId,
+                    targetChainTokenId: event.targetChainTokenId,
+                    sourceBlockId: event.sourceBlockId,
+                    toChain: event.toChain,
+                    sourceTxId: event.sourceTxId,
+                };
+                if (!saved) {
+                    await queryRunner.manager.insert(EventTriggerEntity, entity);
+                }
+                else {
+                    await queryRunner.manager.update(EventTriggerEntity, {
+                        boxId: event.boxId
+                    }, entity);
+                }
+            }
             await queryRunner.commitTransaction();
         }
         catch (e) {
+            console.log(`An error occurred during store eventTrigger action: ${e}`);
             await queryRunner.rollbackTransaction();
             success = false;
         }
@@ -58,7 +79,7 @@ class EventTriggerDB {
         await this.datasource.createQueryBuilder()
             .delete()
             .from(EventTriggerEntity)
-            .where("extractor = :extractor AND blockId = :block", {
+            .where("extractor = :extractor AND block = :block", {
             "block": block,
             "extractor": extractor
         }).execute();

package/dist/actions/commitmentDB.d.ts

@@ -3,20 +3,22 @@ import { extractedCommitment } from "../interfaces/extractedCommitment";
 import { BlockEntity } from "@rosen-bridge/scanner";
 declare class CommitmentEntityAction {
     private readonly datasource;
+    private readonly commitmentRepository;
     constructor(dataSource: DataSource);
     /**
      * It stores list of observations in the dataSource with block id
      * @param commitments
      * @param block
-     * @param extractorId
+     * @param extractor
      */
-    storeCommitments: (commitments: Array<extractedCommitment>, block: BlockEntity, extractorId: string) => Promise<boolean>;
+    storeCommitments: (commitments: Array<extractedCommitment>, block: BlockEntity, extractor: string) => Promise<boolean>;
     /**
      * update spendBlock Column of the commitments in the dataBase
      * @param spendId
      * @param block
+     * @param extractor
      */
-    spendCommitments: (spendId: Array<string>, block: BlockEntity) => Promise<void>;
+    spendCommitments: (spendId: Array<string>, block: BlockEntity, extractor: string) => Promise<void>;
     /**
      * deleting all permits corresponding to the block(id) and extractor(id)
      * @param block

package/dist/actions/commitmentDB.js

@@ -1,38 +1,60 @@
+import { In } from "typeorm";
 import CommitmentEntity from "../entities/CommitmentEntity";
 class CommitmentEntityAction {
     datasource;
+    commitmentRepository;
     constructor(dataSource) {
         this.datasource = dataSource;
+        this.commitmentRepository = dataSource.getRepository(CommitmentEntity);
     }
     /**
      * It stores list of observations in the dataSource with block id
      * @param commitments
      * @param block
-     * @param extractorId
+     * @param extractor
      */
-    storeCommitments = async (commitments, block, extractorId) => {
-        const commitmentEntity = commitments.map((commitment) => {
-            const row = new CommitmentEntity();
-            row.commitment = commitment.commitment;
-            row.eventId = commitment.eventId;
-            row.commitmentBoxId = commitment.commitmentBoxId;
-            row.WID = commitment.WID;
-            row.extractor = extractorId;
-            row.blockId = block.hash;
-            row.height = block.height;
-            return row;
+    storeCommitments = async (commitments, block, extractor) => {
+        if (commitments.length === 0)
+            return true;
+        const boxIds = commitments.map(commitment => commitment.boxId);
+        const savedCommitments = await this.commitmentRepository.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(commitmentEntity);
+            for (const commitment of commitments) {
+                const saved = savedCommitments.some((entity) => {
+                    return entity.boxId === commitment.boxId;
+                });
+                const entity = {
+                    commitment: commitment.commitment,
+                    eventId: commitment.eventId,
+                    boxId: commitment.boxId,
+                    WID: commitment.WID,
+                    extractor: extractor,
+                    block: block.hash,
+                    height: block.height,
+                    boxSerialized: commitment.boxSerialized,
+                };
+                if (!saved) {
+                    await queryRunner.manager.insert(CommitmentEntity, entity);
+                }
+                else {
+                    await queryRunner.manager.update(CommitmentEntity, {
+                        boxId: commitment.boxId
+                    }, entity);
+                }
+            }
             await queryRunner.commitTransaction();
         }
         catch (e) {
-            success = false;
+            console.log(`An error occurred during store commitments action: ${e}`);
             await queryRunner.rollbackTransaction();
+            success = false;
         }
         finally {
             await queryRunner.release();
@@ -43,14 +65,15 @@ class CommitmentEntityAction {
      * update spendBlock Column of the commitments in the dataBase
      * @param spendId
      * @param block
+     * @param extractor
      */
-    spendCommitments = async (spendId, block) => {
+    spendCommitments = async (spendId, block, extractor) => {
         //todo: should change with single db call
         for (const id of spendId) {
             await this.datasource.createQueryBuilder()
                 .update(CommitmentEntity)
-                .set({ spendBlockHash: block.hash })
-                .where("commitmentBoxId = :id", { id: id })
+                .set({ spendBlock: block.hash, spendHeight: block.height })
+                .where("boxId = :id AND extractor = :extractor", { id: id, extractor: extractor })
                 .execute();
         }
     };
@@ -63,15 +86,15 @@ class CommitmentEntityAction {
         await this.datasource.createQueryBuilder()
             .delete()
             .from(CommitmentEntity)
-            .where("extractor = :extractor AND blockId = :block", {
+            .where("extractor = :extractor AND block = :block", {
             "block": block,
             "extractor": extractor
         }).execute();
         //TODO: should handled null value in spendBlockHeight
         await this.datasource.createQueryBuilder()
             .update(CommitmentEntity)
-            .set({ spendBlockHash: undefined, spendBlockHeight: 0 })
-            .where("spendBlockHash = :block AND blockId = :block", {
+            .set({ spendBlock: undefined, spendHeight: 0 })
+            .where("spendBlock = :block AND block = :block", {
             block: block
         }).execute();
     };

package/dist/actions/permitDB.d.ts

@@ -3,6 +3,7 @@ import { extractedPermit } from "../interfaces/extractedPermit";
 import { BlockEntity } from "@rosen-bridge/scanner";
 declare class PermitEntityAction {
     private readonly datasource;
+    private readonly permitRepository;
     constructor(dataSource: DataSource);
     /**
      * It stores list of permits in the dataSource with block id
@@ -15,8 +16,9 @@ declare class PermitEntityAction {
      * update spendBlock Column of the permits in the dataBase
      * @param spendId
      * @param block
+     * @param extractor
      */
-    spendPermits: (spendId: Array<string>, block: BlockEntity) => Promise<void>;
+    spendPermits: (spendId: Array<string>, block: BlockEntity, extractor: string) => Promise<void>;
     /**
      * deleting all permits corresponding to the block(id) and extractor(id)
      * @param block

package/dist/actions/permitDB.js

@@ -1,9 +1,12 @@
+import { In } from "typeorm";
 import PermitEntity from "../entities/PermitEntity";
 import CommitmentEntity from "../entities/CommitmentEntity";
 class PermitEntityAction {
     datasource;
+    permitRepository;
     constructor(dataSource) {
         this.datasource = dataSource;
+        this.permitRepository = dataSource.getRepository(PermitEntity);
     }
     /**
      * It stores list of permits in the dataSource with block id
@@ -12,25 +15,43 @@ class PermitEntityAction {
      * @param extractor
      */
     storePermits = async (permits, block, extractor) => {
-        const permitEntity = permits.map((permit) => {
-            const row = new PermitEntity();
-            row.boxId = permit.boxId;
-            row.boxSerialized = permit.boxSerialized;
-            row.blockId = block.hash;
-            row.height = block.height;
-            row.extractor = extractor;
-            row.WID = permit.WID;
-            return row;
+        if (permits.length === 0)
+            return true;
+        const boxIds = permits.map(permit => permit.boxId);
+        const savedPermits = await this.permitRepository.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(permitEntity);
+            for (const permit of permits) {
+                const saved = savedPermits.some((entity) => {
+                    return entity.boxId === permit.boxId;
+                });
+                const entity = {
+                    boxId: permit.boxId,
+                    boxSerialized: permit.boxSerialized,
+                    block: block.hash,
+                    height: block.height,
+                    extractor: extractor,
+                    WID: permit.WID,
+                };
+                if (!saved) {
+                    await queryRunner.manager.insert(PermitEntity, entity);
+                }
+                else {
+                    await queryRunner.manager.update(PermitEntity, {
+                        boxId: permit.boxId
+                    }, entity);
+                }
+            }
             await queryRunner.commitTransaction();
         }
         catch (e) {
+            console.log(`An error occurred during store permit action: ${e}`);
             await queryRunner.rollbackTransaction();
             success = false;
         }
@@ -43,14 +64,15 @@ class PermitEntityAction {
      * update spendBlock Column of the permits in the dataBase
      * @param spendId
      * @param block
+     * @param extractor
      */
-    spendPermits = async (spendId, block) => {
+    spendPermits = async (spendId, block, extractor) => {
         //todo: should change with single db call
         for (const id of spendId) {
             await this.datasource.createQueryBuilder()
                 .update(PermitEntity)
-                .set({ spendBlockHash: block.hash })
-                .where("boxId = :id", { id: id })
+                .set({ spendBlock: block.hash, spendHeight: block.height })
+                .where("boxId = :id AND extractor = :extractor", { id: id, extractor: extractor })
                 .execute();
         }
     };
@@ -64,15 +86,15 @@ class PermitEntityAction {
         await this.datasource.createQueryBuilder()
             .delete()
             .from(PermitEntity)
-            .where("extractor = :extractor AND blockId = :block", {
+            .where("extractor = :extractor AND block = :block", {
             "block": block,
             "extractor": extractor
         }).execute();
         //TODO: should handled null value in spendBlockHeight
         await this.datasource.createQueryBuilder()
             .update(CommitmentEntity)
-            .set({ spendBlockHash: undefined, spendBlockHeight: 0 })
-            .where("spendBlockHash = :block AND blockId = :block", {
+            .set({ spendBlock: undefined, spendHeight: 0 })
+            .where("spendBlock = :block AND block = :block", {
             block: block
         }).execute();
     };

package/dist/entities/CommitmentEntity.d.ts

@@ -4,10 +4,11 @@ declare class CommitmentEntity {
     eventId: string;
     commitment: string;
     WID: string;
-    commitmentBoxId: string;
-    blockId: string;
+    boxId: string;
+    block: string;
     height: number;
-    spendBlockHash: string;
-    spendBlockHeight?: number;
+    boxSerialized: string;
+    spendBlock: string;
+    spendHeight?: number;
 }
 export default CommitmentEntity;

package/dist/entities/CommitmentEntity.js

@@ -7,18 +7,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn, Unique } from "typeorm";
 let CommitmentEntity = class CommitmentEntity {
     id;
     extractor;
     eventId;
     commitment;
     WID;
-    commitmentBoxId;
-    blockId;
+    boxId;
+    block;
     height;
-    spendBlockHash;
-    spendBlockHeight;
+    boxSerialized;
+    spendBlock;
+    spendHeight;
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -43,24 +44,29 @@ __decorate([
 __decorate([
     Column(),
     __metadata("design:type", String)
-], CommitmentEntity.prototype, "commitmentBoxId", void 0);
+], CommitmentEntity.prototype, "boxId", void 0);
 __decorate([
     Column(),
     __metadata("design:type", String)
-], CommitmentEntity.prototype, "blockId", void 0);
+], CommitmentEntity.prototype, "block", void 0);
 __decorate([
     Column(),
     __metadata("design:type", Number)
 ], CommitmentEntity.prototype, "height", void 0);
+__decorate([
+    Column(),
+    __metadata("design:type", String)
+], CommitmentEntity.prototype, "boxSerialized", void 0);
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", String)
-], CommitmentEntity.prototype, "spendBlockHash", void 0);
+], CommitmentEntity.prototype, "spendBlock", void 0);
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", Number)
-], CommitmentEntity.prototype, "spendBlockHeight", void 0);
+], CommitmentEntity.prototype, "spendHeight", void 0);
 CommitmentEntity = __decorate([
-    Entity()
+    Entity(),
+    Unique(["boxId", "extractor"])
 ], CommitmentEntity);
 export default CommitmentEntity;

package/dist/entities/EventTriggerEntity.d.ts

@@ -3,7 +3,7 @@ declare class EventTriggerEntity {
     extractor: string;
     boxId: string;
     boxSerialized: string;
-    blockId: string;
+    block: string;
     height: number;
     fromChain: string;
     toChain: string;

package/dist/entities/EventTriggerEntity.js

@@ -7,13 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn, Unique } from "typeorm";
 let EventTriggerEntity = class EventTriggerEntity {
     id;
     extractor;
     boxId;
     boxSerialized;
-    blockId;
+    block;
     height;
     fromChain;
     toChain;
@@ -47,7 +47,7 @@ __decorate([
 __decorate([
     Column(),
     __metadata("design:type", String)
-], EventTriggerEntity.prototype, "blockId", void 0);
+], EventTriggerEntity.prototype, "block", void 0);
 __decorate([
     Column(),
     __metadata("design:type", Number)
@@ -101,6 +101,7 @@ __decorate([
     __metadata("design:type", String)
 ], EventTriggerEntity.prototype, "WIDs", void 0);
 EventTriggerEntity = __decorate([
-    Entity()
+    Entity(),
+    Unique(["boxId", "extractor"])
 ], EventTriggerEntity);
 export default EventTriggerEntity;

package/dist/entities/PermitEntity.d.ts

@@ -4,9 +4,9 @@ declare class PermitEntity {
     boxId: string;
     boxSerialized: string;
     WID: string;
-    blockId: string;
+    block: string;
     height: number;
-    spendBlockHash: string;
-    spendBlockHeight?: number;
+    spendBlock: string;
+    spendHeight?: number;
 }
 export default PermitEntity;

package/dist/entities/PermitEntity.js

@@ -7,17 +7,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn, Unique } from "typeorm";
 let PermitEntity = class PermitEntity {
     id;
     extractor;
     boxId;
     boxSerialized;
     WID;
-    blockId;
+    block;
     height;
-    spendBlockHash;
-    spendBlockHeight;
+    spendBlock;
+    spendHeight;
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -42,7 +42,7 @@ __decorate([
 __decorate([
     Column(),
     __metadata("design:type", String)
-], PermitEntity.prototype, "blockId", void 0);
+], PermitEntity.prototype, "block", void 0);
 __decorate([
     Column(),
     __metadata("design:type", Number)
@@ -50,12 +50,13 @@ __decorate([
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", String)
-], PermitEntity.prototype, "spendBlockHash", void 0);
+], PermitEntity.prototype, "spendBlock", void 0);
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", Number)
-], PermitEntity.prototype, "spendBlockHeight", void 0);
+], PermitEntity.prototype, "spendHeight", void 0);
 PermitEntity = __decorate([
-    Entity()
+    Entity(),
+    Unique(["boxId", "extractor"])
 ], PermitEntity);
 export default PermitEntity;

package/dist/extractor/EventTriggerExtractor.js

@@ -40,17 +40,15 @@ class EventTriggerExtractor extends AbstractExtractor {
                                     R4Serialized.length >= 1 &&
                                     R5Serialized.length >= 11 &&
                                     output.ergo_tree().to_base16_bytes() === this.eventTriggerErgoTree) {
-                                    const WIDs = R4Serialized.map(byteArray => {
-                                        Buffer.from(byteArray).toString();
-                                    }).join(',');
+                                    const WIDs = R4Serialized.map(byteArray => Buffer.from(byteArray).toString("hex")).join(',');
                                     boxes.push({
                                         boxId: output.box_id().to_str(),
                                         boxSerialized: Buffer.from(output.sigma_serialize_bytes()).toString("base64"),
                                         toChain: Buffer.from(R5Serialized[2]).toString(),
                                         toAddress: Buffer.from(R5Serialized[4]).toString(),
-                                        networkFee: Buffer.from(R5Serialized[7]).toString(),
-                                        bridgeFee: Buffer.from(R5Serialized[6]).toString(),
-                                        amount: Buffer.from(R5Serialized[5]).toString(),
+                                        networkFee: BigInt("0x" + Buffer.from(R5Serialized[7]).toString("hex")).toString(10),
+                                        bridgeFee: BigInt("0x" + Buffer.from(R5Serialized[6]).toString("hex")).toString(10),
+                                        amount: BigInt("0x" + Buffer.from(R5Serialized[5]).toString("hex")).toString(10),
                                         sourceChainTokenId: Buffer.from(R5Serialized[8]).toString(),
                                         targetChainTokenId: Buffer.from(R5Serialized[9]).toString(),
                                         sourceTxId: Buffer.from(R5Serialized[0]).toString(),

package/dist/extractor/commitmentExtractor.js

@@ -49,7 +49,8 @@ class CommitmentExtractor extends AbstractExtractor {
                                         WID: WID,
                                         commitment: eventDigest,
                                         eventId: requestId,
-                                        commitmentBoxId: output.box_id().to_str(),
+                                        boxId: output.box_id().to_str(),
+                                        boxSerialized: Buffer.from(output.sigma_serialize_bytes()).toString("base64")
                                     });
                                 }
                             }
@@ -66,7 +67,7 @@ class CommitmentExtractor extends AbstractExtractor {
                 });
                 // process save commitments
                 this.actions.storeCommitments(commitments, block, this.id).then(() => {
-                    this.actions.spendCommitments(spendIds, block).then(() => {
+                    this.actions.spendCommitments(spendIds, block, this.id).then(() => {
                         resolve(true);
                     });
                 }).catch((e) => reject(e));

package/dist/extractor/permitExtractor.js

@@ -41,7 +41,7 @@ class PermitExtractor extends AbstractExtractor {
                                     boxes.push({
                                         boxId: output.box_id().to_str(),
                                         boxSerialized: Buffer.from(output.sigma_serialize_bytes()).toString("base64"),
-                                        WID: Buffer.from(R4Serialized[0]).toString()
+                                        WID: Buffer.from(R4Serialized[0]).toString('hex')
                                     });
                                 }
                             }
@@ -57,7 +57,7 @@ class PermitExtractor extends AbstractExtractor {
                     }
                 });
                 this.actions.storePermits(boxes, block, this.getId()).then(() => {
-                    this.actions.spendPermits(spendIds, block).then(() => {
+                    this.actions.spendPermits(spendIds, block, this.getId()).then(() => {
                         resolve(true);
                     });
                 }).catch((e) => {

package/dist/interfaces/extractedCommitment.d.ts

@@ -2,6 +2,7 @@ interface extractedCommitment {
     WID: string;
     commitment: string;
     eventId: string;
-    commitmentBoxId: string;
+    boxId: string;
+    boxSerialized: string;
 }
 export { extractedCommitment };

package/dist/migrations/{init.js → 1659787165000-initMigration.js}

@@ -4,21 +4,23 @@ export class initMigration1659787165000 {
         await queryRunner.query(`CREATE TABLE "commitment_entity" 
                     ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, 
                     "extractor" varchar NOT NULL, 
-                    "eventId" varchar NOT NULL, 
+                    "eventId" varchar NOT NULL,
+                    "boxSerialized" varchar NOT NULL, 
                     "commitment" varchar NOT NULL, 
                     "WID" varchar NOT NULL, 
-                    "commitmentBoxId" varchar NOT NULL, 
-                    "blockId" varchar NOT NULL, 
+                    "boxId" varchar NOT NULL, 
+                    "block" varchar NOT NULL, 
                     "height" INTEGER NOT NULL, 
-                    "spendBlockHash" varchar,
-                    "spendBlockHeight" INTEGER
+                    "spendBlock" varchar,
+                    "spendHeight" INTEGER,
+                    CONSTRAINT "UQ_cc294fc304a66f8f194840f1ece" UNIQUE ("boxId", "extractor")
                 )`);
         await queryRunner.query(`CREATE TABLE "event_trigger_entity" 
                     ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, 
                     "extractor" varchar NOT NULL, 
                     "boxId" varchar NOT NULL, 
                     "boxSerialized" varchar NOT NULL, 
-                    "blockId" varchar NOT NULL,
+                    "block" varchar NOT NULL,
                     "fromChain" varchar NOT NULL,
                     "toChain" varchar NOT NULL,
                     "fromAddress" varchar NOT NULL,
@@ -31,18 +33,20 @@ export class initMigration1659787165000 {
                     "sourceBlockId" varchar NOT NULL,
                     "sourceTxId" varchar NOT NULL,
                     "height" INTEGER NOT NULL, 
-                    "WIDs" varchar NOT NULL
+                    "WIDs" varchar NOT NULL,
+                    CONSTRAINT "UQ_c905f221a1b6271ca4405dbbe5f" UNIQUE ("boxId", "extractor")
                 )`);
         await queryRunner.query(`CREATE TABLE "permit_entity" 
                     ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, 
                     "extractor" varchar NOT NULL, 
                     "boxId" varchar NOT NULL, 
                     "boxSerialized" varchar NOT NULL, 
-                    "blockId" varchar NOT NULL,
+                    "block" varchar NOT NULL,
                     "height" INTEGER NOT NULL, 
                     "WID" varchar NOT NULL,
-                    "spendBlockHash" varchar,
-                    "spendBlockHeight" INTEGER
+                    "spendBlock" varchar,
+                    "spendHeight" INTEGER,
+                     CONSTRAINT "UQ_d3226602b909b64bcaeadc39c3c" UNIQUE ("boxId", "extractor")
                 )`);
     }
     async down(queryRunner) {

package/dist/migrations/index.d.ts

@@ -1,2 +1,2 @@
-import { initMigration1659787165000 } from "./init";
+import { initMigration1659787165000 } from "./1659787165000-initMigration";
 export declare const migrations: (typeof initMigration1659787165000)[];

package/dist/migrations/index.js

@@ -1,2 +1,2 @@
-import { initMigration1659787165000 } from "./init";
+import { initMigration1659787165000 } from "./1659787165000-initMigration";
 export const migrations = [initMigration1659787165000];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosen-bridge/watcher-data-extractor",
-  "version": "0.1.0-alpha-3",
+  "version": "0.1.2-alpha",
   "description": "Extractor for rosen specific boxes on ergo blockchain",
   "author": "Sahand Zoufan",
   "license": "GPL-3.0",
@@ -16,7 +16,7 @@
     "dist"
   ],
   "dependencies": {
-    "@rosen-bridge/scanner": "^0.1.7-alpha-2",
+    "@rosen-bridge/scanner": "0.1.9-alpha",
     "blakejs": "^1.2.1",
     "ergo-lib-wasm-nodejs": "^0.18.0",
     "reflect-metadata": "^0.1.13",