From 11985bdcf906b066657b76d5a8416103a5a6c2d4 Mon Sep 17 00:00:00 2001
From: Halil Beycan <50718965+BeycanDeveloper@users.noreply.github.com>
Date: Sat, 8 Jun 2024 09:15:24 +0800
Subject: [PATCH 1/2] first check token programs

---
 packages/networks/solana/src/models/Transaction.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/networks/solana/src/models/Transaction.ts b/packages/networks/solana/src/models/Transaction.ts
index 3bd4a07..9a0438f 100644
--- a/packages/networks/solana/src/models/Transaction.ts
+++ b/packages/networks/solana/src/models/Transaction.ts
@@ -123,13 +123,7 @@ export class Transaction implements TransactionInterface<ParsedTransactionWithMe
 
         return await new Promise((resolve) => {
             instructions.forEach((instruction) => {
-                if (
-                    instruction.programId.equals(SystemProgram.programId) &&
-                    (instruction.parsed.type === 'createAccount' ||
-                        instruction.parsed.type === 'transfer')
-                ) {
-                    resolve(TransactionTypeEnum.COIN)
-                } else if (instruction.programId.equals(TOKEN_2022_PROGRAM_ID)) {
+                if (instruction.programId.equals(TOKEN_2022_PROGRAM_ID)) {
                     resolve(TransactionTypeEnum.TOKEN)
                 } else if (instruction.programId.equals(TOKEN_PROGRAM_ID)) {
                     const postBalance = data.meta?.postTokenBalances?.find(
@@ -143,6 +137,12 @@ export class Transaction implements TransactionInterface<ParsedTransactionWithMe
                     } else {
                         resolve(TransactionTypeEnum.TOKEN)
                     }
+                } else if (
+                    instruction.programId.equals(SystemProgram.programId) &&
+                    (instruction.parsed.type === 'createAccount' ||
+                        instruction.parsed.type === 'transfer')
+                ) {
+                    resolve(TransactionTypeEnum.COIN)
                 } else {
                     resolve(TransactionTypeEnum.CONTRACT)
                 }

From cb409c848b3facb85b1610059b8a61294f07ed79 Mon Sep 17 00:00:00 2001
From: Halil Beycan <50718965+BeycanDeveloper@users.noreply.github.com>
Date: Tue, 11 Jun 2024 18:06:28 +0800
Subject: [PATCH 2/2] fixed

---
 packages/networks/solana/package.json              | 2 +-
 packages/networks/solana/src/models/Transaction.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/networks/solana/package.json b/packages/networks/solana/package.json
index af8d997..9b2fab3 100644
--- a/packages/networks/solana/package.json
+++ b/packages/networks/solana/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@multiplechain/solana",
-    "version": "0.4.4",
+    "version": "0.4.5",
     "type": "module",
     "main": "dist/index.cjs",
     "module": "dist/index.es.js",
diff --git a/packages/networks/solana/src/models/Transaction.ts b/packages/networks/solana/src/models/Transaction.ts
index 9a0438f..cbe8fac 100644
--- a/packages/networks/solana/src/models/Transaction.ts
+++ b/packages/networks/solana/src/models/Transaction.ts
@@ -122,7 +122,7 @@ export class Transaction implements TransactionInterface<ParsedTransactionWithMe
         const instructions = data.transaction.message.instructions as ParsedInstruction[]
 
         return await new Promise((resolve) => {
-            instructions.forEach((instruction) => {
+            instructions.forEach((instruction, index) => {
                 if (instruction.programId.equals(TOKEN_2022_PROGRAM_ID)) {
                     resolve(TransactionTypeEnum.TOKEN)
                 } else if (instruction.programId.equals(TOKEN_PROGRAM_ID)) {
@@ -143,7 +143,9 @@ export class Transaction implements TransactionInterface<ParsedTransactionWithMe
                         instruction.parsed.type === 'transfer')
                 ) {
                     resolve(TransactionTypeEnum.COIN)
-                } else {
+                }
+
+                if (index === instructions.length - 1) {
                     resolve(TransactionTypeEnum.CONTRACT)
                 }
             })