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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.30",
+  "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": "5270d4cf5f0a0ae9486533f237e6abe6f026ed16"
+  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
 }

package/src/api.js

@@ -52,23 +52,25 @@ export class Api {
 
   request(path, contentType = 'application/json') {
     return wretch(urljoin(this.rpcUrl, path)).headers({
-      'Content-type': contentType,
+      'Content-Type': contentType,
     })
   }
 
   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,
@@ -772,8 +774,8 @@ export class Api {
     if (!stakingAddresses.length) return 0
 
     // custom endpoint!
-    const rewards = await this.request(`rewards?addresses=${stakingAddresses.join(',')}`)
-      .get()
+    const rewards = await this.request('rewards')
+      .post({ addresses: stakingAddresses })
       .error(500, () => ({})) // addresses not found
       .error(400, () => ({}))
       .json()

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

@@ -41,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)
       },
-      */
     })
   }