@exodus/solana-lib 1.6.6 → 1.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -16,8 +16,8 @@
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
     "@exodus/key-utils": "^3.1.0",
-    "@exodus/models": "^8.10.4",
-    "@exodus/solana-meta": "^1.0.2",
+    "@exodus/models": "^10.1.0",
+    "@exodus/solana-meta": "^1.0.3",
     "@exodus/solana-spl-token": "0.1.8-exodus.1",
     "@project-serum/serum": "0.13.64",
     "bn.js": "^4.11.0",
@@ -27,5 +27,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "752eba9b060c07db518f06c154d905378bcb7b3c"
+  "gitHead": "846ed76714355879216f43c6be8ec2b072169635"
 }

package/src/encode.js

@@ -1,4 +1,3 @@
-// @flow
 import assert from 'assert'
 import { PublicKey, StakeProgram } from './vendor'
 import {
@@ -28,15 +27,15 @@ BinaryWriter.prototype.writePubkeyAsString = function (value) {
 }
 */
 
-export function getAddressFromPublicKey(publicKey: string | Buffer): string {
+export function getAddressFromPublicKey(publicKey) {
   return bs58.encode(Buffer.from(publicKey, 'hex'))
 }
 
-export function getAddressFromPrivateKey(privateKey: string | Buffer): string {
+export function getAddressFromPrivateKey(privateKey) {
   return getAddressFromPublicKey(getPublicKey(privateKey))
 }
 
-export function isValidAddress(address: string): boolean {
+export function isValidAddress(address) {
   try {
     // assume base 58 encoding by default
     const decoded = bs58.decode(address)
@@ -53,22 +52,19 @@ export function isValidAddress(address: string): boolean {
   }
 }
 
-export function getEncodedSecretKey(privateKey): string {
+export function getEncodedSecretKey(privateKey) {
   const { secretKey } = getKeyPairFromPrivateKey(Buffer.from(privateKey, 'hex'))
   return bs58.encode(secretKey)
 }
 
-export function getPrivateKeyFromSecretKey(secretKey: string): string {
+export function getPrivateKeyFromSecretKey(secretKey) {
   const privateKey = bs58.decode(secretKey).slice(0, 32) // Buffer
   assert(privateKey.length === 32, 'privateKey has unexpected length')
   return privateKey
 }
 
 // doc: https://spl.solana.com/associated-token-account (HACK: refactored to sync)
-export function findAssociatedTokenAddress(
-  walletAddress: string,
-  tokenMintAddress: string
-): string {
+export function findAssociatedTokenAddress(walletAddress, tokenMintAddress) {
   walletAddress = new PublicKey(walletAddress)
   tokenMintAddress = new PublicKey(tokenMintAddress)
   return PublicKey.findProgramAddress(
@@ -77,7 +73,7 @@ export function findAssociatedTokenAddress(
   )[0].toBase58() // returns encoded PublicKey
 }
 
-export function createStakeAddress(walletAddress: string, seed = SEED): string {
+export function createStakeAddress(walletAddress, seed = SEED) {
   const fromPubkey = new PublicKey(walletAddress)
 
   const newAccountPubkey = PublicKey.createWithSeed(
@@ -91,7 +87,7 @@ export function createStakeAddress(walletAddress: string, seed = SEED): string {
 }
 
 // get Metaplex Metadata account
-export function getMetadataAccount(tokenMintAddress: string): string {
+export function getMetadataAccount(tokenMintAddress) {
   const METADATA_PREFIX = 'metadata'
 
   return PublicKey.findProgramAddress(
@@ -105,7 +101,7 @@ export function getMetadataAccount(tokenMintAddress: string): string {
 }
 
 // metaplex NFT Master Edition PDA
-export function getMasterEditionPDA(tokenMintAddress: string): string {
+export function getMasterEditionPDA(tokenMintAddress) {
   return PublicKey.findProgramAddress(
     [
       Buffer.from('metadata', 'utf8'),
@@ -118,7 +114,7 @@ export function getMasterEditionPDA(tokenMintAddress: string): string {
 }
 
 // metaplex TokenRecord PDA
-export function getTokenRecordPDA(tokenMintAddress: string, token: string): string {
+export function getTokenRecordPDA(tokenMintAddress, token) {
   return PublicKey.findProgramAddress(
     [
       Buffer.from('metadata', 'utf8'),
@@ -131,7 +127,7 @@ export function getTokenRecordPDA(tokenMintAddress: string, token: string): stri
   )[0].toBase58()
 }
 
-export function deserializeMetaplexMetadata(rawData: Buffer) {
+export function deserializeMetaplexMetadata(rawData) {
   const metadata = deserializeUnchecked(METADATA_SCHEMA, Metadata, rawData)
 
   // eslint-disable-next-line no-control-regex

package/src/helpers/spl-token.js

@@ -1,7 +1,7 @@
 import assert from 'assert'
 import BN from 'bn.js'
 import * as BufferLayout from '@exodus/buffer-layout'
-import { Account, PublicKey, TransactionInstruction } from '../vendor'
+import { TransactionInstruction } from '../vendor'
 import * as Layout from '../vendor/utils/layout'
 
 // Extracted from https://github.com/ExodusMovement/solana-spl-token/blob/master/src/index.js#L263
@@ -13,7 +13,7 @@ export class U64 extends BN {
   /**
    * Convert to Buffer representation
    */
-  toBuffer(): typeof Buffer {
+  toBuffer() {
     const a = super.toArray().reverse()
     const b = Buffer.from(a)
     if (b.length === 8) {
@@ -29,7 +29,7 @@ export class U64 extends BN {
   /**
    * Construct a u64 from Buffer representation
    */
-  static fromBuffer(buffer: typeof Buffer): U64 {
+  static fromBuffer(buffer) {
     assert(buffer.length === 8, `Invalid buffer length: ${buffer.length}`)
     return new U64(
       [...buffer]
@@ -41,8 +41,6 @@ export class U64 extends BN {
   }
 }
 
-const u64 = U64 // alias
-
 /**
  * Layout for a public key
  */
@@ -71,14 +69,7 @@ export class Token {
    * @param multiSigners Signing accounts if `authority` is a multiSig
    * @param amount Number of tokens to transfer
    */
-  static createTransferInstruction(
-    programId: PublicKey,
-    source: PublicKey,
-    destination: PublicKey,
-    owner: PublicKey,
-    multiSigners: Array<Account>,
-    amount: number | u64
-  ): TransactionInstruction {
+  static createTransferInstruction(programId, source, destination, owner, multiSigners, amount) {
     const dataLayout = BufferLayout.struct([
       BufferLayout.u8('instruction'),
       Layout.uint64('amount'),
@@ -120,7 +111,7 @@ export class Token {
     })
   }
 
-  static decode(data: string) {
+  static decode(data) {
     return BufferLayout.struct([
       publicKey('mint'),
       publicKey('owner'),

package/src/helpers/tokenTransfer.js

@@ -5,9 +5,9 @@ import { findAssociatedTokenAddress } from '../encode'
 
 // https://github.com/paul-schaaf/spl-token-ui/blob/main/src/solana/token/associatedToken.ts#L59
 export const createAssociatedTokenAccount = (
-  senderAddress: string,
-  tokenMintAddress: string,
-  ownerAddress: string // destination SOL address
+  senderAddress,
+  tokenMintAddress,
+  ownerAddress // destination SOL address
 ) => {
   const associatedTokenAccountPublicKey = new PublicKey(
     findAssociatedTokenAddress(ownerAddress, tokenMintAddress)
@@ -28,10 +28,10 @@ export const createAssociatedTokenAccount = (
 }
 
 function createIx(
-  funderPubkey: PublicKey,
-  associatedTokenAccountPublicKey: PublicKey,
-  ownerPublicKey: PublicKey,
-  tokenMintPublicKey: PublicKey
+  funderPubkey,
+  associatedTokenAccountPublicKey,
+  ownerPublicKey,
+  tokenMintPublicKey
 ) {
   return new TransactionInstruction({
     programId: SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID,

package/src/helpers/transaction-strategy.js

@@ -10,7 +10,7 @@ const isVersionedTransactionTypeSupported = (transaction) => {
   return SUPPORTED_TRANSACTION_VERSIONS.has(transaction.version)
 }
 
-const getTransactionStrategy = (transaction): VersionedTransaction | Transaction => {
+const getTransactionStrategy = (transaction) => {
   if (isVersionedTransactionType(transaction)) {
     if (isVersionedTransactionTypeSupported(transaction)) {
       return VersionedTransaction

package/src/index.js

@@ -1,5 +1,3 @@
-// @flow
-
 export * from './constants'
 export * from './encode'
 export * from './keypair'

package/src/keypair.js

@@ -1,8 +1,7 @@
-// @flow
 import nacl from 'tweetnacl'
 import { PublicKey } from './vendor'
 
-export function getKeyPairFromPrivateKey(privateKey: string | Buffer): Object {
+export function getKeyPairFromPrivateKey(privateKey) {
   const { publicKey, secretKey } = nacl.sign.keyPair.fromSeed(
     Buffer.from(privateKey, 'hex').slice(0, 32)
   )
@@ -22,21 +21,17 @@ export function generateKeyPair() {
   }
 }
 
-export function getPublicKey(privateKey: string | Buffer): Buffer {
+export function getPublicKey(privateKey) {
   return getKeyPairFromPrivateKey(privateKey).publicKey
 }
 
-export function sign(data: Buffer, privateKey: string | Buffer): Buffer {
+export function sign(data, privateKey) {
   return Buffer.from(
     nacl.sign.detached(data, getKeyPairFromPrivateKey(Buffer.from(privateKey, 'hex')).secretKey),
     'hex'
   )
 }
 
-export function verifySignature(
-  data: Buffer,
-  signature: Buffer,
-  publicKey: string | Buffer
-): boolean {
+export function verifySignature(data, signature, publicKey) {
   return nacl.sign.detached.verify(data, signature, Buffer.from(publicKey, 'hex'))
 }

package/src/transaction.js

@@ -1,4 +1,3 @@
-// @flow
 import assert from 'assert'
 import BN from 'bn.js'
 import bs58 from 'bs58'
@@ -354,7 +353,7 @@ class Tx {
     return transaction
   }
 
-  static sign(tx, privateKey: Buffer | string, extraSigners: Account[] = []) {
+  static sign(tx, privateKey, extraSigners = []) {
     if (!privateKey) throw new Error('Please provide a secretKey')
     const { secretKey } = getKeyPairFromPrivateKey(privateKey)
     const signers = [new Account(secretKey), ...extraSigners]
@@ -379,7 +378,7 @@ class Tx {
     return transaction.serialize().toString('base64')
   }
 
-  static decodeStakingTx(serialized: string) {
+  static decodeStakingTx(serialized) {
     // as base64
     const wireTransaction = Buffer.from(serialized, 'base64')
     const tx = Transaction.from(wireTransaction) // Transaction instance

package/src/tx/build-raw-transaction.js

@@ -3,7 +3,7 @@ import { PACKET_DATA_SIZE } from '../vendor'
 
 // Copied from:
 // https://github.com/solana-labs/solana-web3.js/blob/42612c936d8d4ddbcb09dbb73db9e1aeaf6d8764/src/util/shortvec-encoding.ts#L15-L28.
-function encodeLength(bytes: number[], length: number) {
+function encodeLength(bytes, length) {
   let remainingLength = length
 
   for (;;) {
@@ -26,8 +26,8 @@ const MAX_SIGNATURES = 255
 
 export const SIGNATURE_LENGTH = nacl.sign.signatureLength
 
-export function buildRawTransaction(signData: Buffer, signatures: (Uint8Array | null)[]) {
-  const signatureCount: number[] = []
+export function buildRawTransaction(signData, signatures) {
+  const signatureCount = []
   encodeLength(signatureCount, signatures.length)
 
   const signaturesLength = signatureCount.length + signatures.length * SIGNATURE_LENGTH

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

@@ -1,8 +1,7 @@
 import { createUnsignedTx } from './create-unsigned-tx'
 import { signUnsignedTx } from './sign-unsigned-tx'
-import type { ParsedTransaction, SignedTransaction } from '@exodus/models/lib/types'
 
-export function createAndSignTx(input: ParsedTransaction, privateKey: Buffer): SignedTransaction {
+export function createAndSignTx(input, privateKey) {
   const unsignedTx = createUnsignedTx(input)
   return signUnsignedTx(unsignedTx, privateKey)
 }

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

@@ -1,5 +1,3 @@
-import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
-
 export function createUnsignedTx({
   asset,
   from,
@@ -34,7 +32,7 @@ export function createUnsignedTx({
   // Wallet Connect
   instructions,
   feePayer,
-}: ParsedTransaction): UnsignedTransaction {
+}) {
   return {
     txData: {
       from,

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

@@ -2,24 +2,9 @@ import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@exodus/solana-sp
 import { MARKETS, TokenInstructions } from '@project-serum/serum'
 import * as BufferLayout from '@exodus/buffer-layout'
 
-import {
-  Message,
-  SystemInstruction,
-  SystemProgram,
-  TransactionInstruction,
-  PublicKey,
-} from './../vendor'
+import { SystemInstruction, SystemProgram } from './../vendor'
 import bs58 from 'bs58'
 
-type DecodedInstruction = {
-  type: string,
-  title: string,
-  data: {
-    programId: PublicKey,
-    rawData?: Buffer,
-  },
-}
-
 const INSTRUCTION_LAYOUT = BufferLayout.union(BufferLayout.u8('instruction'))
 INSTRUCTION_LAYOUT.addVariant(
   12,
@@ -61,12 +46,12 @@ class InstructionKeys {
     this.keys = keys
   }
 
-  getAddress(index: number) {
+  getAddress(index) {
     return this.keys[index] ? this.keys[index].pubkey : undefined
   }
 }
 
-export function getTransactionInstructionsFromMessage(message: Message): TransactionInstruction[] {
+export function getTransactionInstructionsFromMessage(message) {
   const { accountKeys, instructions } = message
   return instructions.map((instruction) => {
     const { accounts, data, programIdIndex } = instruction
@@ -82,7 +67,7 @@ export function getTransactionInstructionsFromMessage(message: Message): Transac
   })
 }
 
-function decodeSystemInstruction(instruction: TransactionInstruction): DecodedInstruction {
+function decodeSystemInstruction(instruction) {
   const instructionType = SystemInstruction.decodeInstructionType(instruction)
 
   let data
@@ -102,7 +87,7 @@ function decodeSystemInstruction(instruction: TransactionInstruction): DecodedIn
   }
 }
 
-function decodeTokenInstructionData(data: Buffer) {
+function decodeTokenInstructionData(data) {
   if (data.length === 1) {
     switch (data[0]) {
       case 1:
@@ -128,9 +113,7 @@ function decodeTokenInstructionData(data: Buffer) {
   return TokenInstructions.decodeTokenInstructionData(data)
 }
 
-export function decodeTokenProgramInstruction(
-  instruction: TransactionInstruction
-): DecodedInstruction {
+export function decodeTokenProgramInstruction(instruction) {
   const decodedInstructionData = decodeTokenInstructionData(instruction.data)
 
   if (!decodedInstructionData || Object.keys(decodedInstructionData).length > 1) {
@@ -169,9 +152,7 @@ export function decodeTokenProgramInstruction(
   }
 }
 
-function decodeAssociatedTokenProgramInstruction(
-  instruction: TransactionInstruction
-): DecodedInstruction {
+function decodeAssociatedTokenProgramInstruction(instruction) {
   const { programId } = instruction
   const type = 'createAssociatedTokenAccount'
   return {
@@ -181,11 +162,11 @@ function decodeAssociatedTokenProgramInstruction(
   }
 }
 
-function decodeMarketProgramInstruction(instruction: TransactionInstruction): DecodedInstruction {
+function decodeMarketProgramInstruction(instruction) {
   throw new Error('Not yet implemented')
 }
 
-function decodeTokenInstruction(instruction: TransactionInstruction): DecodedInstruction {
+function decodeTokenInstruction(instruction) {
   const { programId } = instruction
 
   try {
@@ -215,24 +196,19 @@ function decodeTokenInstruction(instruction: TransactionInstruction): DecodedIns
   }
 }
 
-export function decodeTransactionInstructions(
-  transactionMessages: Message[]
-): DecodedInstruction[] {
-  const transactionInstructions = transactionMessages.reduce(
-    (prevInstructions: TransactionInstruction[], message: Message) => {
-      let instructions
-      const isTransactionMessage =
-        message.instructions.length > 0 && message.instructions[0].programId !== undefined
-      if (isTransactionMessage) {
-        instructions = message.instructions
-      } else {
-        instructions = getTransactionInstructionsFromMessage(message)
-      }
-
-      return [...prevInstructions, ...instructions]
-    },
-    []
-  )
+export function decodeTransactionInstructions(transactionMessages) {
+  const transactionInstructions = transactionMessages.reduce((prevInstructions, message) => {
+    let instructions
+    const isTransactionMessage =
+      message.instructions.length > 0 && message.instructions[0].programId !== undefined
+    if (isTransactionMessage) {
+      instructions = message.instructions
+    } else {
+      instructions = getTransactionInstructionsFromMessage(message)
+    }
+
+    return [...prevInstructions, ...instructions]
+  }, [])
   return transactionInstructions.map((instruction) => {
     if (instruction.programId.equals(SystemProgram.programId)) {
       return decodeSystemInstruction(instruction)

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

@@ -1,7 +1,6 @@
 import { asset } from '@exodus/solana-meta'
-import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
 
-export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransaction {
+export function parseUnsignedTx(unsignedTx) {
   const {
     from,
     to,

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

@@ -1,13 +1,9 @@
 import { asset } from '@exodus/solana-meta'
-import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
 
 import { Transaction, getTransactionStrategy } from '../'
 import { createMetaplexTransferTransaction } from '../helpers/metaplex-transfer'
 
-export function signUnsignedTx(
-  unsignedTx: UnsignedTransaction,
-  privateKey: Buffer
-): SignedTransaction {
+export function signUnsignedTx(unsignedTx, privateKey) {
   const { amount: unitAmount, from, method, transaction } = unsignedTx.txData
 
   if (transaction) {

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

@@ -1,7 +1,7 @@
 import { Token, U64 } from '../helpers/spl-token'
 import { PublicKey } from '../vendor/'
 
-export function computeBalance(futureAccountBalance: string, currentAccountBalance: string) {
+export function computeBalance(futureAccountBalance, currentAccountBalance) {
   return new U64(futureAccountBalance).sub(new U64(currentAccountBalance))
 }
 

package/src/vendor/account.js

@@ -1,5 +1,3 @@
-// @flow
-import type { KeyPair } from 'tweetnacl'
 import { PublicKey } from './publickey'
 import { getKeyPairFromPrivateKey } from '../keypair'
 
@@ -7,14 +5,14 @@ import { getKeyPairFromPrivateKey } from '../keypair'
  * An account key pair (public and secret keys).
  */
 export class Account {
-  _keypair: KeyPair
+  _keypair
 
   /**
    * Create a new Account object
    *
    * @param secretKey Secret key for the account
    */
-  constructor(secretKey: Buffer | Uint8Array | Array<number>) {
+  constructor(secretKey) {
     if (secretKey) {
       this._keypair = getKeyPairFromPrivateKey(Buffer.from(secretKey, 'hex'))
     } else {
@@ -25,14 +23,14 @@ export class Account {
   /**
    * The public key for this account
    */
-  get publicKey(): PublicKey {
+  get publicKey() {
     return new PublicKey(this._keypair.publicKey)
   }
 
   /**
    * The **unencrypted** secret key for this account
    */
-  get secretKey(): Buffer {
+  get secretKey() {
     return this._keypair.secretKey
   }
 }

package/src/vendor/instruction.js

@@ -1,7 +1,3 @@
-// @flow
-
-import * as BufferLayout from '@exodus/buffer-layout'
-
 import * as Layout from './utils/layout'
 
 /**
@@ -9,15 +5,11 @@ import * as Layout from './utils/layout'
  * @property (index} The Instruction index (from solana upstream program)
  * @property (BufferLayout} The BufferLayout to use to build data
  */
-export type InstructionType = {|
-  index: number,
-  layout: typeof BufferLayout,
-|}
 
 /**
  * Populate a buffer of instruction data using an InstructionType
  */
-export function encodeData(type: InstructionType, fields: Object): Buffer {
+export function encodeData(type, fields) {
   const allocLength = type.layout.span >= 0 ? type.layout.span : Layout.getAlloc(type, fields)
   const data = Buffer.alloc(allocLength)
   const layoutFields = Object.assign({ instruction: type.index }, fields)
@@ -28,7 +20,7 @@ export function encodeData(type: InstructionType, fields: Object): Buffer {
 /**
  * Decode instruction data buffer using an InstructionType
  */
-export function decodeData(type: InstructionType, buffer: Buffer): Object {
+export function decodeData(type, buffer) {
   let data
   try {
     data = type.layout.decode(buffer)

package/src/vendor/message.js

@@ -1,10 +1,8 @@
-// @flow
-
 import bs58 from 'bs58'
 import * as BufferLayout from '@exodus/buffer-layout'
 
 import { PublicKey } from './publickey'
-import type { Blockhash } from './utils/blockhash'
+
 import * as Layout from './utils/layout'
 import { PACKET_DATA_SIZE } from './transaction'
 import * as shortvec from './utils/shortvec-encoding'
@@ -18,11 +16,6 @@ import * as shortvec from './utils/shortvec-encoding'
  * @property {number} numReadonlySignedAccounts: The last `numReadonlySignedAccounts` of the signed keys are read-only accounts
  * @property {number} numReadonlyUnsignedAccounts The last `numReadonlySignedAccounts` of the unsigned keys are read-only accounts
  */
-export type MessageHeader = {
-  numRequiredSignatures: number,
-  numReadonlySignedAccounts: number,
-  numReadonlyUnsignedAccounts: number,
-}
 
 /**
  * An instruction to execute by a program
@@ -32,11 +25,6 @@ export type MessageHeader = {
  * @property {number[]} accounts Ordered indices into the transaction keys array indicating which accounts to pass to the program
  * @property {string} data The program input data encoded as base 58
  */
-export type CompiledInstruction = {
-  programIdIndex: number,
-  accounts: number[],
-  data: string,
-}
 
 /**
  * Message constructor arguments
@@ -47,12 +35,6 @@ export type CompiledInstruction = {
  * @property {Blockhash} recentBlockhash The hash of a recent ledger block
  * @property {CompiledInstruction[]} instructions Instructions that will be executed in sequence and committed in one atomic transaction if all succeed.
  */
-type MessageArgs = {
-  header: MessageHeader,
-  accountKeys: string[],
-  recentBlockhash: Blockhash,
-  instructions: CompiledInstruction[],
-}
 
 const PUBKEY_LENGTH = 32
 
@@ -60,23 +42,23 @@ const PUBKEY_LENGTH = 32
  * List of instructions to be processed atomically
  */
 export class Message {
-  header: MessageHeader
-  accountKeys: PublicKey[]
-  recentBlockhash: Blockhash
-  instructions: CompiledInstruction[]
+  header
+  accountKeys
+  recentBlockhash
+  instructions
 
-  constructor(args: MessageArgs) {
+  constructor(args) {
     this.header = args.header
     this.accountKeys = args.accountKeys.map((account) => new PublicKey(account))
     this.recentBlockhash = args.recentBlockhash
     this.instructions = args.instructions
   }
 
-  isAccountSigner(index: number): boolean {
+  isAccountSigner(index) {
     return index < this.header.numRequiredSignatures
   }
 
-  isAccountWritable(index: number): boolean {
+  isAccountWritable(index) {
     return (
       index < this.header.numRequiredSignatures - this.header.numReadonlySignedAccounts ||
       (index >= this.header.numRequiredSignatures &&
@@ -84,7 +66,7 @@ export class Message {
     )
   }
 
-  findSignerIndex(signer: PublicKey): number {
+  findSignerIndex(signer) {
     const index = this.accountKeys.findIndex((accountKey) => {
       return accountKey.equals(signer)
     })
@@ -94,7 +76,7 @@ export class Message {
     return index
   }
 
-  serialize(): Buffer {
+  serialize() {
     const numKeys = this.accountKeys.length
 
     let keyCount = []
@@ -170,7 +152,7 @@ export class Message {
   /**
    * Decode a compiled message into a Message object.
    */
-  static from(buffer: Buffer | Uint8Array | Array<number>): Message {
+  static from(buffer) {
     // Slice up wire data
     let byteArray = [...buffer]