solana: add instructionIndex to instruction

tmcgroul · tmcgroul · commit e83c294f9e22 · 2024-10-29T23:53:52.000+07:00
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,

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,7 @@ class InstructionParser {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`let i: Instruction = {`
	`400`	`+ instructionIndex: this.instructions.length,`
`400`	`401`	`transactionIndex: this.tx.transactionIndex,`
`401`	`402`	`instructionAddress: address,`
`402`	`403`	`programId: this.getAccount(src.programIdIndex),`