@exodus/solana-api 2.5.31-alpha.3 → 2.5.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.31-alpha.3",
+  "version": "2.5.32",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -14,11 +14,17 @@
   "publishConfig": {
     "access": "restricted"
   },
+  "scripts": {
+    "test": "run -T jest",
+    "lint": "run -T eslint ./src",
+    "lint:fix": "yarn lint --fix"
+  },
   "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",
     "@exodus/fetch": "^1.2.0",
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
@@ -27,12 +33,16 @@
     "@exodus/solana-meta": "^1.0.7",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
+    "delay": "^4.0.1",
     "lodash": "^4.17.11",
+    "make-concurrent": "^4.0.0",
+    "minimalistic-assert": "^1.0.1",
+    "ms": "^2.1.3",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
   },
   "devDependencies": {
-    "@exodus/assets-testing": "file:../../../__testing__"
+    "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
+  "gitHead": "6b37a481bbf82a7ff63a453ca66446fbd45fb4a8"
 }

package/src/account-state.js

@@ -27,6 +27,7 @@ export class SolanaAccountState extends AccountState {
       accounts: {}, // stake accounts
     },
   }
+
   static _tokens = [asset, ...tokens] // deprecated - will be removed
 
   static _postParse(data) {

package/src/api.js

@@ -25,15 +25,15 @@ import { Connection } from './connection'
 const RPC_URL = 'https://solana.a.exodus.io' // https://vip-api.mainnet-beta.solana.com/, https://api.mainnet-beta.solana.com
 const WS_ENDPOINT = 'wss://solana.a.exodus.io/ws' // not standard across all node providers (we're compatible only with Quicknode)
 const FORCE_HTTP = true // use https over ws
-const TXS_LIMIT = 100
 
 // 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 = {}
   }
 
@@ -60,16 +60,18 @@ export class Api {
   async watchAddress({
     address,
     tokensAddresses = [],
+    onMessage,
     handleAccounts,
     handleTransfers,
     handleReconnect,
     reconnectDelay,
   }) {
-    if (FORCE_HTTP) return false
+    if (this.connections[address]) return // already subscribed
     const conn = new Connection({
       endpoint: this.wsUrl,
       address,
       tokensAddresses,
+      onMsg: (json) => onMessage(json),
       callback: (updates) =>
         this.handleUpdates({ updates, address, handleAccounts, handleTransfers }),
       reconnectCallback: handleReconnect,
@@ -98,6 +100,7 @@ export class Api {
     if (lodash.get(connection, 'isOpen') && !lodash.get(connection, 'shutdown') && !forceHttp) {
       return connection.sendMessage(method, params)
     }
+
     // http fallback
     return this.api.post({ method, params })
   }
@@ -120,7 +123,7 @@ export class Api {
     return state
   }
 
-  async getRecentBlockHash(commitment?) {
+  async getRecentBlockHash(commitment) {
     const result = await this.rpcCall(
       'getLatestBlockhash',
       [{ commitment: commitment || 'finalized', encoding: 'jsonParsed' }],
@@ -165,11 +168,12 @@ 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
 
     try {
-      let until = cursor
+      const until = cursor
 
       const tokenAccountsByOwner = await this.getTokenAccountsByOwner(address) // Array
       const tokenAccountAddresses = tokenAccountsByOwner
@@ -186,7 +190,7 @@ export class Api {
           })
         )
       )
-      let txsId = txsResultsByAccount.reduce((arr, row) => arr.concat(row), []).slice(0, TXS_LIMIT) // merge arrays
+      let txsId = txsResultsByAccount.flat() // merge arrays
       txsId = lodash.uniqBy(txsId, 'signature')
 
       // get txs details in parallel
@@ -236,14 +240,8 @@ export class Api {
     tokenAccountsByOwner,
     { includeUnparsed = false } = {}
   ) {
-    let {
-      fee,
-      preBalances,
-      postBalances,
-      preTokenBalances,
-      postTokenBalances,
-      innerInstructions,
-    } = txDetails.meta
+    let { fee, preBalances, postBalances, preTokenBalances, postTokenBalances, innerInstructions } =
+      txDetails.meta
     preBalances = preBalances || []
     postBalances = postBalances || []
     preTokenBalances = preTokenBalances || []
@@ -339,7 +337,7 @@ export class Api {
       }))
     innerInstructions = innerInstructions
       .reduce((acc, val) => {
-        return acc.concat(val.instructions)
+        return [...acc, ...val.instructions]
       }, [])
       .map((ix) => {
         const type = lodash.get(ix, 'parsed.type')
@@ -355,7 +353,7 @@ export class Api {
         const tokenAccount = tokenAccountsByOwner.find(({ tokenAccountAddress }) => {
           return [source, destination].includes(tokenAccountAddress)
         })
-        const isSending = !!tokenAccountsByOwner.find(({ tokenAccountAddress }) => {
+        const isSending = tokenAccountsByOwner.some(({ tokenAccountAddress }) => {
           return [source].includes(tokenAccountAddress)
         })
 
@@ -382,7 +380,7 @@ export class Api {
     const stakeTx = lodash.find(instructions, { program: 'system', type: 'createAccountWithSeed' })
     const stakeWithdraw = lodash.find(instructions, { program: 'stake', type: 'withdraw' })
     const stakeUndelegate = lodash.find(instructions, { program: 'stake', type: 'deactivate' })
-    const hasSolanaTx = solanaTx && !preTokenBalances.length && !postTokenBalances.length // only SOL moved and no tokens movements
+    const hasSolanaTx = solanaTx && preTokenBalances.length === 0 && postTokenBalances.length === 0 // only SOL moved and no tokens movements
 
     let tx = {}
     if (hasSolanaTx) {
@@ -449,7 +447,7 @@ export class Api {
         Array.isArray(tokenAccountsByOwner),
         'tokenAccountsByOwner is required when parsing token tx'
       )
-      let tokenTxs = lodash
+      const tokenTxs = lodash
         .filter(instructions, ({ program, type }) => {
           return program === 'spl-token' && ['transfer', 'transferChecked'].includes(type)
         }) // get Token transfer: could have more than 1 instructions
@@ -476,7 +474,7 @@ export class Api {
           }
         })
 
-      if (tokenTxs.length) {
+      if (tokenTxs.length > 0) {
         // found spl-token simple transfer/transferChecked instruction
         // .reduce to sum/sub (based on isSending) all the same tokens amount (From instructions -> 1 single tx)
         tx = tokenTxs.reduce((finalTx, ix) => {
@@ -491,9 +489,11 @@ export class Api {
         const accountIndexes = lodash.mapKeys(accountKeys, (x, i) => i)
         Object.values(accountIndexes).forEach((acc) => {
           // filter by ownerAddress
+          // eslint-disable-next-line unicorn/prefer-array-some
           const hasKnownOwner = !!lodash.find(tokenAccountsByOwner, {
             tokenAccountAddress: acc.pubkey,
           })
+          // eslint-disable-next-line @exodus/mutable/no-param-reassign-prop-only
           acc.owner = hasKnownOwner ? ownerAddress : null
         })
 
@@ -509,15 +509,15 @@ export class Api {
           )
         })
 
-        if (preBalances.length || postBalances.length) {
+        if (preBalances.length > 0 || postBalances.length > 0) {
           tx = {}
 
-          if (includeUnparsed && innerInstructions.length) {
+          if (includeUnparsed && innerInstructions.length > 0) {
             // when using includeUnparsed for DEX tx we want to keep SOL tx as "unparsed"
             // 1. we want to treat all SOL dex transactions as "Contract transaction", not "Sent SOL"
             // 2. default behavior is not perfect. For example it doesn't see SOL-side tx in
             //    SOL->SPL swaps on Raydium and Orca.
-            tx = getUnparsedTx(tx)
+            tx = getUnparsedTx()
             tx.dexTxs = getInnerTxsFromBalanceChanges()
           } else {
             if (solanaTx) {
@@ -532,7 +532,7 @@ export class Api {
             }
 
             // If it has inner instructions then it's a DEX tx that moved SPL -> SPL
-            if (innerInstructions.length) {
+            if (innerInstructions.length > 0) {
               tx.dexTxs = innerInstructions
               // if tx involves only SPL swaps. Expand DEX ix (first element as tx base and the other kept there)
               if (!tx.from && !solanaTx) {
@@ -548,7 +548,7 @@ export class Api {
     const unparsed = Object.keys(tx).length === 0
 
     if (unparsed && includeUnparsed) {
-      tx = getUnparsedTx(tx)
+      tx = getUnparsedTx()
     }
 
     // How tokens tx are parsed:
@@ -572,7 +572,7 @@ export class Api {
 
   async getWalletTokensList({ tokenAccounts }) {
     const tokensMint = []
-    for (let account of tokenAccounts) {
+    for (const account of tokenAccounts) {
       const mint = account.mintAddress
 
       // skip cached NFT
@@ -585,6 +585,7 @@ export class Api {
         this.tokensToSkip[mint] = true
         continue
       }
+
       // OK
       tokensMint.push(mint)
     }
@@ -600,7 +601,7 @@ export class Api {
     )
 
     const tokenAccounts = []
-    for (let entry of accountsList) {
+    for (const entry of accountsList) {
       const { pubkey, account } = entry
 
       const mint = lodash.get(account, 'data.parsed.info.mint')
@@ -618,6 +619,7 @@ export class Api {
         mintAddress: mint,
       })
     }
+
     // eventually filter by token
     return tokenTicker
       ? tokenAccounts.filter(({ ticker }) => ticker === tokenTicker)
@@ -625,18 +627,24 @@ export class Api {
   }
 
   async getTokensBalance({ address, filterByTokens = [], tokenAccounts }) {
-    let accounts = tokenAccounts || (await this.getTokenAccountsByOwner(address))
+    const accounts = tokenAccounts || (await this.getTokenAccountsByOwner(address))
 
-    const tokensBalance = accounts.reduce((acc, { tokenName, balance }) => {
-      if (tokenName === 'unknown' || (filterByTokens.length && !filterByTokens.includes(tokenName)))
+    return accounts.reduce((acc, { tokenName, balance }) => {
+      if (
+        tokenName === 'unknown' ||
+        (filterByTokens.length > 0 && !filterByTokens.includes(tokenName))
+      )
         return acc // filter by supported tokens only
-      if (!acc[tokenName]) acc[tokenName] = Number(balance)
+      if (acc[tokenName]) {
+        acc[tokenName] += Number(balance)
+      }
       // e.g { 'serum': 123 }
-      else acc[tokenName] += Number(balance) // merge same token account balance
+      else {
+        acc[tokenName] = Number(balance)
+      } // merge same token account balance
+
       return acc
     }, {})
-
-    return tokensBalance
   }
 
   async isAssociatedTokenAccountActive(tokenAddress) {
@@ -644,7 +652,7 @@ export class Api {
     try {
       await this.rpcCall('getTokenAccountBalance', [tokenAddress])
       return true
-    } catch (e) {
+    } catch {
       return false
     }
   }
@@ -697,20 +705,19 @@ export class Api {
     return account.owner === SYSTEM_PROGRAM_ID.toBase58()
       ? 'solana'
       : account.owner === TOKEN_PROGRAM_ID.toBase58()
-      ? 'token'
-      : null
+        ? 'token'
+        : null
   }
 
   async getTokenAddressOwner(address) {
     const value = await this.getAccountInfo(address)
-    const owner = lodash.get(value, 'data.parsed.info.owner', null)
-    return owner
+    return lodash.get(value, 'data.parsed.info.owner', null)
   }
 
   async getAddressMint(address) {
     const value = await this.getAccountInfo(address)
-    const mintAddress = lodash.get(value, 'data.parsed.info.mint', null) // token mint
-    return mintAddress
+    // token mint
+    return lodash.get(value, 'data.parsed.info.mint', null)
   }
 
   async isTokenAddress(address) {
@@ -745,7 +752,7 @@ export class Api {
     let locked = 0
     let withdrawable = 0
     let pending = 0
-    for (let entry of res) {
+    for (const entry of res) {
       const addr = entry.pubkey
       const lamports = lodash.get(entry, 'account.lamports', 0)
       const delegation = lodash.get(entry, 'account.data.parsed.info.stake.delegation', {})
@@ -766,11 +773,12 @@ export class Api {
       withdrawable += accounts[addr].canWithdraw ? lamports : 0
       pending += accounts[addr].isDeactivating ? lamports : 0
     }
+
     return { accounts, totalStake, locked, withdrawable, pending }
   }
 
   async getRewards(stakingAddresses = []) {
-    if (!stakingAddresses.length) return 0
+    if (stakingAddresses.length === 0) return 0
 
     // custom endpoint!
     const rewards = await this.request('rewards')
@@ -780,11 +788,9 @@ export class Api {
       .json()
 
     // sum rewards for all addresses
-    const earnings = Object.values(rewards).reduce((total, x) => {
+    return Object.values(rewards).reduce((total, x) => {
       return total + x
     }, 0)
-
-    return earnings
   }
 
   async getMinimumBalanceForRentExemption(size) {
@@ -820,7 +826,7 @@ export class Api {
         } catch (error) {
           if (
             error.message &&
-            !errorMessagesToRetry.find((errorMessage) => error.message.includes(errorMessage))
+            !errorMessagesToRetry.some((errorMessage) => error.message.includes(errorMessage))
           ) {
             error.finalError = true
           }
@@ -868,6 +874,7 @@ export class Api {
           if (error.message && error.message.includes('could not find account')) {
             return defaultValue
           }
+
           throw error
         }
       }
@@ -959,11 +966,12 @@ export class Api {
   simulateAndRetrieveSideEffects = async (
     message,
     publicKey,
-    transactionMessage? // decompiled TransactionMessage
+    transactionMessage // decompiled TransactionMessage
   ) => {
     const { config, accountAddresses } = getTransactionSimulationParams(
       transactionMessage || message
     )
+    // eslint-disable-next-line unicorn/no-new-array
     const signatures = new Array(message.header.numRequiredSignatures || 1).fill(null)
     const encodedTransaction = buildRawTransaction(
       Buffer.from(message.serialize()),

package/src/connection.js

@@ -20,6 +20,7 @@ export class Connection {
     address,
     tokensAddresses = [],
     callback,
+    onMsg,
     reconnectCallback = () => {},
     reconnectDelay = DEFAULT_RECONNECT_DELAY,
   }) {
@@ -27,6 +28,7 @@ export class Connection {
     this.tokensAddresses = tokensAddresses
     this.endpoint = endpoint
     this.callback = callback
+    this.onMsg = onMsg
     this.reconnectCallback = reconnectCallback
     this.reconnectDelay = reconnectDelay
 
@@ -66,10 +68,10 @@ export class Connection {
     reqUrl = `${obj}`
     debug('Opening WS to:', reqUrl)
     const ws = new WebSocket(`${reqUrl}`)
-    ws.onmessage = this.onMessage.bind(this)
-    ws.onopen = this.onOpen.bind(this)
-    ws.onclose = this.onClose.bind(this)
-    ws.onerror = this.onError.bind(this)
+    ws.addEventListener('message', this.onMessage.bind(this))
+    ws.addEventListener('open', this.onOpen.bind(this))
+    ws.addEventListener('close', this.onClose.bind(this))
+    ws.addEventListener('error', this.onError.bind(this))
     return ws
   }
 
@@ -90,14 +92,14 @@ export class Connection {
   }
 
   get running() {
-    return !!(!this.isClosed || this.inProcessMessages || this.messageQueue.length)
+    return !!(!this.isClosed || this.inProcessMessages || this.messageQueue.length > 0)
   }
 
   get connectionState() {
     if (this.isConnecting) return 'CONNECTING'
-    else if (this.isOpen) return 'OPEN'
-    else if (this.isClosing) return 'CLOSING'
-    else if (this.isClosed) return 'CLOSED'
+    if (this.isOpen) return 'OPEN'
+    if (this.isClosing) return 'CLOSING'
+    if (this.isClosed) return 'CLOSED'
     return 'NONE'
   }
 
@@ -125,7 +127,13 @@ export class Connection {
     try {
       const json = JSON.parse(evt.data)
       debug('new ws msg:', json)
-      if (!json.error) {
+      if (json.error) {
+        if (lodash.get(this.rpcQueue, json.id)) {
+          this.rpcQueue[json.id].reject(new Error(json.error.message))
+          clearTimeout(this.rpcQueue[json.id].timeout)
+          delete this.rpcQueue[json.id]
+        } else debug('Unsupported WS message:', json.error.message)
+      } else {
         if (lodash.get(this.rpcQueue, json.id)) {
           // json-rpc reply
           clearTimeout(this.rpcQueue[json.id].timeout)
@@ -136,13 +144,8 @@ export class Connection {
           debug('pushing msg to queue', msg)
           this.messageQueue.push(msg) // sub results
         }
-        this.processMessages()
-      } else {
-        if (lodash.get(this.rpcQueue, json.id)) {
-          this.rpcQueue[json.id].reject(new Error(json.error.message))
-          clearTimeout(this.rpcQueue[json.id].timeout)
-          delete this.rpcQueue[json.id]
-        } else debug('Unsupported WS message:', json.error.message)
+
+        this.processMessages(json)
       }
     } catch (e) {
       debug(e)
@@ -153,8 +156,8 @@ export class Connection {
   onOpen(evt) {
     debug('Opened WS')
     // subscribe to each addresses (SOL and ASA addr)
-
-    this.tokensAddresses.concat(this.address).forEach((address) => {
+    const addresses = [...this.tokensAddresses, this.address]
+    addresses.forEach((address) => {
       // sub for account state changes
       this.ws.send(
         JSON.stringify({
@@ -195,11 +198,12 @@ export class Connection {
     }
   }
 
-  async processMessages() {
+  async processMessages(json) {
+    if (this.onMsg) await this.onMsg(json)
     if (this.inProcessMessages) return null
     this.inProcessMessages = true
     try {
-      while (this.messageQueue.length) {
+      while (this.messageQueue.length > 0) {
         const items = this.messageQueue.splice(0, this.messageQueue.length)
         await this.callback(items)
       }

package/src/get-balances.js

@@ -3,35 +3,33 @@ import { TxSet } from '@exodus/models'
 // 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,
-  txLog,
-}) => {
-  const zero = asset.currency.ZERO
-  const { balance, locked, withdrawable, pending } = fixBalances({
-    txLog,
-    balance: getBalanceFromAccountState({ asset, accountState }),
-    locked: accountState.mem?.locked || zero,
-    withdrawable: accountState.mem?.withdrawable || zero,
-    pending: accountState.mem?.pending || zero,
-    asset,
-  })
-  if (asset.baseAsset.name !== asset.name) {
-    return { balance, spendableBalance: balance }
-  }
+export const getBalancesFactory =
+  ({ stakingFeatureAvailable }) =>
+  ({ asset, accountState, txLog }) => {
+    const zero = asset.currency.ZERO
+    const { balance, locked, withdrawable, pending } = fixBalances({
+      txLog,
+      balance: getBalanceFromAccountState({ asset, accountState }),
+      locked: accountState.mem?.locked || zero,
+      withdrawable: accountState.mem?.withdrawable || zero,
+      pending: accountState.mem?.pending || zero,
+      asset,
+    })
+    if (asset.baseAsset.name !== asset.name) {
+      return { balance, spendableBalance: balance }
+    }
 
-  const balanceWithoutStaking = balance
-    .sub(locked)
-    .sub(withdrawable)
-    .sub(pending)
-    .clampLowerZero()
+    const balanceWithoutStaking = balance
+      .sub(locked)
+      .sub(withdrawable)
+      .sub(pending)
+      .clampLowerZero()
 
-  return {
-    balance: stakingFeatureAvailable ? balance : balanceWithoutStaking,
-    spendableBalance: balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero(),
+    return {
+      balance: stakingFeatureAvailable ? balance : balanceWithoutStaking,
+      spendableBalance: balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero(),
+    }
   }
-}
 
 const fixBalances = ({ txLog = TxSet.EMPTY, balance, locked, withdrawable, pending, asset }) => {
   for (const tx of txLog) {
@@ -40,10 +38,7 @@ const fixBalances = ({ txLog = TxSet.EMPTY, balance, locked, withdrawable, pendi
         balance = balance.sub(tx.feeAmount)
       }
 
-      if (!tx.data.staking) {
-        // coinAmount is negative for sent tx
-        balance = balance.sub(tx.coinAmount.abs())
-      } else {
+      if (tx.data.staking) {
         // staking tx
         switch (tx.data.staking?.method) {
           case 'delegate':
@@ -57,9 +52,13 @@ const fixBalances = ({ txLog = TxSet.EMPTY, balance, locked, withdrawable, pendi
             locked = asset.currency.ZERO
             break
         }
+      } else {
+        // coinAmount is negative for sent tx
+        balance = balance.sub(tx.coinAmount.abs())
       }
     }
   }
+
   return {
     balance: balance.clampLowerZero(),
     locked: locked.clampLowerZero(),

package/src/index.js

@@ -4,7 +4,6 @@ import assetsList from '@exodus/solana-meta'
 
 import { Api } from './api'
 
-export { Api }
 export { default as SolanaFeeMonitor } from './fee-monitor'
 export { SolanaMonitor } from './tx-log'
 export { SolanaAccountState } from './account-state'
@@ -26,3 +25,5 @@ const assets = connectAssets(keyBy(assetsList, (asset) => asset.name))
 // Clients should not call an specific server api directly.
 const serverApi = new Api({ assets })
 export default serverApi
+
+export { Api } from './api'

package/src/staking-utils.js

@@ -9,9 +9,7 @@ export const getSolStakedFee = ({ asset, stakingInfo, fee }) => {
   const { accounts } = stakingInfo
 
   const allPending = Object.entries(accounts).length
-  const pendingFee = allPending > 0 ? fee.mul(allPending) : currency.ZERO
-
-  return pendingFee
+  return allPending > 0 ? fee.mul(allPending) : currency.ZERO
 }
 
 export const getStakingInfo = (accountMem) => {

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
 
@@ -12,6 +13,7 @@ const DEFAULT_REMOTE_CONFIG = {
 
 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({
@@ -52,15 +54,10 @@ export class SolanaMonitor extends BaseMonitor {
     })
     return this.api.watchAddress({
       address,
-      /*
-      // OPTIONAL. Relying on polling through ws
-      tokensAddresses: [], // needed for ASA subs
-      handleAccounts: (updates) => this.accountsCallback({ updates, walletAccount }),
-      handleTransfers: (txs) => {
-        // new SOL tx, ticking monitor
-        this.tick({ walletAccount }) // it will cause refresh for both sender/receiver. Without necessarily fetching the tx if it's not finalized in the node.
+      onMessage: (json) => {
+        // new SOL tx event, tick monitor with 15 sec delay (to avoid hitting delayed nodes)
+        setTimeout(() => this.tick({ walletAccount }), 15_000)
       },
-      */
     })
   }
 
@@ -97,24 +94,41 @@ 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)
+    const stakingAddresses = [...txLog]
       .filter((tx) => _.get(tx, 'data.staking.stakeAddresses'))
       .map((tx) => tx.data.staking.stakeAddresses)
-    return _.uniq(_.flatten(stakingAddresses))
+    return _.uniq(stakingAddresses.flat())
   }
 
-  balanceChanged({ account, newAccount }) {
+  #balanceChanged({ account, newAccount }) {
     const solBalanceChanged = !account.balance || !account.balance.equals(newAccount.balance)
     if (solBalanceChanged) return true
 
-    const tokenBalanceChanged =
+    // 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 tokenBalanceChanged
+    return clearedLogItems
   }
 
   async tick({ walletAccount, refresh }) {
@@ -137,7 +151,7 @@ export class SolanaMonitor extends BaseMonitor {
     const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
     const account = await this.getAccount({ address, staking, tokenAccounts })
 
-    const balanceChanged = this.balanceChanged({ account: accountState, newAccount: account })
+    const balanceChanged = this.#balanceChanged({ account: accountState, newAccount: account })
 
     const isHistoryUpdateTick =
       this.tickCount[walletAccount] % this.ticksBetweenHistoryFetches === 0
@@ -152,6 +166,7 @@ export class SolanaMonitor extends BaseMonitor {
       await this.updateState({ account, walletAccount, staking })
       await this.emitUnknownTokensEvent({ tokenAccounts })
     }
+
     if (shouldUpdateHistory) {
       const { logItemsByAsset, cursorState } = await this.getHistory({
         address,
@@ -163,7 +178,8 @@ export class SolanaMonitor extends BaseMonitor {
       const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
 
       // update all state at once
-      await this.updateTxLogByAsset({ walletAccount, logItemsByAsset, refresh })
+      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) {
@@ -173,7 +189,7 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async getHistory({ address, accountState, refresh } = {}) {
-    let cursor = refresh ? '' : accountState.cursor
+    const cursor = refresh ? '' : accountState.cursor
     const baseAsset = this.asset
 
     const { transactions, newCursor } = await this.api.getTransactions(address, {
@@ -226,6 +242,7 @@ export class SolanaMonitor extends BaseMonitor {
 
         item.data.meta = tx.data.meta
       }
+
       if (asset.assetType === 'SOLANA_TOKEN' && item.feeAmount && item.feeAmount.isPositive) {
         const feeItem = {
           ..._.clone(item),
@@ -235,6 +252,7 @@ export class SolanaMonitor extends BaseMonitor {
         }
         mappedTransactions.push(feeItem)
       }
+
       mappedTransactions.push(item)
     }
 

package/src/tx-send.js

@@ -1,183 +1,181 @@
 import { createUnsignedTx, findAssociatedTokenAddress } from '@exodus/solana-lib'
 import assert from 'minimalistic-assert'
 
-export const createAndBroadcastTXFactory = (api) => async (
-  { asset, walletAccount, address, amount, options = {} },
-  { assetClientInterface }
-) => {
-  const assetName = asset.name
-  assert(assetClientInterface, `assetClientInterface must be supplied in sendTx for ${assetName}`)
-
-  const {
-    feeAmount,
-    method,
-    stakeAddresses,
-    seed,
-    pool,
-    customMintAddress,
-    tokenStandard,
-    // <MagicEden>
-    initializerAddress,
-    initializerDepositTokenAddress,
-    takerAmount,
-    escrowAddress,
-    escrowBump,
-    pdaAddress,
-    takerAddress,
-    expectedTakerAmount,
-    expectedMintAddress,
-    metadataAddress,
-    creators,
-    // </MagicEden>
-    reference,
-    memo,
-  } = options
-  const { baseAsset } = asset
-  const from = await assetClientInterface.getReceiveAddress({
-    assetName: baseAsset.name,
-    walletAccount,
-  })
-
-  const isToken = asset.assetType === 'SOLANA_TOKEN'
-
-  // Check if receiver has address active when sending tokens.
-  if (isToken) {
-    // check address mint is the same
-    const targetMint = await api.getAddressMint(address) // null if it's a SOL address
-    if (targetMint && targetMint !== asset.mintAddress) {
-      const err = new Error('Wrong Destination Wallet')
-      err.reason = { mintAddressMismatch: true }
-      throw err
+export const createAndBroadcastTXFactory =
+  (api) =>
+  async ({ asset, walletAccount, address, amount, options = {} }, { assetClientInterface }) => {
+    const assetName = asset.name
+    assert(assetClientInterface, `assetClientInterface must be supplied in sendTx for ${assetName}`)
+
+    const {
+      feeAmount,
+      method,
+      stakeAddresses,
+      seed,
+      pool,
+      customMintAddress,
+      tokenStandard,
+      // <MagicEden>
+      initializerAddress,
+      initializerDepositTokenAddress,
+      takerAmount,
+      escrowAddress,
+      escrowBump,
+      pdaAddress,
+      takerAddress,
+      expectedTakerAmount,
+      expectedMintAddress,
+      metadataAddress,
+      creators,
+      // </MagicEden>
+      reference,
+      memo,
+    } = options
+    const { baseAsset } = asset
+    const from = await assetClientInterface.getReceiveAddress({
+      assetName: baseAsset.name,
+      walletAccount,
+    })
+
+    const isToken = asset.assetType === 'SOLANA_TOKEN'
+
+    // Check if receiver has address active when sending tokens.
+    if (isToken) {
+      // check address mint is the same
+      const targetMint = await api.getAddressMint(address) // null if it's a SOL address
+      if (targetMint && targetMint !== asset.mintAddress) {
+        const err = new Error('Wrong Destination Wallet')
+        err.reason = { mintAddressMismatch: true }
+        throw err
+      }
+    } else {
+      // sending SOL
+      const addressType = await api.getAddressType(address)
+      if (addressType === 'token') {
+        const err = new Error('Destination Wallet is a Token address')
+        err.reason = { wrongAddressType: true }
+        throw err
+      }
     }
-  } else {
-    // sending SOL
-    const addressType = await api.getAddressType(address)
-    if (addressType === 'token') {
-      const err = new Error('Destination Wallet is a Token address')
-      err.reason = { wrongAddressType: true }
-      throw err
+
+    const recentBlockhash = options.recentBlockhash || (await api.getRecentBlockHash())
+
+    let tokenParams = Object.create(null)
+    if (isToken || customMintAddress) {
+      const tokenMintAddress = customMintAddress || asset.mintAddress
+      const tokenAddress = findAssociatedTokenAddress(address, tokenMintAddress)
+      const [destinationAddressType, isAssociatedTokenAccountActive, fromTokenAccountAddresses] =
+        await Promise.all([
+          api.getAddressType(address),
+          api.isAssociatedTokenAccountActive(tokenAddress),
+          api.getTokenAccountsByOwner(from),
+        ])
+
+      const fromTokenAddresses = fromTokenAccountAddresses.filter(
+        ({ mintAddress }) => mintAddress === tokenMintAddress
+      )
+
+      tokenParams = {
+        tokenMintAddress,
+        destinationAddressType,
+        isAssociatedTokenAccountActive,
+        fromTokenAddresses,
+        tokenStandard,
+      }
     }
-  }
 
-  const recentBlockhash = options.recentBlockhash || (await api.getRecentBlockHash())
-
-  let tokenParams = Object.create(null)
-  if (isToken || customMintAddress) {
-    const tokenMintAddress = customMintAddress || asset.mintAddress
-    const tokenAddress = findAssociatedTokenAddress(address, tokenMintAddress)
-    const [
-      destinationAddressType,
-      isAssociatedTokenAccountActive,
-      fromTokenAccountAddresses,
-    ] = await Promise.all([
-      api.getAddressType(address),
-      api.isAssociatedTokenAccountActive(tokenAddress),
-      api.getTokenAccountsByOwner(from),
-    ])
-
-    const fromTokenAddresses = fromTokenAccountAddresses.filter(
-      ({ mintAddress }) => mintAddress === tokenMintAddress
-    )
-
-    tokenParams = {
-      tokenMintAddress,
-      destinationAddressType,
-      isAssociatedTokenAccountActive,
-      fromTokenAddresses,
-      tokenStandard,
+    const stakingParams = {
+      method,
+      stakeAddresses,
+      seed,
+      pool,
     }
-  }
 
-  const stakingParams = {
-    method,
-    stakeAddresses,
-    seed,
-    pool,
-  }
+    const magicEdenParams = {
+      method,
+      initializerAddress,
+      initializerDepositTokenAddress,
+      takerAmount,
+      escrowAddress,
+      escrowBump,
+      pdaAddress,
+      takerAddress,
+      expectedTakerAmount,
+      expectedMintAddress,
+      metadataAddress,
+      creators,
+    }
 
-  const magicEdenParams = {
-    method,
-    initializerAddress,
-    initializerDepositTokenAddress,
-    takerAmount,
-    escrowAddress,
-    escrowBump,
-    pdaAddress,
-    takerAddress,
-    expectedTakerAmount,
-    expectedMintAddress,
-    metadataAddress,
-    creators,
-  }
+    const unsignedTransaction = createUnsignedTx({
+      asset,
+      from,
+      to: address,
+      amount,
+      fee: feeAmount,
+      recentBlockhash,
+      reference,
+      memo,
+      ...tokenParams,
+      ...stakingParams,
+      ...magicEdenParams,
+    })
 
-  const unsignedTransaction = createUnsignedTx({
-    asset,
-    from,
-    to: address,
-    amount,
-    fee: feeAmount,
-    recentBlockhash,
-    reference,
-    memo,
-    ...tokenParams,
-    ...stakingParams,
-    ...magicEdenParams,
-  })
-
-  const { txId, rawTx } = await assetClientInterface.signTransaction({
-    assetName: baseAsset.name,
-    unsignedTx: unsignedTransaction,
-    walletAccount,
-  })
-
-  await baseAsset.api.broadcastTx(rawTx)
-
-  const selfSend = from === address
-  const isStakingTx = ['delegate', 'undelegate', 'withdraw'].includes(method)
-  const coinAmount = isStakingTx
-    ? amount.abs()
-    : selfSend
-    ? asset.currency.ZERO
-    : amount.abs().negate()
-
-  const data = isStakingTx ? { staking: stakingParams } : Object.create(null)
-  const tx = {
-    txId,
-    confirmations: 0,
-    coinName: assetName,
-    coinAmount,
-    feeAmount,
-    feeCoinName: asset.feeAsset.name,
-    selfSend,
-    to: address,
-    data,
-    currencies: { [assetName]: asset.currency, [asset.feeAsset.name]: asset.feeAsset.currency },
-  }
-  await assetClientInterface.updateTxLogAndNotify({ assetName, walletAccount, txs: [tx] })
+    const { txId, rawTx } = await assetClientInterface.signTransaction({
+      assetName: baseAsset.name,
+      unsignedTx: unsignedTransaction,
+      walletAccount,
+    })
+
+    await baseAsset.api.broadcastTx(rawTx)
 
-  if (isToken) {
-    // write tx entry in solana for token fee
-    const txForFee = {
+    const selfSend = from === address
+    const isStakingTx = ['delegate', 'undelegate', 'withdraw'].includes(method)
+    const coinAmount = isStakingTx
+      ? amount.abs()
+      : selfSend
+        ? asset.currency.ZERO
+        : amount.abs().negate()
+
+    const data = isStakingTx
+      ? { staking: { ...stakingParams, stake: coinAmount.toBaseNumber() } }
+      : Object.create(null)
+    const tx = {
       txId,
       confirmations: 0,
-      coinName: baseAsset.name,
-      coinAmount: baseAsset.currency.ZERO,
-      tokens: [assetName],
+      coinName: assetName,
+      coinAmount,
       feeAmount,
-      feeCoinName: baseAsset.feeAsset.name,
-      to: address,
+      feeCoinName: asset.feeAsset.name,
       selfSend,
-      currencies: {
-        [baseAsset.name]: baseAsset.currency,
-        [baseAsset.feeAsset.name]: baseAsset.feeAsset.currency,
-      },
+      to: address,
+      data,
+      currencies: { [assetName]: asset.currency, [asset.feeAsset.name]: asset.feeAsset.currency },
+    }
+    await assetClientInterface.updateTxLogAndNotify({ assetName, walletAccount, txs: [tx] })
+
+    if (isToken) {
+      // write tx entry in solana for token fee
+      const txForFee = {
+        txId,
+        confirmations: 0,
+        coinName: baseAsset.name,
+        coinAmount: baseAsset.currency.ZERO,
+        tokens: [assetName],
+        feeAmount,
+        feeCoinName: baseAsset.feeAsset.name,
+        to: address,
+        selfSend,
+        currencies: {
+          [baseAsset.name]: baseAsset.currency,
+          [baseAsset.feeAsset.name]: baseAsset.feeAsset.currency,
+        },
+      }
+      await assetClientInterface.updateTxLogAndNotify({
+        assetName: baseAsset.name,
+        walletAccount,
+        txs: [txForFee],
+      })
     }
-    await assetClientInterface.updateTxLogAndNotify({
-      assetName: baseAsset.name,
-      walletAccount,
-      txs: [txForFee],
-    })
-  }
 
-  return { txId }
-}
+    return { txId }
+  }