recursively check parents

subsquid · Jul 24, 2024 · 31a4134 · 31a4134
1 parent ebc176f
commit 31a4134
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/substrate/substrate-processor/src/mapping.ts b/substrate/substrate-processor/src/mapping.ts
@@ -400,14 +400,16 @@ export function setUpItems(block: Block): void {
         }
 
         if (i < block.calls.length - 1) {
-            let prev = block.calls[i + 1]
-            if (isSubcall(prev, rec)) {
-                rec.parentCall = prev
-                populateSubcalls(prev, rec)
-            }
-            if (prev.parentCall && isSubcall(prev.parentCall, rec)) {
-                rec.parentCall = prev.parentCall
-                populateSubcalls(prev.parentCall, rec)
+            let prev: Call | undefined = block.calls[i + 1]
+            if (prev.extrinsicIndex == rec.extrinsicIndex) {
+                while (prev != null) {
+                    if (isSubcall(prev, rec)) {
+                        rec.parentCall = prev
+                        populateSubcalls(prev, rec)
+                        break
+                    }
+                    prev = prev.parentCall
+                }
             }
         }
     }
@@ -491,3 +493,8 @@ function isSubcall(parent: CallKey, call: CallKey): boolean {
     }
     return true
 }
+
+
+function traverseCalls(prev: Call, call: Call) {
+
+}