@exodus/solana-api 2.5.25 → 2.5.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.25",
+  "version": "2.5.27",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -23,8 +23,8 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.7.3",
-    "@exodus/solana-meta": "^1.0.3",
+    "@exodus/solana-lib": "^1.7.4",
+    "@exodus/solana-meta": "^1.0.5",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "ed1cf2465307952f91fac5fbfef36eaa59a3acaf"
+  "gitHead": "9e93c3846854f6c64b0bdd5abe103ec5ff980596"
 }

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

@@ -111,20 +111,24 @@ export class SolanaMonitor extends BaseMonitor {
       refresh,
     })
 
-    let staking = accountState.mem
-
     const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
-    if (refresh || cursorChanged) {
-      staking = await this.updateStakingInfo({ walletAccount, address, stakingAddresses })
-      this.cursors[walletAccount] = cursorState.cursor
-    }
 
-    await this.updateTxLogByAsset({ walletAccount, logItemsByAsset, refresh })
     if (refresh || hasNewTxs || cursorChanged) {
+      const staking =
+        refresh || cursorChanged
+          ? await this.getStakingInfo({ address, stakingAddresses })
+          : accountState.mem
+
       const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
-      await this.emitUnknownTokensEvent({ tokenAccounts })
       const account = await this.getAccount({ address, staking, tokenAccounts })
-      await this.updateState({ account, cursorState, walletAccount })
+
+      // update all state at once
+      await this.emitUnknownTokensEvent({ tokenAccounts })
+      await this.updateTxLogByAsset({ walletAccount, logItemsByAsset, refresh })
+      await this.updateState({ account, cursorState, walletAccount, staking })
+      if (refresh || cursorChanged) {
+        this.cursors[walletAccount] = cursorState.cursor
+      }
     }
   }
 
@@ -144,6 +148,7 @@ export class SolanaMonitor extends BaseMonitor {
       if (assetName === 'unknown' || !asset) continue // skip unknown tokens
       const feeAsset = asset.feeAsset
 
+      // TODO: remove all uses of toDefault()
       const coinAmount = asset.currency.baseUnit(tx.amount).toDefault()
 
       const item = {
@@ -209,15 +214,15 @@ export class SolanaMonitor extends BaseMonitor {
       this.api.getTokensBalance({ address, filterByTokens: tokens, tokenAccounts }),
     ])
 
-    const stakedBalance = this.asset.currency.baseUnit(staking.locked).toDefault()
-    const withdrawableBalance = this.asset.currency.baseUnit(staking.withdrawable).toDefault()
-    const pendingBalance = this.asset.currency.baseUnit(staking.pending).toDefault()
+    const stakedBalance = this.asset.currency.baseUnit(staking.locked)
+    const withdrawableBalance = this.asset.currency.baseUnit(staking.withdrawable)
+    const pendingBalance = this.asset.currency.baseUnit(staking.pending)
     const balance = this.asset.currency
       .baseUnit(solBalance)
-      .toDefault()
       .add(stakedBalance)
       .add(withdrawableBalance)
       .add(pendingBalance)
+      .toDefault()
 
     const tokenBalances = _.mapValues(splBalances, (balance, name) =>
       this.assets[name].currency.baseUnit(balance).toDefault()
@@ -229,18 +234,19 @@ export class SolanaMonitor extends BaseMonitor {
     }
   }
 
-  async updateState({ account, cursorState, walletAccount }) {
+  async updateState({ account, cursorState, walletAccount, staking }) {
     const { balance, tokenBalances } = account
-    const newData = { balance, tokenBalances, ...cursorState }
+    const newData = { balance, tokenBalances, mem: staking, ...cursorState }
     return this.updateAccountState({ newData, walletAccount })
   }
 
-  async updateStakingInfo({ walletAccount, address, stakingAddresses = [] }) {
+  async getStakingInfo({ address, stakingAddresses = [] }) {
     const stakingInfo = await this.api.getStakeAccountsInfo(address)
     // merge current and old staking addresses
     const allStakingAddresses = _.uniq([...Object.keys(stakingInfo.accounts), ...stakingAddresses])
     const rewards = await this.api.getRewards(allStakingAddresses)
-    const mem = {
+
+    return {
       loaded: true,
       staking: this.staking,
       isDelegating: Object.values(stakingInfo.accounts).some(({ state }) =>
@@ -252,8 +258,5 @@ export class SolanaMonitor extends BaseMonitor {
       earned: this.asset.currency.baseUnit(rewards).toDefault(),
       accounts: stakingInfo.accounts, // Obj
     }
-
-    await this.updateAccountState({ walletAccount, newData: { mem } })
-    return mem
   }
 }

package/src/tx-send.js

@@ -196,7 +196,11 @@ export const createAndBroadcastTXFactory = (api) => async (
     Object.assign(changes, { mem: stakingData })
   }
 
-  await assetClientInterface.updateAccountState({ assetName, walletAccount, newData: changes })
+  await assetClientInterface.updateAccountState({
+    assetName: baseAsset.name,
+    walletAccount,
+    newData: changes,
+  })
 
   return { txId }
 }