@exodus/solana-api 2.5.21 → 2.5.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.21",
+  "version": "2.5.23",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.7.0",
+    "@exodus/solana-lib": "^1.7.1",
     "@exodus/solana-meta": "^1.0.3",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "d0aa3d128fe488e0d4849923e5b134b80b6fef97"
+  "gitHead": "9e502c63fb13a0d98349cb953f10b24467fff617"
 }

package/src/fee-monitor.js

@@ -1,13 +1,16 @@
 import { FeeMonitor } from '@exodus/asset-lib'
-import api from './'
 
 export default class SolanaFeeMonitor extends FeeMonitor {
-  constructor({ updateFee, interval = '1m', assetName = 'solana' }) {
+  #api
+
+  constructor({ updateFee, interval = '1m', assetName = 'solana', api }) {
     super({ updateFee, interval, assetName })
+    this.#api = api
   }
 
   async fetchFee() {
-    const fee = await api.getFee()
+    const fee = await this.#api.getFee()
+    if (fee === undefined) throw new Error('Failed to fetch fee')
 
     return {
       fee: `${fee} Lamports`,

package/src/get-balances.js

@@ -0,0 +1,25 @@
+// staking may be a feature that may not be available for a given wallet.
+// In this case, The wallet should exclude the staking balance from the general balance
+
+export const getBalancesFactory = ({ stakingFeatureAvailable }) => ({ asset, accountState }) => {
+  if (asset.baseAsset.name !== asset.name) {
+    return { balance: accountState?.tokenBalances?.[asset.name], spendableBalance: null }
+  }
+
+  const zero = asset.currency.ZERO
+
+  const balance = accountState.balance || zero
+
+  const { locked, withdrawable, pending } = accountState.mem || {}
+
+  const balanceWithoutStaking = balance
+    .sub(locked || zero)
+    .sub(withdrawable || zero)
+    .sub(pending || zero)
+    .clampLowerZero()
+
+  return {
+    balance: stakingFeatureAvailable ? balance : balanceWithoutStaking,
+    spendableBalance: balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero(),
+  }
+}

package/src/index.js

@@ -4,11 +4,13 @@ import assetsList from '@exodus/solana-meta'
 
 import { Api } from './api'
 
+export { Api }
 export { default as SolanaFeeMonitor } from './fee-monitor'
-export * from './api'
-export * from './tx-log'
-export * from './account-state'
-export * from './tx-send'
+export { SolanaMonitor } from './tx-log'
+export { SolanaAccountState } from './account-state'
+export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils'
+export { createAndBroadcastTXFactory } from './tx-send'
+export { getBalancesFactory } from './get-balances'
 
 // 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()

package/src/staking-utils.js

@@ -0,0 +1,33 @@
+/**
+ * Generates pending Fee for stake-able asset
+ * @param {Object} stakingInfo solana staking information object
+ * @param {Object} fee solana asset fee
+ *
+ */
+export const getSolStakedFee = ({ asset, stakingInfo, fee }) => {
+  const { currency } = asset
+  const { accounts } = stakingInfo
+
+  const allPending = Object.entries(accounts).length
+  const pendingFee = allPending > 0 ? fee.mul(allPending) : currency.ZERO
+
+  return pendingFee
+}
+
+export const getStakingInfo = (accountMem) => {
+  return {
+    loaded: accountMem.loaded,
+    staking: accountMem.staking,
+    isDelegating: accountMem.isDelegating,
+    locked: accountMem.locked,
+    withdrawable: accountMem.withdrawable,
+    pending: accountMem.pending,
+    accounts: accountMem.accounts,
+    earned: accountMem.earned,
+  }
+}
+
+export const getUnstakingFee = ({ asset, fee, accountState }) => {
+  const stakingInfo = getStakingInfo(accountState.mem ?? {})
+  return getSolStakedFee({ asset, stakingInfo, fee })
+}

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

@@ -34,7 +34,11 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async startListener({ walletAccount }) {
-    const address = await this.aci.getReceiveAddress({ assetName: this.asset.name, walletAccount })
+    const address = await this.aci.getReceiveAddress({
+      assetName: this.asset.name,
+      walletAccount,
+      useCache: true,
+    })
     return this.api.watchAddress({
       address,
       /*
@@ -50,7 +54,11 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async stopListener({ walletAccount }) {
-    const address = await this.aci.getReceiveAddress({ assetName: this.asset.name, walletAccount })
+    const address = await this.aci.getReceiveAddress({
+      assetName: this.asset.name,
+      walletAccount,
+      useCache: true,
+    })
     return this.api.unwatchAddress({ address })
   }
 
@@ -93,7 +101,7 @@ export class SolanaMonitor extends BaseMonitor {
     this.api.setTokens(this.assets)
 
     const accountState = await this.aci.getAccountState({ assetName, walletAccount })
-    const address = await this.aci.getReceiveAddress({ assetName, walletAccount })
+    const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
     const stakingAddresses = await this.getStakingAddressesFromTxLog({ assetName, walletAccount })
 
     const { logItemsByAsset, hasNewTxs, cursorState } = await this.getHistory({