@exodus/solana-lib 2.2.0 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -23,6 +23,7 @@
     "@exodus/currency": "^2.3.2",
     "@exodus/key-utils": "^3.1.0",
     "@exodus/models": "^10.1.0",
+    "@exodus/solana-web3.js": "^1.63.1-exodus.3",
     "@project-serum/serum": "0.13.64",
     "bn.js": "^4.11.0",
     "borsh": "^0.7.0",
@@ -39,5 +40,5 @@
     "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "85fd61e1f2f77aff4c32b5684eb5f4845f06794a"
+  "gitHead": "02a052ff417b0c4d0379edf866b6a984ca6a4830"
 }

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/index.js

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

package/src/msg/index.js

@@ -0,0 +1,2 @@
+export { signMessage } from './sign-message-deprecated'
+export { signMessageNew } from './sign-message'

package/src/msg/sign-message-deprecated.js

@@ -0,0 +1,20 @@
+import assert from 'assert'
+import nacl from 'tweetnacl'
+import bs58 from 'bs58'
+
+import { isTransactionMessage } from './validation'
+import { getKeyPairFromPrivateKey } from '../keypair'
+
+/**
+ * @deprecated please use messageSigner
+ */
+export function signMessage({ message, privateKey }) {
+  const { secretKey } = getKeyPairFromPrivateKey(privateKey)
+  const messageBuffer = bs58.decode(message)
+  assert(
+    !isTransactionMessage(messageBuffer),
+    'attempted to sign transaction using message signing'
+  )
+  const signature = nacl.sign.detached(messageBuffer, secretKey)
+  return bs58.encode(signature)
+}

package/src/msg/sign-message.js

@@ -0,0 +1,19 @@
+import assert from 'minimalistic-assert'
+import * as nacl from 'tweetnacl'
+
+import { isTransactionMessage } from './validation'
+
+export const signMessageNew = async ({ privateKey, message }) => {
+  const { rawMessage } = message
+  assert(Buffer.isBuffer(rawMessage), `rawMessage must be buffer`)
+  assert(
+    !isTransactionMessage(rawMessage),
+    `malicious message signing request, was a transaction message`
+  )
+  assert(
+    Buffer.isBuffer(privateKey) || privateKey instanceof Uint8Array,
+    `privateKey is not a Buffer or Uint8Array`
+  )
+
+  return Buffer.from(nacl.sign.detached(rawMessage, privateKey))
+}

package/src/{tx/sign-message.js → msg/validation.js}

@@ -1,10 +1,10 @@
-import assert from 'assert'
-import nacl from 'tweetnacl'
-import bs58 from 'bs58'
-
-import { Message } from '../vendor/message'
-import { getKeyPairFromPrivateKey } from '../keypair'
+import { Message } from '@exodus/solana-web3.js'
 
+/**
+ * Checks if its contains a legacy message.
+ * @param {Uint8Array} data
+ * @returns {boolean}
+ */
 function isLegacyMessage(data) {
   try {
     const message = Message.from(data)
@@ -15,6 +15,11 @@ function isLegacyMessage(data) {
   }
 }
 
+/**
+ * Checks if its contains a versioned message.
+ * @param {Uint8Array} data
+ * @returns {boolean}
+ */
 function isVersionedMessage(data) {
   if (data.length > 1) {
     // We deploy a heuristic to detect transaction messages.
@@ -27,18 +32,12 @@ function isVersionedMessage(data) {
   return false
 }
 
+/**
+ * Check whether a message contains a transaction message.
+ * @param {Uint8Array} data
+ * @returns {boolean}
+ */
 export function isTransactionMessage(data) {
   const messageBuffer = Buffer.from(data)
   return isLegacyMessage(messageBuffer) || isVersionedMessage(messageBuffer)
 }
-
-export default function signMessage({ message, privateKey }) {
-  const { secretKey } = getKeyPairFromPrivateKey(privateKey)
-  const messageBuffer = bs58.decode(message)
-  assert(
-    !isTransactionMessage(messageBuffer),
-    'attempted to sign transaction using message signing'
-  )
-  const signature = nacl.sign.detached(messageBuffer, secretKey)
-  return bs58.encode(signature)
-}

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,5 @@ export * from './simulate-and-sign-tx'
 export * from './decode-tx-instructions'
 export * from './build-raw-transaction'
 export * from './sign-hardware'
-export { default as signMessage } from './sign-message'
+export * from './prepare-for-signing'
+export { transactionToBase58 } from './common'

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)