@exodus/solana-api 2.5.8 → 2.5.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.8",
+  "version": "2.5.10",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "@exodus/models": "^8.10.4",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.6.3",
+    "@exodus/solana-lib": "^1.6.4",
     "@exodus/solana-meta": "^1.0.2",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -31,5 +31,5 @@
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
   },
-  "gitHead": "46b0e2b60d3b21c3aa9e33be5785d34b0ba29cca"
+  "gitHead": "eee9405e4872054f731aafc9723c26209a4b1a31"
 }

package/src/connection.js

@@ -1,6 +1,5 @@
 import ms from 'ms'
 import delay from 'delay'
-import url from 'url'
 import lodash from 'lodash'
 import debugLogger from 'debug'
 import { WebSocket } from '@exodus/fetch'
@@ -41,10 +40,9 @@ export class Connection {
   }
 
   newSocket(reqUrl) {
-    // eslint-disable-next-line
-    const obj = url.parse(reqUrl)
+    const obj = new URL(reqUrl)
     obj.protocol = 'wss:'
-    reqUrl = url.format(obj)
+    reqUrl = `${obj}`
     debug('Opening WS to:', reqUrl)
     const ws = new WebSocket(`${reqUrl}`)
     ws.onmessage = this.onMessage.bind(this)

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

@@ -75,6 +75,14 @@ export class SolanaMonitor extends BaseMonitor {
     }
   }
 
+  async getStakingAddressesFromTxLog({ assetName, walletAccount }) {
+    const txLog = await this.aci.getTxLog({ assetName: this.asset.name, walletAccount })
+    const stakingAddresses = Array.from(txLog)
+      .filter((tx) => _.get(tx, 'data.staking.stakeAddresses'))
+      .map((tx) => tx.data.staking.stakeAddresses)
+    return _.uniq(_.flatten(stakingAddresses))
+  }
+
   async tick({ walletAccount, refresh }) {
     // Check for new wallet account
     await this.initWalletAccount({ walletAccount })
@@ -85,6 +93,7 @@ export class SolanaMonitor extends BaseMonitor {
 
     const accountState = await this.aci.getAccountState({ assetName, walletAccount })
     const address = await this.aci.getReceiveAddress({ assetName, walletAccount })
+    const stakingAddresses = await this.getStakingAddressesFromTxLog({ assetName, walletAccount })
 
     const { logItemsByAsset, hasNewTxs, cursorState } = await this.getHistory({
       address,
@@ -97,7 +106,7 @@ export class SolanaMonitor extends BaseMonitor {
 
     const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
     if (refresh || cursorChanged) {
-      staking = await this.updateStakingInfo({ walletAccount, address })
+      staking = await this.updateStakingInfo({ walletAccount, address, stakingAddresses })
       this.cursors[walletAccount] = cursorState.cursor
     }
 
@@ -146,6 +155,7 @@ export class SolanaMonitor extends BaseMonitor {
         // send transaction
         item.to = tx.to
         item.feeAmount = baseAsset.currency.baseUnit(tx.fee).toDefault() // in SOL
+        item.feeCointName = baseAsset.name
         item.coinAmount = item.coinAmount.negate()
 
         if (tx.to === tx.owner) {
@@ -153,7 +163,10 @@ export class SolanaMonitor extends BaseMonitor {
           item.coinAmount = asset.currency.ZERO
         }
       } else if (tx.unparsed) {
-        if (tx.fee !== 0) item.feeAmount = baseAsset.currency.baseUnit(tx.fee).toDefault() // in SOL
+        if (tx.fee !== 0) {
+          item.feeAmount = baseAsset.currency.baseUnit(tx.fee).toDefault() // in SOL
+          item.feeCointName = baseAsset.name
+        }
 
         item.data.meta = tx.data.meta
       }
@@ -212,9 +225,11 @@ export class SolanaMonitor extends BaseMonitor {
     return this.updateAccountState({ newData, walletAccount })
   }
 
-  async updateStakingInfo({ walletAccount, address }) {
+  async updateStakingInfo({ walletAccount, address, stakingAddresses = [] }) {
     const stakingInfo = await this.api.getStakeAccountsInfo(address)
-    const rewards = await this.api.getRewards(Object.keys(stakingInfo.accounts))
+    // merge current and old staking addresses
+    const allStakingAddresses = _.uniq([...Object.keys(stakingInfo.accounts), ...stakingAddresses])
+    const rewards = await this.api.getRewards(allStakingAddresses)
     const mem = {
       loaded: true,
       staking: this.staking,