Merge pull request #201 from UniqueNetwork/fix/v1.7.2-index-tokens-owner

Fix/v1.7.2 index tokens owner

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm --no-git-tag-version version patch && git add package.json

apps/crawler/src/sdk/sdk.service.ts

@@ -60,7 +60,11 @@ export class SdkService {
     tokenId: number,
     at?: string,
   ): Promise<TokenByIdResult | null> {
-    return await this.sdk.tokens.get({ collectionId, tokenId });
+    if (at) {
+      return await this.sdk.tokens.get({ collectionId, tokenId, at });
+    } else {
+      return await this.sdk.tokens.get({ collectionId, tokenId });
+    }
   }
 
   @SdkCache('isTokenBundle')
@@ -111,10 +115,22 @@ export class SdkService {
   }
 
   @SdkCache('getTotalPieces')
-  async getTotalPieces(tokenId, collectionId): Promise<any> {
-    return await this.sdk.refungible.totalPieces({
-      tokenId: tokenId,
-      collectionId: collectionId,
-    });
+  async getTotalPieces(
+    tokenId: number,
+    collectionId: number,
+    at?: string,
+  ): Promise<any> {
+    if (at) {
+      return await this.sdk.refungible.totalPieces({
+        tokenId,
+        collectionId,
+        at,
+      });
+    } else {
+      return await this.sdk.refungible.totalPieces({
+        tokenId,
+        collectionId,
+      });
+    }
   }
 }

apps/crawler/src/services/extrinsic.service.ts

@@ -237,7 +237,12 @@ export class ExtrinsicService {
           tokenId: extrinsic.token_id,
         });
         const updateTokenTransfer = { ...extrinsic, ...pieceToken };
-        await this.updateOrSaveTokenOwnerPart(extrinsic, updateTokenTransfer);
+        //await this.updateOrSaveTokenOwnerPart(extrinsic, updateTokenTransfer);
+        await this.tokensOwnersRepository.upsert({ ...updateTokenTransfer }, [
+          'collection_id',
+          'token_id',
+          'owner',
+        ]);
       }
     }
 

apps/crawler/src/services/token/token.service.ts

@@ -131,6 +131,7 @@ export class TokenService {
     );
     let rejected = [];
     let data = [];
+
     for (const chunk of eventChunks) {
       const result = await Promise.allSettled(
         chunk.map((event) => {
@@ -143,10 +144,7 @@ export class TokenService {
           const { blockHash, blockTimestamp, blockNumber } = blockCommonData;
           const eventName = `${section}.${method}`;
 
-          if (
-            eventName === 'Common.ItemCreated' ||
-            eventName === 'Common.Transfer'
-          ) {
+          if (eventName === 'Common.ItemCreated') {
             data = JSON.parse(event.data);
           }
 
@@ -165,6 +163,9 @@ export class TokenService {
           }
 
           if (TOKEN_UPDATE_EVENTS.includes(eventName)) {
+            if (eventName === 'Common.Transfer') {
+              data = JSON.parse(event.data);
+            }
             return this.update({
               blockNumber,
               collectionId,
@@ -211,15 +212,16 @@ export class TokenService {
     data: any;
   }): Promise<SubscriberAction> {
     const tokenData = await this.getTokenData(collectionId, tokenId, blockHash);
-
     let result;
+
     if (tokenData) {
       const { tokenDecoded } = tokenData;
       const needCheckNesting = eventName === EventName.TRANSFER;
 
       const pieces = await this.sdkService.getTotalPieces(
         tokenId,
         collectionId,
+        blockHash,
       );
 
       if (data.length != 0) {
@@ -237,7 +239,11 @@ export class TokenService {
           block_number: blockNumber,
         };
 
-        await this.checkAndSaveOrUpdateTokenOwnerPart(tokenOwner);
+        await this.tokensOwnersRepository.upsert({ ...tokenOwner }, [
+          'collection_id',
+          'token_id',
+          'owner',
+        ]);
       }
 
       const preparedData = await this.prepareDataForDb(
@@ -259,9 +265,17 @@ export class TokenService {
         },
         ['collection_id', 'token_id'],
       );
-
       result = SubscriberAction.UPSERT;
     } else {
+      const ownerToken = normalizeSubstrateAddress(data[2].value);
+
+      await this.burnTokenOwnerPart({
+        collection_id: collectionId,
+        token_id: tokenId,
+        owner: ownerToken,
+        owner_normalized: ownerToken,
+        block_number: blockNumber,
+      });
       // No entity returned from sdk. Most likely it was destroyed in a future block.
       await this.burn(collectionId, tokenId);
 
@@ -271,7 +285,11 @@ export class TokenService {
     return result;
   }
 
-  async burn(collectionId: number, tokenId: number) {
+  async burn(
+    collectionId: number,
+    tokenId: number,
+    owner?: string,
+  ): Promise<any> {
     await this.nestingService.removeTokenFromParents(collectionId, tokenId);
 
     return this.tokensRepository.update(
@@ -298,7 +316,6 @@ export class TokenService {
         blockHash,
       );
     }
-
     if (!tokenDecoded) {
       return null;
     }
@@ -325,7 +342,7 @@ export class TokenService {
     });
   }
 
-  private async checkAndSaveOrUpdateTokenOwnerPart(tokenOwner: TokenOwnerData) {
+  private async burnTokenOwnerPart(tokenOwner: TokenOwnerData) {
     const ownerToken = await this.tokensOwnersRepository.findOne({
       where: {
         owner: tokenOwner.owner,
@@ -341,6 +358,27 @@ export class TokenService {
           collection_id: tokenOwner.collection_id,
           token_id: tokenOwner.token_id,
         },
+        {
+          amount: 0,
+          block_number: tokenOwner.block_number,
+        },
+      );
+    }
+  }
+
+  private async checkAndSaveOrUpdateTokenOwnerPart(tokenOwner: TokenOwnerData) {
+    const ownerToken = await this.tokensOwnersRepository.findOne({
+      where: {
+        owner: tokenOwner.owner,
+        collection_id: tokenOwner.collection_id,
+        token_id: tokenOwner.token_id,
+      },
+    });
+    if (ownerToken != null) {
+      await this.tokensOwnersRepository.update(
+        {
+          id: ownerToken.id,
+        },
         {
           amount: tokenOwner.amount,
           block_number: tokenOwner.block_number,

apps/crawler/src/services/token/token.types.ts

@@ -12,11 +12,11 @@ export interface TokenData {
 
 export interface TokenOwnerData {
   owner: string;
-  owner_normalized: string;
+  owner_normalized?: string;
   collection_id: number;
   token_id: number;
-  date_created: string;
-  amount: number;
-  type: TokenType;
-  block_number: number;
+  date_created?: string;
+  amount?: number;
+  type?: TokenType;
+  block_number?: number;
 }

apps/crawler/src/subscribers/blocks.subscriber.service.ts

@@ -115,7 +115,6 @@ export class BlocksSubscriberService implements ISubscriberService {
           blockCommonData,
           blockItems,
         });
-      //console.dir(events);
       const [itemCounts] = await Promise.all([
         this.blockService.upsert({
           block,

migrations/1676377784283-unqindex-tokens-owners.ts

@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class unqindextokensowners1676377784283 implements MigrationInterface {
+  name = 'unqindextokensowners1676377784283';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `TRUNCATE TABLE tokens_owners RESTART IDENTITY CASCADE`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "tokens_owners_idx" ON "tokens_owners" ("token_id", "collection_id","owner")`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "public"."tokens_owners_idx"`);
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkastats-backend-uniquenetwork",
-  "version": "1.7.1",
+  "version": "1.7.4",
   "description": "",
   "author": "Unique Network Team",
   "private": true,