@exodus/solana-api 2.0.5 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -19,7 +19,8 @@
     "@exodus/assets-base": "^8.0.139",
     "@exodus/models": "^8.7.2",
     "@exodus/nfts-core": "^0.5.0",
-    "@exodus/solana-lib": "^1.3.10",
+    "@exodus/solana-lib": "^1.3.11",
+    "bn.js": "^4.11.0",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
@@ -27,5 +28,5 @@
   "devDependencies": {
     "node-fetch": "~2.6.0"
   },
-  "gitHead": "c15c374eaf769d76288023a8573b3b120d8922b0"
+  "gitHead": "6c666e0fc0759e60553490c570dd94181dddfd37"
 }

package/src/api.js

@@ -1,4 +1,5 @@
 // @flow
+import BN from 'bn.js'
 import createApi from '@exodus/asset-json-rpc'
 import {
   getMetadataAccount,
@@ -228,6 +229,58 @@ export class Api {
       }
     }
 
+    const getInnerTxsFromBalanceChanges = () => {
+      const ownPreTokenBalances = preTokenBalances.filter(
+        (balance) => balance.owner === ownerAddress
+      )
+      const ownPostTokenBalances = postTokenBalances.filter(
+        (balance) => balance.owner === ownerAddress
+      )
+
+      return ownPostTokenBalances
+        .map((postBalance) => {
+          const tokenAccount = tokenAccountsByOwner.find(
+            (tokenAccount) => tokenAccount.mintAddress === postBalance.mint
+          )
+
+          const preBalance = ownPreTokenBalances.find(
+            (balance) => balance.accountIndex === postBalance.accountIndex
+          )
+
+          const preAmount = new BN(lodash.get(preBalance, 'uiTokenAmount.amount', '0'), 10)
+          const postAmount = new BN(lodash.get(postBalance, 'uiTokenAmount.amount', '0'), 10)
+
+          const amount = postAmount.sub(preAmount)
+
+          if (!tokenAccount || amount.isZero()) return null
+
+          // This is not perfect as there could be multiple same-token transfers in single
+          // transaction, but our wallet only supports one transaction with single txId
+          // so we are picking first that matches (correct token + type - send or receive)
+          const { from, to, owner } = innerInstructions.find((inner) => {
+            const targetOwner = amount.isNeg() ? ownerAddress : null
+            return (
+              inner.token.mintAddress === tokenAccount.mintAddress && targetOwner === inner.owner
+            )
+          })
+
+          return {
+            id: txDetails.transaction.signatures[0],
+            slot: txDetails.slot,
+            owner,
+            from,
+            to,
+            amount: amount.abs().toNumber(),
+            fee: 0,
+            token: tokenAccount,
+            data: {
+              inner: true,
+            },
+          }
+        })
+        .filter((ix) => !!ix)
+    }
+
     instructions = instructions
       .filter((ix) => ix.parsed) // only known instructions
       .map((ix) => ({
@@ -412,7 +465,7 @@ export class Api {
             // 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 }))
+            tx.dexTxs = getInnerTxsFromBalanceChanges()
           } else {
             if (solanaTx) {
               // the base tx will be the one that moved solana.
@@ -776,6 +829,7 @@ export class Api {
           collectionId: null,
           collectionName: null,
           collectionTitle: null,
+          title: null,
         }
 
         // Only perform an NFT check (getSupply) if decimal is zero
@@ -785,11 +839,13 @@ export class Api {
               id: collectionId,
               collectionName,
               collectionTitle,
+              title,
             } = await magicEden.api.getNFTByMintAddress(account.mint)
             nft = {
               collectionId,
               collectionTitle,
               collectionName,
+              title,
             }
             tokenMetaPlex.name = tokenMetaPlex.name || collectionTitle
             tokenMetaPlex.symbol = tokenMetaPlex.symbol || collectionName
@@ -859,5 +915,3 @@ export class Api {
     return this.resolveSimulationSideEffects(solAccounts, tokenAccounts)
   }
 }
-
-export default new Api()

package/src/index.js

@@ -1,3 +1,9 @@
+import { Api } from './api'
 export * from './api'
 export * from './tx-log'
 export * from './account-state'
+
+// At some point we would like to exclude this export. Default export should be the whole asset "plugin" ready to be injected.
+// Clients should not call an specific server api directly.
+const serverApi = new Api()
+export default serverApi

package/src/tx-log/solana-monitor.js

@@ -94,6 +94,7 @@ export class SolanaMonitor extends BaseMonitor {
         data: {
           staking: tx.staking || null,
           unparsed: !!tx.unparsed,
+          swapTx: !!(tx.data && tx.data.inner),
         },
       }