@exodus/solana-api 1.4.7 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "7d0c7a92fe8f9d108f88584b6578edf7a66adfd4"
+  "gitHead": "90293962539f80a74060b3010cbfa4ab4570baa7"
 }

package/src/index.js

@@ -120,7 +120,10 @@ class Api {
   /**
    * Get transactions from an address
    */
-  async getTransactions(address: string, { cursor, before, limit } = {}): any {
+  async getTransactions(
+    address: string,
+    { cursor, before, limit, includeUnparsed = false } = {}
+  ): any {
     let transactions = []
     // cursor is a txHash
 
@@ -151,8 +154,10 @@ class Api {
         if (txDetail === null) return
 
         const timestamp = txDetail.blockTime * 1000
-        const parsedTx = this.parseTransaction(address, txDetail, tokenAccountsByOwner)
-        if (!parsedTx.from) return // cannot parse it
+        const parsedTx = this.parseTransaction(address, txDetail, tokenAccountsByOwner, {
+          includeUnparsed,
+        })
+        if (!parsedTx.from && !includeUnparsed) return // cannot parse it
 
         // split dexTx in separate txs
         if (parsedTx.dexTxs) {
@@ -184,12 +189,39 @@ class Api {
     return { transactions, newCursor }
   }
 
-  parseTransaction(ownerAddress: string, txDetails: Object, tokenAccountsByOwner: ?Array): Object {
-    let { fee, preTokenBalances, postTokenBalances, innerInstructions } = txDetails.meta
+  parseTransaction(
+    ownerAddress: string,
+    txDetails: Object,
+    tokenAccountsByOwner: ?Array,
+    { includeUnparsed = false } = {}
+  ): Object {
+    let {
+      fee,
+      preBalances,
+      postBalances,
+      preTokenBalances,
+      postTokenBalances,
+      innerInstructions,
+    } = txDetails.meta
+    preBalances = preBalances || []
+    postBalances = postBalances || []
     preTokenBalances = preTokenBalances || []
     postTokenBalances = postTokenBalances || []
     innerInstructions = innerInstructions || []
+
     let { instructions, accountKeys } = txDetails.transaction.message
+
+    const getUnparsedTx = () => {
+      const ownerIndex = accountKeys.findIndex((accountKey) => accountKey.pubkey === ownerAddress)
+      const feePaid = ownerIndex === 0 ? fee : 0
+
+      return {
+        unparsed: true,
+        amount: postBalances[ownerIndex] - preBalances[ownerIndex] + feePaid,
+        fee: feePaid,
+      }
+    }
+
     instructions = instructions
       .filter((ix) => ix.parsed) // only known instructions
       .map((ix) => ({
@@ -368,30 +400,45 @@ class Api {
         if (preBalances.length || postBalances.length) {
           tx = {}
 
-          if (solanaTx) {
-            // the base tx will be the one that moved solana.
-            tx = {
-              owner: solanaTx.source,
-              from: solanaTx.source,
-              to: solanaTx.destination,
-              amount: solanaTx.lamports, // number
-              fee: ownerAddress === solanaTx.source ? fee : 0,
+          if (includeUnparsed && innerInstructions.length) {
+            // when using includeUnparsed for DEX tx we want to keep SOL tx as "unparsed"
+            // 1. we want to treat all SOL dex transactions as "Contract transaction", not "Sent SOL"
+            // 2. default behavior is not perfect. For example it doesn't see SOL-side tx in
+            //    SOL->SPL swaps on Raydium and Orca.
+            tx = getUnparsedTx(tx)
+            tx.dexTxs = innerInstructions.map((i) => ({ ...i, fee: 0 }))
+          } else {
+            if (solanaTx) {
+              // the base tx will be the one that moved solana.
+              tx = {
+                owner: solanaTx.source,
+                from: solanaTx.source,
+                to: solanaTx.destination,
+                amount: solanaTx.lamports, // number
+                fee: ownerAddress === solanaTx.source ? fee : 0,
+              }
             }
-          }
 
-          // If it has inner instructions then it's a DEX tx that moved SPL -> SPL
-          if (innerInstructions.length) {
-            tx.dexTxs = innerInstructions
-            // if tx involves only SPL swaps. Expand DEX ix (first element as tx base and the other kept there)
-            if (!tx.from && !solanaTx) {
-              tx = tx.dexTxs[0]
-              tx.dexTxs = innerInstructions.slice(1)
+            // If it has inner instructions then it's a DEX tx that moved SPL -> SPL
+            if (innerInstructions.length) {
+              tx.dexTxs = innerInstructions
+              // if tx involves only SPL swaps. Expand DEX ix (first element as tx base and the other kept there)
+              if (!tx.from && !solanaTx) {
+                tx = tx.dexTxs[0]
+                tx.dexTxs = innerInstructions.slice(1)
+              }
             }
           }
         }
       }
     }
 
+    const unparsed = Object.keys(tx).length === 0
+
+    if (unparsed && includeUnparsed) {
+      tx = getUnparsedTx(tx)
+    }
+
     // How tokens tx are parsed:
     // 0. compute incoming or outgoing tx: it's outgoing if spl-token:transfer has source/destination included in tokenAccountsByOwner
     // 1. if it's a sent tx: sum all instructions amount (spl-token:transfer)