@exodus/solana-api 2.5.31-alpha.0 → 2.5.31-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.31-alpha.0",
+  "version": "2.5.31-alpha.1",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "659340c999fa86c132293643a7fb96f33963e6cd"
+  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
 }

package/src/api.js

@@ -59,16 +59,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,

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
 
@@ -136,7 +138,7 @@ export class Connection {
           debug('pushing msg to queue', msg)
           this.messageQueue.push(msg) // sub results
         }
-        this.processMessages()
+        this.processMessages(json)
       } else {
         if (lodash.get(this.rpcQueue, json.id)) {
           this.rpcQueue[json.id].reject(new Error(json.error.message))
@@ -195,7 +197,8 @@ export class Connection {
     }
   }
 
-  async processMessages() {
+  async processMessages(json) {
+    if (this.onMsg) await this.onMsg(json)
     if (this.inProcessMessages) return null
     this.inProcessMessages = true
     try {

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

@@ -10,25 +10,14 @@ const DEFAULT_REMOTE_CONFIG = {
   staking: { enabled: true, pool: DEFAULT_POOL_ADDRESS },
 }
 
-const TICKS_BETWEEN_HISTORY_FETCHES = 10
-const TICKS_BETWEEN_STAKE_FETCHES = 5
-
 export class SolanaMonitor extends BaseMonitor {
-  constructor({
-    api,
-    includeUnparsed = false,
-    ticksBetweenHistoryFetches = TICKS_BETWEEN_HISTORY_FETCHES,
-    ticksBetweenStakeFetches = TICKS_BETWEEN_STAKE_FETCHES,
-    ...args
-  }) {
+  constructor({ api, includeUnparsed = false, ...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))
   }
@@ -52,15 +41,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)
       },
-      */
     })
   }
 
@@ -103,20 +87,6 @@ export class SolanaMonitor extends BaseMonitor {
     return _.uniq(_.flatten(stakingAddresses))
   }
 
-  balanceChanged({ account, newAccount }) {
-    const solBalanceChanged = !account.balance || !account.balance.equals(newAccount.balance)
-    if (solBalanceChanged) return true
-
-    const tokenBalanceChanged =
-      !account.tokenBalances ||
-      Object.entries(newAccount.tokenBalances).some(
-        ([token, balance]) =>
-          !account.tokenBalances[token] || !account.tokenBalances[token].equals(balance)
-      )
-
-    return tokenBalanceChanged
-  }
-
   async tick({ walletAccount, refresh }) {
     // Check for new wallet account
     await this.initWalletAccount({ walletAccount })
@@ -129,43 +99,28 @@ export class SolanaMonitor extends BaseMonitor {
     const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
     const stakingAddresses = await this.getStakingAddressesFromTxLog({ assetName, walletAccount })
 
-    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 { logItemsByAsset, hasNewTxs, cursorState } = await this.getHistory({
+      address,
+      accountState,
+      walletAccount,
+      refresh,
+    })
 
-    const balanceChanged = this.balanceChanged({ account: accountState, newAccount: account })
+    const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
 
-    const isHistoryUpdateTick =
-      this.tickCount[walletAccount] % this.ticksBetweenHistoryFetches === 0
+    if (refresh || hasNewTxs || cursorChanged) {
+      const staking =
+        refresh || cursorChanged
+          ? await this.getStakingInfo({ address, stakingAddresses })
+          : accountState.mem
 
-    const shouldUpdateHistory = refresh || isHistoryUpdateTick || balanceChanged
-    const shouldUpdateOnlyBalance = balanceChanged && !shouldUpdateHistory
-    const shouldUpdateBalanceBeforeHistory = true
+      const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
+      const account = await this.getAccount({ address, staking, tokenAccounts })
 
-    // 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 })
-    }
-    if (shouldUpdateHistory) {
-      const { logItemsByAsset, cursorState } = await this.getHistory({
-        address,
-        accountState,
-        walletAccount,
-        refresh,
-      })
-
-      const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
-
-      // update all state at once
       await this.updateTxLogByAsset({ walletAccount, logItemsByAsset, refresh })
       await this.updateState({ account, cursorState, walletAccount, staking })
-      await this.emitUnknownTokensEvent({ tokenAccounts })
       if (refresh || cursorChanged) {
         this.cursors[walletAccount] = cursorState.cursor
       }