@exodus/solana-lib 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -29,5 +29,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "6ffded97383f994c21ccaebb2703c32d48aa70c5"
+  "gitHead": "cafda9efb741487bae7db4c3187c8b69d3553151"
 }

package/src/tx/decode-tx-instructions.js

@@ -1,5 +1,7 @@
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@exodus/solana-spl-token'
 import { MARKETS, TokenInstructions } from '@project-serum/serum'
+import * as BufferLayout from '@exodus/buffer-layout'
+
 import {
   Message,
   SystemInstruction,
@@ -18,6 +20,13 @@ type DecodedInstruction = {
   },
 }
 
+const INSTRUCTION_LAYOUT = BufferLayout.union(BufferLayout.u8('instruction'))
+INSTRUCTION_LAYOUT.addVariant(
+  12,
+  BufferLayout.struct([BufferLayout.nu64('amount'), BufferLayout.u8('decimals')]),
+  'transferChecked'
+)
+
 export const INSTRUCTION_TITLE_BY_TYPE = {
   approve: 'Approve',
   cancelOrder: 'Cancel Order',
@@ -43,6 +52,7 @@ export const INSTRUCTION_TITLE_BY_TYPE = {
   systemAuthorizeNonceAccount: 'Authorize Nonce Account',
   systemWithdrawNonceAccount: 'Withdraw Nonce Account',
   transfer: 'Transfer Token',
+  transferChecked: 'Transfer Token Checked',
   unknown: 'Unknown',
 }
 
@@ -56,7 +66,7 @@ class InstructionKeys {
   }
 }
 
-function getTransactionInstructionsFromMessage(message: Message): TransactionInstruction[] {
+export function getTransactionInstructionsFromMessage(message: Message): TransactionInstruction[] {
   const { accountKeys, instructions } = message
   return instructions.map((instruction) => {
     const { accounts, data, programIdIndex } = instruction
@@ -110,10 +120,17 @@ function decodeTokenInstructionData(data: Buffer) {
     }
   }
 
+  // Type TransferChecked
+  if (data.length > 1 && data[0] === 12) {
+    return INSTRUCTION_LAYOUT.decode(data)
+  }
+
   return TokenInstructions.decodeTokenInstructionData(data)
 }
 
-function decodeTokenProgramInstruction(instruction: TransactionInstruction): DecodedInstruction {
+export function decodeTokenProgramInstruction(
+  instruction: TransactionInstruction
+): DecodedInstruction {
   const decodedInstructionData = decodeTokenInstructionData(instruction.data)
 
   if (!decodedInstructionData || Object.keys(decodedInstructionData).length > 1) {
@@ -202,10 +219,18 @@ export function decodeTransactionInstructions(
   transactionMessages: Message[]
 ): DecodedInstruction[] {
   const transactionInstructions = transactionMessages.reduce(
-    (prevInstructions: TransactionInstruction[], message: Message) => [
-      ...prevInstructions,
-      ...getTransactionInstructionsFromMessage(message),
-    ],
+    (prevInstructions: TransactionInstruction[], message: Message) => {
+      let instructions
+      const isTransactionMessage =
+        message.instructions.length > 0 && message.instructions[0].programId !== undefined
+      if (isTransactionMessage) {
+        instructions = message.instructions
+      } else {
+        instructions = getTransactionInstructionsFromMessage(message)
+      }
+
+      return [...prevInstructions, ...instructions]
+    },
     []
   )
   return transactionInstructions.map((instruction) => {