@exodus/solana-lib 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -25,7 +25,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/project-serum-serum": "0.13.64-exodus.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.3",
-    "bn.js": "^4.11.0",
+    "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
     "create-hash": "^1.1.3",
@@ -40,5 +40,5 @@
     "@solana/web3.js": "^1.90.0",
     "bip39": "^2.6.0"
   },
-  "gitHead": "7fa370d0fdd120110c54d56e2b528a5464e6f9e5"
+  "gitHead": "8f0211c5cbdc7117872f2f910c9b31d7e4e106f0"
 }

package/src/key-identifier.js

@@ -7,7 +7,7 @@ import {
 export const getSupportedPurposes = () => [44]
 
 export const createGetKeyIdentifier =
-  ({ bip44 } = {}) =>
+  ({ bip44, assetName } = {}) =>
   (partialParams = {}) => {
     assert(typeof bip44 === 'number', 'bip44 must be a number')
 
@@ -31,6 +31,7 @@ export const createGetKeyIdentifier =
       case 'phantom':
         // Phantom doesn't use chainIndex (normal vs change address)
         return {
+          assetName,
           derivationAlgorithm: 'SLIP10',
           derivationPath: `m/${purpose}'/${unhardenedBip44}'/${accountIndex}'/${addressIndex}'`,
           keyType: 'nacl',
@@ -38,17 +39,19 @@ export const createGetKeyIdentifier =
       case 'ledger':
       case 'trust':
         return {
+          assetName,
           derivationAlgorithm: 'SLIP10',
           derivationPath: `m/${purpose}'/${unhardenedBip44}'/${accountIndex}'`,
           keyType: 'nacl',
         }
       case 'mathwallet':
         return {
+          assetName,
           derivationAlgorithm: 'BIP32',
           derivationPath: `m/${purpose}'/${unhardenedBip44}'/${accountIndex}'/${addressIndex}`,
           keyType: 'nacl',
         }
       default:
-        return _createGetKeyIdentifier({ bip44, keyType: 'nacl' })(params)
+        return _createGetKeyIdentifier({ bip44, keyType: 'nacl', assetName })(params)
     }
   }

package/src/transaction.js

@@ -412,7 +412,14 @@ class Tx {
   static decodeStakingTx(serialized) {
     // as base64
     const wireTransaction = Buffer.from(serialized, 'base64')
-    const tx = Transaction.from(wireTransaction) // Transaction instance
+
+    let tx
+    try {
+      tx = Transaction.from(wireTransaction) // Transaction instance
+    } catch {
+      // versioned transaction
+      return null
+    }
 
     const txId = bs58.encode(tx.signature)
 

package/src/vendor/message.js

@@ -6,6 +6,7 @@ import { PublicKey } from './publickey'
 import * as Layout from './utils/layout'
 import { PACKET_DATA_SIZE } from './constants'
 import * as shortvec from './utils/shortvec-encoding'
+import { guardedShift, guardedSplice } from './utils/guarded-array-utils.js'
 
 /**
  * The message header, identifying signed and read-only account
@@ -36,7 +37,8 @@ import * as shortvec from './utils/shortvec-encoding'
  * @property {CompiledInstruction[]} instructions Instructions that will be executed in sequence and committed in one atomic transaction if all succeed.
  */
 
-const PUBKEY_LENGTH = 32
+const PUBLIC_KEY_LENGTH = 32
+const VERSION_PREFIX_MASK = 0x7f
 
 /**
  * List of instructions to be processed atomically
@@ -155,36 +157,39 @@ export class Message {
    */
   static from(buffer) {
     // Slice up wire data
-    let byteArray = [...buffer]
+    const byteArray = [...buffer]
 
-    const numRequiredSignatures = byteArray.shift()
-    const numReadonlySignedAccounts = byteArray.shift()
-    const numReadonlyUnsignedAccounts = byteArray.shift()
+    const numRequiredSignatures = guardedShift(byteArray)
+    if (numRequiredSignatures !== (numRequiredSignatures & VERSION_PREFIX_MASK)) {
+      throw new Error('Versioned messages must be deserialized with VersionedMessage.deserialize()')
+    }
+
+    const numReadonlySignedAccounts = guardedShift(byteArray)
+    const numReadonlyUnsignedAccounts = guardedShift(byteArray)
 
     const accountCount = shortvec.decodeLength(byteArray)
     const accountKeys = []
     for (let i = 0; i < accountCount; i++) {
-      const account = byteArray.slice(0, PUBKEY_LENGTH)
-      byteArray = byteArray.slice(PUBKEY_LENGTH)
-      accountKeys.push(bs58.encode(Buffer.from(account)))
+      const account = guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH)
+      accountKeys.push(Buffer.from(account))
     }
 
-    const recentBlockhash = byteArray.slice(0, PUBKEY_LENGTH)
-    byteArray = byteArray.slice(PUBKEY_LENGTH)
+    const recentBlockhash = guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH)
 
     const instructionCount = shortvec.decodeLength(byteArray)
     const instructions = []
     for (let i = 0; i < instructionCount; i++) {
-      const instruction = Object.create(null)
-      instruction.programIdIndex = byteArray.shift()
+      const programIdIndex = guardedShift(byteArray)
       const accountCount = shortvec.decodeLength(byteArray)
-      instruction.accounts = byteArray.slice(0, accountCount)
-      byteArray = byteArray.slice(accountCount)
+      const accounts = guardedSplice(byteArray, 0, accountCount)
       const dataLength = shortvec.decodeLength(byteArray)
-      const data = byteArray.slice(0, dataLength)
-      instruction.data = bs58.encode(Buffer.from(data))
-      byteArray = byteArray.slice(dataLength)
-      instructions.push(instruction)
+      const dataSlice = guardedSplice(byteArray, 0, dataLength)
+      const data = bs58.encode(Buffer.from(dataSlice))
+      instructions.push({
+        programIdIndex,
+        accounts,
+        data,
+      })
     }
 
     const messageArgs = {

package/src/vendor/transaction.js

@@ -8,6 +8,7 @@ import { Message } from './message'
 import { PublicKey } from './publickey'
 import { PACKET_DATA_SIZE } from './constants'
 import * as shortvec from './utils/shortvec-encoding'
+import { guardedSplice } from './utils/guarded-array-utils.js'
 
 /**
  * @typedef {string} TransactionSignature
@@ -555,13 +556,12 @@ export class Transaction {
    */
   static from(buffer) {
     // Slice up wire data
-    let byteArray = [...buffer]
+    const byteArray = [...buffer]
 
     const signatureCount = shortvec.decodeLength(byteArray)
     const signatures = []
     for (let i = 0; i < signatureCount; i++) {
-      const signature = byteArray.slice(0, SIGNATURE_LENGTH)
-      byteArray = byteArray.slice(SIGNATURE_LENGTH)
+      const signature = guardedSplice(byteArray, 0, SIGNATURE_LENGTH)
       signatures.push(bs58.encode(Buffer.from(signature)))
     }
 

package/src/vendor/utils/guarded-array-utils.js

@@ -0,0 +1,30 @@
+// https://github.com/solana-labs/solana-web3.js/blob/master/packages/library-legacy/src/utils/guarded-array-utils.ts
+const END_OF_BUFFER_ERROR_MESSAGE = 'Reached end of buffer unexpectedly'
+
+/**
+ * Delegates to `Array#shift`, but throws if the array is zero-length.
+ */
+export function guardedShift(byteArray) {
+  if (byteArray.length === 0) {
+    throw new Error(END_OF_BUFFER_ERROR_MESSAGE)
+  }
+
+  return byteArray.shift()
+}
+
+/**
+ * Delegates to `Array#splice`, but throws if the section being spliced out extends past the end of
+ * the array.
+ */
+export function guardedSplice(byteArray, ...args) {
+  const [start] = args
+  if (
+    args.length === 2 // Implies that `deleteCount` was supplied
+      ? start + (args[1] ?? 0) > byteArray.length
+      : start >= byteArray.length
+  ) {
+    throw new Error(END_OF_BUFFER_ERROR_MESSAGE)
+  }
+
+  return byteArray.splice(...args)
+}