@exodus/solana-api 3.10.0 → 3.11.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.11.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.10.1...@exodus/solana-api@3.11.0) (2024-09-11)
+
+
+### Features
+
+* switch solana to ESM ([#3412](https://github.com/ExodusMovement/assets/issues/3412)) ([c1d30ce](https://github.com/ExodusMovement/assets/commit/c1d30ce752c9d2aa0667f98a8b90a55396fec286))
+
+
+### Bug Fixes
+
+* exodus/asset-json-rpc is cjs exporting an object with 'default' ([#3312](https://github.com/ExodusMovement/assets/issues/3312)) ([d6fee86](https://github.com/ExodusMovement/assets/commit/d6fee8693517859fc445c062c0cf97c618da0fad))
+* solana socket id collisions ([#3422](https://github.com/ExodusMovement/assets/issues/3422)) ([d6df7d5](https://github.com/ExodusMovement/assets/commit/d6df7d5ca08dd707dc52d8726802d5fc9bbd17a2))
+* **solana-api:** websocket fixes and performance ([#3419](https://github.com/ExodusMovement/assets/issues/3419)) ([664dacd](https://github.com/ExodusMovement/assets/commit/664dacdcefe68e84ae10b9beeffea8b1af6074a0))
+
+
+
+## [3.10.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.10.0...@exodus/solana-api@3.10.1) (2024-08-26)
+
+
+### Bug Fixes
+
+* update exodus/timer ([#3134](https://github.com/ExodusMovement/assets/issues/3134)) ([e977be5](https://github.com/ExodusMovement/assets/commit/e977be5280c214c1b814409d9461ce6628bb19be))
+
+
+
 ## [3.10.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.4...@exodus/solana-api@3.10.0) (2024-08-08)
 
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "description": "Exodus internal Solana asset API wrapper",
+  "type": "module",
   "main": "src/index.js",
   "files": [
     "src",
@@ -16,23 +17,22 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "run -T exodus-test --jest --esbuild",
-    "lint": "run -T eslint .",
+    "test": "run -T exodus-test --jest",
+    "lint": "run -T eslintc .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.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/asset-lib": "^5.0.0",
+    "@exodus/assets": "^11.0.0",
+    "@exodus/basic-utils": "^3.0.1",
+    "@exodus/currency": "^5.0.2",
     "@exodus/fetch": "^1.2.0",
-    "@exodus/models": "^10.1.0",
-    "@exodus/nfts-core": "^0.5.0",
+    "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.4.2",
-    "@exodus/solana-meta": "^1.0.7",
-    "@exodus/timer": "^1.0.0",
+    "@exodus/solana-lib": "^3.6.0",
+    "@exodus/solana-meta": "^2.0.0",
+    "@exodus/timer": "^1.1.1",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
     "delay": "^4.0.1",
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0",
-    "@solana/web3.js": "^1.91.8"
+    "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc2"
   },
-  "gitHead": "101deb0e348677bb19d301df54c53557a64f80fe",
+  "gitHead": "b41d4471ed86010b8eed3e22af9503f01e5ff595",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/account-state.js

@@ -1,7 +1,9 @@
 import { assetsListToObject } from '@exodus/assets'
 import { isNumberUnit } from '@exodus/currency'
 import { AccountState } from '@exodus/models'
-import { isString, reduce } from 'lodash'
+import lodash from 'lodash'
+
+const { isString, reduce } = lodash
 
 const parseBalance = (balance, asset) =>
   !isNumberUnit(balance) && isString(balance) ? asset.currency.parse(balance) : balance

package/src/api.js

@@ -1,5 +1,4 @@
-import createApi from '@exodus/asset-json-rpc'
-import { magicEden } from '@exodus/nfts-core'
+import createApiCJS from '@exodus/asset-json-rpc'
 import { retry } from '@exodus/simple-retry'
 import {
   buildRawTransaction,
@@ -14,13 +13,15 @@ import {
   TOKEN_2022_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
-import assert from 'assert'
 import BN from 'bn.js'
 import lodash from 'lodash'
+import assert from 'minimalistic-assert'
 import urljoin from 'url-join'
 import wretch from 'wretch'
 
-import { Connection } from './connection'
+import { Connection } from './connection.js'
+
+const createApi = createApiCJS.default || createApiCJS
 
 // Doc: https://docs.solana.com/apps/jsonrpc-api
 
@@ -491,7 +492,7 @@ export class Api {
       }
     } else {
       // Token tx
-      assert.ok(
+      assert(
         Array.isArray(tokenAccountsByOwner),
         'tokenAccountsByOwner is required when parsing token tx'
       )
@@ -988,32 +989,14 @@ export class Api {
         ])
 
         const tokenMetaPlex = _tokenMetaPlex || { name: null, symbol: null }
-        let nft = {
-          collectionId: null,
-          collectionName: null,
-          collectionTitle: null,
-          title: null,
-        }
+        let nft = Object.create(null)
 
         // Only perform an NFT check (getSupply) if decimal is zero
         if (decimal === 0 && (await _getSupply(account.mint)) === '1') {
-          try {
-            const {
-              id: collectionId,
-              collectionName,
-              collectionTitle,
-              title,
-            } = await magicEden.api.getNFTByMintAddress(account.mint)
-            nft = {
-              collectionId,
-              collectionTitle,
-              collectionName,
-              title,
-            }
-            tokenMetaPlex.name = tokenMetaPlex.name || collectionTitle
-            tokenMetaPlex.symbol = tokenMetaPlex.symbol || collectionName
-          } catch (error) {
-            console.warn(error)
+          const compositeId = account.mint
+          nft = {
+            id: `solana:${compositeId}`,
+            compositeId,
           }
         }
 

package/src/connection.js

@@ -40,12 +40,13 @@ export class Connection {
     this.pingTimeout = null
     this.reconnectTimeout = null
     this.txCache = {}
+    this.seq = 0
 
     this.sendMessage = makeConcurrent(
       async (method, params = []) => {
         return new Promise((resolve, reject) => {
           if (this.isClosed || this.shutdown) return reject(new Error('connection not started'))
-          const id = Math.floor(Math.random() * 1e7) + 1
+          const id = ++this.seq
 
           this.rpcQueue[id] = { resolve, reject }
           this.rpcQueue[id].timeout = setTimeout(() => {
@@ -169,7 +170,7 @@ export class Connection {
               encoding: 'jsonParsed',
             },
           ],
-          id: 1,
+          id: ++this.seq,
         })
       )
       // sub for incoming/outcoming txs
@@ -178,7 +179,7 @@ export class Connection {
           jsonrpc: '2.0',
           method: 'logsSubscribe',
           params: [{ mentions: [address] }, { commitment: 'finalized' }],
-          id: 2,
+          id: ++this.seq,
         })
       )
     })
@@ -219,9 +220,10 @@ export class Connection {
     clearTimeout(this.pingTimeout)
     if (this.ws && (this.isConnecting || this.isOpen)) {
       // this.ws.send(JSON.stringify({ method: 'close' }))
-      await delay(ms('1s')) // allow for the 'close' round-trip
+      // Not sending the method above so just no need to wait below
+      // await delay(ms('1s')) // allow for the 'close' round-trip
       await this.ws.close()
-      await this.ws.terminate()
+      if (this.ws.terminate) await this.ws.terminate()
     }
   }
 
@@ -239,8 +241,6 @@ export class Connection {
     if (this.shutdown) return
     this.shutdown = true
     await this.close()
-    while (this.running) {
-      await delay(ms('1s'))
-    }
+    while (this.running) await delay(ms('50ms'))
   }
 } // Connection

package/src/index.js

@@ -2,21 +2,21 @@ import { connectAssets } from '@exodus/assets'
 import { keyBy } from '@exodus/basic-utils'
 import assetsList from '@exodus/solana-meta'
 
-import { Api } from './api'
+import { Api } from './api.js'
 
-export { default as SolanaFeeMonitor } from './fee-monitor'
-export { SolanaMonitor, SolanaAutoWithdrawMonitor } from './tx-log'
-export { createAccountState } from './account-state'
-export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils'
+export { default as SolanaFeeMonitor } from './fee-monitor.js'
+export { SolanaMonitor, SolanaAutoWithdrawMonitor } from './tx-log/index.js'
+export { createAccountState } from './account-state.js'
+export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils.js'
 export {
   isSolanaStaking,
   isSolanaUnstaking,
   isSolanaWithdrawn,
   isSolanaRewardsActivityTx,
-} from './txs-utils'
-export { createAndBroadcastTXFactory } from './tx-send'
-export { getBalancesFactory } from './get-balances'
-export { stakingProviderClientFactory } from './staking-provider-client'
+} from './txs-utils.js'
+export { createAndBroadcastTXFactory } from './tx-send.js'
+export { getBalancesFactory } from './get-balances.js'
+export { stakingProviderClientFactory } from './staking-provider-client.js'
 
 // These are not the same asset objects as the wallet creates, so they should never be returned to the wallet.
 // Initially this may be violated by the Solana code until the first monitor tick updates assets with setTokens()
@@ -27,4 +27,4 @@ const assets = connectAssets(keyBy(assetsList, (asset) => asset.name))
 const serverApi = new Api({ assets })
 export default serverApi
 
-export { Api } from './api'
+export { Api } from './api.js'

package/src/tx-log/index.js

@@ -1,2 +1,2 @@
-export * from './solana-monitor'
-export * from './solana-auto-withdraw-monitor'
+export * from './solana-monitor.js'
+export * from './solana-auto-withdraw-monitor.js'

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

@@ -1,8 +1,10 @@
 import { Timer } from '@exodus/timer'
-import assert from 'assert'
-import { get } from 'lodash'
+import lodash from 'lodash'
+import assert from 'minimalistic-assert'
 import ms from 'ms'
 
+const { get } = lodash
+
 const INTERVAL = ms('30s')
 
 export class SolanaAutoWithdrawMonitor {

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

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import assert from 'minimalistic-assert'
 import ms from 'ms'
 
-import { DEFAULT_POOL_ADDRESS } from '../account-state'
+import { DEFAULT_POOL_ADDRESS } from '../account-state.js'
 
 const DEFAULT_REMOTE_CONFIG = {
   rpcs: [],

package/src/tx-send.js

@@ -5,7 +5,7 @@ import {
   TOKEN_2022_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
-import { transactionToBase58 } from '@exodus/solana-lib/src/tx/common'
+import { transactionToBase58 } from '@exodus/solana-lib/src/tx/common.js'
 import assert from 'minimalistic-assert'
 
 export const createAndBroadcastTXFactory =

package/src/txs-utils.js

@@ -1,4 +1,6 @@
-import { get } from 'lodash'
+import lodash from 'lodash'
+
+const { get } = lodash
 
 const isSolanaTx = (tx) => tx.coinName === 'solana'
 export const isSolanaStaking = (tx) =>