feat: Balance update improved for batchs & transfers

Author: ipapandinas

project.yaml

@@ -21,6 +21,24 @@ dataSources:
     mapping:
       file: "./dist/index.js"
       handlers:
+        # Batch Calls
+        - handler: batchCallHandler
+          kind: substrate/CallHandler
+          filter:
+            module: utility
+            method: batchAll
+            success: true
+        - handler: batchCallHandler
+          kind: substrate/CallHandler
+          filter:
+            module: utility
+            method: batch
+        - handler: batchCallHandler
+          kind: substrate/CallHandler
+          filter:
+            module: utility
+            method: forceBatch
+
         # Balance
         - handler: handleEvent
           kind: substrate/EventHandler
@@ -52,11 +70,6 @@ dataSources:
           filter:
             module: balances
             method: Slashed
-        - handler: handleEvent
-          kind: substrate/EventHandler
-          filter:
-            module: balances
-            method: BalanceSet
         - handler: handleEvent
           kind: substrate/EventHandler
           filter:

src/callHandlers/batch.ts

@@ -0,0 +1,27 @@
+import { SubstrateExtrinsic } from "@subql/types"
+import { updateAccount } from "../helpers"
+
+const balanceMethods = ["BalanceSet", "Deposit", "DustLost", "Endowed", "Reserved", "Slashed", "Unreserved", "Withdraw"]
+
+export async function batchCallHandler(extrinsic: SubstrateExtrinsic): Promise<void> {
+  if (!extrinsic.success) {
+    return
+  }
+
+  const signer = extrinsic.extrinsic.signer.toString()
+  const events = extrinsic.events
+
+  const addressStack: string[] = []
+
+  for (const event of events) {
+    const { data, method, section } = event.event
+    if (section === "balances" && balanceMethods.includes(method)) {
+      const [who] = data
+      if (!addressStack.includes(who.toString()) && who.toString() !== signer) {
+        addressStack.push(who.toString())
+      }
+    }
+  }
+
+  await Promise.all(addressStack.map(async (address) => await updateAccount(address)))
+}

src/callHandlers/index.ts

@@ -0,0 +1 @@
+export * from "./batch"

src/eventHandlers/balances.ts

@@ -1,14 +1,15 @@
 import { SubstrateEvent } from "@subql/types"
 import { Codec } from "@polkadot/types/types"
 import { Balance } from "@polkadot/types/interfaces"
-import { updateAccount, getCommonEventData, roundPrice, CommonEventData } from "../helpers"
+import { updateAccount, getCommonEventData, roundPrice, CommonEventData, getSigner } from "../helpers"
 import { TransferEntity } from "../types"
 
 export const transferHandler = async (event: SubstrateEvent): Promise<void> => {
   const commonEventData = getCommonEventData(event)
+  const signer = getSigner(event)
   const [from, to, amount] = event.event.data
   await genericTransferHandler(from, to, amount, commonEventData)
-  await updateAccount(from.toString())
+  if (from.toString() !== signer) await updateAccount(from.toString())
   await updateAccount(to.toString())
 }
 

src/helpers/account.ts

@@ -1,9 +1,11 @@
+import type { AccountInfo } from "@polkadot/types/interfaces"
+
 import { AccountEntity } from "../types/models/AccountEntity"
 import { roundPrice } from "../helpers"
 
 export const updateAccount = async (user: string) => {
   try {
-    const res: any = await api.query.system.account(user)
+    const res = await api.query.system.account<AccountInfo>(user)
     const balance = res.data
     if (balance) {
       const { feeFrozen, free, miscFrozen, reserved } = balance

src/helpers/event.ts

@@ -37,6 +37,18 @@ export const getCommonEventData = (event: SubstrateEvent): CommonEventData => {
   }
 }
 
+export const checkIfTransfer = (extrinsic: SubstrateExtrinsic): boolean => {
+  const { section, method } = extrinsic.extrinsic.method
+  if (section === "balances" && ["transfer", "transferAll", "transferKeepAlive"].includes(method)) return true
+  return false
+}
+
+export const checkIfAnyBatch = (extrinsic: SubstrateExtrinsic): boolean => {
+  const { section, method } = extrinsic.extrinsic.method
+  if (section === "utility" && ["batch", "batchAll", "forceBatch"].includes(method)) return true
+  return false
+}
+
 const checkIfBatch = (extrinsic: SubstrateExtrinsic): boolean => {
   const { section, method } = extrinsic.extrinsic.method
   if (section === "utility" && method === "batch") return true

src/index.ts

@@ -1,2 +1,3 @@
 //Exports all handler functions
+export * from "./callHandlers"
 export * from "./mappings/mappingHandlers"

src/mappings/mappingHandlers.ts

@@ -1,6 +1,6 @@
 import { SubstrateEvent } from "@subql/types"
 import * as eventHandlers from "../eventHandlers"
-import { updateAccount } from "../helpers"
+import { checkIfAnyBatch, checkIfTransfer, updateAccount } from "../helpers"
 
 export async function handleEvent(event: SubstrateEvent): Promise<void> {
   const key = `${event.event.section}.${event.event.method}`
@@ -15,9 +15,16 @@ export async function handleEvent(event: SubstrateEvent): Promise<void> {
       case "balances.Slashed":
       case "balances.Unreserved":
       case "balances.Withdraw":
+        const isBatchCall = event.extrinsic && checkIfAnyBatch(event.extrinsic)
+        const isTransferCall = event.extrinsic && checkIfTransfer(event.extrinsic)
+        if (!isBatchCall && !isTransferCall) {
+          const [who] = event.event.data
+          await updateAccount(who.toString())
+        }
+        break
       case "transactionPayment.TransactionFeePaid":
-        const [who] = event.event.data
-        await updateAccount(who.toString())
+        const [whoPaid] = event.event.data
+        await updateAccount(whoPaid.toString())
         break
       case "balances.Transfer":
         await eventHandlers.transferHandler(event)