allow to load sibling calls

common/changes/@subsquid/substrate-processor/call-siblings_2024-07-17-09-27.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/substrate-processor",
+      "comment": "allow to request sibling calls",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/substrate-processor"
+}

substrate/substrate-processor/src/ds-rpc-filter.ts

@@ -152,6 +152,11 @@ function filterBlock(block: Block, dataRequest: DataRequest): void {
             if (rel.extrinsic) {
                 include.addExtrinsic(call.extrinsic)
             }
+            if (rel.siblings) {
+                for (let sibling of call.siblings) {
+                    include.addCall(sibling)
+                }
+            }
         }
     }
 
@@ -175,6 +180,7 @@ function filterBlock(block: Block, dataRequest: DataRequest): void {
             call.extrinsic = undefined
         }
         call.subcalls = call.subcalls.filter(sub => include.calls.has(sub))
+        call.siblings = call.siblings.filter(sib => include.calls.has(sib))
         call.events = call.events.filter(event => include.events.has(event))
         return true
     })

substrate/substrate-processor/src/interfaces/data-request.ts

@@ -31,6 +31,7 @@ export interface CallRelations {
     extrinsic?: boolean
     stack?: boolean
     events?: boolean
+    siblings?: boolean
 }
 
 

substrate/substrate-processor/src/interfaces/data.ts

@@ -122,6 +122,7 @@ export type Call<F extends FieldSelection = {}> = Simplify<
         parentCall?: Call<F>
         getParentCall(): Call<F>
         subcalls: Call<F>[]
+        siblings: Call<F>[]
         events: Event<F>[]
     }
 >

substrate/substrate-processor/src/mapping.ts

@@ -155,6 +155,7 @@ export class Call {
     #extrinsic?: Extrinsic
     #parentCall?: Call
     #subcalls?: Call[]
+    #siblings?: Call[]
     #events?: Event[]
     #ethereumTransactTo?: Bytes
     #ethereumTransactSighash?: Bytes
@@ -219,6 +220,15 @@ export class Call {
         this.#subcalls = calls
     }
 
+    get siblings(): Call[] {
+        this.#siblings = this.#siblings || []
+        return this.#siblings
+    }
+
+    set siblings(calls: Call[]) {
+        this.#siblings = calls
+    }
+
     get events(): Event[] {
         this.#events = this.#events || []
         return this.#events
@@ -405,6 +415,9 @@ export function setUpItems(block: Block): void {
                 rec.parentCall = prev
                 populateSubcalls(prev, rec)
             }
+            if (isSibling(prev, rec)) {
+                populateSiblings(prev, rec)
+            }
         }
     }
 
@@ -462,6 +475,15 @@ function populateSubcalls(parent: Call | undefined, child: Call): void {
 }
 
 
+function populateSiblings(prev: Call, call: Call) {
+    call.siblings.unshift(prev, ...prev.siblings)
+    for (let sibling of prev.siblings) {
+        sibling.siblings.unshift(call)
+    }
+    prev.siblings.unshift(call)
+}
+
+
 function callCompare(a: Call, b: Call) {
     return a.extrinsicIndex - b.extrinsicIndex || addressCompare(a.address, b.address)
 }
@@ -487,3 +509,9 @@ function isSubcall(parent: CallKey, call: CallKey): boolean {
     }
     return true
 }
+
+
+function isSibling(a: CallKey, b: CallKey): boolean {
+    if (a.extrinsicIndex != b.extrinsicIndex) return false
+    return a.address.length == b.address.length
+}