@exodus/solana-api 2.5.31 → 2.5.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.31",
+  "version": "2.5.32",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
-    "@exodus/asset-lib": "^4.0.0",
+    "@exodus/asset-lib": "^4.1.0",
     "@exodus/assets": "^9.0.1",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/currency": "^2.3.2",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
+  "gitHead": "6b37a481bbf82a7ff63a453ca66446fbd45fb4a8"
 }

package/src/api.js

@@ -28,11 +28,12 @@ const FORCE_HTTP = true // use https over ws
 
 // Tokens + SOL api support
 export class Api {
-  constructor({ rpcUrl, wsUrl, assets }) {
+  constructor({ rpcUrl, wsUrl, assets, txsLimit }) {
     this.setServer(rpcUrl)
     this.setWsEndpoint(wsUrl)
     this.setTokens(assets)
     this.tokensToSkip = {}
+    this.txsLimit = txsLimit
     this.connections = {}
   }
 
@@ -167,6 +168,7 @@ export class Api {
    * Get transactions from an address
    */
   async getTransactions(address, { cursor, before, limit, includeUnparsed = false } = {}) {
+    limit = limit || this.txsLimit
     let transactions = []
     // cursor is a txHash
 

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

@@ -1,6 +1,7 @@
 import { BaseMonitor } from '@exodus/asset-lib'
 import _ from 'lodash'
 import assert from 'minimalistic-assert'
+import ms from 'ms'
 
 const DEFAULT_POOL_ADDRESS = '9QU2QSxhb24FUX3Tu2FpczXjpK3VYrvRudywSZaM29mF' // Everstake
 
@@ -10,14 +11,26 @@ const DEFAULT_REMOTE_CONFIG = {
   staking: { enabled: true, pool: DEFAULT_POOL_ADDRESS },
 }
 
+const TICKS_BETWEEN_HISTORY_FETCHES = 10
+const TICKS_BETWEEN_STAKE_FETCHES = 5
+const TX_STALE_AFTER = ms('2m') // mark txs as dropped after N minutes
+
 export class SolanaMonitor extends BaseMonitor {
-  constructor({ api, includeUnparsed = false, ...args }) {
+  constructor({
+    api,
+    includeUnparsed = false,
+    ticksBetweenHistoryFetches = TICKS_BETWEEN_HISTORY_FETCHES,
+    ticksBetweenStakeFetches = TICKS_BETWEEN_STAKE_FETCHES,
+    ...args
+  }) {
     super(args)
     assert(api, 'api is required')
     this.api = api
     this.cursors = {}
     this.assets = {}
     this.staking = DEFAULT_REMOTE_CONFIG.staking
+    this.ticksBetweenStakeFetches = ticksBetweenStakeFetches
+    this.ticksBetweenHistoryFetches = ticksBetweenHistoryFetches
     this.includeUnparsed = includeUnparsed
     this.addHook('before-stop', (...args) => this.beforeStop(...args))
   }
@@ -87,6 +100,37 @@ export class SolanaMonitor extends BaseMonitor {
     return _.uniq(stakingAddresses.flat())
   }
 
+  #balanceChanged({ account, newAccount }) {
+    const solBalanceChanged = !account.balance || !account.balance.equals(newAccount.balance)
+    if (solBalanceChanged) return true
+
+    // token balance changed
+    return (
+      !account.tokenBalances ||
+      Object.entries(newAccount.tokenBalances).some(
+        ([token, balance]) =>
+          !account.tokenBalances[token] || !account.tokenBalances[token].equals(balance)
+      )
+    )
+  }
+
+  async markStaleTransactions({ walletAccount, logItemsByAsset = {} }) {
+    // mark stale txs as dropped in logItemsByAsset
+    const clearedLogItems = logItemsByAsset
+    const tokenNames = [...this.api.tokens.values()].map(({ name }) => name)
+    const assets = [this.asset.name, ...tokenNames]
+
+    for (const assetName of assets) {
+      const txSet = await this.aci.getTxLog({ assetName, walletAccount })
+      const { stale } = this.getUnconfirmed({ txSet, staleTxAge: TX_STALE_AFTER })
+      if (stale.length > 0) {
+        clearedLogItems[assetName] = _.unionBy(stale, logItemsByAsset[assetName], 'txId')
+      }
+    }
+
+    return clearedLogItems
+  }
+
   async tick({ walletAccount, refresh }) {
     // Check for new wallet account
     await this.initWalletAccount({ walletAccount })
@@ -99,28 +143,45 @@ export class SolanaMonitor extends BaseMonitor {
     const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
     const stakingAddresses = await this.getStakingAddressesFromTxLog({ assetName, walletAccount })
 
-    const { logItemsByAsset, hasNewTxs, cursorState } = await this.getHistory({
-      address,
-      accountState,
-      walletAccount,
-      refresh,
-    })
+    const fetchStakingInfo = this.tickCount[walletAccount] % this.ticksBetweenStakeFetches === 0
+    const staking = fetchStakingInfo
+      ? await this.getStakingInfo({ address, stakingAddresses })
+      : accountState.mem
+
+    const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
+    const account = await this.getAccount({ address, staking, tokenAccounts })
 
-    const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
+    const balanceChanged = this.#balanceChanged({ account: accountState, newAccount: account })
 
-    if (refresh || hasNewTxs || cursorChanged) {
-      const staking =
-        refresh || cursorChanged
-          ? await this.getStakingInfo({ address, stakingAddresses })
-          : accountState.mem
+    const isHistoryUpdateTick =
+      this.tickCount[walletAccount] % this.ticksBetweenHistoryFetches === 0
 
-      const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
-      const account = await this.getAccount({ address, staking, tokenAccounts })
+    const shouldUpdateHistory = refresh || isHistoryUpdateTick || balanceChanged
+    const shouldUpdateOnlyBalance = balanceChanged && !shouldUpdateHistory
+    const shouldUpdateBalanceBeforeHistory = true
 
+    // getHistory is more likely to fail/be rate limited, so we want to update users balance only on a lot of ticks
+    if (shouldUpdateBalanceBeforeHistory || shouldUpdateOnlyBalance) {
       // update all state at once
+      await this.updateState({ account, walletAccount, staking })
       await this.emitUnknownTokensEvent({ tokenAccounts })
-      await this.updateTxLogByAsset({ walletAccount, logItemsByAsset, refresh })
+    }
+
+    if (shouldUpdateHistory) {
+      const { logItemsByAsset, cursorState } = await this.getHistory({
+        address,
+        accountState,
+        walletAccount,
+        refresh,
+      })
+
+      const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
+
+      // update all state at once
+      const clearedLogItems = await this.markStaleTransactions({ walletAccount, logItemsByAsset })
+      await this.updateTxLogByAsset({ walletAccount, logItemsByAsset: clearedLogItems, refresh })
       await this.updateState({ account, cursorState, walletAccount, staking })
+      await this.emitUnknownTokensEvent({ tokenAccounts })
       if (refresh || cursorChanged) {
         this.cursors[walletAccount] = cursorState.cursor
       }

package/src/tx-send.js

@@ -136,7 +136,9 @@ export const createAndBroadcastTXFactory =
         ? asset.currency.ZERO
         : amount.abs().negate()
 
-    const data = isStakingTx ? { staking: stakingParams } : Object.create(null)
+    const data = isStakingTx
+      ? { staking: { ...stakingParams, stake: coinAmount.toBaseNumber() } }
+      : Object.create(null)
     const tx = {
       txId,
       confirmations: 0,