@exodus/solana-lib 1.6.7 → 1.6.9

package/src/vendor/transaction.js

@@ -1,20 +1,16 @@
-// @flow
 // https://github.com/solana-labs/solana-web3.js/blob/master/src/transaction.js
 
 import invariant from 'assert'
 import nacl from 'tweetnacl'
 import bs58 from 'bs58'
 
-import type { Blockhash } from './utils/blockhash'
-import type { CompiledInstruction } from './message'
 import { Message } from './message'
-import { PublicKey, Account } from './index'
+import { PublicKey } from './index'
 import * as shortvec from './utils/shortvec-encoding'
 
 /**
  * @typedef {string} TransactionSignature
  */
-export type TransactionSignature = string
 
 /**
  * Default (empty) signature
@@ -42,11 +38,6 @@ const SIGNATURE_LENGTH = 64
  * @property {boolean} isSigner True if an instruction requires a transaction signature matching `pubkey`
  * @property {boolean} isWritable True if the `pubkey` can be loaded as a read-write account.
  */
-export type AccountMeta = {
-  pubkey: PublicKey,
-  isSigner: boolean,
-  isWritable: boolean,
-}
 
 /**
  * List of TransactionInstruction object fields that may be initialized at construction
@@ -56,11 +47,6 @@ export type AccountMeta = {
  * @property {?PublicKey} programId
  * @property {?Buffer} data
  */
-export type TransactionInstructionCtorFields = {|
-  keys?: Array<AccountMeta>,
-  programId?: PublicKey,
-  data?: Buffer,
-|}
 
 /**
  * Configuration object for Transaction.serialize()
@@ -69,10 +55,6 @@ export type TransactionInstructionCtorFields = {|
  * @property {boolean|undefined} requireAllSignatures Require all transaction signatures be present (default: true)
  * @property {boolean|undefined} verifySignatures Verify provided signatures (default: true)
  */
-export type SerializeConfig = {
-  requireAllSignatures?: boolean,
-  verifySignatures?: boolean,
-}
 
 /**
  * Transaction Instruction class
@@ -82,19 +64,19 @@ export class TransactionInstruction {
    * Public keys to include in this transaction
    * Boolean represents whether this pubkey needs to sign the transaction
    */
-  keys: Array<AccountMeta> = []
+  keys = []
 
   /**
    * Program Id to execute
    */
-  programId: PublicKey
+  programId
 
   /**
    * Program input
    */
-  data: Buffer = Buffer.alloc(0)
+  data = Buffer.alloc(0)
 
-  constructor(opts?: TransactionInstructionCtorFields) {
+  constructor(opts?) {
     opts && Object.assign(this, opts)
   }
 }
@@ -102,10 +84,6 @@ export class TransactionInstruction {
 /**
  * @private
  */
-type SignaturePubkeyPair = {|
-  signature: Buffer | null,
-  publicKey: PublicKey,
-|}
 
 /**
  * NonceInformation to be used to build a Transaction.
@@ -114,10 +92,6 @@ type SignaturePubkeyPair = {|
  * @property {Blockhash} nonce The current Nonce blockhash
  * @property {TransactionInstruction} nonceInstruction AdvanceNonceAccount Instruction
  */
-type NonceInformation = {|
-  nonce: Blockhash,
-  nonceInstruction: TransactionInstruction,
-|}
 
 /**
  * List of Transaction object fields that may be initialized at construction
@@ -127,11 +101,6 @@ type NonceInformation = {|
  * @property {?Array<SignaturePubkeyPair>} signatures One or more signatures
  *
  */
-type TransactionCtorFields = {|
-  recentBlockhash?: Blockhash | null,
-  nonceInfo?: NonceInformation | null,
-  signatures?: Array<SignaturePubkeyPair>,
-|}
 
 /**
  * Transaction class
@@ -141,12 +110,12 @@ export class Transaction {
    * Signatures for the transaction.  Typically created by invoking the
    * `sign()` method
    */
-  signatures: Array<SignaturePubkeyPair> = []
+  signatures = []
 
   /**
    * The first (payer) Transaction signature
    */
-  get signature(): Buffer | null {
+  get signature() {
     if (this.signatures.length > 0) {
       return this.signatures[0].signature
     }
@@ -156,12 +125,12 @@ export class Transaction {
   /**
    * The transaction fee payer
    */
-  feePayer: PublicKey
+  feePayer
 
   /**
    * The transaction fee payer (first signer)
    */
-  getFeePayer(): PublicKey | null {
+  getFeePayer() {
     if (this.signatures.length > 0) {
       return this.signatures[0].publicKey
     }
@@ -171,36 +140,34 @@ export class Transaction {
   /**
    * The instructions to atomically execute
    */
-  instructions: Array<TransactionInstruction> = []
+  instructions = []
 
   /**
    * A recent transaction id.  Must be populated by the caller
    */
-  recentBlockhash: Blockhash | null
+  recentBlockhash
 
   /**
    * Optional Nonce information. If populated, transaction will use a durable
    * Nonce hash instead of a recentBlockhash. Must be populated by the caller
    */
-  nonceInfo: NonceInformation | null
+  nonceInfo
 
   /**
    * Construct an empty Transaction
    */
-  constructor(opts?: TransactionCtorFields) {
+  constructor(opts?) {
     opts && Object.assign(this, opts)
   }
   /**
    * Add one or more instructions to this Transaction
    */
-  add(
-    ...items: Array<Transaction | TransactionInstruction | TransactionInstructionCtorFields>
-  ): Transaction {
+  add(...items) {
     if (items.length === 0) {
       throw new Error('No instructions')
     }
 
-    items.forEach((item: any) => {
+    items.forEach((item) => {
       if ('instructions' in item) {
         this.instructions = this.instructions.concat(item.instructions)
       } else if ('data' in item && 'programId' in item && 'keys' in item) {
@@ -214,7 +181,7 @@ export class Transaction {
   /**
    * Compile transaction data
    */
-  compileMessage(): Message {
+  compileMessage() {
     const { nonceInfo } = this
     if (nonceInfo && this.instructions[0] !== nonceInfo.nonceInstruction) {
       this.recentBlockhash = nonceInfo.nonce
@@ -229,7 +196,7 @@ export class Transaction {
       throw new Error('No instructions provided')
     }
 
-    let feePayer: PublicKey
+    let feePayer
     if (this.feePayer) {
       feePayer = this.feePayer
     } else if (this.signatures.length > 0 && this.signatures[0].publicKey) {
@@ -239,8 +206,8 @@ export class Transaction {
       throw new Error('Transaction fee payer required')
     }
 
-    const programIds: string[] = []
-    const accountMetas: AccountMeta[] = []
+    const programIds = []
+    const accountMetas = []
     this.instructions.forEach((instruction) => {
       instruction.keys.forEach((accountMeta) => {
         accountMetas.push({ ...accountMeta })
@@ -278,7 +245,7 @@ export class Transaction {
     })
 
     // Cull duplicate account metas
-    const uniqueMetas: AccountMeta[] = []
+    const uniqueMetas = []
     accountMetas.forEach((accountMeta) => {
       const pubkeyString = accountMeta.pubkey.toString()
       const uniqueIndex = uniqueMetas.findIndex((x) => {
@@ -339,8 +306,8 @@ export class Transaction {
     let numReadonlySignedAccounts = 0
     let numReadonlyUnsignedAccounts = 0
     // Split out signing from non-signing keys and count header values
-    const signedKeys: string[] = []
-    const unsignedKeys: string[] = []
+    const signedKeys = []
+    const unsignedKeys = []
     uniqueMetas.forEach(({ pubkey, isSigner, isWritable }) => {
       if (isSigner) {
         signedKeys.push(pubkey.toString())
@@ -357,7 +324,7 @@ export class Transaction {
     })
 
     const accountKeys = signedKeys.concat(unsignedKeys)
-    const instructions: CompiledInstruction[] = this.instructions.map((instruction) => {
+    const instructions = this.instructions.map((instruction) => {
       const { data, programId } = instruction
       return {
         programIdIndex: accountKeys.indexOf(programId.toString()),
@@ -385,7 +352,7 @@ export class Transaction {
   /**
    * Get a buffer of the Transaction data that need to be covered by signatures
    */
-  serializeMessage(): Buffer {
+  serializeMessage() {
     return this.compileMessage().serialize()
   }
   /**
@@ -394,7 +361,7 @@ export class Transaction {
    *
    * Signatures can be added with either `partialSign` or `addSignature`
    */
-  setSigners(...signers: Array<PublicKey>) {
+  setSigners(...signers) {
     if (signers.length === 0) {
       throw new Error('No signers')
     }
@@ -424,7 +391,7 @@ export class Transaction {
    *
    * The Transaction must be assigned a valid `recentBlockhash` before invoking this method
    */
-  sign(...signers: Array<Account>) {
+  sign(...signers) {
     if (signers.length === 0) {
       throw new Error('No signers')
     }
@@ -453,7 +420,7 @@ export class Transaction {
    *
    * All the caveats from the `sign` method apply to `partialSign`
    */
-  partialSign(...signers: Array<Account>) {
+  partialSign(...signers) {
     if (signers.length === 0) {
       throw new Error('No signers')
     }
@@ -475,7 +442,7 @@ export class Transaction {
    * Add an externally created signature to a transaction. The public key
    * must correspond to a public key that was previously provided to `setSigners`.
    */
-  addSignature(pubkey: PublicKey, signature: Buffer) {
+  addSignature(pubkey, signature) {
     invariant(signature.length === 64)
 
     const index = this.signatures.findIndex((sigpair) => pubkey.equals(sigpair.publicKey))
@@ -488,13 +455,13 @@ export class Transaction {
   /**
    * Verify signatures of a complete, signed Transaction
    */
-  verifySignatures(): boolean {
+  verifySignatures() {
     return this._verifySignatures(this.serializeMessage(), true)
   }
   /**
    * @private
    */
-  _verifySignatures(signData: Buffer, requireAllSignatures: boolean): boolean {
+  _verifySignatures(signData, requireAllSignatures) {
     for (const { signature, publicKey } of this.signatures) {
       if (signature === null) {
         if (requireAllSignatures) {
@@ -511,7 +478,7 @@ export class Transaction {
   /**
    * Serialize the Transaction in the wire format.
    */
-  serialize(config?: SerializeConfig): Buffer {
+  serialize(config?) {
     const { requireAllSignatures, verifySignatures } = Object.assign(
       { requireAllSignatures: true, verifySignatures: true },
       config
@@ -527,7 +494,7 @@ export class Transaction {
   /**
    * @private
    */
-  _serialize(signData: Buffer): Buffer {
+  _serialize(signData) {
     const { signatures } = this
     const signatureCount = []
     shortvec.encodeLength(signatureCount, signatures.length)
@@ -552,7 +519,7 @@ export class Transaction {
    * Deprecated method
    * @private
    */
-  get keys(): Array<PublicKey> {
+  get keys() {
     invariant(this.instructions.length === 1)
     return this.instructions[0].keys.map((keyObj) => keyObj.pubkey)
   }
@@ -560,7 +527,7 @@ export class Transaction {
    * Deprecated method
    * @private
    */
-  get programId(): PublicKey {
+  get programId() {
     invariant(this.instructions.length === 1)
     return this.instructions[0].programId
   }
@@ -568,14 +535,14 @@ export class Transaction {
    * Deprecated method
    * @private
    */
-  get data(): Buffer {
+  get data() {
     invariant(this.instructions.length === 1)
     return this.instructions[0].data
   }
   /**
    * Parse a wire transaction into a Transaction object.
    */
-  static from(buffer: Buffer | Uint8Array | Array<number>): Transaction {
+  static from(buffer) {
     // Slice up wire data
     let byteArray = [...buffer]
 
@@ -592,7 +559,7 @@ export class Transaction {
   /**
    * Populate Transaction object from message and signatures
    */
-  static populate(message: Message, signatures: Array<string>): Transaction {
+  static populate(message, signatures) {
     const transaction = new Transaction()
     transaction.recentBlockhash = message.recentBlockhash
     signatures.forEach((signature, index) => {

package/src/vendor/utils/blockhash.js

@@ -1,6 +1,3 @@
-// @flow
-
 /**
  * @typedef {string} Blockhash
  */
-export type Blockhash = string

package/src/vendor/utils/fee-calculator.js

@@ -1,4 +1,3 @@
-// @flow
 import * as BufferLayout from '@exodus/buffer-layout'
 
 /**
@@ -12,6 +11,3 @@ export const FeeCalculatorLayout = BufferLayout.nu64('lamportsPerSignature')
  * @typedef {Object} FeeCalculator
  * @property {number} lamportsPerSignature lamports Cost in lamports to validate a signature
  */
-export type FeeCalculator = {
-  lamportsPerSignature: number,
-}

package/src/vendor/utils/layout.js

@@ -1,25 +1,24 @@
-// @flow
 import BN from 'bn.js'
 import * as BufferLayout from '@exodus/buffer-layout'
 
 /**
  * Layout for a public key
  */
-export const publicKey = (property: string = 'publicKey'): Object => {
+export const publicKey = (property = 'publicKey') => {
   return BufferLayout.blob(32, property)
 }
 
 /**
  * Layout for a 64bit unsigned value
  */
-export const uint64 = (property: string = 'uint64'): Object => {
+export const uint64 = (property = 'uint64') => {
   return BufferLayout.blob(8, property)
 }
 
 /**
  * Layout for a Rust String type
  */
-export const rustString = (property: string = 'string') => {
+export const rustString = (property = 'string') => {
   const rsl = BufferLayout.struct(
     [
       BufferLayout.u32('length'),
@@ -53,21 +52,21 @@ export const rustString = (property: string = 'string') => {
 /**
  * Layout for an Authorized object
  */
-export const authorized = (property: string = 'authorized') => {
+export const authorized = (property = 'authorized') => {
   return BufferLayout.struct([publicKey('staker'), publicKey('withdrawer')], property)
 }
 
 /**
  * Layout for a Lockup object
  */
-export const lockup = (property: string = 'lockup') => {
+export const lockup = (property = 'lockup') => {
   return BufferLayout.struct(
     [BufferLayout.ns64('unixTimestamp'), BufferLayout.ns64('epoch'), publicKey('custodian')],
     property
   )
 }
 
-export const bnAmountU64 = (property: string) => {
+export const bnAmountU64 = (property) => {
   const rsl = BufferLayout.blob(8, property)
 
   const _decode = rsl.decode.bind(rsl)
@@ -84,7 +83,7 @@ export const bnAmountU64 = (property: string) => {
   return rsl
 }
 
-export function getAlloc(type: Object, fields: Object): number {
+export function getAlloc(type, fields) {
   let alloc = 0
   type.layout.fields.forEach((item) => {
     if (item.span >= 0) {

package/src/vendor/utils/shortvec-encoding.js

@@ -1,6 +1,4 @@
-// @flow
-
-export function decodeLength(bytes: Array<number>): number {
+export function decodeLength(bytes) {
   let len = 0
   let size = 0
   for (;;) {
@@ -14,7 +12,7 @@ export function decodeLength(bytes: Array<number>): number {
   return len
 }
 
-export function encodeLength(bytes: Array<number>, len: number) {
+export function encodeLength(bytes, len) {
   let remLen = len
   for (;;) {
     let elem = remLen & 0x7f

package/src/vendor/utils/to-buffer.js

@@ -1,4 +1,4 @@
-export const toBuffer = (arr: Buffer | Uint8Array | Array<number>): Buffer => {
+export const toBuffer = (arr) => {
   if (arr instanceof Buffer) {
     return arr
   } else if (arr instanceof Uint8Array) {

package/src/versioned-transaction.js

@@ -14,7 +14,7 @@ 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[] = []) {
+  static sign(tx, privateKey, extraSigners = []) {
     if (!privateKey) {
       throw new Error('Please provide a secretKey')
     }