@exodus/solana-plugin 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-plugin",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Exodus internal Solana asset plugin",
   "main": "src/index.js",
   "files": [
@@ -21,8 +21,8 @@
   "dependencies": {
     "@exodus/assets": "^9.0.1",
     "@exodus/bip44-constants": "^195.0.0",
-    "@exodus/solana-api": "^2.5.34",
-    "@exodus/solana-lib": "^1.7.5",
+    "@exodus/solana-api": "^3.0.0",
+    "@exodus/solana-lib": "^2.0.0",
     "@exodus/solana-meta": "^1.0.7",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.3"
@@ -30,5 +30,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "9da341db0c5c18d52690699d241675c1f7392d71"
+  "gitHead": "01254e502415ab368a8d8c9932f7e30476146e9a"
 }

package/src/create-asset.js

@@ -0,0 +1,167 @@
+import { connectAssetsList } from '@exodus/assets'
+import bip44Constants from '@exodus/bip44-constants/by-ticker'
+import {
+  createGetKeyIdentifier,
+  getAddressFromPublicKey,
+  getEncodedSecretKey,
+  isValidAddress,
+  parseUnsignedTx,
+  signUnsignedTx,
+  signHardware,
+  createFeeData,
+} from '@exodus/solana-lib'
+import ms from 'ms'
+import {
+  isSolanaRewardsActivityTx,
+  getBalancesFactory,
+  getUnstakingFee,
+  SolanaMonitor,
+  SolanaFeeMonitor,
+  createAccountState,
+  createAndBroadcastTXFactory,
+} from '@exodus/solana-api'
+
+const DEFAULT_ACCOUNT_RESERVE = 0.01
+const DEFAULT_LOW_BALANCE = 0.01
+const DEFAULT_MIN_STAKING_AMOUNT = 0.01
+
+export const createSolanaAssetFactory =
+  ({ assetList, serverApi }) =>
+  ({
+    config: {
+      stakingFeatureAvailable = true,
+      includeUnparsed = false,
+      monitorInterval = ms('30s'),
+      defaultAccountReserve = DEFAULT_ACCOUNT_RESERVE,
+      defaultLowBalance = DEFAULT_LOW_BALANCE,
+      defaultMinStakingAmount = DEFAULT_MIN_STAKING_AMOUNT,
+      ticksBetweenHistoryFetches,
+      ticksBetweenStakeFetches,
+      txsLimit,
+    } = {},
+    overrideCallback = ({ asset }) => asset,
+  } = {}) => {
+    const assets = connectAssetsList(assetList)
+    const base = assets.solana
+
+    const accountReserve = base.currency.defaultUnit(
+      defaultAccountReserve ?? DEFAULT_ACCOUNT_RESERVE
+    )
+
+    const lowBalance = base.currency.defaultUnit(defaultLowBalance ?? DEFAULT_LOW_BALANCE)
+
+    const MIN_STAKING_AMOUNT = base.currency.defaultUnit(
+      defaultMinStakingAmount ?? DEFAULT_MIN_STAKING_AMOUNT
+    )
+
+    const address = {
+      validate: isValidAddress,
+    }
+
+    const bip44 = bip44Constants[base.ticker]
+
+    const keys = {
+      encodePrivate: getEncodedSecretKey,
+      encodePublic: getAddressFromPublicKey,
+    }
+
+    const getBalances = getBalancesFactory({ stakingFeatureAvailable })
+
+    const feeData = createFeeData({ asset: base })
+
+    const sendTx = createAndBroadcastTXFactory(serverApi)
+
+    const createToken = ({ mintAddress, name, ...tokenDef }) => ({
+      ...tokenDef,
+      address,
+      assetId: mintAddress,
+      bip44,
+      keys,
+      mintAddress,
+      name,
+      api: {
+        features: {},
+        getBalances,
+      },
+    })
+
+    const createCustomToken = ({ assetId, assetName, ...rest }) =>
+      createToken({ ...rest, name: assetName, mintAddress: assetId })
+
+    const isSmallValueTx = (tx) =>
+      !tx.tokens?.length &&
+      !isSolanaRewardsActivityTx(tx) &&
+      Math.abs(tx.coinAmount.toDefaultNumber()) <= 0.000_000_001
+
+    const getActivityTxs = ({ txs }) => txs.filter((tx) => !isSmallValueTx(tx))
+
+    const features = {
+      accountState: true,
+      customTokens: true,
+      feeMonitor: false,
+      feesApi: true,
+      nfts: true,
+      staking: {},
+    }
+
+    const assetStakingApi = {
+      isStaking: ({ accountState }) => accountState.mem.isDelegating,
+    }
+
+    const SolanaAccountState = createAccountState({ assetList })
+
+    const api = {
+      getActivityTxs,
+      addressHasHistory: (...args) => serverApi.getAccountInfo(...args).then((acc) => !!acc),
+      broadcastTx: (...args) => serverApi.broadcastTransaction(...args),
+      createAccountState: () => SolanaAccountState,
+      createFeeMonitor: (args) => new SolanaFeeMonitor({ ...args, api: serverApi }),
+      createHistoryMonitor: (args) =>
+        new SolanaMonitor({
+          interval: monitorInterval,
+          ticksBetweenHistoryFetches,
+          ticksBetweenStakeFetches,
+          includeUnparsed,
+          api: serverApi,
+          txsLimit,
+          ...args,
+        }),
+      createToken: (tokenDef) =>
+        tokenDef.isBuiltIn ? createToken(tokenDef) : createCustomToken(tokenDef),
+      defaultAddressPath: 'm/0/0',
+      features,
+      getBalances,
+      getFee: ({ feeData }) => feeData.fee,
+      getFeeAsync: async ({ feeData }) => feeData.fee,
+      getFeeData: () => feeData,
+      getSupportedPurposes: () => [44],
+      getKeyIdentifier: createGetKeyIdentifier({ bip44 }),
+      getTokens: () =>
+        Object.values(assets)
+          .filter((asset) => asset.name !== base.name)
+          .map(createToken),
+      getUnstakingFee,
+      hasFeature: (feature) => !!features[feature], // @deprecated use api.features instead
+      parseUnsignedTx: (unsignedTx) => parseUnsignedTx({ asset: base, unsignedTx }),
+      parseTx: ({ unsignedTx }) => parseUnsignedTx({ asset: base, unsignedTx }),
+      sendTx,
+      signTx: ({ unsignedTx, privateKey }) => signUnsignedTx(unsignedTx, privateKey),
+      signUnsignedTx,
+      signHardware,
+      staking: assetStakingApi,
+      validateAssetId: isValidAddress,
+    }
+
+    const fullAsset = {
+      ...base,
+      address,
+      keys,
+      api,
+      bip44,
+      accountReserve,
+      lowBalance,
+      MIN_STAKING_AMOUNT,
+    }
+
+    return overrideCallback({ asset: fullAsset })
+  }

package/src/index.js

@@ -1,160 +1,12 @@
-import { connectAssetsList } from '@exodus/assets'
-import bip44Constants from '@exodus/bip44-constants/by-ticker'
-import {
-  createGetKeyIdentifier,
-  getAddressFromPublicKey,
-  getEncodedSecretKey,
-  isValidAddress,
-  parseUnsignedTx,
-  signUnsignedTx,
-  signHardware,
-} from '@exodus/solana-lib'
-import { solana as feeData } from '@exodus/solana-lib/src/fee-data'
 import assetList from '@exodus/solana-meta'
-import ms from 'ms'
-import serverApi, {
-  isSolanaRewardsActivityTx,
-  getBalancesFactory,
-  getUnstakingFee,
-  SolanaMonitor,
-  SolanaFeeMonitor,
-  SolanaAccountState,
-  createAndBroadcastTXFactory,
-} from '@exodus/solana-api'
+import serverApi from '@exodus/solana-api'
 
-const DEFAULT_ACCOUNT_RESERVE = 0.01
-const DEFAULT_LOW_BALANCE = 0.01
-const DEFAULT_MIN_STAKING_AMOUNT = 0.01
+import { createSolanaAssetFactory } from './create-asset'
 
-const createAsset = ({
-  config: {
-    stakingFeatureAvailable = true,
-    includeUnparsed = false,
-    monitorInterval = ms('30s'),
-    defaultAccountReserve = DEFAULT_ACCOUNT_RESERVE,
-    defaultLowBalance = DEFAULT_LOW_BALANCE,
-    defaultMinStakingAmount = DEFAULT_MIN_STAKING_AMOUNT,
-    ticksBetweenHistoryFetches,
-    ticksBetweenStakeFetches,
-    txsLimit,
-  } = {},
-  overrideCallback = ({ asset }) => asset,
-} = {}) => {
-  const assets = connectAssetsList(assetList)
-  const base = assets.solana
+export * from './create-asset' // for solanatestnet and solanadevnet
 
-  const accountReserve = base.currency.SOL(defaultAccountReserve ?? DEFAULT_ACCOUNT_RESERVE)
-  const lowBalance = base.currency.SOL(defaultLowBalance ?? DEFAULT_LOW_BALANCE)
-  const MIN_STAKING_AMOUNT = base.currency.SOL(
-    defaultMinStakingAmount ?? DEFAULT_MIN_STAKING_AMOUNT
-  )
-
-  const address = {
-    validate: isValidAddress,
-  }
-
-  const bip44 = bip44Constants[base.ticker]
-
-  const keys = {
-    encodePrivate: getEncodedSecretKey,
-    encodePublic: getAddressFromPublicKey,
-  }
-
-  const getBalances = getBalancesFactory({ stakingFeatureAvailable })
-
-  const sendTx = createAndBroadcastTXFactory(serverApi)
-
-  const createToken = ({ mintAddress, name, ...tokenDef }) => ({
-    ...tokenDef,
-    address,
-    assetId: mintAddress,
-    bip44,
-    keys,
-    mintAddress,
-    name,
-    api: {
-      features: {},
-      getBalances,
-    },
-  })
-
-  const createCustomToken = ({ assetId, assetName, ...rest }) =>
-    createToken({ ...rest, name: assetName, mintAddress: assetId })
-
-  const isSmallValueTx = (tx) =>
-    !tx.tokens?.length &&
-    !isSolanaRewardsActivityTx(tx) &&
-    Math.abs(tx.coinAmount.toDefaultNumber()) <= 0.000_000_001
-
-  const getActivityTxs = ({ txs }) => txs.filter((tx) => !isSmallValueTx(tx))
-
-  const features = {
-    accountState: true,
-    customTokens: true,
-    feeMonitor: false,
-    feesApi: true,
-    nfts: true,
-    staking: {},
-  }
-
-  const assetStakingApi = {
-    isStaking: ({ accountState }) => accountState.mem.isDelegating,
-  }
-
-  const api = {
-    getActivityTxs,
-    addressHasHistory: (...args) => serverApi.getAccountInfo(...args).then((acc) => !!acc),
-    broadcastTx: (...args) => serverApi.broadcastTransaction(...args),
-    createAccountState: () => SolanaAccountState,
-    createFeeMonitor: (args) => new SolanaFeeMonitor({ ...args, api: serverApi }),
-    createHistoryMonitor: (args) =>
-      new SolanaMonitor({
-        interval: monitorInterval,
-        ticksBetweenHistoryFetches,
-        ticksBetweenStakeFetches,
-        includeUnparsed,
-        api: serverApi,
-        txsLimit,
-        ...args,
-      }),
-    createToken: (tokenDef) =>
-      tokenDef.isBuiltIn ? createToken(tokenDef) : createCustomToken(tokenDef),
-    defaultAddressPath: 'm/0/0',
-    features,
-    getBalances,
-    getFee: ({ feeData }) => feeData.fee,
-    getFeeAsync: async ({ feeData }) => feeData.fee,
-    getFeeData: () => feeData,
-    getKeyIdentifier: createGetKeyIdentifier({ bip44 }),
-    getTokens: () =>
-      Object.values(assets)
-        .filter((asset) => asset.name !== base.name)
-        .map(createToken),
-    getUnstakingFee,
-    hasFeature: (feature) => !!features[feature], // @deprecated use api.features instead
-    parseUnsignedTx,
-    parseTx: ({ unsignedTx }) => parseUnsignedTx(unsignedTx),
-    sendTx,
-    signTx: ({ unsignedTx, privateKey }) => signUnsignedTx(unsignedTx, privateKey),
-    signUnsignedTx,
-    signHardware,
-    staking: assetStakingApi,
-    validateAssetId: isValidAddress,
-  }
-
-  const fullAsset = {
-    ...base,
-    address,
-    keys,
-    api,
-    bip44,
-    accountReserve,
-    lowBalance,
-    MIN_STAKING_AMOUNT,
-  }
-
-  return overrideCallback({ asset: fullAsset })
-}
+const createAsset = createSolanaAssetFactory({ assetList, serverApi })
 
 const defaultExport = { createAsset }
+
 export default defaultExport