@exodus/solana-api 1.2.16 → 1.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "882b8a97ef05cbd0fbd7da0b2ce457e0a0ae7e35"
+  "gitHead": "d65135b4c452dda913c1673a4465b0438f2d51ec"
 }

package/src/index.js

@@ -198,12 +198,15 @@ class Api {
         staking: {
           method: 'createAccountWithSeed',
           seed: stakeTx.seed,
-          stakeAddress: stakeTx.newAccount,
+          stakeAddresses: [stakeTx.newAccount],
           stake: stakeTx.lamports,
         },
       }
     } else if (stakeWithdraw) {
-      // TODO: lodash.find above returns 1 occurence, there could be multiple withdraw instructions in the same tx.
+      const stakeAccounts = lodash.map(
+        lodash.filter(instructions, { program: 'stake', type: 'withdraw' }),
+        'stakeAccount'
+      )
       tx = {
         owner: stakeWithdraw.withdrawAuthority,
         from: stakeWithdraw.stakeAccount,
@@ -212,20 +215,24 @@ class Api {
         fee,
         staking: {
           method: 'withdraw',
-          stakeAddress: stakeWithdraw.stakeAccount,
+          stakeAddresses: stakeAccounts,
           stake: stakeWithdraw.lamports,
         },
       }
     } else if (stakeUndelegate) {
+      const stakeAccounts = lodash.map(
+        lodash.filter(instructions, { program: 'stake', type: 'deactivate' }),
+        'stakeAccount'
+      )
       tx = {
         owner: stakeUndelegate.stakeAuthority,
         from: stakeUndelegate.stakeAuthority,
-        to: stakeUndelegate.stakeAccount,
+        to: stakeUndelegate.stakeAccount, // obsolete
         amount: 0,
         fee,
         staking: {
           method: 'undelegate',
-          stakeAddress: stakeUndelegate.stakeAccount,
+          stakeAddresses: stakeAccounts,
         },
       }
     } else {
@@ -235,7 +242,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 })
@@ -254,7 +263,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
           }
         })