solana: add innerInstructionIndex to instruction

subsquid · Oct 30, 2024 · 0dd85c8 · 0dd85c8
1 parent df25b72
commit 0dd85c8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/common/changes/@subsquid/solana-normalization/instruction-index_2024-10-29-16-53.json b/common/changes/@subsquid/solana-normalization/instruction-index_2024-10-29-16-53.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/solana-normalization",
+      "comment": "add innerInstructionIndex to instruction",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/solana-normalization"
+}
diff --git a/common/changes/@subsquid/solana-stream/instruction-index_2024-10-29-16-53.json b/common/changes/@subsquid/solana-stream/instruction-index_2024-10-29-16-53.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/solana-stream",
+      "comment": "support instruction.innerInstructionIndex field",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/solana-stream"
+}
diff --git a/solana/solana-normalization/src/data.ts b/solana/solana-normalization/src/data.ts
@@ -46,6 +46,7 @@ export interface AddressTableLookup {
 
 export interface Instruction {
     transactionIndex: number
+    innerInstructionIndex: number
     instructionAddress: number[]
     programId: Base58Bytes
     accounts: Base58Bytes[]

diff --git a/solana/solana-normalization/src/mapping.ts b/solana/solana-normalization/src/mapping.ts
@@ -138,6 +138,7 @@ const PROGRAMS_MISSING_INVOKE_LOG = new Set([
 
 class InstructionParser {
     private pos = 0
+    private innerPos = -1
     private messages: Message[]
     private messagePos = 0
     private messagesTruncated = false
@@ -396,7 +397,14 @@ class InstructionParser {
             address[stackHeight - 1] = 0
         }
 
+        if (stackHeight === 1) {
+            this.innerPos = -1
+        } else {
+            this.innerPos++
+        }
+
         let i: Instruction = {
+            innerInstructionIndex: this.innerPos,
             transactionIndex: this.tx.transactionIndex,
             instructionAddress: address,
             programId: this.getAccount(src.programIdIndex),

diff --git a/solana/solana-stream/src/archive/schema.ts b/solana/solana-stream/src/archive/schema.ts
@@ -60,6 +60,7 @@ export const getDataSchema = weakMemo((fields: FieldSelection) => {
         transactionIndex: NAT,
         instructionAddress: array(NAT),
         ...project(fields.instruction, {
+            instructionIndex: NAT,
             programId: B58,
             accounts: array(B58),
             data: B58,