@exodus/solana-lib 1.7.0 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "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": "d0aa3d128fe488e0d4849923e5b134b80b6fef97"
+  "gitHead": "107ccdaaaee35747ff1723be05723b734410bca6"
 }

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)
   }
 }

package/src/vendor/publickey.js

@@ -80,6 +80,13 @@ export class PublicKey {
     return this.toBase58()
   }
 
+  /**
+   * Returns a JSON representation of the public key
+   */
+  toJSON() {
+    return this.toBase58()
+  }
+
   /**
    * Find a valid program address
    *