@exodus/solana-lib 3.2.2 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.2.2",
+  "version": "3.3.1",
   "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": "8f0211c5cbdc7117872f2f910c9b31d7e4e106f0"
+  "gitHead": "45964c12e52066c643ee1b6c906eb898baad1088"
 }

package/src/msg/sign-message-with-signer.js

@@ -10,7 +10,7 @@ const signMessageWithSigner = async ({ signer, message }) => {
     'expected signer with a sign method'
   )
 
-  return signer.sign({ data: rawMessage })
+  return signer.sign({ data: rawMessage, signatureType: 'ed25519' })
 }
 
 export default signMessageWithSigner

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,32 +61,21 @@ 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 })
 }
 
 const _signVersionedTransaction = async ({ tx, signer, publicKey }) => {
   const messageData = tx.message.serialize()
-  const signature = await signer.sign({ data: messageData })
+  const signature = await signer.sign({ data: messageData, signatureType: 'ed25519' })
   tx.addSignature(publicKey, signature)
 }
 
 const _signLegacyTransaction = async ({ tx, signer, publicKey }) => {
   const messageData = tx.compileMessage().serialize()
-  const signature = await signer.sign({ data: messageData })
+  const signature = await signer.sign({ data: messageData, signatureType: 'ed25519' })
   tx.addSignature(publicKey, signature)
 }