@exodus/solana-lib 2.2.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -39,5 +39,5 @@
     "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "85fd61e1f2f77aff4c32b5684eb5f4845f06794a"
+  "gitHead": "5be11b271fd14c54f4fe8dd04b146361100e2a4d"
 }

package/src/fee-data/index.js

@@ -4,6 +4,8 @@ export const createFeeData = ({ asset }) =>
   new FeeData({
     config: {
       fee: `0.000005 ${asset.ticker}`,
+      priorityFee: 0,
+      fallbackPriorityFee: 100_000,
       fuelThreshold: `0.000015 ${asset.ticker}`,
     },
     mainKey: 'fee',

package/src/tx/common.js

@@ -8,6 +8,10 @@ export function isLegacyTransaction(tx) {
   return !isVersionedTransaction(tx)
 }
 
+export function transactionToBase58(tx) {
+  return base58.encode(tx.serialize())
+}
+
 export function getTxId(tx) {
   const signature = getFirstSignature(tx)
   if (signature === null) {

package/src/tx/index.js

@@ -6,4 +6,6 @@ export * from './simulate-and-sign-tx'
 export * from './decode-tx-instructions'
 export * from './build-raw-transaction'
 export * from './sign-hardware'
+export * from './prepare-for-signing'
+export { transactionToBase58 } from './common'
 export { default as signMessage } from './sign-message'

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

@@ -5,17 +5,11 @@ import { ComputeBudgetProgram, PublicKey } from '../vendor'
 import Transaction from '../transaction'
 import { createMetaplexTransferTransaction } from '../helpers/metaplex-transfer'
 
-const addPriorityFeeToTransaction = ({ transaction, feeAmount = 0, fixedFee = 0 }) => {
-  // if fee greater than base fee. Add prioritization fee:
-  if (feeAmount > fixedFee) {
-    const ratio = feeAmount - fixedFee
-    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)
-  }
+const addPriorityFeeToTransaction = ({ transaction, priorityFee }) => {
+  const priorityFeeInstruction = ComputeBudgetProgram.setComputeUnitPrice({
+    microLamports: priorityFee,
+  }) // 1 microLamport = 0.000001 lamports
+  transaction.add(priorityFeeInstruction)
 }
 
 /**
@@ -24,14 +18,7 @@ const addPriorityFeeToTransaction = ({ transaction, feeAmount = 0, fixedFee = 0
  * @returns a Solana Web3.js Transaction object
  */
 export function prepareForSigning(unsignedTx) {
-  const {
-    amount: unitAmount,
-    fee: feeAmount,
-    fixedFee,
-    from,
-    method,
-    transaction,
-  } = unsignedTx.txData
+  const { amount: unitAmount, fee: feeAmount, from, method, transaction } = unsignedTx.txData
 
   if (!transaction) {
     // Create a transaction in web3.js format
@@ -49,7 +36,12 @@ export function prepareForSigning(unsignedTx) {
 
     const transaction = createTx({ txData, method })
 
-    addPriorityFeeToTransaction({ transaction, feeAmount, fixedFee })
+    if (txData.priorityFee) {
+      addPriorityFeeToTransaction({
+        transaction,
+        priorityFee: txData.priorityFee,
+      })
+    }
 
     if (!transaction.feePayer) {
       transaction.feePayer = new PublicKey(from)