@exodus/solana-api 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -14,7 +14,8 @@
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
-    "@exodus/solana-lib": "^1.3.6",
+    "@exodus/nfts-core": "^0.5.0",
+    "@exodus/solana-lib": "^1.3.8",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
@@ -22,5 +23,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "90859f94717cf2b928cb93b030ecfba523b8179e"
+  "gitHead": "a0fdfde1511f31373bc94c8cd12c8bee22757876"
 }

package/src/index.js

@@ -10,6 +10,7 @@ import {
   TOKEN_PROGRAM_ID,
   SOL_DECIMAL,
   computeBalance,
+  SolanaWeb3Message,
   buildRawTransaction,
 } from '@exodus/solana-lib'
 import assets from '@exodus/assets'
@@ -17,6 +18,7 @@ import assert from 'assert'
 import lodash from 'lodash'
 import urljoin from 'url-join'
 import wretch, { Wretcher } from 'wretch'
+import { magicEden } from '@exodus/nfts-core'
 
 // Doc: https://docs.solana.com/apps/jsonrpc-api
 
@@ -458,7 +460,9 @@ class Api {
   }
 
   async getSupply(mintAddress: string): string {
-    const { value: { amount } } = await this.api.post({
+    const {
+      value: { amount },
+    } = await this.api.post({
       method: 'getTokenSupply',
       params: [mintAddress],
     })
@@ -741,37 +745,84 @@ class Api {
         type: 'SOL',
       }
     })
-    const _getTokenBalance = async (address) => {
-      try {
-        return await this.getTokenBalance(address)
-      } catch (error) {
-        if (error.message && error.message.includes('could not find account')) {
-          return '0'
+
+    const _wrapAndHandleAccountNotFound = (fn, defaultValue) => {
+      return async (...params) => {
+        try {
+          return await fn.apply(this, params)
+        } catch (error) {
+          if (error.message && error.message.includes('could not find account')) {
+            return defaultValue
+          }
+          throw error
         }
-        throw error
       }
     }
 
+    const _getTokenBalance = _wrapAndHandleAccountNotFound(this.getTokenBalance, '0')
+    const _getDecimals = _wrapAndHandleAccountNotFound(this.getDecimals, 0)
+    const _getSupply = _wrapAndHandleAccountNotFound(this.getSupply, '0')
+
     const resolveTokens = tokenAccounts.map(async (account) => {
-      const [_tokenMetaPlex, currentAmount, decimal] = await Promise.all([
-        this.getMetaplexMetadata(account.mint),
-        _getTokenBalance(account.address),
-        this.getDecimals(account.mint),
-      ])
+      try {
+        const [_tokenMetaPlex, currentAmount, decimal] = await Promise.all([
+          this.getMetaplexMetadata(account.mint),
+          _getTokenBalance(account.address),
+          _getDecimals(account.mint),
+        ])
+
+        const tokenMetaPlex = _tokenMetaPlex || { name: null, symbol: null }
+        let nft = {
+          collectionId: null,
+          collectionName: null,
+          collectionTitle: null,
+        }
 
-      const balance = computeBalance(account.amount, currentAmount)
-      const tokenMetaPlex = _tokenMetaPlex || { name: null, symbol: null }
-      return {
-        name: tokenMetaPlex.name,
-        symbol: tokenMetaPlex.symbol,
-        balance,
-        decimal,
-        type: 'TOKEN',
+        // Only perform an NFT check (getSupply) if decimal is zero
+        if (decimal === 0 && (await _getSupply(account.mint)) === '1') {
+          try {
+            const {
+              id: collectionId,
+              collectionName,
+              collectionTitle,
+            } = await magicEden.api.getNFTByMintAddress(account.mint)
+            nft = {
+              collectionId,
+              collectionTitle,
+              collectionName,
+            }
+            tokenMetaPlex.name = tokenMetaPlex.name || collectionTitle
+            tokenMetaPlex.symbol = tokenMetaPlex.symbol || collectionName
+          } catch (error) {
+            console.warn(error)
+          }
+        }
+
+        const balance = computeBalance(account.amount, currentAmount)
+        return {
+          balance,
+          decimal,
+          nft,
+          address: account.address,
+          mint: account.mint,
+          name: tokenMetaPlex.name,
+          symbol: tokenMetaPlex.symbol,
+          type: 'TOKEN',
+        }
+      } catch (error) {
+        console.warn(error)
+        return {
+          balance: null,
+        }
       }
     })
 
     const accounts = await Promise.all([...resolveSols, ...resolveTokens])
     accounts.forEach((account) => {
+      if (account.balance === null) {
+        return
+      }
+
       if (account.balance > 0) {
         willReceive.push(account)
       } else {
@@ -788,11 +839,15 @@ class Api {
   /**
    * Simulate transaction and return side effects
    */
-  simulateAndRetrieveSideEffects = async (transactionMessage, publicKey: string) => {
+  simulateAndRetrieveSideEffects = async (
+    transactionMessage: SolanaWeb3Message,
+    publicKey: string
+  ) => {
     const { config, accountAddresses } = getTransactionSimulationParams(transactionMessage)
+    const signatures = new Array(transactionMessage.header.numRequiredSignatures || 1).fill(null)
     const encodedTransaction = buildRawTransaction(
       transactionMessage.serialize(),
-      transactionMessage.header.numRequiredSignatures || 1
+      signatures
     ).toString('base64')
     const futureAccountsState = await this.simulateTransaction(encodedTransaction, config)
     const { solAccounts, tokenAccounts } = filterAccountsByOwner(