@exodus/solana-api 2.5.20 → 2.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.20",
+  "version": "2.5.22",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.6.11",
+    "@exodus/solana-lib": "^1.7.1",
     "@exodus/solana-meta": "^1.0.3",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
+  "gitHead": "c0a8ca34924dc74d81ea0b339aa0909062c79d1a"
 }

package/src/fee-monitor.js

@@ -8,6 +8,7 @@ export default class SolanaFeeMonitor extends FeeMonitor {
 
   async fetchFee() {
     const fee = await api.getFee()
+    if (fee === undefined) throw new Error('Failed to fetch fee')
 
     return {
       fee: `${fee} Lamports`,

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

@@ -34,7 +34,11 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async startListener({ walletAccount }) {
-    const address = await this.aci.getReceiveAddress({ assetName: this.asset.name, walletAccount })
+    const address = await this.aci.getReceiveAddress({
+      assetName: this.asset.name,
+      walletAccount,
+      useCache: true,
+    })
     return this.api.watchAddress({
       address,
       /*
@@ -50,7 +54,11 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async stopListener({ walletAccount }) {
-    const address = await this.aci.getReceiveAddress({ assetName: this.asset.name, walletAccount })
+    const address = await this.aci.getReceiveAddress({
+      assetName: this.asset.name,
+      walletAccount,
+      useCache: true,
+    })
     return this.api.unwatchAddress({ address })
   }
 
@@ -93,7 +101,7 @@ export class SolanaMonitor extends BaseMonitor {
     this.api.setTokens(this.assets)
 
     const accountState = await this.aci.getAccountState({ assetName, walletAccount })
-    const address = await this.aci.getReceiveAddress({ assetName, walletAccount })
+    const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
     const stakingAddresses = await this.getStakingAddressesFromTxLog({ assetName, walletAccount })
 
     const { logItemsByAsset, hasNewTxs, cursorState } = await this.getHistory({

package/lib/account-state.js

@@ -1,48 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SolanaAccountState = void 0;
-
-var _assets = _interopRequireDefault(require("@exodus/assets"));
-
-var _models = require("@exodus/models");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const asset = _assets.default.solana;
-const solTokens = Object.values(_assets.default).filter(asset => asset.assetType === 'SOLANA_TOKEN');
-
-class SolanaAccountState extends _models.AccountState {
-  // deprecated - will be removed
-  static _postParse(data) {
-    return { ...data,
-      tokenBalances: {}
-    };
-  }
-
-}
-
-exports.SolanaAccountState = SolanaAccountState;
-SolanaAccountState.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
-
-  }
-};
-SolanaAccountState._tokens = [asset, ...solTokens];