@exodus/solana-lib 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@solana/web3.js": "^1.90.0"
   },
-  "gitHead": "dc0ae33970f29ed4ac1d66ea4211f6da10202d14"
+  "gitHead": "4c01d2640992ed8487c6a018844a96ba1990095e"
 }

package/src/transaction.js

@@ -2,7 +2,6 @@ import assert from 'assert'
 import BN from 'bn.js'
 import bs58 from 'bs58'
 import { get } from 'lodash'
-import feeData from './fee-data/solana'
 
 import { getKeyPairFromPrivateKey } from './keypair'
 import { findAssociatedTokenAddress, createStakeAddress } from './encode'
@@ -21,7 +20,6 @@ import {
   Authorized,
   Lockup,
   TransactionInstruction,
-  ComputeBudgetProgram,
 } from './vendor'
 import { MagicEdenEscrowProgram } from './magiceden/escrow-program'
 import { MEMO_PROGRAM_ID, SEED, STAKE_PROGRAM_ID } from './constants'
@@ -98,17 +96,6 @@ class Tx {
         })
       )
     }
-
-    // if fee greater than base fee. Add prioritization fee:
-    if (fee > feeData.fee.toBaseNumber()) {
-      const ratio = fee - feeData.fee.toBaseNumber()
-      if (ratio > 1_000_000) throw new Error('Prioritization fee is too high')
-
-      const priorityFeeInstruction = ComputeBudgetProgram.setComputeUnitPrice({
-        microLamports: ratio || 100,
-      }) // 1 microLamport = 0.000001 lamports
-      this.transaction.add(priorityFeeInstruction)
-    }
   }
 
   buildSOLtransaction({ from, to, amount, recentBlockhash, feePayer, reference }) {

package/src/tx/prepare-for-signing.js

@@ -1,8 +1,23 @@
 import { asset } from '@exodus/solana-meta'
 
-import { PublicKey } from '../vendor'
+import { ComputeBudgetProgram, PublicKey } from '../vendor'
 import Transaction from '../transaction'
 import { createMetaplexTransferTransaction } from '../helpers/metaplex-transfer'
+import feeData from '../fee-data/solana'
+
+const addPriorityFeeToTransaction = ({ transaction, feeAmount }) => {
+  // if fee greater than base fee. Add prioritization fee:
+  const feeAmountNU = asset.currency.baseUnit(feeAmount || 0)
+  if (feeAmountNU.gt(feeData.fee)) {
+    const ratio = feeAmountNU.sub(feeData.fee).toBaseNumber()
+    if (ratio > 1_000_000) throw new Error('Prioritization fee is too high')
+
+    const priorityFeeInstruction = ComputeBudgetProgram.setComputeUnitPrice({
+      microLamports: ratio || 100,
+    }) // 1 microLamport = 0.000001 lamports
+    transaction.add(priorityFeeInstruction)
+  }
+}
 
 /**
  * Prepares the transaction to be signed (exodus & ledger).
@@ -21,7 +36,7 @@ export function prepareForSigning(unsignedTx) {
     const txData = { ...unsignedTx.txData, address, amount, fee }
 
     const transaction = createTx({ txData, method })
-
+    addPriorityFeeToTransaction({ transaction, feeAmount })
     if (!transaction.feePayer) {
       transaction.feePayer = new PublicKey(from)
     }