@exodus/solana-api 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
-    "@exodus/solana-lib": "^1.3.0",
+    "@exodus/solana-lib": "^1.3.1",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "158aae6b4aeb871b1566b2500456a5f475ef9d5f"
+  "gitHead": "49f3f78ac41acaf405e2849cccb2f9ecd0060424"
 }

package/src/index.js

@@ -5,13 +5,13 @@ import {
   deserializeMetaplexMetadata,
   getTransactionSimulationParams,
   filterAccountsByOwner,
-  tokens,
   SYSTEM_PROGRAM_ID,
   STAKE_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
   SOL_DECIMAL,
   computeBalance,
 } from '@exodus/solana-lib'
+import assets from '@exodus/assets'
 import assert from 'assert'
 import lodash from 'lodash'
 import urljoin from 'url-join'
@@ -25,6 +25,7 @@ const RPC_URL = 'https://solana.a.exodus.io' // https://vip-api.mainnet-beta.sol
 class Api {
   constructor(rpcUrl) {
     this.setServer(rpcUrl)
+    this.setTokens(assets)
   }
 
   setServer(rpcUrl) {
@@ -32,12 +33,21 @@ class Api {
     this.api = createApi(this.rpcUrl)
   }
 
+  setTokens(assets = {}) {
+    const solTokens = lodash.pickBy(assets, (asset) => asset.assetType === 'SOLANA_TOKEN')
+    this.tokens = lodash.mapKeys(solTokens, (v) => v.mintAddress )
+  }
+
   request(path, contentType = 'application/json'): Wretcher {
     return wretch(urljoin(this.rpcUrl, path)).headers({
       'Content-type': contentType,
     })
   }
 
+  isTokenSupported(mint: string) {
+    return !!this.tokens[mint]
+  }
+
   async getEpochInfo(): number {
     const { epoch } = await this.api.post({
       method: 'getEpochInfo',
@@ -140,7 +150,7 @@ class Api {
         if (txDetail === null) return
 
         const timestamp = txDetail.blockTime * 1000
-        const parsedTx = Api.parseTransaction(address, txDetail, tokenAccountsByOwner)
+        const parsedTx = this.parseTransaction(address, txDetail, tokenAccountsByOwner)
         if (!parsedTx.from) return // cannot parse it
 
         transactions.push({
@@ -161,16 +171,7 @@ class Api {
     return { transactions, newCursor }
   }
 
-  parseTransaction(...args) {
-    // alias
-    return Api.parseTransaction(...args)
-  }
-
-  static parseTransaction(
-    ownerAddress: string,
-    txDetails: Object,
-    tokenAccountsByOwner: ?Array
-  ): Object {
+  parseTransaction(ownerAddress: string, txDetails: Object, tokenAccountsByOwner: ?Array): Object {
     const { fee, preTokenBalances, postTokenBalances } = txDetails.meta
     let { instructions, accountKeys } = txDetails.transaction.message
     instructions = instructions
@@ -305,10 +306,14 @@ class Api {
 
         // group by owner and supported token
         const preBalances = preTokenBalances.filter((t) => {
-          return accountIndexes[t.accountIndex].owner === ownerAddress && isTokenSupported(t.mint)
+          return (
+            accountIndexes[t.accountIndex].owner === ownerAddress && this.isTokenSupported(t.mint)
+          )
         })
         const postBalances = postTokenBalances.filter((t) => {
-          return accountIndexes[t.accountIndex].owner === ownerAddress && isTokenSupported(t.mint)
+          return (
+            accountIndexes[t.accountIndex].owner === ownerAddress && this.isTokenSupported(t.mint)
+          )
         })
 
         if (preBalances.length && preBalances.length === postBalances.length) {
@@ -319,8 +324,8 @@ class Api {
           const isSending = Math.sign(amount) <= 0
 
           const mint = lodash.get(postBalances, '[0].mint', '')
-          const { tokenName, ticker } = tokens.find(({ mintAddress }) => mintAddress === mint) || {
-            tokenName: 'unknown',
+          const { name, ticker } = this.tokens[mint] || {
+            name: 'unknown',
             ticker: 'UNKNOWN',
           }
 
@@ -328,7 +333,7 @@ class Api {
             owner: isSending ? ownerAddress : TOKEN_PROGRAM_ID.toBase58(),
             token: {
               tokenAccountAddress: '', // token account is closed after the swap
-              tokenName,
+              tokenName: name,
               ticker,
             },
             from: isSending ? ownerAddress : TOKEN_PROGRAM_ID.toBase58(),
@@ -365,15 +370,15 @@ class Api {
       const { pubkey, account } = entry
 
       const mint = lodash.get(account, 'data.parsed.info.mint')
-      const token = tokens.find(({ mintAddress }) => mintAddress === mint) || {
-        tokenName: 'unknown',
+      const token = this.tokens[mint] || {
+        name: 'unknown',
         ticker: 'UNKNOWN',
       }
       const balance = lodash.get(account, 'data.parsed.info.tokenAmount.amount', '0')
       tokenAccounts.push({
         tokenAccountAddress: pubkey,
         owner: address,
-        tokenName: token.tokenName,
+        tokenName: token.name,
         ticker: token.ticker,
         balance,
         mintAddress: mint,
@@ -663,8 +668,4 @@ class Api {
   }
 }
 
-function isTokenSupported(mint: string) {
-  return !!tokens.find(({ mintAddress }) => mintAddress === mint)
-}
-
 export default new Api()