@exodus/solana-lib 1.8.1 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.8.1",
+  "version": "2.0.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -20,9 +20,9 @@
   "dependencies": {
     "@exodus/asset-lib": "^4.1.0",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
+    "@exodus/currency": "^2.3.2",
     "@exodus/key-utils": "^3.1.0",
     "@exodus/models": "^10.1.0",
-    "@exodus/solana-meta": "^1.0.7",
     "@project-serum/serum": "0.13.64",
     "bn.js": "^4.11.0",
     "borsh": "^0.7.0",
@@ -33,7 +33,8 @@
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
+    "@exodus/solana-meta": "^1.0.7",
     "@solana/web3.js": "^1.90.0"
   },
-  "gitHead": "4a4e5e5ea8765b595cb83acd293305bb28b2a103"
+  "gitHead": "1f9f097ac7c8d4c657ef1a4786af7781bcfd7660"
 }

package/src/fee-data/index.js

@@ -1 +1,11 @@
-export { default as solana } from './solana'
+import { FeeData } from '@exodus/asset-lib'
+
+export const createFeeData = ({ asset }) =>
+  new FeeData({
+    config: {
+      fee: `0.000005 ${asset.ticker}`,
+      fuelThreshold: `0.000015 ${asset.ticker}`,
+    },
+    mainKey: 'fee',
+    currency: asset.currency,
+  })

package/src/index.js

@@ -2,6 +2,7 @@ export * from './constants'
 export * from './encode'
 export * from './keypair'
 export * from './tx'
+export * from './fee-data'
 export {
   TransactionInstruction,
   StakeInstruction,

package/src/tx/create-unsigned-tx.js

@@ -4,6 +4,7 @@ export function createUnsignedTx({
   to,
   amount,
   fee,
+  feeData,
   recentBlockhash,
   // Tokens related:
   tokenMintAddress,
@@ -39,6 +40,7 @@ export function createUnsignedTx({
       to,
       amount: amount ? amount.toBaseNumber() : null,
       fee: fee ? fee.toBaseNumber() : null,
+      fixedFee: feeData ? feeData.fee.toBaseNumber() : null,
       recentBlockhash,
       // Tokens related:
       tokenMintAddress,

package/src/tx/parse-unsigned-tx.js

@@ -1,6 +1,4 @@
-import { asset } from '@exodus/solana-meta'
-
-export function parseUnsignedTx(unsignedTx) {
+export function parseUnsignedTx({ asset, unsignedTx }) {
   const {
     from,
     to,

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

@@ -1,14 +1,14 @@
-import { asset } from '@exodus/solana-meta'
+import { isNumberUnit } from '@exodus/currency'
+import BN from 'bn.js'
 
 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 }) => {
+const addPriorityFeeToTransaction = ({ transaction, feeAmount = 0, fixedFee = 0 }) => {
   // if fee greater than base fee. Add prioritization fee:
-  if (feeAmount > feeData.fee.toBaseNumber()) {
-    const ratio = feeAmount - feeData.fee.toBaseNumber()
+  if (feeAmount > fixedFee) {
+    const ratio = feeAmount - fixedFee
     if (ratio > 1_000_000) throw new Error('Prioritization fee is too high')
 
     const priorityFeeInstruction = ComputeBudgetProgram.setComputeUnitPrice({
@@ -24,18 +24,33 @@ const addPriorityFeeToTransaction = ({ transaction, feeAmount }) => {
  * @returns a Solana Web3.js Transaction object
  */
 export function prepareForSigning(unsignedTx) {
-  const { amount: unitAmount, fee: feeAmount, from, method, transaction } = unsignedTx.txData
+  const {
+    amount: unitAmount,
+    fee: feeAmount,
+    fixedFee,
+    from,
+    method,
+    transaction,
+  } = unsignedTx.txData
 
   if (!transaction) {
     // Create a transaction in web3.js format
     const address = from
-    const amount = unitAmount ? asset.currency.baseUnit(unitAmount).toNumber() : unitAmount
-    const fee = feeAmount ? asset.currency.baseUnit(feeAmount).toNumber() : feeAmount
+
+    const amount = unitAmount
+      ? new BN(isNumberUnit(unitAmount) ? unitAmount.toBaseString() : unitAmount).toNumber()
+      : unitAmount
+
+    const fee = feeAmount
+      ? new BN(isNumberUnit(feeAmount) ? feeAmount.toBaseString() : feeAmount).toNumber()
+      : feeAmount
 
     const txData = { ...unsignedTx.txData, address, amount, fee }
 
     const transaction = createTx({ txData, method })
-    addPriorityFeeToTransaction({ transaction, feeAmount })
+
+    addPriorityFeeToTransaction({ transaction, feeAmount, fixedFee })
+
     if (!transaction.feePayer) {
       transaction.feePayer = new PublicKey(from)
     }

package/src/fee-data/solana.js

@@ -1,11 +0,0 @@
-import { FeeData } from '@exodus/asset-lib'
-import { asset } from '@exodus/solana-meta'
-
-export default new FeeData({
-  config: {
-    fee: '0.000005 SOL',
-    fuelThreshold: '0.000015 SOL',
-  },
-  mainKey: 'fee',
-  currency: asset.currency,
-})