@exodus/solana-api 2.5.34 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.34",
+  "version": "3.1.0",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -29,7 +29,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.7.5",
+    "@exodus/solana-lib": "^2.1.0",
     "@exodus/solana-meta": "^1.0.7",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "9da341db0c5c18d52690699d241675c1f7392d71"
+  "gitHead": "84f77ed9720dcdabb8057ed9170f45fcb4f9eff9"
 }

package/src/account-state.js

@@ -1,4 +1,3 @@
-import assetsList, { asset, tokens } from '@exodus/solana-meta'
 import { AccountState } from '@exodus/models'
 import { assetsListToObject } from '@exodus/assets'
 import { isString, reduce } from 'lodash'
@@ -7,41 +6,46 @@ import { isNumberUnit } from '@exodus/currency'
 const parseBalance = (balance, asset) =>
   !isNumberUnit(balance) && isString(balance) ? asset.currency.parse(balance) : balance
 
-export class SolanaAccountState extends AccountState {
-  static defaults = {
-    cursor: '',
-    balance: asset.currency.ZERO,
-    tokenBalances: {},
-    mem: {
-      loaded: false,
-      staking: {
-        // remote-config data
-        enabled: true,
-        pool: null,
+export const createAccountState = ({ assetList }) => {
+  const asset = assetList.find((asset) => asset.baseAssetName === asset.name)
+  const tokens = assetList.filter((asset) => asset.baseAssetName !== asset.name)
+
+  return class SolanaAccountState extends AccountState {
+    static defaults = {
+      cursor: '',
+      balance: asset.currency.ZERO,
+      tokenBalances: {},
+      mem: {
+        loaded: false,
+        staking: {
+          // remote-config data
+          enabled: true,
+          pool: null,
+        },
+        isDelegating: false,
+        locked: asset.currency.defaultUnit(0),
+        withdrawable: asset.currency.defaultUnit(0),
+        pending: asset.currency.defaultUnit(0),
+        earned: asset.currency.defaultUnit(0),
+        accounts: {}, // stake accounts
       },
-      isDelegating: false,
-      locked: asset.currency.defaultUnit(0),
-      withdrawable: asset.currency.defaultUnit(0),
-      pending: asset.currency.defaultUnit(0),
-      earned: asset.currency.defaultUnit(0),
-      accounts: {}, // stake accounts
-    },
-  }
+    }
 
-  static _tokens = [asset, ...tokens] // deprecated - will be removed
+    static _tokens = [asset, ...tokens] // deprecated - will be removed
 
-  static _postParse(data) {
-    const assets = assetsListToObject(assetsList)
-    return {
-      ...data,
-      tokenBalances: reduce(
-        data.tokenBalances,
-        (r, tokenBalance, assetName) =>
-          assets[assetName]
-            ? Object.assign(r, { [assetName]: parseBalance(tokenBalance, assets[assetName]) })
-            : r,
-        {}
-      ),
+    static _postParse(data) {
+      const assets = assetsListToObject(assetList)
+      return {
+        ...data,
+        tokenBalances: reduce(
+          data.tokenBalances,
+          (r, tokenBalance, assetName) =>
+            assets[assetName]
+              ? Object.assign(r, { [assetName]: parseBalance(tokenBalance, assets[assetName]) })
+              : r,
+          {}
+        ),
+      }
     }
   }
 }

package/src/api.js

@@ -9,6 +9,7 @@ import {
   SYSTEM_PROGRAM_ID,
   STAKE_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
+  TOKEN_2022_PROGRAM_ID,
   SOL_DECIMAL,
   computeBalance,
   buildRawTransaction,
@@ -342,7 +343,9 @@ export class Api {
       .map((ix) => {
         const type = lodash.get(ix, 'parsed.type')
         const isTransferTx =
-          ix.parsed && ix.program === 'spl-token' && ['transfer', 'transferChecked'].includes(type)
+          ix.parsed &&
+          ix.program === 'spl-token' &&
+          ['transfer', 'transferChecked', 'transferCheckedWithFee'].includes(type)
         const source = lodash.get(ix, 'parsed.info.source')
         const destination = lodash.get(ix, 'parsed.info.destination')
         const amount = Number(
@@ -449,7 +452,10 @@ export class Api {
       )
       const tokenTxs = lodash
         .filter(instructions, ({ program, type }) => {
-          return program === 'spl-token' && ['transfer', 'transferChecked'].includes(type)
+          return (
+            program === 'spl-token' &&
+            ['transfer', 'transferChecked', 'transferCheckedWithFee'].includes(type)
+          )
         }) // get Token transfer: could have more than 1 instructions
         .map((ix) => {
           // add token details based on source/destination address
@@ -469,7 +475,7 @@ export class Api {
             token: tokenAccount,
             from: ix.source,
             to: ix.destination,
-            amount: Number(ix.amount || lodash.get(ix, 'tokenAmount.amount', 0)), // supporting both types: transfer and transferChecked
+            amount: Number(ix.amount || lodash.get(ix, 'tokenAmount.amount', 0)), // supporting types: transfer, transferChecked, transferCheckedWithFee
             fee: isSending ? fee : 0, // in lamports
           }
         })
@@ -594,11 +600,21 @@ export class Api {
   }
 
   async getTokenAccountsByOwner(address, tokenTicker) {
-    const { value: accountsList } = await this.rpcCall(
-      'getTokenAccountsByOwner',
-      [address, { programId: TOKEN_PROGRAM_ID.toBase58() }, { encoding: 'jsonParsed' }],
-      { address }
-    )
+    const [{ value: standardTokenAccounts }, { value: token2022Accounts }] = await Promise.all([
+      this.rpcCall(
+        'getTokenAccountsByOwner',
+        [address, { programId: TOKEN_PROGRAM_ID.toBase58() }, { encoding: 'jsonParsed' }],
+        { address }
+      ),
+      this.rpcCall(
+        'getTokenAccountsByOwner',
+        [address, { programId: TOKEN_2022_PROGRAM_ID.toBase58() }, { encoding: 'jsonParsed' }],
+        { address }
+      ),
+    ])
+
+    // merge regular token and token2022 program tokens
+    const accountsList = [...standardTokenAccounts, ...token2022Accounts]
 
     const tokenAccounts = []
     for (const entry of accountsList) {
@@ -608,8 +624,15 @@ export class Api {
       const token = this.getTokenByAddress(mint) || {
         name: 'unknown',
         ticker: 'UNKNOWN',
+        decimals: 0,
       }
       const balance = lodash.get(account, 'data.parsed.info.tokenAmount.amount', '0')
+      const tokenProgram = lodash.get(account, 'owner', null) // TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID
+      const { feeBasisPoints = 0, maximumFee = 0 } =
+        tokenProgram === TOKEN_2022_PROGRAM_ID.toBase58()
+          ? await this.getTokenFeeBasisPoints(mint)
+          : {}
+
       tokenAccounts.push({
         tokenAccountAddress: pubkey,
         owner: address,
@@ -617,6 +640,10 @@ export class Api {
         ticker: token.ticker,
         balance,
         mintAddress: mint,
+        tokenProgram,
+        decimals: token.decimals,
+        feeBasisPoints,
+        maximumFee,
       })
     }
 
@@ -674,7 +701,19 @@ export class Api {
 
   async isSpl(address) {
     const { owner } = await this.getAccountInfo(address)
-    return owner === 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+    return [TOKEN_PROGRAM_ID.toBase58(), TOKEN_2022_PROGRAM_ID.toBase58()].includes(owner)
+  }
+
+  async getTokenFeeBasisPoints(address) {
+    // only for token-2022
+    const value = await this.getAccountInfo(address)
+    const { transferFeeBasisPoints, maximumFee } = lodash.get(
+      value,
+      'data.parsed.info.extensions[0].state.newerTransferFee',
+      { transferFeeBasisPoints: 0, maximumFee: 0 }
+    )
+
+    return { feeBasisPoints: transferFeeBasisPoints, maximumFee }
   }
 
   async getMetaplexMetadata(tokenMintAddress) {
@@ -702,11 +741,10 @@ export class Api {
       lamports: value.lamports,
     }
 
-    return account.owner === SYSTEM_PROGRAM_ID.toBase58()
-      ? 'solana'
-      : account.owner === TOKEN_PROGRAM_ID.toBase58()
-        ? 'token'
-        : null
+    if (account.owner === SYSTEM_PROGRAM_ID.toBase58()) return 'solana'
+    if (account.owner === TOKEN_PROGRAM_ID.toBase58()) return 'token'
+    if (account.owner === TOKEN_2022_PROGRAM_ID.toBase58()) return 'token-2022'
+    return null
   }
 
   async getTokenAddressOwner(address) {
@@ -722,7 +760,7 @@ export class Api {
 
   async isTokenAddress(address) {
     const type = await this.getAddressType(address)
-    return type === 'token'
+    return ['token', 'token-2022'].includes(type)
   }
 
   async isSOLaddress(address) {

package/src/index.js

@@ -6,7 +6,7 @@ import { Api } from './api'
 
 export { default as SolanaFeeMonitor } from './fee-monitor'
 export { SolanaMonitor } from './tx-log'
-export { SolanaAccountState } from './account-state'
+export { createAccountState } from './account-state'
 export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils'
 export {
   isSolanaStaking,

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

@@ -116,7 +116,7 @@ export class SolanaMonitor extends BaseMonitor {
     )
   }
 
-  async markStaleTransactions({ walletAccount, logItemsByAsset = {} }) {
+  async markStaleTransactions({ walletAccount, logItemsByAsset = Object.create(null) }) {
     // mark stale txs as dropped in logItemsByAsset
     const clearedLogItems = logItemsByAsset
     const tokenNames = [...this.api.tokens.values()].map(({ name }) => name)

package/src/tx-send.js

@@ -1,4 +1,9 @@
-import { createUnsignedTx, findAssociatedTokenAddress } from '@exodus/solana-lib'
+import {
+  createUnsignedTx,
+  findAssociatedTokenAddress,
+  TOKEN_PROGRAM_ID,
+  TOKEN_2022_PROGRAM_ID,
+} from '@exodus/solana-lib'
 import assert from 'minimalistic-assert'
 
 export const createAndBroadcastTXFactory =
@@ -60,10 +65,20 @@ export const createAndBroadcastTXFactory =
 
     const recentBlockhash = options.recentBlockhash || (await api.getRecentBlockHash())
 
+    const feeData = await assetClientInterface.getFeeData({ assetName })
+
     let tokenParams = Object.create(null)
     if (isToken || customMintAddress) {
       const tokenMintAddress = customMintAddress || asset.mintAddress
-      const tokenAddress = findAssociatedTokenAddress(address, tokenMintAddress)
+      const tokenProgram =
+        (await api.getAddressType(tokenMintAddress)) === 'token-2022'
+          ? TOKEN_2022_PROGRAM_ID
+          : TOKEN_PROGRAM_ID
+      const tokenAddress = findAssociatedTokenAddress(
+        address,
+        tokenMintAddress,
+        tokenProgram.toBase58()
+      )
       const [destinationAddressType, isAssociatedTokenAccountActive, fromTokenAccountAddresses] =
         await Promise.all([
           api.getAddressType(address),
@@ -81,6 +96,7 @@ export const createAndBroadcastTXFactory =
         isAssociatedTokenAccountActive,
         fromTokenAddresses,
         tokenStandard,
+        tokenProgram,
       }
     }
 
@@ -113,6 +129,7 @@ export const createAndBroadcastTXFactory =
       amount,
       fee: feeAmount,
       recentBlockhash,
+      feeData,
       reference,
       memo,
       ...tokenParams,