@exodus/solana-api 3.9.1 → 3.9.3

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
+## [3.9.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.1...@exodus/solana-api@3.9.2) (2024-07-18)
+
+
+### Bug Fixes
+
+* match correct solana dex swap amount ([#2878](https://github.com/ExodusMovement/assets/issues/2878)) ([24d8d13](https://github.com/ExodusMovement/assets/commit/24d8d138a99d80d36088b89ff1f5d8a04308a2ec))
+
+
+
 ## [3.9.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.9.0...@exodus/solana-api@3.9.1) (2024-07-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.9.1",
+  "version": "3.9.3",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "run -T jest",
+    "test": "run -T exodus-test --jest --esbuild",
     "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix"
   },
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@solana/web3.js": "^1.91.8"
   },
-  "gitHead": "054951dbfb7fb897b4b072e35fd5601920393b71",
+  "gitHead": "faa92e86406bfff4f738557b73773bc8c539d53d",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/account-state.js

@@ -17,7 +17,7 @@ export const createAccountState = ({ assetList }) => {
       cursor: '',
       balance: asset.currency.ZERO,
       tokenBalances: Object.create(null),
-      mem: {
+      stakingInfo: {
         loaded: false,
         staking: {
           // remote-config data

package/src/api.js

@@ -1,5 +1,5 @@
-import BN from 'bn.js'
 import createApi from '@exodus/asset-json-rpc'
+import { magicEden } from '@exodus/nfts-core'
 import { retry } from '@exodus/simple-retry'
 import {
   buildRawTransaction,
@@ -15,10 +15,11 @@ import {
   TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
 import assert from 'assert'
+import BN from 'bn.js'
 import lodash from 'lodash'
 import urljoin from 'url-join'
 import wretch from 'wretch'
-import { magicEden } from '@exodus/nfts-core'
+
 import { Connection } from './connection'
 
 // Doc: https://docs.solana.com/apps/jsonrpc-api
@@ -26,7 +27,6 @@ import { Connection } from './connection'
 const RPC_URL = 'https://solana.a.exodus.io' // https://vip-api.mainnet-beta.solana.com/, https://api.mainnet-beta.solana.com
 const WS_ENDPOINT = 'wss://solana.a.exodus.io/ws' // not standard across all node providers (we're compatible only with Quicknode)
 const FORCE_HTTP = true // use https over ws
-const WRAPPED_SOLANA_TOKEN_MINT_ADDRESS = `So11111111111111111111111111111111111111112`
 
 // Tokens + SOL api support
 export class Api {
@@ -379,24 +379,19 @@ export class Api {
 
         const source = lodash.get(ix, 'parsed.info.source')
         const destination = lodash.get(ix, 'parsed.info.destination')
-        const mint = lodash.get(ix, 'parsed.info.mint')
         const amount = Number(
           lodash.get(ix, 'parsed.info.amount', 0) ||
             lodash.get(ix, 'parsed.info.tokenAmount.amount', 0)
         )
         const txId = txDetails.transaction.signatures[0]
-        if (
-          accountToRedeemToOwner &&
-          [source, destination].includes(accountToRedeemToOwner) &&
-          mint === WRAPPED_SOLANA_TOKEN_MINT_ADDRESS
-        ) {
-          const ownerOrAccount = (account) =>
+        if (accountToRedeemToOwner && destination === accountToRedeemToOwner) {
+          const getOwnerOrAccount = (account) =>
             account && account === accountToRedeemToOwner ? ownerAddress : account
 
           solanaTransferTx = {
             id: txId,
-            from: ownerOrAccount(source),
-            to: ownerOrAccount(destination),
+            from: getOwnerOrAccount(source),
+            to: getOwnerOrAccount(destination),
             amount,
             fee,
           }

package/src/get-balances.js

@@ -10,9 +10,9 @@ export const getBalancesFactory =
     const { balance, locked, withdrawable, pending } = fixBalances({
       txLog,
       balance: getBalanceFromAccountState({ asset, accountState }),
-      locked: accountState.mem?.locked || zero,
-      withdrawable: accountState.mem?.withdrawable || zero,
-      pending: accountState.mem?.pending || zero,
+      locked: accountState.stakingInfo?.locked || zero,
+      withdrawable: accountState.stakingInfo?.withdrawable || zero,
+      pending: accountState.stakingInfo?.pending || zero,
       asset,
     })
     if (asset.baseAsset.name !== asset.name) {

package/src/staking-utils.js

@@ -12,21 +12,21 @@ export const getSolStakedFee = ({ asset, stakingInfo, fee }) => {
   return allPending > 0 ? fee.mul(allPending) : currency.ZERO
 }
 
-export const getStakingInfo = (accountMem) => {
+export const getStakingInfo = (stakingInfo) => {
   return {
-    loaded: accountMem.loaded,
-    staking: accountMem.staking,
-    isDelegating: accountMem.isDelegating,
-    locked: accountMem.locked,
-    activating: accountMem.activating,
-    withdrawable: accountMem.withdrawable,
-    pending: accountMem.pending,
-    accounts: accountMem.accounts,
-    earned: accountMem.earned,
+    loaded: stakingInfo.loaded,
+    staking: stakingInfo.staking,
+    isDelegating: stakingInfo.isDelegating,
+    locked: stakingInfo.locked,
+    activating: stakingInfo.activating,
+    withdrawable: stakingInfo.withdrawable,
+    pending: stakingInfo.pending,
+    accounts: stakingInfo.accounts,
+    earned: stakingInfo.earned,
   }
 }
 
 export const getUnstakingFee = ({ asset, fee, accountState }) => {
-  const stakingInfo = getStakingInfo(accountState.mem ?? {})
+  const stakingInfo = getStakingInfo(accountState.stakingInfo ?? {})
   return getSolStakedFee({ asset, stakingInfo, fee })
 }

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

@@ -125,7 +125,7 @@ export class MeSolanaMonitor extends SolanaMonitor {
     const staking =
       this.isStakingEnabled() && fetchStakingInfo
         ? await this.getStakingInfo({ address, walletAccount })
-        : { ...accountState.mem, staking: this.staking }
+        : { ...accountState.stakingInfo, staking: this.staking }
 
     return { account, tokenAccounts, staking }
   }

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

@@ -31,8 +31,8 @@ export class SolanaAutoWithdrawMonitor {
       assetName: this.assetName,
       walletAccount,
     })
-    const { cursor, mem } = accountState
-    const { loaded, withdrawable } = mem
+    const { cursor, stakingInfo } = accountState
+    const { loaded, withdrawable } = stakingInfo
 
     if (!Array.isArray(this.cursors[walletAccount])) this.cursors[walletAccount] = []
     const cursorChanged = !this.cursors[walletAccount].includes(cursor)
@@ -49,7 +49,7 @@ export class SolanaAutoWithdrawMonitor {
   }
 
   async tryWithdraw({ accountState, walletAccount }) {
-    const stakingInfo = accountState.mem
+    const stakingInfo = accountState.stakingInfo
     const feeData = await this.aci.getFeeData({ assetName: this.assetName })
     const fee = get(feeData, 'fee', this.asset.currency.ZERO)
 

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

@@ -309,7 +309,7 @@ export class SolanaMonitor extends BaseMonitor {
     const staking =
       this.isStakingEnabled() && fetchStakingInfo
         ? await this.getStakingInfo({ address, walletAccount })
-        : { ...accountState.mem, staking: this.staking }
+        : { ...accountState.stakingInfo, staking: this.staking }
 
     const stakedBalance = this.asset.currency.baseUnit(staking.locked)
     const withdrawableBalance = this.asset.currency.baseUnit(staking.withdrawable)
@@ -332,7 +332,7 @@ export class SolanaMonitor extends BaseMonitor {
 
   async updateState({ account, cursorState, walletAccount, staking }) {
     const { balance, tokenBalances } = account
-    const newData = { balance, tokenBalances, mem: staking, ...cursorState }
+    const newData = { balance, tokenBalances, stakingInfo: staking, ...cursorState }
     return this.updateAccountState({ newData, walletAccount })
   }