fix handling of TransactionPayment.TransactionFeePaid in Karura/Acala

subsquid · Sep 19, 2023 · 6a0c4aa · 6a0c4aa
1 parent a7adae7
commit 6a0c4aa
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/common/changes/@subsquid/substrate-data/master_2023-09-19-18-57.json b/common/changes/@subsquid/substrate-data/master_2023-09-19-18-57.json
@@ -0,0 +1,15 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/substrate-data",
+      "comment": "fix handling of `TransactionPayment.TransactionFeePaid` in Karura/Acala",
+      "type": "patch"
+    },
+    {
+      "packageName": "@subsquid/substrate-ingest",
+      "comment": "fix handling of `TransactionPayment.TransactionFeePaid` in Karura/Acala",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@subsquid/substrate-data"
+}
diff --git a/substrate/substrate-data/src/parsing/fee/index.ts b/substrate/substrate-data/src/parsing/fee/index.ts
@@ -4,6 +4,7 @@ import {Event, Extrinsic} from '../../interfaces/data'
 import {assertEvent, isEvent, UnexpectedEventType} from '../../types/util'
 import {getFeeCalc} from './calc'
 import {
+    AcalaTransactionFeePaid,
     ExtrinsicFailed,
     ExtrinsicSuccessLatest,
     ExtrinsicSuccessLegacy,
@@ -20,9 +21,17 @@ export function setExtrinsicFeesFromPaidEvent(
     for (let e of events) {
         if (e.name == 'TransactionPayment.TransactionFeePaid') {
             let extrinsic = extrinsics[assertNotNull(e.extrinsicIndex)]
-            assertEvent(runtime, TransactionFeePaid, e)
-            let actualFee = BigInt(e.args.actualFee)
-            let tip = BigInt(e.args.tip)
+            let actualFee: bigint
+            let tip: bigint
+            if (isEvent(runtime, TransactionFeePaid, e)) {
+                actualFee = BigInt(e.args.actualFee)
+                tip = BigInt(e.args.tip)
+            } else if (isEvent(runtime, AcalaTransactionFeePaid, e)) {
+                actualFee = BigInt(e.args.actualFee)
+                tip = BigInt(e.args.actualTip)
+            } else {
+                throw new Error('TransactionPayment.TransactionFeePaid event has unexpected type')
+            }
             extrinsic.fee = actualFee - tip
             extrinsic.tip = tip
         }

diff --git a/substrate/substrate-data/src/parsing/fee/types.ts b/substrate/substrate-data/src/parsing/fee/types.ts
@@ -85,3 +85,9 @@ export const TransactionFeePaid = struct({
     actualFee: numeric(),
     tip: numeric()
 })
+
+
+export const AcalaTransactionFeePaid = struct({
+    actualFee: numeric(),
+    actualTip: numeric()
+})