fix(hydra-cli): fix ts compilation error in generated relationship resolver

affects: @dzlzv/hydra-cli, hydra-e2e-tests, sample, sample-mappings

Author: dzhelezov

packages/hydra-cli/src/templates/entities/resolver.ts.mst

@@ -128,10 +128,10 @@ export class {{className}}Resolver {
               .getMany();
             let {{relatedTsProp}}Ids: string[] = []
             {{#relationType.isOTM}}
-            {{relatedTsProp}}Ids = Array.from(new Set(result.map(v => v.{{relatedTsProp}}.id)));
+            {{relatedTsProp}}Ids = Array.from(new Set(result.map(v => v!.{{relatedTsProp}}!.id)));
             {{/relationType.isOTM}}
             {{#relationType.isMTM}}
-            Array.from(new Set(result.map(v => v.{{relatedTsProp}}.map(c => {{relatedTsProp}}Ids.push(c.id)))));
+            Array.from(new Set(result.map(v => v!.{{relatedTsProp}}!.map(c => {{relatedTsProp}}Ids.push(c.id)))));
             {{/relationType.isMTM}}
 
             delete where.{{fieldName}}_some

packages/hydra-e2e-tests/fixtures/mappings/mappings.ts

@@ -3,6 +3,7 @@ import {
   BlockTimestamp,
   BlockHook,
   HookType,
+  Account,
 } from '../generated/graphql-server/model'
 
 // run 'NODE_URL=<RPC_ENDPOINT> EVENTS=<comma separated list of events> yarn codegen:mappings-types'
@@ -14,8 +15,25 @@ import {
   EventContext,
   BlockContext,
   StoreContext,
+  DatabaseManager,
 } from '@dzlzv/hydra-common'
 
+async function getOrCreate<T>(
+  e: { new (...args: any[]): T },
+  id: string,
+  store: DatabaseManager
+): Promise<T> {
+  let entity: T | undefined = await store.get<T>(e, {
+    where: { id },
+  })
+
+  if (entity === undefined) {
+    entity = new e() as T
+    ;(<any>entity).id = id
+  }
+  return entity
+}
+
 export async function balancesTransfer({
   store,
   event,
@@ -30,6 +48,24 @@ export async function balancesTransfer({
   transfer.tip = extrinsic ? new BN(extrinsic.tip.toString(10)) : new BN(0)
   transfer.insertedAt = new Date(block.timestamp)
 
+  const fromAcc = await getOrCreate<Account>(Account, from.toString(), store)
+  fromAcc.hex = from.toHex()
+  const toAcc = await getOrCreate<Account>(Account, to.toString(), store)
+  toAcc.hex = to.toHex()
+
+  fromAcc.balance = fromAcc.balance || new BN(0)
+  fromAcc.balance = fromAcc.balance.sub(value)
+  fromAcc.balance = fromAcc.balance.sub(transfer.tip)
+
+  await store.save<Account>(fromAcc)
+
+  toAcc.balance = toAcc.balance || new BN(0)
+  toAcc.balance = toAcc.balance.add(value)
+  await store.save<Account>(toAcc)
+
+  transfer.fromAccount = fromAcc
+  transfer.toAccount = toAcc
+
   transfer.block = block.height
   transfer.comment = `Transferred ${transfer.value} from ${transfer.from} to ${transfer.to}`
   transfer.timestamp = new BN(block.timestamp)

packages/hydra-e2e-tests/fixtures/schema.graphql

@@ -2,6 +2,8 @@
 type Transfer @entity {
   from: Bytes!
   to: Bytes!
+  fromAccount: Account!
+  toAccount: Account!
   value: BigInt!
   comment: String @fulltext(query: "commentSearch")
   block: Int!
@@ -27,6 +29,15 @@ enum HookType {
   POST
 }
 
+type Account @entity {
+  "Account address"
+  id: ID!
+  hex: String!
+  balance: BigInt!
+  incoming: [Transfer!] @derivedFrom(field: "toAccount")
+  outgoing: [Transfer!] @derivedFrom(field: "fromAccount")
+}
+
 ############## Test purpose only @hydra-e2e-tests #################
 # To make sure graphql api is generated as expected
 type Extrinsic @entity {

packages/sample/.env

@@ -41,14 +41,13 @@ MAPPINGS_LOCATION=../../mappings
 TYPES_JSON=
 
 # Indexer GraphQL API endpoint to fetch indexed events
-#INDEXER_ENDPOINT_URL=https://indexer-kusama.joystream.app/graphql
-INDEXER_ENDPOINT_URL=http://localhost:4001/graphql
+INDEXER_ENDPOINT_URL=https://indexer-kusama.joystream.app/graphql
 
 
 # Block height from which the processor starts. Note that if 
 # there are already processed events in the database, this setting is ignored
 BLOCK_HEIGHT=100000
-BATCH_SIZE=5000
+BATCH_SIZE=10000
 BLOCK_WINDOW=10000
 
 

packages/sample/manifest.yml

@@ -34,8 +34,8 @@ mappings:
       handler: balancesTransfer
       filter:
         specVersion: '[0,)'
-  preBlockHooks:
-    - handler: preHook
-  postBlockHooks:
-    - handler: postHook
+  # preBlockHooks:
+  #   - handler: preHook
+  # postBlockHooks:
+  #   - handler: postHook
 

packages/sample/mappings/mappings.ts

@@ -3,6 +3,7 @@ import {
   BlockTimestamp,
   BlockHook,
   HookType,
+  Account,
 } from '../generated/graphql-server/model'
 
 // run 'NODE_URL=<RPC_ENDPOINT> EVENTS=<comma separated list of events> yarn codegen:mappings-types'
@@ -14,13 +15,30 @@ import {
   EventContext,
   BlockContext,
   StoreContext,
+  DatabaseManager,
 } from '@dzlzv/hydra-common'
 
 const start = Date.now()
 let blockTime = 0
 let totalEvents = 0
 let totalBlocks = 0
 
+async function getOrCreate<T>(
+  e: { new (...args: any[]): T },
+  id: string,
+  store: DatabaseManager
+): Promise<T> {
+  let entity: T | undefined = await store.get<T>(e, {
+    where: { id },
+  })
+
+  if (entity === undefined) {
+    entity = new e() as T
+    ;(<any>entity).id = id
+  }
+  return entity
+}
+
 export async function balancesTransfer({
   store,
   event,
@@ -29,10 +47,25 @@ export async function balancesTransfer({
 }: EventContext & StoreContext) {
   const transfer = new Transfer()
   const [from, to, value] = new Balances.TransferEvent(event).params
-  transfer.from = Buffer.from(from.toHex())
-  transfer.to = Buffer.from(to.toHex())
+  const fromAcc = await getOrCreate<Account>(Account, from.toString(), store)
+  fromAcc.hex = from.toHex()
+  const toAcc = await getOrCreate<Account>(Account, to.toString(), store)
+  toAcc.hex = to.toHex()
+
   transfer.value = value.toBn()
   transfer.tip = extrinsic ? new BN(extrinsic.tip.toString(10)) : new BN(0)
+
+  fromAcc.balance = fromAcc.balance.sub(value)
+  fromAcc.balance = fromAcc.balance.sub(transfer.tip)
+
+  await store.save<Account>(fromAcc)
+
+  toAcc.balance = toAcc.balance.add(value)
+  await store.save<Account>(toAcc)
+
+  transfer.from = fromAcc
+  transfer.to = toAcc
+
   transfer.insertedAt = new Date(block.timestamp)
   transfer.block = block.height
   transfer.comment = `Transferred ${transfer.value} from ${transfer.from} to ${transfer.to}`

packages/sample/schema.graphql

@@ -1,7 +1,7 @@
 " All transfers "
 type Transfer @entity {
-  from: Bytes!
-  to: Bytes!
+  from: Account!
+  to: Account!
   value: BigInt!
   comment: String @fulltext(query: "commentSearch")
   block: Int!
@@ -10,6 +10,16 @@ type Transfer @entity {
   insertedAt: DateTime!
 }
 
+
+type Account @entity {
+  "Account address"
+  id: ID!
+  hex: String!
+  balance: BigInt!
+  incoming: [Transfer!] @derivedFrom(field: "to")
+  outgoing: [Transfer!] @derivedFrom(field: "from")
+}
+
 " Tracks block timestamps "
 type BlockTimestamp @entity {
   blockNumber: BigInt!