Update npm dependencies and configuration

package.json

@@ -21,9 +21,9 @@
   "devDependencies": {
     "@polkadot/api": "^10",
     "@subql/cli": "^4.2.4",
-    "@subql/node": "^3.4.4",
+    "@subql/node": "^4.4.1",
     "@subql/testing": "^2.1.0",
-    "@subql/types": "^3.3.0",
+    "@subql/types": "^3.6.0",
     "@types/node-fetch": "^2.6.11",
     "typescript": "^4.1.3"
   },

project.yaml

@@ -16,13 +16,13 @@ repository: https://github.com/NodleCode/subquery.git
 schema:
   file: ./schema.graphql
 network:
-  chainId: "0x97da7ede98d7bad4e36b4d734b6055425a3be036da2a332ea5a7037656427a21"
-  endpoint: "wss://eden-rpc.dwellir.com:443/928f1361-a903-4360-b8ca-4fd786d7214c"
+  chainId: "0xd9d12d9139d020f658d4469fa5c02e331195227da62567d7bf9bbd1abaf77522"
+  endpoint: "https://node-6957502816543653888.lh.onfinality.io/jsonrpc?apikey=09b04494-3139-4b57-a5d1-e1c4c18748ce"
 chaintypes:
   file: ./dist/chaintypes.js
 dataSources:
   - kind: substrate/Runtime
-    startBlock: 3783563
+    startBlock: 1
     mapping:
       file: ./dist/index.js
       handlers:

schema.graphql

@@ -19,7 +19,6 @@ type Item @entity @compositeIndexes(fields: [["owner", "itemId"]]) {
     collectionItemKey: String! @index
     collection: Collection!
     metadataCid: String
-    payloadCid: String @index
     isBurned: Boolean!
     createdAt: BigInt @index
     updatedAt: BigInt @index

src/mappings/mappingBalancesHandlers.ts

@@ -58,6 +58,7 @@ const getEntityByTxType = (event: SubstrateEvent) => {
 
 export async function handleBalancesTransferEvent(event: SubstrateEvent) {
     const [from, to, amount] = event.event.data
+    let receiver: string 
 
     if (!from || !to) {
         logger.error(
@@ -67,12 +68,35 @@ export async function handleBalancesTransferEvent(event: SubstrateEvent) {
         return
     }
 
+    const otherEvents = event.extrinsic?.events?.findIndex(
+        (item) => item.event.method === 'ContractEmitted'
+    )
+
+    let idWithProposal: string
+    if (otherEvents && otherEvents !== -1) {
+        logger.info('ContractEmitted event found')
+        const payloadDataAddress =
+            event.extrinsic?.extrinsic?.args[4]?.toString()
+
+        const hexReceiver = payloadDataAddress?.split('x')?.pop()
+        if (hexReceiver) {
+            logger.info('Receiver address found in payload ' + hexReceiver)
+            const rawReceiver = Buffer.from(hexReceiver, 'hex').toString()
+            logger.info('Receiver address in raw format ' + rawReceiver)
+            receiver = '0x' + rawReceiver.split('x').pop()
+            logger.info('Receiver address in polkadot format ' + receiver)
+        }
+
+        idWithProposal = `${event.block?.block?.header?.number?.toNumber()}-${event.idx}`
+    }
+
     let records = getEntityByTxType(event)
 
     records.forEach(record => {
+        record.id = idWithProposal || `${event.block.block.header.number.toNumber()}-${event.idx}`
         record.blockNumber = event.block.block.header.number.toBigInt()
         record.from = from.toString()
-        record.to = to.toString()
+        record.to = receiver || to.toString()
         record.amount = (amount as Balance).toBigInt()
         if (event.extrinsic) {
             record.txHash = event.extrinsic.extrinsic.hash.toString()

src/mappings/mappingUniquesHandlers.ts

@@ -2,25 +2,7 @@ import { Item } from './../types/models/Item'
 import { Balance } from '@polkadot/types/interfaces/runtime'
 import { ensureCollection, ensureItem } from './../helpers/verifyUnique'
 import { SubstrateEvent } from '@subql/types'
-import fetch from 'node-fetch'
-import { Collection, UniquesTransfer } from '../types/models'
-
-const fetchMetadata = async (cid: string, gateways: string[]): Promise<any> => {
-    if (gateways.length === 0) {
-        return null
-    }
-
-    const gateway = gateways[0]
-    const url = `https://${gateway}/ipfs/${cid}`
-
-    try {
-        const res = await fetch(url)
-        return await res.json()
-    } catch (err) {
-        logger.error(err)
-        return fetchMetadata(cid, gateways.slice(1))
-    }
-}
+import { UniquesTransfer } from '../types/models'
 
 export async function handleUniquesTransferEvent(event: SubstrateEvent) {
     logger.debug(
@@ -108,18 +90,6 @@ export const handleUniquesMetadataSetEvent = async (event: SubstrateEvent) => {
 
     item.metadataCid = data.toHuman()!.toString()
 
-    if (item.metadataCid) {
-        const metadata = await fetchMetadata(item.metadataCid, [
-          'pinning.infura-ipfs.io',
-          'nodle-web-wallet.infura-ipfs.io',
-          'cloudflare-ipfs.com'
-        ]);
-
-        if (metadata) {
-            item.payloadCid = metadata.content || metadata.image || ''
-        }
-    }
-
     return item.save()
 }
 
@@ -239,19 +209,14 @@ export const handleUniquesCreatedEvent = async (event: SubstrateEvent) => {
 
     const timestamp = event.extrinsic!.block.timestamp
     const collectionIdAsNumber = Number(collectionId.toString())
-
-    const id = `${collectionIdAsNumber}-${blockNumber}-${event.idx}`
-
     logger.warn('Creating new collection', collectionIdAsNumber)
-
-    const collection = new Collection(
-        id,
-        collectionIdAsNumber,
-        '',
-        '',
-        '',
-        false
-    )
+
+    const collection = await ensureCollection({
+        collectionId,
+        blockNumber,
+        idx: event.idx,
+        timestamp: event.extrinsic!.block.timestamp,
+    })
 
     collection.createdAt = BigInt(timestamp.getTime())
     collection.issuer = creator.toString()