@exodus/solana-api 3.6.1 → 3.7.0

package/CHANGELOG.md

@@ -0,0 +1,178 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [3.7.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.6.2...@exodus/solana-api@3.7.0) (2024-06-13)
+
+
+### Features
+
+* use ME API for SOL fungible assets ([#2490](https://github.com/ExodusMovement/assets/issues/2490)) ([8234222](https://github.com/ExodusMovement/assets/commit/82342222f57949da4d7128f7f92baf6a0bc1781e))
+
+
+
+## [3.6.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.6.1...@exodus/solana-api@3.6.2) (2024-06-11)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
+## [3.6.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.6.0...@exodus/solana-api@3.6.1) (2024-06-06)
+
+
+### Bug Fixes
+
+* set solana pool address ([#2494](https://github.com/ExodusMovement/assets/issues/2494)) ([1307021](https://github.com/ExodusMovement/assets/commit/13070218d33476ea1c9603dc01cb1852dd89d701))
+
+
+
+## [3.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.5.0...@exodus/solana-api@3.6.0) (2024-05-31)
+
+
+### Features
+
+* add SOL staking provider client ([#2420](https://github.com/ExodusMovement/assets/issues/2420)) ([a39413d](https://github.com/ExodusMovement/assets/commit/a39413db095f12f9f8dfb757a56052561d399616))
+
+
+
+## [3.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.4.2...@exodus/solana-api@3.5.0) (2024-05-29)
+
+
+### Features
+
+* **solana:** add getFeeForMessage to Solana API ([#2203](https://github.com/ExodusMovement/assets/issues/2203)) ([26bf824](https://github.com/ExodusMovement/assets/commit/26bf82496932c7d1f183afaeb75e224f831571e2))
+
+
+
+## [3.4.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.4.1...@exodus/solana-api@3.4.2) (2024-05-28)
+
+
+### Bug Fixes
+
+* add recommended option to getPriorityFeeEstimate rpc ([#2402](https://github.com/ExodusMovement/assets/issues/2402)) ([d010996](https://github.com/ExodusMovement/assets/commit/d010996a05833d0517559a6697af02fba7fe6b2b))
+
+
+
+## [3.4.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.4.0...@exodus/solana-api@3.4.1) (2024-04-22)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
+## [3.4.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.3.2...@exodus/solana-api@3.4.0) (2024-04-20)
+
+
+### Features
+
+* add compute budget instruction ([#2006](https://github.com/ExodusMovement/assets/issues/2006)) ([f1479ac](https://github.com/ExodusMovement/assets/commit/f1479aca619370da573f442ef4526e6d21db14d2))
+
+
+
+## [3.3.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.3.1...@exodus/solana-api@3.3.2) (2024-04-17)
+
+### Bug Fixes
+
+* support solana spl -> sol dex txs ([#2045](https://github.com/ExodusMovement/assets/issues/2045)) ([d48bd85](https://github.com/ExodusMovement/assets/commit/d48bd85d2b52e1daaa92a1c00ce6c9d6309ebbf7))
+
+
+
+## [3.3.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.3.0...@exodus/solana-api@3.3.1) (2024-04-12)
+
+
+### Bug Fixes
+
+* add fetch polyfill with exodus user-agent ([#1983](https://github.com/ExodusMovement/assets/issues/1983)) ([4dc0e23](https://github.com/ExodusMovement/assets/commit/4dc0e23f397a9bc257ccb5589077d80c29172abe))
+* **solana:** send transaction changes ([#2027](https://github.com/ExodusMovement/assets/issues/2027)) ([0047303](https://github.com/ExodusMovement/assets/commit/0047303b72e76620617a119f845bb4f26074912f))
+
+
+
+## [3.3.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.2.0...@exodus/solana-api@3.3.0) (2024-04-04)
+
+
+### Features
+
+* implement helius priority fee ([#1799](https://github.com/ExodusMovement/assets/issues/1799)) ([e681ee7](https://github.com/ExodusMovement/assets/commit/e681ee7f52526bc8a77ab9917d57fb5c2fca2fd4))
+
+
+
+## [3.2.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.1.0...@exodus/solana-api@3.2.0) (2024-03-29)
+
+
+### Features
+
+* solana new balances ([#1913](https://github.com/ExodusMovement/assets/issues/1913)) ([f83c5f7](https://github.com/ExodusMovement/assets/commit/f83c5f7b3e450df9fcd6790a6b40a6797e42dc2e))
+
+
+
+## [3.1.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.0.0...@exodus/solana-api@3.1.0) (2024-03-27)
+
+
+### Features
+
+* add new Solana token 2022 program ([#1808](https://github.com/ExodusMovement/assets/issues/1808)) ([90747bc](https://github.com/ExodusMovement/assets/commit/90747bc97fba0e629a1eaba5878dd06f834b0d72))
+
+
+### Bug Fixes
+
+* support token-2022 program for metaplex transfer ([#1894](https://github.com/ExodusMovement/assets/issues/1894)) ([31f712a](https://github.com/ExodusMovement/assets/commit/31f712a8fda681969b1c3dbe6f4c5e3d250f3062))
+
+
+
+## [3.0.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@2.5.34...@exodus/solana-api@3.0.0) (2024-03-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* expose account state factory function (#1832)
+
+### Features
+
+* **solana-api:** pass feeData to createUnsignedTx ([#1815](https://github.com/ExodusMovement/assets/issues/1815)) ([3c6fe2a](https://github.com/ExodusMovement/assets/commit/3c6fe2a529b362025482c858cf0c0a102291b62e))
+
+
+### Code Refactoring
+
+* expose account state factory function ([#1832](https://github.com/ExodusMovement/assets/issues/1832)) ([1879d7b](https://github.com/ExodusMovement/assets/commit/1879d7ba060e5c7f08316711df5b94448e7bcea6))
+
+
+
+## [2.5.34](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@2.5.33...@exodus/solana-api@2.5.34) (2024-03-18)
+
+
+### Bug Fixes
+
+* pass in txsLimit to solana monitor ([#1792](https://github.com/ExodusMovement/assets/issues/1792)) ([7283048](https://github.com/ExodusMovement/assets/commit/7283048c56b239a690064d14ff9b4d0228c078a9))
+
+
+
+
+
+## [2.5.33](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@2.5.32...@exodus/solana-api@2.5.33) (2024-03-18)
+
+
+### Bug Fixes
+
+* prefer on-chain data over account state calculation ([#1781](https://github.com/ExodusMovement/assets/issues/1781)) ([aa5cbcf](https://github.com/ExodusMovement/assets/commit/aa5cbcf81c3e5d0ee29a8650d74ab928e1317724))
+
+
+
+
+
+## [2.5.32](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@2.5.30...@exodus/solana-api@2.5.32) (2024-03-16)
+
+
+### Features
+
+* limit SOL txs to latest 100 ([#1688](https://github.com/ExodusMovement/assets/issues/1688)) ([6b24ac5](https://github.com/ExodusMovement/assets/commit/6b24ac57c1e3d0f2eccb1efdaad9b9a1759d3a7c))
+* solana monitor history refactor to use fewer transaction rpc calls ([#1559](https://github.com/ExodusMovement/assets/issues/1559)) ([8933aa6](https://github.com/ExodusMovement/assets/commit/8933aa61d712faf9665de87bdc1a1c5cabd2d403))
+* **solana:** migrate some implementations and remove `@exodus/solana-spl-tokan` usage. ([#1669](https://github.com/ExodusMovement/assets/issues/1669)) ([ee75e1f](https://github.com/ExodusMovement/assets/commit/ee75e1fbf5c276aafc91260dee9ad6e44e5c8b8b))
+
+
+### Bug Fixes
+
+* solana set stake amount when in tx on tx-send ([#1752](https://github.com/ExodusMovement/assets/issues/1752)) ([7c09616](https://github.com/ExodusMovement/assets/commit/7c0961624df39bbb57a5c3bce395f8f31f3be141))

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
     "src",
-    "!src/**/__tests__",
+    "CHANGELOG.md",
+    "package.json",
     "README.md",
-    "package.json"
+    "!src/**/__tests__"
   ],
-  "author": "Exodus",
+  "author": "Exodus Movement, Inc.",
   "license": "ISC",
   "publishConfig": {
     "access": "restricted"
   },
   "scripts": {
     "test": "run -T jest",
-    "lint": "run -T eslint ./src",
+    "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
@@ -38,12 +39,20 @@
     "make-concurrent": "^4.0.0",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.3",
-    "url-join": "4.0.0",
+    "url-join": "^4.0.0",
     "wretch": "^1.5.2"
   },
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0",
     "@solana/web3.js": "^1.91.8"
   },
-  "gitHead": "9d24eb58422692fc1acdcb834061d02b2632801d"
+  "gitHead": "0703f508ef7b1a34bc99f910e6220989382abc00",
+  "bugs": {
+    "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
+  },
+  "homepage": "https://github.com/ExodusMovement/assets/tree/master/solana/solana-api",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ExodusMovement/assets.git"
+  }
 }

package/src/api.js

@@ -2,17 +2,17 @@ import BN from 'bn.js'
 import createApi from '@exodus/asset-json-rpc'
 import { retry } from '@exodus/simple-retry'
 import {
-  getMetadataAccount,
+  buildRawTransaction,
+  computeBalance,
   deserializeMetaplexMetadata,
-  getTransactionSimulationParams,
   filterAccountsByOwner,
-  SYSTEM_PROGRAM_ID,
+  getMetadataAccount,
+  getTransactionSimulationParams,
+  SOL_DECIMAL,
   STAKE_PROGRAM_ID,
-  TOKEN_PROGRAM_ID,
+  SYSTEM_PROGRAM_ID,
   TOKEN_2022_PROGRAM_ID,
-  SOL_DECIMAL,
-  computeBalance,
-  buildRawTransaction,
+  TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
 import assert from 'assert'
 import lodash from 'lodash'
@@ -37,6 +37,11 @@ export class Api {
     this.tokensToSkip = {}
     this.txsLimit = txsLimit
     this.connections = {}
+    this.getSupply = lodash.memoize(async (mintAddress) => {
+      // cached getSupply
+      const result = await this.rpcCall('getTokenSupply', [mintAddress])
+      return lodash.get(result, 'value.amount')
+    })
   }
 
   setServer(rpcUrl) {
@@ -620,11 +625,6 @@ export class Api {
     }
   }
 
-  async getSupply(mintAddress) {
-    const result = await this.rpcCall('getTokenSupply', [mintAddress])
-    return lodash.get(result, 'value.amount')
-  }
-
   async getWalletTokensList({ tokenAccounts }) {
     const tokensMint = []
     for (const account of tokenAccounts) {
@@ -635,10 +635,12 @@ export class Api {
       // skip 0 balance
       if (account.balance === '0') continue
       // skip NFT
-      const supply = await this.getSupply(mint)
-      if (supply === '1') {
-        this.tokensToSkip[mint] = true
-        continue
+      if (!this.tokens.has(mint)) {
+        const supply = await this.getSupply(mint)
+        if (supply === '1') {
+          this.tokensToSkip[mint] = true
+          continue
+        }
       }
 
       // OK

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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,135 @@
+import { SolanaMonitor } from './solana-monitor'
+import wretch from 'wretch'
+import urljoin from 'url-join'
+import fetchFlagrEvaluation from './me-flagr'
+
+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.staking.enabled
+  }
+
+  async getTokenAccounts({ address }) {
+    if (!this.useMeMonitor) {
+      return super.getTokenAccounts({ address })
+    }
+
+    const tokens = this.getTokens()
+    const body = [
+      {
+        address,
+        chain: 'solana',
+      },
+    ]
+
+    const { balances } = await this.request('v1/wallet/balances/fungible').post(body).json()
+
+    return balances
+      .filter((balance) => balance.asset.mintAddress !== SOL_NATIVE)
+      .map((balance) => {
+        const asset = balance.asset
+        const mintAddress = asset.mintAddress
+        const token = tokens.get(mintAddress) || {
+          // name here is the exodus unique identifier not the display name
+          name: 'unknown',
+          ticker: asset.symbol,
+          decimals: balance.decimals,
+        }
+
+        return {
+          tokenAccountAddress: asset.tokenAccount,
+          owner: balance.owner,
+          tokenName: token.name,
+          ticker: token.ticker,
+          balance: balance.balance.rawBalance,
+          mintAddress,
+          tokenProgram: asset.tokenProgram,
+          decimals: token.decimals,
+          feeBasisPoints: asset.feeBasisPoints ?? 0,
+          maximumFee: asset.maximumFee ?? 0,
+        }
+      })
+  }
+
+  async getAccount({ address, staking, tokenAccounts }) {
+    if (!this.useMeMonitor) {
+      return super.getAccount({ address })
+    }
+
+    const tokens = this.getTokens()
+    const body = [
+      {
+        address,
+        chain: 'solana',
+      },
+    ]
+
+    const { balances } = await this.request('v1/wallet/balances/fungible').post(body).json()
+
+    const result = {
+      balance: null,
+      tokenBalances: {},
+    }
+
+    balances.forEach((balanceData) => {
+      const { asset: responseAsset, balance } = balanceData
+      const mintAddress = responseAsset.mintAddress
+
+      if (mintAddress === SOL_NATIVE) {
+        // SOL balance
+        result.balance = this.asset.currency.baseUnit(balance.rawBalance)
+      } else if (tokens.has(mintAddress)) {
+        // Fungible token balances
+        const token = tokens.get(mintAddress)
+        const tokenKey = token.name
+        result.tokenBalances[tokenKey] = token.currency.baseUnit(balance.rawBalance)
+      }
+    })
+
+    return result
+  }
+}

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

@@ -54,6 +54,7 @@ export class SolanaMonitor extends BaseMonitor {
       walletAccount,
       useCache: true,
     })
+
     return this.api.watchAddress({
       address,
       onMessage: (json) => {
@@ -133,6 +134,14 @@ export class SolanaMonitor extends BaseMonitor {
     return clearedLogItems
   }
 
+  async getTokenAccounts({ address }) {
+    return this.api.getTokenAccountsByOwner(address)
+  }
+
+  isStakingEnabled() {
+    return true
+  }
+
   async tick({ walletAccount, refresh }) {
     // Check for new wallet account
     await this.initWalletAccount({ walletAccount })
@@ -146,11 +155,12 @@ export class SolanaMonitor extends BaseMonitor {
     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, staking: this.staking }
+    const staking =
+      this.isStakingEnabled() && fetchStakingInfo
+        ? await this.getStakingInfo({ address, stakingAddresses })
+        : { ...accountState.mem, staking: this.staking }
 
-    const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
+    const tokenAccounts = await this.getTokenAccounts({ address })
     const account = await this.getAccount({ address, staking, tokenAccounts })
 
     const balanceChanged = this.#balanceChanged({ account: accountState, newAccount: account })