@exodus/solana-api 1.2.17 → 1.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "6e6162c94eefd164c7dd63d039be60f790b37ced"
+  "gitHead": "3c07cdab72a42b26fcb199418f7e61f71bf3d91f"
 }

package/src/index.js

@@ -171,7 +171,10 @@ class Api {
       }))
 
     // program:type tells us if it's a SOL or Token transfer
-    const solanaTx = lodash.find(instructions, { program: 'system', type: 'transfer' }) // get SOL transfer
+    const solanaTx = lodash.find(instructions, (ix) => {
+      if (![ix.source, ix.destination].includes(ownerAddress)) return false
+      return ix.program === 'system' && ix.type === 'transfer'
+    }) // get SOL transfer
     const stakeTx = lodash.find(instructions, { program: 'system', type: 'createAccountWithSeed' })
     const stakeWithdraw = lodash.find(instructions, { program: 'stake', type: 'withdraw' })
     const stakeUndelegate = lodash.find(instructions, { program: 'stake', type: 'deactivate' })
@@ -242,7 +245,9 @@ class Api {
         'tokenAccountsByOwner is required when parsing token tx'
       )
       let tokenTxs = lodash
-        .filter(instructions, { program: 'spl-token', type: 'transfer' }) // get Token transfer: could have more than 1 instructions
+        .filter(instructions, ({ program, type }) => {
+          return program === 'spl-token' && ['transfer', 'transferChecked'].includes(type)
+        }) // get Token transfer: could have more than 1 instructions
         .map((ix) => {
           // add token details based on source/destination address
           let tokenAccount = lodash.find(tokenAccountsByOwner, { tokenAccountAddress: ix.source })
@@ -261,7 +266,7 @@ class Api {
             token: tokenAccount,
             from: ix.source,
             to: ix.destination,
-            amount: Number(ix.amount), // token
+            amount: Number(ix.amount || lodash.get(ix, 'tokenAmount.amount', 0)), // supporting both types: transfer and transferChecked
             fee: isSending ? fee : 0, // in lamports
           }
         })