@exodus/solana-lib 3.1.0 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.1.0",
+  "version": "3.2.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": "0214827414fb3ac874b22cef41dae41bcef98ed6"
+  "gitHead": "7fa370d0fdd120110c54d56e2b528a5464e6f9e5"
 }

package/src/msg/index.js

@@ -1,2 +1,3 @@
 export { signMessage } from './sign-message-deprecated'
 export { signMessageNew } from './sign-message'
+export { default as signMessageWithSigner } from './sign-message-with-signer'

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

@@ -0,0 +1,16 @@
+import assert from 'minimalistic-assert'
+
+import { assertValidMessage } from './validation'
+
+const signMessageWithSigner = async ({ signer, message }) => {
+  const { rawMessage } = assertValidMessage(message)
+
+  assert(
+    typeof signer === 'object' && typeof signer.sign === 'function',
+    'expected signer with a sign method'
+  )
+
+  return signer.sign({ data: rawMessage })
+}
+
+export default signMessageWithSigner

package/src/msg/sign-message.js

@@ -1,15 +1,11 @@
 import assert from 'minimalistic-assert'
 import * as nacl from 'tweetnacl'
 
-import { isTransactionMessage } from './validation'
+import { assertValidMessage } 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`
-  )
+  const { rawMessage } = assertValidMessage(message)
+
   assert(
     Buffer.isBuffer(privateKey) || privateKey instanceof Uint8Array,
     `privateKey is not a Buffer or Uint8Array`

package/src/msg/validation.js

@@ -1,4 +1,5 @@
 import { Message } from '@exodus/solana-web3.js'
+import assert from 'minimalistic-assert'
 
 /**
  * Checks if its contains a legacy message.
@@ -41,3 +42,18 @@ export function isTransactionMessage(data) {
   const messageBuffer = Buffer.from(data)
   return isLegacyMessage(messageBuffer) || isVersionedMessage(messageBuffer)
 }
+
+/**
+ * Asserts that the message provided to the sign message functions has the expected shape
+ * @param message
+ */
+export function assertValidMessage(message) {
+  const { rawMessage } = message
+  assert(Buffer.isBuffer(rawMessage), `rawMessage must be buffer`)
+  assert(
+    !isTransactionMessage(rawMessage),
+    `malicious message signing request, was a transaction message`
+  )
+
+  return message
+}