return '__type' field back to decoded ink events (#323)

common/changes/@subsquid/ink-abi/ink-abi-fix_2024-07-25-11-06.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/ink-abi",
+      "comment": "return `__type` field back to decoded events",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@subsquid/ink-abi"
+}

substrate/ink-abi/src/abi-description.ts

@@ -22,6 +22,7 @@ export interface SelectorsMap {
 
 
 export interface AbiEvent {
+    name: string
     type: Ti
     amountIndexed: number
     signatureTopic?: Bytes
@@ -98,6 +99,7 @@ export class AbiDescription {
             })
 
             return {
+                name: normalizeLabel(e.label),
                 type: ti,
                 amountIndexed: e.args.reduce((val, e) => e.indexed ? val + 1 : val, 0),
                 signatureTopic: e.signature_topic as Bytes

substrate/ink-abi/src/abi.ts

@@ -62,15 +62,21 @@ export class Abi {
             throw new Error(`Unable to find event with index ${idx}`);
         }
 
-        return this.scaleCodec.decode(event.type, src)
+        return {
+            __type: event.name,
+            ...this.scaleCodec.decode(event.type, src)
+        }
     }
 
     decodeEventV5(data: Uint8Array | Bytes, topics: Bytes[]) {
         let topic = topics[0]
         if (topic) {
             let event = this.events.find(e => e.signatureTopic == topic)
             if (event) {
-                return this.scaleCodec.decodeBinary(event.type, data)
+                return {
+                    __type: event.name,
+                    ...this.scaleCodec.decodeBinary(event.type, data)
+                }
             }
         }
 
@@ -86,7 +92,10 @@ export class Abi {
 
         if (potentialEvents.length == 1) {
             let event = potentialEvents[0]
-            return this.scaleCodec.decodeBinary(event.type, data)
+            return {
+                __type: event.name,
+                ...this.scaleCodec.decodeBinary(event.type, data)
+            }
         }
 
         throw new Error('Unable to determine event')