@exodus/solana-api 2.5.34 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.34",
+  "version": "3.0.0",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -29,7 +29,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.7.5",
+    "@exodus/solana-lib": "^2.0.0",
     "@exodus/solana-meta": "^1.0.7",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "9da341db0c5c18d52690699d241675c1f7392d71"
+  "gitHead": "44827e13fbd513ee9a0d7cec603d20fe89d0d80a"
 }

package/src/account-state.js

@@ -1,4 +1,3 @@
-import assetsList, { asset, tokens } from '@exodus/solana-meta'
 import { AccountState } from '@exodus/models'
 import { assetsListToObject } from '@exodus/assets'
 import { isString, reduce } from 'lodash'
@@ -7,41 +6,46 @@ import { isNumberUnit } from '@exodus/currency'
 const parseBalance = (balance, asset) =>
   !isNumberUnit(balance) && isString(balance) ? asset.currency.parse(balance) : balance
 
-export class SolanaAccountState extends AccountState {
-  static defaults = {
-    cursor: '',
-    balance: asset.currency.ZERO,
-    tokenBalances: {},
-    mem: {
-      loaded: false,
-      staking: {
-        // remote-config data
-        enabled: true,
-        pool: null,
+export const createAccountState = ({ assetList }) => {
+  const asset = assetList.find((asset) => asset.baseAssetName === asset.name)
+  const tokens = assetList.filter((asset) => asset.baseAssetName !== asset.name)
+
+  return class SolanaAccountState extends AccountState {
+    static defaults = {
+      cursor: '',
+      balance: asset.currency.ZERO,
+      tokenBalances: {},
+      mem: {
+        loaded: false,
+        staking: {
+          // remote-config data
+          enabled: true,
+          pool: null,
+        },
+        isDelegating: false,
+        locked: asset.currency.defaultUnit(0),
+        withdrawable: asset.currency.defaultUnit(0),
+        pending: asset.currency.defaultUnit(0),
+        earned: asset.currency.defaultUnit(0),
+        accounts: {}, // stake accounts
       },
-      isDelegating: false,
-      locked: asset.currency.defaultUnit(0),
-      withdrawable: asset.currency.defaultUnit(0),
-      pending: asset.currency.defaultUnit(0),
-      earned: asset.currency.defaultUnit(0),
-      accounts: {}, // stake accounts
-    },
-  }
+    }
 
-  static _tokens = [asset, ...tokens] // deprecated - will be removed
+    static _tokens = [asset, ...tokens] // deprecated - will be removed
 
-  static _postParse(data) {
-    const assets = assetsListToObject(assetsList)
-    return {
-      ...data,
-      tokenBalances: reduce(
-        data.tokenBalances,
-        (r, tokenBalance, assetName) =>
-          assets[assetName]
-            ? Object.assign(r, { [assetName]: parseBalance(tokenBalance, assets[assetName]) })
-            : r,
-        {}
-      ),
+    static _postParse(data) {
+      const assets = assetsListToObject(assetList)
+      return {
+        ...data,
+        tokenBalances: reduce(
+          data.tokenBalances,
+          (r, tokenBalance, assetName) =>
+            assets[assetName]
+              ? Object.assign(r, { [assetName]: parseBalance(tokenBalance, assets[assetName]) })
+              : r,
+          {}
+        ),
+      }
     }
   }
 }

package/src/index.js

@@ -6,7 +6,7 @@ import { Api } from './api'
 
 export { default as SolanaFeeMonitor } from './fee-monitor'
 export { SolanaMonitor } from './tx-log'
-export { SolanaAccountState } from './account-state'
+export { createAccountState } from './account-state'
 export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils'
 export {
   isSolanaStaking,

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

@@ -116,7 +116,7 @@ export class SolanaMonitor extends BaseMonitor {
     )
   }
 
-  async markStaleTransactions({ walletAccount, logItemsByAsset = {} }) {
+  async markStaleTransactions({ walletAccount, logItemsByAsset = Object.create(null) }) {
     // mark stale txs as dropped in logItemsByAsset
     const clearedLogItems = logItemsByAsset
     const tokenNames = [...this.api.tokens.values()].map(({ name }) => name)

package/src/tx-send.js

@@ -60,6 +60,8 @@ export const createAndBroadcastTXFactory =
 
     const recentBlockhash = options.recentBlockhash || (await api.getRecentBlockHash())
 
+    const feeData = await assetClientInterface.getFeeData({ assetName })
+
     let tokenParams = Object.create(null)
     if (isToken || customMintAddress) {
       const tokenMintAddress = customMintAddress || asset.mintAddress
@@ -113,6 +115,7 @@ export const createAndBroadcastTXFactory =
       amount,
       fee: feeAmount,
       recentBlockhash,
+      feeData,
       reference,
       memo,
       ...tokenParams,