@exodus/solana-plugin 1.12.4 → 1.13.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-plugin@1.12.5...@exodus/solana-plugin@1.13.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))
+
+
+
+## [1.12.5](https://github.com/ExodusMovement/assets/compare/@exodus/solana-plugin@1.12.4...@exodus/solana-plugin@1.12.5) (2024-08-07)
+
+
+### Bug Fixes
+
+* SOL lint ([#2953](https://github.com/ExodusMovement/assets/issues/2953)) ([3f1b3b8](https://github.com/ExodusMovement/assets/commit/3f1b3b8c9a1544ca7d41ac883c06e465d6928b32))
+* update SOL staking api ([#3121](https://github.com/ExodusMovement/assets/issues/3121)) ([af609fc](https://github.com/ExodusMovement/assets/commit/af609fcec899da4c1a569e973cb1acca89450be6))
+
+
+
 ## [1.12.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-plugin@1.12.3...@exodus/solana-plugin@1.12.4) (2024-06-27)
 
 **Note:** Version bump only for package @exodus/solana-plugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-plugin",
-  "version": "1.12.4",
+  "version": "1.13.0",
   "description": "Exodus internal Solana asset plugin",
   "main": "src/index.js",
   "files": [
@@ -15,14 +15,14 @@
     "access": "restricted"
   },
   "scripts": {
-    "test": "run -T jest",
+    "test": "run -T exodus-test --jest --esbuild",
     "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
     "@exodus/assets": "^9.0.1",
     "@exodus/bip44-constants": "^195.0.0",
-    "@exodus/solana-api": "^3.8.3",
+    "@exodus/solana-api": "^3.10.0",
     "@exodus/solana-lib": "^3.5.0",
     "@exodus/solana-meta": "^1.0.7",
     "@exodus/web3-solana-utils": "^2.0.0",
@@ -39,5 +39,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "8a78b9595437fd8fecc5b08916a98584eabde577"
+  "gitHead": "101deb0e348677bb19d301df54c53557a64f80fe"
 }

package/src/create-asset.js

@@ -1,42 +1,37 @@
 import { connectAssetsList } from '@exodus/assets'
 import bip44Constants from '@exodus/bip44-constants/by-ticker'
 import {
+  createAccountState,
+  createAndBroadcastTXFactory,
+  getBalancesFactory,
+  getUnstakingFee,
+  isSolanaRewardsActivityTx,
+  SolanaAutoWithdrawMonitor,
+  SolanaFeeMonitor,
+  SolanaMonitor,
+} from '@exodus/solana-api'
+import {
+  createFeeData,
   createGetKeyIdentifier,
   getAddressFromPublicKey,
   getEncodedSecretKey,
   isValidAddress,
   prepareForSigning,
-  signUnsignedTx,
-  signUnsignedTxWithSigner,
   signHardware,
   signMessageNew,
-  createFeeData,
   signMessageWithSigner,
+  signUnsignedTx,
+  signUnsignedTxWithSigner,
 } from '@exodus/solana-lib'
 import ms from 'ms'
-import {
-  isSolanaRewardsActivityTx,
-  getBalancesFactory,
-  getUnstakingFee,
-  SolanaMonitor,
-  SolanaFeeMonitor,
-  SolanaAutoWithdrawMonitor,
-  createAccountState,
-  createAndBroadcastTXFactory,
-} from '@exodus/solana-api'
+
 import { createGetBalanceForAddress } from './get-balance-for-address'
 import { createWeb3API } from './web3'
-import { MeSolanaMonitor } from '@exodus/solana-api/src/tx-log/me-solana-monitor'
 
 const DEFAULT_ACCOUNT_RESERVE = 0.01
 const DEFAULT_LOW_BALANCE = 0.01
 const DEFAULT_MIN_STAKING_AMOUNT = 0.01
 
-const MonitorType = {
-  DEFAULT: 'default',
-  ME: 'meMonitor',
-}
-
 export const createSolanaAssetFactory =
   ({ assetList, serverApi, isTestnet = false }) =>
   ({
@@ -52,7 +47,6 @@ export const createSolanaAssetFactory =
       ticksBetweenStakeFetches,
       txsLimit,
       signWithSigner = true,
-      monitorType = MonitorType.DEFAULT,
     } = {},
     overrideCallback = ({ asset }) => asset,
   } = {}) => {
@@ -125,7 +119,7 @@ export const createSolanaAssetFactory =
     }
 
     const assetStakingApi = {
-      isStaking: ({ accountState }) => accountState.mem.isDelegating,
+      isStaking: ({ accountState }) => accountState.stakingInfo.isDelegating,
     }
 
     const SolanaAccountState = createAccountState({ assetList })
@@ -139,25 +133,15 @@ export const createSolanaAssetFactory =
       createAccountState: () => SolanaAccountState,
       createFeeMonitor: (args) => new SolanaFeeMonitor({ ...args, api: serverApi }),
       createHistoryMonitor: (args) =>
-        monitorType === MonitorType.ME
-          ? new MeSolanaMonitor({
-              interval: monitorInterval,
-              ticksBetweenHistoryFetches,
-              ticksBetweenStakeFetches,
-              includeUnparsed,
-              api: serverApi,
-              txsLimit,
-              ...args,
-            })
-          : new SolanaMonitor({
-              interval: monitorInterval,
-              ticksBetweenHistoryFetches,
-              ticksBetweenStakeFetches,
-              includeUnparsed,
-              api: serverApi,
-              txsLimit,
-              ...args,
-            }),
+        new SolanaMonitor({
+          interval: monitorInterval,
+          ticksBetweenHistoryFetches,
+          ticksBetweenStakeFetches,
+          includeUnparsed,
+          api: serverApi,
+          txsLimit,
+          ...args,
+        }),
       createToken: (tokenDef) =>
         tokenDef.isBuiltIn ? createToken(tokenDef) : createCustomToken(tokenDef),
       defaultAddressPath,
@@ -210,5 +194,20 @@ export const createSolanaAssetFactory =
         new SolanaAutoWithdrawMonitor({ ...args, assetClientInterface }),
     }
 
-    return overrideCallback({ asset: fullAsset })
+    return overrideCallback({
+      asset: fullAsset,
+      config: {
+        stakingFeatureAvailable,
+        includeUnparsed,
+        monitorInterval,
+        defaultAccountReserve,
+        defaultLowBalance,
+        defaultMinStakingAmount,
+        ticksBetweenHistoryFetches,
+        ticksBetweenStakeFetches,
+        txsLimit,
+        signWithSigner,
+      },
+      serverApi,
+    })
   }

package/src/index.js

@@ -1,5 +1,5 @@
-import assetList from '@exodus/solana-meta'
 import serverApi from '@exodus/solana-api'
+import assetList from '@exodus/solana-meta'
 
 import { createSolanaAssetFactory } from './create-asset'
 

package/src/web3/createSimulateTransactions.js

@@ -1,8 +1,8 @@
-import assert from 'minimalistic-assert'
 import {
   createSimulateTransactions as createSimulateSolanaTransactions,
   deserializeTransactionBytes,
 } from '@exodus/web3-solana-utils'
+import assert from 'minimalistic-assert'
 
 // This function accepts either a list of transactions created by a wallet (unsignedTxs) or a web3 transaction (transactionBuffers).
 export const createSimulateTransactions = ({ asset, assetClientInterface, prepareForSigning }) => {