@exodus/solana-api 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -15,18 +15,19 @@
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
     "@exodus/asset-lib": "^3.7.1",
-    "@exodus/assets": "^8.0.78",
-    "@exodus/assets-base": "^8.0.157",
+    "@exodus/assets": "^8.0.85",
+    "@exodus/basic-utils": "^1.3.0",
     "@exodus/fetch": "^1.2.0",
     "@exodus/models": "^8.10.4",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.6.1",
+    "@exodus/solana-lib": "^1.6.3",
+    "@exodus/solana-meta": "^1.0.2",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
   },
-  "gitHead": "145ae526c51aefa39ffda8c63c70b30724aa9881"
+  "gitHead": "a7b27e4f299057c16dda446f006fa61a945a6cbf"
 }

package/src/account-state.js

@@ -1,9 +1,6 @@
-import assets from '@exodus/assets'
+import { asset, tokens } from '@exodus/solana-meta'
 import { AccountState } from '@exodus/models'
 
-const asset = assets.solana
-const solTokens = Object.values(assets).filter((asset) => asset.assetType === 'SOLANA_TOKEN')
-
 export class SolanaAccountState extends AccountState {
   static defaults = {
     cursor: '',
@@ -24,7 +21,7 @@ export class SolanaAccountState extends AccountState {
       accounts: {}, // stake accounts
     },
   }
-  static _tokens = [asset, ...solTokens] // deprecated - will be removed
+  static _tokens = [asset, ...tokens] // deprecated - will be removed
 
   static _postParse(data) {
     return { ...data, tokenBalances: {} }

package/src/api.js

@@ -15,7 +15,6 @@ import {
   SolanaWeb3Message,
   buildRawTransaction,
 } from '@exodus/solana-lib'
-import assets from '@exodus/assets'
 import assert from 'assert'
 import lodash from 'lodash'
 import urljoin from 'url-join'
@@ -30,7 +29,7 @@ const WS_ENDPOINT = 'wss://solana.a.exodus.io/ws'
 
 // Tokens + SOL api support
 export class Api {
-  constructor(rpcUrl, wsUrl) {
+  constructor({ rpcUrl, wsUrl, assets }) {
     this.setServer(rpcUrl)
     this.setWsEndpoint(wsUrl)
     this.setTokens(assets)
@@ -603,7 +602,7 @@ export class Api {
       const { pubkey, account } = entry
 
       const mint = lodash.get(account, 'data.parsed.info.mint')
-      const token = this.tokens[mint] || {
+      const token = this.getTokenByAddress(mint) || {
         name: 'unknown',
         ticker: 'UNKNOWN',
       }

package/src/index.js

@@ -1,9 +1,18 @@
+import { keyBy } from '@exodus/basic-utils'
+import { connectAssets } from '@exodus/assets'
+import assetsList from '@exodus/solana-meta'
+
 import { Api } from './api'
+
 export * from './api'
 export * from './tx-log'
 export * from './account-state'
 
+// These are not the same asset objects as the wallet creates, so they should never be returned to the wallet.
+// Initially this may be violated by the Solana code until the first monitor tick updates assets with setTokens()
+const assets = connectAssets(keyBy(assetsList, (asset) => asset.name))
+
 // 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()
+const serverApi = new Api({ assets })
 export default serverApi