@exodus/solana-lib 1.7.1 → 1.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -27,5 +27,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "c0a8ca34924dc74d81ea0b339aa0909062c79d1a"
+  "gitHead": "ed1cf2465307952f91fac5fbfef36eaa59a3acaf"
 }

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

@@ -21,7 +21,7 @@ export function prepareForSigning(unsignedTx) {
 
     const txData = { ...unsignedTx.txData, address, amount }
 
-    const { transaction } = createTx({ txData, method })
+    const transaction = createTx({ txData, method })
 
     if (!transaction.feePayer) {
       transaction.feePayer = new PublicKey(from)
@@ -174,7 +174,7 @@ const createTokenTransaction = ({
     tokenMintAddress,
     memo,
     reference,
-  })
+  }).transaction
 
 const createCloseAccountTransaction = ({ account, programId, recentBlockhash, walletPublicKey }) =>
   Transaction.createCloseAccount({

package/src/tx/sign-hardware.js

@@ -34,8 +34,21 @@ const signWithHardwareWallet = async ({ tx, hardwareDevice, accountIndex }) => {
 
 const applySignatures = ({ tx, signatures }) => {
   if (isLegacyTransaction(tx)) {
-    const publicKeys = signatures.map(({ publicKey }) => new PublicKey(publicKey))
-    tx.setSigners(...publicKeys)
+    signatures.forEach(({ publicKey: publicKeyBuffer }) => {
+      const publicKey = new PublicKey(publicKeyBuffer)
+      // 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: pubKey }) =>
+        pubKey.equals(publicKey)
+      )
+      if (!foundEmptySignatureSlot) {
+        // We could use `setSigners` but maybe this is more robust?
+        tx.signatures.push({
+          publicKey,
+          signature: null,
+        })
+      }
+    })
   }
 
   signatures.forEach(({ publicKey, signature }) => {

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

@@ -24,6 +24,23 @@ const _signTx = ({ tx, privateKey }) => {
     tx.sign([account])
   } else {
     // Legacy Transactions
-    tx.sign(account)
+
+    // 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.equals(account.publicKey)
+    )
+    if (!foundEmptySignatureSlot) {
+      // We could use `setSigners` but maybe this is more robust?
+      tx.signatures.push({
+        publicKey: account.publicKey,
+        signature: null,
+      })
+    }
+
+    // We need to use `partialSign()` here because legacy `sign()` will
+    // delete all existing signatures which isn't great if we're
+    // signing a transaction that already has signatures.
+    tx.partialSign(account)
   }
 }