@exodus/solana-api 3.9.3 → 3.10.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.10.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.4...@exodus/solana-api@3.10.0) (2024-08-08)
+
+
+### Features
+
+* move ME solana monitor to the ME codebase ([#3117](https://github.com/ExodusMovement/assets/issues/3117)) ([6e2b25c](https://github.com/ExodusMovement/assets/commit/6e2b25c15d5c43a775b0ab53792882f69aa5c30d))
+
+
+### Reverts
+
+* Revert "chore: skip ws test" (#3078) ([072f542](https://github.com/ExodusMovement/assets/commit/072f542dbe1adca57703da680508bbf21b412e3a)), closes [#3078](https://github.com/ExodusMovement/assets/issues/3078)
+
+
+
+## [3.9.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.3...@exodus/solana-api@3.9.4) (2024-08-01)
+
+
+### Bug Fixes
+
+* revert object.defineProperty usage ([#3056](https://github.com/ExodusMovement/assets/issues/3056)) ([493a486](https://github.com/ExodusMovement/assets/commit/493a4865ed07c816167b96a5d01ba0f154b077c8))
+* SOL lint ([#2953](https://github.com/ExodusMovement/assets/issues/2953)) ([3f1b3b8](https://github.com/ExodusMovement/assets/commit/3f1b3b8c9a1544ca7d41ac883c06e465d6928b32))
+
+
+
 ## [3.9.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.2...@exodus/solana-api@3.9.3) (2024-07-23)
 
 **Note:** Version bump only for package @exodus/solana-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.9.3",
+  "version": "3.10.0",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@solana/web3.js": "^1.91.8"
   },
-  "gitHead": "faa92e86406bfff4f738557b73773bc8c539d53d",
+  "gitHead": "101deb0e348677bb19d301df54c53557a64f80fe",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/account-state.js

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

package/src/connection.js

@@ -1,9 +1,9 @@
-import ms from 'ms'
+import { WebSocket } from '@exodus/fetch'
+import debugLogger from 'debug'
 import delay from 'delay'
 import lodash from 'lodash'
-import debugLogger from 'debug'
-import { WebSocket } from '@exodus/fetch'
 import makeConcurrent from 'make-concurrent'
+import ms from 'ms'
 
 // WS subscriptions: https://docs.solana.com/developing/clients/jsonrpc-api#subscription-websocket
 

package/src/index.js

@@ -1,5 +1,5 @@
-import { keyBy } from '@exodus/basic-utils'
 import { connectAssets } from '@exodus/assets'
+import { keyBy } from '@exodus/basic-utils'
 import assetsList from '@exodus/solana-meta'
 
 import { Api } from './api'

package/src/staking-provider-client.js

@@ -1,5 +1,5 @@
-import assert from 'minimalistic-assert'
 import { fetchival } from '@exodus/fetch'
+import assert from 'minimalistic-assert'
 import ms from 'ms'
 
 const DEFAULT_STAKING_URL = 'https://staking.a.exodus.io'

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

@@ -1,7 +1,7 @@
 import { Timer } from '@exodus/timer'
+import assert from 'assert'
 import { get } from 'lodash'
 import ms from 'ms'
-import assert from 'assert'
 
 const INTERVAL = ms('30s')
 

package/src/tx-send.js

@@ -2,8 +2,8 @@ import {
   createUnsignedTx,
   findAssociatedTokenAddress,
   prepareForSigning,
-  TOKEN_PROGRAM_ID,
   TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
 import { transactionToBase58 } from '@exodus/solana-lib/src/tx/common'
 import assert from 'minimalistic-assert'

package/src/tx-log/me-flagr.js

@@ -1,18 +0,0 @@
-import wretch from 'wretch'
-import urljoin from 'url-join'
-
-const FLAGR_URL = 'https://flagr-w.magiceden.io/api/v1/evaluation'
-
-const fetchFlagrEvaluation = async (wallet, flagKey) => {
-  const url = urljoin(FLAGR_URL)
-  const entityContext = { wallet }
-
-  try {
-    return await wretch(url).post({ entityContext, flagKey }).json()
-  } catch (error) {
-    console.error('Error fetching flagr:', error)
-    throw error
-  }
-}
-
-export default fetchFlagrEvaluation

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

@@ -1,132 +0,0 @@
-import urljoin from 'url-join'
-import wretch from 'wretch'
-
-import fetchFlagrEvaluation from './me-flagr'
-import { SolanaMonitor } from './solana-monitor'
-
-const FLAGR_KEY = 'sol-balance-api'
-const SOL_NATIVE = '11111111111111111111111111111111'
-
-export class MeSolanaMonitor extends SolanaMonitor {
-  #extraHeaders
-
-  constructor(args) {
-    super(args)
-    this.useMeMonitor = false
-    this.#extraHeaders = args.extraHeaders
-  }
-
-  async startListener({ walletAccount }) {
-    const address = await this.aci.getReceiveAddress({
-      assetName: this.asset.name,
-      walletAccount,
-      useCache: true,
-    })
-    await this.initFlagr(address)
-    return super.startListener({ walletAccount })
-  }
-
-  request(path, contentType = 'application/json') {
-    return wretch(urljoin('https://api-mainnet.magiceden.io', path)).headers({
-      'Content-Type': contentType,
-      ...this.#extraHeaders,
-    })
-  }
-
-  async initFlagr(address) {
-    // If one of the user's SOL addresses is whitelisted, use the ME API
-    if (this.useMeMonitor) return
-    try {
-      const response = await fetchFlagrEvaluation(address, FLAGR_KEY)
-      if (response.variantKey === 'on') {
-        this.useMeMonitor = true
-      }
-    } catch (error) {
-      console.error('Failed to fetch useMeMonitor config:', error)
-    }
-  }
-
-  getTokens() {
-    return this.api.tokens
-  }
-
-  isStakingEnabled() {
-    return !this.useMeMonitor
-  }
-
-  async getAccountsAndBalances({ refresh, address, accountState, walletAccount }) {
-    if (!this.useMeMonitor) {
-      return super.getAccountsAndBalances({ refresh, address, accountState, walletAccount })
-    }
-
-    const tokens = this.getTokens()
-    const body = [
-      {
-        address,
-        chain: 'solana',
-      },
-    ]
-
-    const { balances } = await this.request('v1/wallet/balances/fungible').post(body).json()
-    const metadata = new Map()
-
-    const account = {
-      balance: this.asset.currency.ZERO,
-      tokenBalances: Object.create(null),
-    }
-    const tokenAccounts = []
-
-    balances.forEach((assetBalance) => {
-      const { asset: assetData, balance } = assetBalance
-      const mintAddress = assetData.mintAddress
-
-      if (assetBalance.asset?.id) {
-        metadata.set(assetBalance.asset.id, { imageURL: assetBalance.image })
-      }
-
-      if (mintAddress === SOL_NATIVE) {
-        // SOL balance
-        account.balance = this.asset.currency.baseUnit(balance.rawBalance)
-      } else {
-        // Fungible token balances
-        const token = tokens.get(mintAddress) || {
-          // name here is the exodus unique identifier not the display name
-          name: 'unknown',
-          ticker: assetData.symbol,
-          decimals: balance.decimals,
-        }
-
-        if (tokens.get(mintAddress)) {
-          const tokenKey = token.name
-          Object.defineProperty(account.tokenBalances, tokenKey, {
-            value: token.currency.baseUnit(balance.rawBalance),
-          })
-        }
-
-        const tokenAccount = {
-          tokenAccountAddress: assetData.tokenAccount,
-          owner: assetBalance.owner,
-          tokenName: token.name,
-          ticker: token.ticker,
-          balance: assetBalance.balance.rawBalance,
-          mintAddress,
-          tokenProgram: assetData.tokenProgram,
-          decimals: token.decimals,
-          feeBasisPoints: assetData.feeBasisPoints ?? 0,
-          maximumFee: assetData.maximumFee ?? 0,
-        }
-        tokenAccounts.push(tokenAccount)
-      }
-    })
-    this.emit('token-metadata', { source: 'solana', metadata })
-
-    const fetchStakingInfo =
-      refresh || this.tickCount[walletAccount] % this.ticksBetweenStakeFetches === 0
-    const staking =
-      this.isStakingEnabled() && fetchStakingInfo
-        ? await this.getStakingInfo({ address, walletAccount })
-        : { ...accountState.stakingInfo, staking: this.staking }
-
-    return { account, tokenAccounts, staking }
-  }
-}