@exodus/solana-api 3.1.0 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.1.0",
+  "version": "3.3.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": "^2.1.0",
+    "@exodus/solana-lib": "^2.3.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": "84f77ed9720dcdabb8057ed9170f45fcb4f9eff9"
+  "gitHead": "5be11b271fd14c54f4fe8dd04b146361100e2a4d"
 }

package/src/api.js

@@ -148,6 +148,12 @@ export class Api {
     return lodash.get(result, 'value.feeCalculator.lamportsPerSignature')
   }
 
+  async getPriorityFee(transaction) {
+    // https://docs.helius.dev/solana-rpc-nodes/alpha-priority-fee-api
+    const result = await this.rpcCall('getPriorityFeeEstimate', [{ transaction }])
+    return result.priorityFeeEstimate
+  }
+
   async getBalance(address) {
     const result = await this.rpcCall('getBalance', [address, { encoding: 'jsonParsed' }], {
       address,

package/src/get-balances.js

@@ -16,7 +16,14 @@ export const getBalancesFactory =
       asset,
     })
     if (asset.baseAsset.name !== asset.name) {
-      return { balance, spendableBalance: balance }
+      return {
+        // legacy
+        balance,
+        spendableBalance: balance,
+        // new
+        total: balance,
+        spendable: balance,
+      }
     }
 
     const balanceWithoutStaking = balance
@@ -25,9 +32,21 @@ export const getBalancesFactory =
       .sub(pending)
       .clampLowerZero()
 
+    const total = stakingFeatureAvailable ? balance : balanceWithoutStaking
+    const spendable = balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero()
+
+    const staked = locked
+    const unstaking = pending
+
     return {
-      balance: stakingFeatureAvailable ? balance : balanceWithoutStaking,
-      spendableBalance: balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero(),
+      // legacy
+      balance: total,
+      spendableBalance: spendable,
+      // new
+      total,
+      spendable,
+      staked,
+      unstaking,
     }
   }
 

package/src/tx-send.js

@@ -1,9 +1,11 @@
 import {
   createUnsignedTx,
   findAssociatedTokenAddress,
+  prepareForSigning,
   TOKEN_PROGRAM_ID,
   TOKEN_2022_PROGRAM_ID,
 } from '@exodus/solana-lib'
+import { transactionToBase58 } from '@exodus/solana-lib/src/tx/common'
 import assert from 'minimalistic-assert'
 
 export const createAndBroadcastTXFactory =
@@ -137,6 +139,20 @@ export const createAndBroadcastTXFactory =
       ...magicEdenParams,
     })
 
+    let { priorityFee } = feeData
+
+    if (!priorityFee) {
+      try {
+        const transactionForFeeEstimation = prepareForSigning(unsignedTransaction)
+        priorityFee = await api.getPriorityFee(transactionToBase58(transactionForFeeEstimation))
+      } catch (e) {
+        console.warn(`Failed to fetch priority fee: ${e.message}`)
+        priorityFee = feeData.fallbackPriorityFee
+      }
+    }
+
+    unsignedTransaction.txData.priorityFee = priorityFee
+
     const { txId, rawTx } = await assetClientInterface.signTransaction({
       assetName: baseAsset.name,
       unsignedTx: unsignedTransaction,