@exodus/solana-lib 3.3.0 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -40,5 +40,5 @@
     "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "50bb8d1b38409b9d099d818f6492657d4f7f6c3d"
+  "gitHead": "b6fa8852ada6a3b2de7d2a8c6f0f74c3c6aac7e7"
 }

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

@@ -1,5 +1,6 @@
 import { isNumberUnit } from '@exodus/currency'
 import BN from 'bn.js'
+import { VersionedTransaction } from '@exodus/solana-web3.js'
 
 import { ComputeBudgetProgram, PublicKey } from '../vendor'
 import Transaction from '../transaction'
@@ -25,7 +26,19 @@ const addComputeBudgetToTransaction = ({ transaction, computeUnits }) => {
  * @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,
+    from,
+    method,
+    transaction,
+    transactionBuffer,
+  } = unsignedTx.txData
+
+  // Recreate a Web3.js Transaction instance if the buffer provided.
+  if (transactionBuffer) {
+    return VersionedTransaction.deserialize(transactionBuffer)
+  }
 
   if (!transaction) {
     // Create a transaction in web3.js format

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

@@ -38,6 +38,21 @@ export async function signUnsignedTx(unsignedTx, privateKey) {
   return extractTransaction({ tx })
 }
 
+// Some transactions that we construct internally are technically not complete.
+// They don't contain the empty signature slot for the public key.
+export const fillTransactionWithEmptySignatureSlot = ({ transaction, publicKey }) => {
+  const foundEmptySignatureSlot = transaction.signatures.find(({ publicKey: _publicKey }) =>
+    _publicKey.equals(publicKey)
+  )
+  if (!foundEmptySignatureSlot) {
+    // We could use `setSigners` but maybe this is more robust?
+    transaction.signatures.push({
+      publicKey,
+      signature: null,
+    })
+  }
+}
+
 // Signs plain tx.
 const _signTx = async ({ tx, signer }) => {
   const publicKey = new PublicKey(bs58.encode(Buffer.from(await signer.getPublicKey())))
@@ -46,20 +61,9 @@ const _signTx = async ({ tx, signer }) => {
     // VersionedTransaction
     return _signVersionedTransaction({ tx, signer, publicKey })
   }
-  // Legacy Transactions
 
-  // Some transactions that we construct internally are technically not complete.
-  // They don't contain the empty signature slot for the public key.
-  const foundEmptySignatureSlot = tx.signatures.find(({ publicKey: _publicKey }) =>
-    _publicKey.equals(publicKey)
-  )
-  if (!foundEmptySignatureSlot) {
-    // We could use `setSigners` but maybe this is more robust?
-    tx.signatures.push({
-      publicKey,
-      signature: null,
-    })
-  }
+  // Legacy Transactions
+  fillTransactionWithEmptySignatureSlot({ transaction: tx, publicKey })
 
   return _signLegacyTransaction({ tx, signer, publicKey })
 }