@exodus/solana-lib 1.5.0 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "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": "fe989a47ba9278f5fe797f9b01d8bc93fb53467a"
+  "gitHead": "301d6e9222b3c0828c73cea460c94c9bbce878e6"
 }

package/src/constants.js

@@ -20,3 +20,5 @@ export const SEED = 'stake:0'
 export const LAMPORTS_PER_SOL = 1000000000
 
 export const SOL_DECIMAL = Math.log10(LAMPORTS_PER_SOL)
+
+export const SUPPORTED_TRANSACTION_VERSIONS = new Set(['legacy', 0])

package/src/helpers/transaction-strategy.js

@@ -0,0 +1,25 @@
+import { Transaction, VersionedTransaction } from '..'
+import { SUPPORTED_TRANSACTION_VERSIONS } from '../constants'
+
+const isVersionedTransactionType = (transaction) => {
+  // new transaction types have a version field, either a string(legacy) or a number(>=0)
+  return transaction.version !== undefined
+}
+
+const isVersionedTransactionTypeSupported = (transaction) => {
+  return SUPPORTED_TRANSACTION_VERSIONS.has(transaction.version)
+}
+
+const getTransactionStrategy = (transaction): VersionedTransaction | Transaction => {
+  if (isVersionedTransactionType(transaction)) {
+    if (isVersionedTransactionTypeSupported(transaction)) {
+      return VersionedTransaction
+    }
+
+    throw new Error(`unsupported transaction version: ${transaction.version}`)
+  }
+
+  return Transaction
+}
+
+export default getTransactionStrategy

package/src/index.js

@@ -14,3 +14,5 @@ export {
 } from './vendor'
 export { default as Transaction } from './transaction'
 export { U64 } from './helpers/spl-token'
+export { default as getTransactionStrategy } from './helpers/transaction-strategy'
+export { default as VersionedTransaction } from './versioned-transaction'

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

@@ -38,8 +38,8 @@ export function createUnsignedTx({
     txData: {
       from,
       to,
-      amount: amount ? amount.toBase().toNumber() : null,
-      fee: fee ? fee.toBase().toNumber() : null,
+      amount: amount ? amount.toBaseNumber() : null,
+      fee: fee ? fee.toBaseNumber() : null,
       recentBlockhash,
       // Tokens related:
       tokenMintAddress,

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

@@ -2,7 +2,7 @@ import { merge } from 'lodash'
 import assets from '@exodus/assets'
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
 
-import { Transaction } from '../'
+import { Transaction, getTransactionStrategy } from '../'
 
 export function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
@@ -30,9 +30,11 @@ export function signUnsignedTx(
 
 // Signs plain tx.
 const _signTx = ({ tx, privateKey }) => {
-  Transaction.sign(tx, privateKey)
-  const rawTx = Transaction.serialize(tx)
-  const txId = Transaction.getTxId(tx)
+  const _Transaction = getTransactionStrategy(tx)
+
+  _Transaction.sign(tx, privateKey)
+  const rawTx = _Transaction.serialize(tx)
+  const txId = _Transaction.getTxId(tx)
 
   return { txId, rawTx }
 }

package/src/versioned-transaction.js

@@ -0,0 +1,45 @@
+import base58 from 'bs58'
+import { getKeyPairFromPrivateKey } from './keypair'
+import { Account } from './vendor'
+
+function getFirstSignature(tx) {
+  if (tx.signatures.length > 0) {
+    return tx.signatures[0]
+  }
+
+  return null
+}
+
+class VersionedTx {
+  // tx is not supported from the vendored library (solana-lib/src/vendor).
+  // We also can't make any guarantees that Account from vendored lib with version X
+  // will be compatible with the tx built by an outside library with version Y.
+  static sign(tx, privateKey: Buffer | String, extraSigners: Account[] = []) {
+    if (!privateKey) {
+      throw new Error('Please provide a secretKey')
+    }
+    const { secretKey } = getKeyPairFromPrivateKey(privateKey)
+    const signers = [new Account(secretKey), ...extraSigners]
+
+    tx.sign(signers)
+
+    if (!(tx.signatures && tx.signatures.length)) {
+      throw new Error('!Signature')
+    }
+  }
+
+  static serialize(tx) {
+    const serializedTx = tx.serialize()
+    return Buffer.from(serializedTx).toString('base64')
+  }
+
+  static getTxId(tx) {
+    const signature = getFirstSignature(tx)
+    if (signature === null) {
+      throw new Error('Cannot get transaction ID of unsigned transaction')
+    }
+    return base58.encode(signature)
+  }
+}
+
+export default VersionedTx