solana: add instructionIndex to instruction

subsquid · Oct 29, 2024 · e83c294 · e83c294
1 parent df25b72
commit e83c294
Show file tree

Hide file tree

Showing 5 changed files with 23 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 instructionIndex 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.instructionIndex 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
+    instructionIndex: number
     instructionAddress: number[]
     programId: Base58Bytes
     accounts: Base58Bytes[]

diff --git a/solana/solana-normalization/src/mapping.ts b/solana/solana-normalization/src/mapping.ts
@@ -397,6 +397,7 @@ class InstructionParser {
         }
 
         let i: Instruction = {
+            instructionIndex: this.instructions.length,
             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,