@exodus/solana-lib 2.4.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "2.4.0",
+  "version": "3.0.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -23,8 +23,8 @@
     "@exodus/currency": "^2.3.2",
     "@exodus/key-utils": "^3.1.0",
     "@exodus/models": "^10.1.0",
+    "@exodus/project-serum-serum": "0.13.64-exodus.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.3",
-    "@project-serum/serum": "0.13.64",
     "bn.js": "^4.11.0",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
@@ -40,5 +40,5 @@
     "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "02a052ff417b0c4d0379edf866b6a984ca6a4830"
+  "gitHead": "30fdc2a936b6776866467baf926c899e9a236beb"
 }

package/src/tx/create-and-sign-tx.js

@@ -1,7 +1,7 @@
 import { createUnsignedTx } from './create-unsigned-tx'
 import { signUnsignedTx } from './sign-unsigned-tx'
 
-export function createAndSignTx(input, privateKey) {
+export async function createAndSignTx(input, privateKey) {
   const unsignedTx = createUnsignedTx(input)
   return signUnsignedTx(unsignedTx, privateKey)
 }

package/src/tx/decode-tx-instructions.js

@@ -1,5 +1,5 @@
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../helpers/spl-token'
-import { MARKETS, TokenInstructions } from '@project-serum/serum'
+import { MARKETS, TokenInstructions } from '@exodus/project-serum-serum'
 import * as BufferLayout from '@exodus/buffer-layout'
 
 import { SystemInstruction, SystemProgram } from './../vendor'

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

@@ -1,9 +1,10 @@
 import assert from 'minimalistic-assert'
+import * as nacl from 'tweetnacl'
+import bs58 from 'bs58'
 
 import { prepareForSigning } from './prepare-for-signing'
 import { getKeyPairFromPrivateKey } from '../keypair'
-import { Account } from '../vendor'
-import { AsyncSignerAccount } from './async-account'
+import { PublicKey } from '../vendor'
 import { extractTransaction, isVersionedTransaction } from './common'
 
 /**
@@ -17,49 +18,60 @@ export async function signUnsignedTxWithSigner(unsignedTx, signer) {
 
   const tx = prepareForSigning(unsignedTx)
 
-  const account = new AsyncSignerAccount(signer)
-  await account.updatePublicKey()
-  await _signTx({ tx, account })
+  await _signTx({ tx, signer })
 
   return extractTransaction({ tx })
 }
 
-export function signUnsignedTx(unsignedTx, privateKey) {
+export async function signUnsignedTx(unsignedTx, privateKey) {
   assert(privateKey, 'Please provide a secretKey')
 
   const tx = prepareForSigning(unsignedTx)
 
-  const { secretKey } = getKeyPairFromPrivateKey(privateKey)
-  const account = new Account(secretKey)
-  _signTx({ tx, account })
+  const { secretKey, publicKey } = getKeyPairFromPrivateKey(privateKey)
+  const signer = {
+    getPublicKey: () => publicKey,
+    sign: ({ data }) => nacl.sign.detached(data, secretKey),
+  }
+  await _signTx({ tx, signer })
 
   return extractTransaction({ tx })
 }
 
 // Signs plain tx.
-const _signTx = ({ tx, account }) => {
+const _signTx = async ({ tx, signer }) => {
+  const publicKey = new PublicKey(bs58.encode(Buffer.from(await signer.getPublicKey())))
+
   if (isVersionedTransaction(tx)) {
     // VersionedTransaction
-    return tx.sign([account])
+    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.equals(account.publicKey)
+  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: account.publicKey,
+      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.
-  return tx.partialSign(account)
+  return _signLegacyTransaction({ tx, signer, publicKey })
+}
+
+const _signVersionedTransaction = async ({ tx, signer, publicKey }) => {
+  const messageData = tx.message.serialize()
+  const signature = await signer.sign({ data: messageData })
+  tx.addSignature(publicKey, signature)
+}
+
+const _signLegacyTransaction = async ({ tx, signer, publicKey }) => {
+  const messageData = tx.compileMessage().serialize()
+  const signature = await signer.sign({ data: messageData })
+  tx.addSignature(publicKey, signature)
 }

package/src/vendor/transaction.js

@@ -21,8 +21,6 @@ import * as shortvec from './utils/shortvec-encoding'
 const DEFAULT_SIGNATURE = Buffer.alloc(64).fill(0)
 const SIGNATURE_LENGTH = 64
 
-const isAsyncAccount = (signer) => signer.sign && signer.publicKey && signer.updatePublicKey
-
 /**
  * Account metadata used to define instructions
  *
@@ -436,21 +434,6 @@ export class Transaction {
     })
 
     const signData = message.serialize()
-
-    const isAsyncSign = signers.some(isAsyncAccount)
-    if (isAsyncSign) {
-      return Promise.all(
-        signers.map(async (signer) => ({
-          signature: isAsyncAccount(signer)
-            ? await signer.sign(signData) // Promise
-            : nacl.sign.detached(signData, signer.secretKey),
-          publicKey: signer.publicKey,
-        }))
-      ).then((signatures) =>
-        signatures.forEach(({ publicKey, signature }) => this.addSignature(publicKey, signature))
-      )
-    }
-
     signers.forEach((signer) => {
       const signature = nacl.sign.detached(signData, signer.secretKey)
       this.addSignature(signer.publicKey, signature)

package/src/tx/async-account.js

@@ -1,38 +0,0 @@
-import { PublicKey } from '../vendor/publickey'
-
-export class AsyncSignerAccount {
-  #publicKey
-  #asyncSigner
-
-  /**
-   * Create a new AsyncSignerAccount object
-   *
-   * @param asyncSigner A signer object: `{ sign, getPublicKey }`
-   */
-  constructor(asyncSigner) {
-    if (!asyncSigner) throw new Error('please provide a signer object to async signer')
-
-    this.#asyncSigner = asyncSigner
-    this.updatePublicKey().catch((err) =>
-      console.error('error getting public key from signer', err)
-    )
-  }
-
-  get publicKey() {
-    if (!this.#publicKey) throw new Error('public key not yet available in async signer')
-    return this.#publicKey
-  }
-
-  get secretKey() {
-    throw new Error('secret key not available from async signer')
-  }
-
-  sign = async (signData) => this.#asyncSigner.sign({ data: signData })
-
-  updatePublicKey = async () => {
-    if (!this.#publicKey) {
-      const publicKey = await this.#asyncSigner.getPublicKey()
-      this.#publicKey = new PublicKey(publicKey)
-    }
-  }
-}