@rosen-bridge/watcher-data-extractor 0.1.0-alpha → 0.1.0-alpha-4

package/dist/actions/EventTriggerDB.js

@@ -16,6 +16,7 @@ class EventTriggerDB {
             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;

package/dist/actions/commitmentDB.js

@@ -19,6 +19,8 @@ class CommitmentEntityAction {
             row.WID = commitment.WID;
             row.extractor = extractorId;
             row.blockId = block.hash;
+            row.height = block.height;
+            row.boxSerialized = commitment.boxSerialized;
             return row;
         });
         let success = true;
@@ -48,7 +50,7 @@ class CommitmentEntityAction {
         for (const id of spendId) {
             await this.datasource.createQueryBuilder()
                 .update(CommitmentEntity)
-                .set({ spendBlock: block.hash })
+                .set({ spendBlockHash: block.hash })
                 .where("commitmentBoxId = :id", { id: id })
                 .execute();
         }
@@ -66,6 +68,13 @@ class CommitmentEntityAction {
             "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", {
+            block: block
+        }).execute();
     };
 }
 export default CommitmentEntityAction;

package/dist/actions/permitDB.d.ts

@@ -11,6 +11,12 @@ declare class PermitEntityAction {
      * @param extractor
      */
     storePermits: (permits: Array<extractedPermit>, block: BlockEntity, extractor: string) => Promise<boolean>;
+    /**
+     * update spendBlock Column of the permits in the dataBase
+     * @param spendId
+     * @param block
+     */
+    spendPermits: (spendId: Array<string>, block: BlockEntity) => Promise<void>;
     /**
      * deleting all permits corresponding to the block(id) and extractor(id)
      * @param block

package/dist/actions/permitDB.js

@@ -1,4 +1,5 @@
 import PermitEntity from "../entities/PermitEntity";
+import CommitmentEntity from "../entities/CommitmentEntity";
 class PermitEntityAction {
     datasource;
     constructor(dataSource) {
@@ -16,6 +17,7 @@ class PermitEntityAction {
             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;
@@ -37,6 +39,21 @@ class PermitEntityAction {
         }
         return success;
     };
+    /**
+     * update spendBlock Column of the permits in the dataBase
+     * @param spendId
+     * @param block
+     */
+    spendPermits = async (spendId, block) => {
+        //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 })
+                .execute();
+        }
+    };
     /**
      * deleting all permits corresponding to the block(id) and extractor(id)
      * @param block
@@ -51,6 +68,13 @@ class PermitEntityAction {
             "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", {
+            block: block
+        }).execute();
     };
 }
 export default PermitEntityAction;

package/dist/entities/CommitmentEntity.d.ts

@@ -6,6 +6,9 @@ declare class CommitmentEntity {
     WID: string;
     commitmentBoxId: string;
     blockId: string;
-    spendBlock?: string;
+    height: number;
+    boxSerialized: string;
+    spendBlockHash: string;
+    spendBlockHeight?: number;
 }
 export default CommitmentEntity;

package/dist/entities/CommitmentEntity.js

@@ -16,7 +16,10 @@ let CommitmentEntity = class CommitmentEntity {
     WID;
     commitmentBoxId;
     blockId;
-    spendBlock;
+    height;
+    boxSerialized;
+    spendBlockHash;
+    spendBlockHeight;
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -46,10 +49,22 @@ __decorate([
     Column(),
     __metadata("design:type", String)
 ], CommitmentEntity.prototype, "blockId", 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, "spendBlock", void 0);
+], CommitmentEntity.prototype, "spendBlockHash", void 0);
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", Number)
+], CommitmentEntity.prototype, "spendBlockHeight", void 0);
 CommitmentEntity = __decorate([
     Entity()
 ], CommitmentEntity);

package/dist/entities/EventTriggerEntity.d.ts

@@ -4,6 +4,7 @@ declare class EventTriggerEntity {
     boxId: string;
     boxSerialized: string;
     blockId: string;
+    height: number;
     fromChain: string;
     toChain: string;
     fromAddress: string;

package/dist/entities/EventTriggerEntity.js

@@ -14,6 +14,7 @@ let EventTriggerEntity = class EventTriggerEntity {
     boxId;
     boxSerialized;
     blockId;
+    height;
     fromChain;
     toChain;
     fromAddress;
@@ -47,6 +48,10 @@ __decorate([
     Column(),
     __metadata("design:type", String)
 ], EventTriggerEntity.prototype, "blockId", void 0);
+__decorate([
+    Column(),
+    __metadata("design:type", Number)
+], EventTriggerEntity.prototype, "height", void 0);
 __decorate([
     Column(),
     __metadata("design:type", String)

package/dist/entities/PermitEntity.d.ts

@@ -5,5 +5,8 @@ declare class PermitEntity {
     boxSerialized: string;
     WID: string;
     blockId: string;
+    height: number;
+    spendBlockHash: string;
+    spendBlockHeight?: number;
 }
 export default PermitEntity;

package/dist/entities/PermitEntity.js

@@ -15,6 +15,9 @@ let PermitEntity = class PermitEntity {
     boxSerialized;
     WID;
     blockId;
+    height;
+    spendBlockHash;
+    spendBlockHeight;
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -40,6 +43,18 @@ __decorate([
     Column(),
     __metadata("design:type", String)
 ], PermitEntity.prototype, "blockId", void 0);
+__decorate([
+    Column(),
+    __metadata("design:type", Number)
+], PermitEntity.prototype, "height", void 0);
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", String)
+], PermitEntity.prototype, "spendBlockHash", void 0);
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", Number)
+], PermitEntity.prototype, "spendBlockHeight", void 0);
 PermitEntity = __decorate([
     Entity()
 ], PermitEntity);

package/dist/extractor/EventTriggerExtractor.js

@@ -40,23 +40,21 @@ 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(),
-                                        sourceChainTokenId: Buffer.from(R5Serialized[8]).toString(),
-                                        targetChainTokenId: Buffer.from(R5Serialized[9]).toString(),
-                                        sourceTxId: Buffer.from(R5Serialized[0]).toString(),
+                                        networkFee: Buffer.from(R5Serialized[7]).toString("hex"),
+                                        bridgeFee: Buffer.from(R5Serialized[6]).toString("hex"),
+                                        amount: Buffer.from(R5Serialized[5]).toString("hex"),
+                                        sourceChainTokenId: Buffer.from(R5Serialized[8]).toString("hex"),
+                                        targetChainTokenId: Buffer.from(R5Serialized[9]).toString("hex"),
+                                        sourceTxId: Buffer.from(R5Serialized[0]).toString("hex"),
                                         fromChain: Buffer.from(R5Serialized[1]).toString(),
                                         fromAddress: Buffer.from(R5Serialized[3]).toString(),
-                                        sourceBlockId: Buffer.from(R5Serialized[10]).toString(),
+                                        sourceBlockId: Buffer.from(R5Serialized[10]).toString("hex"),
                                         WIDs: WIDs,
                                     });
                                 }

package/dist/extractor/commitmentExtractor.js

@@ -50,6 +50,7 @@ class CommitmentExtractor extends AbstractExtractor {
                                         commitment: eventDigest,
                                         eventId: requestId,
                                         commitmentBoxId: output.box_id().to_str(),
+                                        boxSerialized: Buffer.from(output.sigma_serialize_bytes()).toString("base64")
                                     });
                                 }
                             }

package/dist/extractor/permitExtractor.js

@@ -26,6 +26,7 @@ class PermitExtractor extends AbstractExtractor {
         return new Promise((resolve, reject) => {
             try {
                 const boxes = [];
+                const spendIds = [];
                 txs.forEach(transaction => {
                     for (let index = 0; index < transaction.outputs().len(); index++) {
                         const output = transaction.outputs().get(index);
@@ -40,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')
                                     });
                                 }
                             }
@@ -49,9 +50,16 @@ class PermitExtractor extends AbstractExtractor {
                             continue;
                         }
                     }
+                    // process inputs
+                    for (let index = 0; index < transaction.inputs().len(); index++) {
+                        const input = transaction.inputs().get(index);
+                        spendIds.push(input.box_id().to_str());
+                    }
                 });
                 this.actions.storePermits(boxes, block, this.getId()).then(() => {
-                    resolve(true);
+                    this.actions.spendPermits(spendIds, block).then(() => {
+                        resolve(true);
+                    });
                 }).catch((e) => {
                     console.log(`Error in storing permits of the block ${block}`);
                     console.log(e);

package/dist/interfaces/extractedCommitment.d.ts

@@ -3,5 +3,6 @@ interface extractedCommitment {
     commitment: string;
     eventId: string;
     commitmentBoxId: string;
+    boxSerialized: string;
 }
 export { extractedCommitment };

package/dist/migrations/init.js

@@ -4,12 +4,15 @@ 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, 
-                    "spendBlock" varchar
+                    "height" INTEGER NOT NULL, 
+                    "spendBlockHash" varchar,
+                    "spendBlockHeight" INTEGER
                 )`);
         await queryRunner.query(`CREATE TABLE "event_trigger_entity" 
                     ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, 
@@ -28,6 +31,7 @@ export class initMigration1659787165000 {
                     "targetChainTokenId" varchar NOT NULL,
                     "sourceBlockId" varchar NOT NULL,
                     "sourceTxId" varchar NOT NULL,
+                    "height" INTEGER NOT NULL, 
                     "WIDs" varchar NOT NULL
                 )`);
         await queryRunner.query(`CREATE TABLE "permit_entity" 
@@ -36,7 +40,10 @@ export class initMigration1659787165000 {
                     "boxId" varchar NOT NULL, 
                     "boxSerialized" varchar NOT NULL, 
                     "blockId" varchar NOT NULL,
-                    "WID" varchar NOT NULL
+                    "height" INTEGER NOT NULL, 
+                    "WID" varchar NOT NULL,
+                    "spendBlockHash" varchar,
+                    "spendBlockHeight" INTEGER
                 )`);
     }
     async down(queryRunner) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosen-bridge/watcher-data-extractor",
-  "version": "0.1.0-alpha",
+  "version": "0.1.0-alpha-4",
   "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",
+    "@rosen-bridge/scanner": "^0.1.7-alpha-2",
     "blakejs": "^1.2.1",
     "ergo-lib-wasm-nodejs": "^0.18.0",
     "reflect-metadata": "^0.1.13",