@exodus/solana-lib 1.7.5 → 1.8.0

package/src/vendor/system-program.js

@@ -197,11 +197,11 @@ export const SYSTEM_INSTRUCTION_LAYOUTS = Object.freeze({
 /**
  * System Instruction class
  */
-export class SystemInstruction {
+export const SystemInstruction = {
   /**
    * Decode a system instruction and retrieve the instruction type.
    */
-  static decodeInstructionType(instruction) {
+  decodeInstructionType(instruction) {
     this.checkProgramId(instruction.programId)
 
     const instructionTypeLayout = BufferLayout.u32('instruction')
@@ -219,12 +219,12 @@ export class SystemInstruction {
     }
 
     return type
-  }
+  },
 
   /**
    * Decode a create account system instruction and retrieve the instruction params.
    */
-  static decodeCreateAccount(instruction) {
+  decodeCreateAccount(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 2)
 
@@ -240,12 +240,12 @@ export class SystemInstruction {
       space,
       programId: new PublicKey(programId),
     }
-  }
+  },
 
   /**
    * Decode a transfer system instruction and retrieve the instruction params.
    */
-  static decodeTransfer(instruction) {
+  decodeTransfer(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 2)
 
@@ -256,12 +256,12 @@ export class SystemInstruction {
       toPubkey: instruction.keys[1].pubkey,
       lamports,
     }
-  }
+  },
 
   /**
    * Decode an allocate system instruction and retrieve the instruction params.
    */
-  static decodeAllocate(instruction) {
+  decodeAllocate(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 1)
 
@@ -271,12 +271,12 @@ export class SystemInstruction {
       accountPubkey: instruction.keys[0].pubkey,
       space,
     }
-  }
+  },
 
   /**
    * Decode an allocate with seed system instruction and retrieve the instruction params.
    */
-  static decodeAllocateWithSeed(instruction) {
+  decodeAllocateWithSeed(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 1)
 
@@ -292,12 +292,12 @@ export class SystemInstruction {
       space,
       programId: new PublicKey(programId),
     }
-  }
+  },
 
   /**
    * Decode an assign system instruction and retrieve the instruction params.
    */
-  static decodeAssign(instruction) {
+  decodeAssign(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 1)
 
@@ -307,12 +307,12 @@ export class SystemInstruction {
       accountPubkey: instruction.keys[0].pubkey,
       programId: new PublicKey(programId),
     }
-  }
+  },
 
   /**
    * Decode an assign with seed system instruction and retrieve the instruction params.
    */
-  static decodeAssignWithSeed(instruction) {
+  decodeAssignWithSeed(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 1)
 
@@ -327,12 +327,12 @@ export class SystemInstruction {
       seed,
       programId: new PublicKey(programId),
     }
-  }
+  },
 
   /**
    * Decode a create account with seed system instruction and retrieve the instruction params.
    */
-  static decodeCreateWithSeed(instruction) {
+  decodeCreateWithSeed(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 2)
 
@@ -350,12 +350,12 @@ export class SystemInstruction {
       space,
       programId: new PublicKey(programId),
     }
-  }
+  },
 
   /**
    * Decode a nonce initialize system instruction and retrieve the instruction params.
    */
-  static decodeNonceInitialize(instruction) {
+  decodeNonceInitialize(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 3)
 
@@ -368,12 +368,12 @@ export class SystemInstruction {
       noncePubkey: instruction.keys[0].pubkey,
       authorizedPubkey: new PublicKey(authorized),
     }
-  }
+  },
 
   /**
    * Decode a nonce advance system instruction and retrieve the instruction params.
    */
-  static decodeNonceAdvance(instruction) {
+  decodeNonceAdvance(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 3)
 
@@ -383,12 +383,12 @@ export class SystemInstruction {
       noncePubkey: instruction.keys[0].pubkey,
       authorizedPubkey: instruction.keys[2].pubkey,
     }
-  }
+  },
 
   /**
    * Decode a nonce withdraw system instruction and retrieve the instruction params.
    */
-  static decodeNonceWithdraw(instruction) {
+  decodeNonceWithdraw(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 5)
 
@@ -403,12 +403,12 @@ export class SystemInstruction {
       authorizedPubkey: instruction.keys[4].pubkey,
       lamports,
     }
-  }
+  },
 
   /**
    * Decode a nonce authorize system instruction and retrieve the instruction params.
    */
-  static decodeNonceAuthorize(instruction) {
+  decodeNonceAuthorize(instruction) {
     this.checkProgramId(instruction.programId)
     this.checkKeyLength(instruction.keys, 2)
 
@@ -422,44 +422,44 @@ export class SystemInstruction {
       authorizedPubkey: instruction.keys[1].pubkey,
       newAuthorizedPubkey: new PublicKey(authorized),
     }
-  }
+  },
 
   /**
    * @private
    */
-  static checkProgramId(programId) {
+  checkProgramId(programId) {
     if (!programId.equals(SystemProgram.programId)) {
       throw new Error('invalid instruction; programId is not SystemProgram')
     }
-  }
+  },
 
   /**
    * @private
    */
-  static checkKeyLength(keys, expectedLength) {
+  checkKeyLength(keys, expectedLength) {
     if (keys.length < expectedLength) {
       throw new Error(
         `invalid instruction; found ${keys.length} keys, expected at least ${expectedLength}`
       )
     }
-  }
+  },
 }
 
 /**
  * Factory class for transactions to interact with the System program
  */
-export class SystemProgram {
+export const SystemProgram = {
   /**
    * Public key that identifies the System program
    */
-  static get programId() {
+  get programId() {
     return new PublicKey('11111111111111111111111111111111')
-  }
+  },
 
   /**
    * Generate a transaction instruction that creates a new account
    */
-  static createAccount(params) {
+  createAccount(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.Create
     const data = encodeData(type, {
       lamports: params.lamports,
@@ -475,12 +475,12 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction instruction that transfers lamports from one account to another
    */
-  static transfer(params) {
+  transfer(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.Transfer
     const data = encodeData(type, { lamports: params.lamports })
 
@@ -492,12 +492,12 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction instruction that assigns an account to a program
    */
-  static assign(params) {
+  assign(params) {
     let data
     if (params.basePubkey) {
       const type = SYSTEM_INSTRUCTION_LAYOUTS.AssignWithSeed
@@ -516,13 +516,13 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction instruction that creates a new account at
    *   an address generated with `from`, a seed, and programId
    */
-  static createAccountWithSeed(params) {
+  createAccountWithSeed(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.CreateWithSeed
     const data = encodeData(type, {
       base: params.basePubkey.toBuffer(),
@@ -540,12 +540,12 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction that creates a new Nonce account
    */
-  static createNonceAccount(params) {
+  createNonceAccount(params) {
     const transaction = new Transaction()
     if (params.basePubkey && params.seed) {
       transaction.add(
@@ -578,12 +578,12 @@ export class SystemProgram {
 
     transaction.add(this.nonceInitialize(initParams))
     return transaction
-  }
+  },
 
   /**
    * Generate an instruction to initialize a Nonce account
    */
-  static nonceInitialize(params) {
+  nonceInitialize(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.InitializeNonceAccount
     const data = encodeData(type, {
       authorized: params.authorizedPubkey.toBuffer(),
@@ -602,12 +602,12 @@ export class SystemProgram {
       data,
     }
     return new TransactionInstruction(instructionData)
-  }
+  },
 
   /**
    * Generate an instruction to advance the nonce in a Nonce account
    */
-  static nonceAdvance(params) {
+  nonceAdvance(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.AdvanceNonceAccount
     const data = encodeData(type)
     const instructionData = {
@@ -624,12 +624,12 @@ export class SystemProgram {
       data,
     }
     return new TransactionInstruction(instructionData)
-  }
+  },
 
   /**
    * Generate a transaction instruction that withdraws lamports from a Nonce account
    */
-  static nonceWithdraw(params) {
+  nonceWithdraw(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.WithdrawNonceAccount
     const data = encodeData(type, { lamports: params.lamports })
 
@@ -652,13 +652,13 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction instruction that authorizes a new PublicKey as the authority
    * on a Nonce account.
    */
-  static nonceAuthorize(params) {
+  nonceAuthorize(params) {
     const type = SYSTEM_INSTRUCTION_LAYOUTS.AuthorizeNonceAccount
     const data = encodeData(type, {
       authorized: params.newAuthorizedPubkey.toBuffer(),
@@ -672,12 +672,12 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 
   /**
    * Generate a transaction instruction that allocates space in an account without funding
    */
-  static allocate(params) {
+  allocate(params) {
     let data
     if (params.basePubkey) {
       const type = SYSTEM_INSTRUCTION_LAYOUTS.AllocateWithSeed
@@ -699,5 +699,5 @@ export class SystemProgram {
       programId: this.programId,
       data,
     })
-  }
+  },
 }

package/src/vendor/transaction.js

@@ -5,7 +5,8 @@ import nacl from 'tweetnacl'
 import bs58 from 'bs58'
 
 import { Message } from './message'
-import { PublicKey } from './index'
+import { PublicKey } from './publickey'
+import { PACKET_DATA_SIZE } from './constants'
 import * as shortvec from './utils/shortvec-encoding'
 
 /**
@@ -18,16 +19,6 @@ import * as shortvec from './utils/shortvec-encoding'
  * Signatures are 64 bytes in length
  */
 const DEFAULT_SIGNATURE = Buffer.alloc(64).fill(0)
-
-/**
- * Maximum over-the-wire size of a Transaction
- *
- * 1280 is IPv6 minimum MTU
- * 40 bytes is the size of the IPv6 header
- * 8 bytes is the size of the fragment header
- */
-export const PACKET_DATA_SIZE = 1280 - 40 - 8
-
 const SIGNATURE_LENGTH = 64
 
 /**
@@ -119,6 +110,7 @@ export class Transaction {
     if (this.signatures.length > 0) {
       return this.signatures[0].signature
     }
+
     return null
   }
 
@@ -134,6 +126,7 @@ export class Transaction {
     if (this.signatures.length > 0) {
       return this.signatures[0].publicKey
     }
+
     return null
   }
 
@@ -159,6 +152,7 @@ export class Transaction {
   constructor(opts) {
     opts && Object.assign(this, opts)
   }
+
   /**
    * Add one or more instructions to this Transaction
    */
@@ -169,7 +163,7 @@ export class Transaction {
 
     items.forEach((item) => {
       if ('instructions' in item) {
-        this.instructions = this.instructions.concat(item.instructions)
+        this.instructions = [...this.instructions, ...item.instructions]
       } else if ('data' in item && 'programId' in item && 'keys' in item) {
         this.instructions.push(item)
       } else {
@@ -178,6 +172,7 @@ export class Transaction {
     })
     return this
   }
+
   /**
    * Compile transaction data
    */
@@ -187,12 +182,13 @@ export class Transaction {
       this.recentBlockhash = nonceInfo.nonce
       this.instructions.unshift(nonceInfo.nonceInstruction)
     }
+
     const { recentBlockhash } = this
     if (!recentBlockhash) {
       throw new Error('Transaction recentBlockhash required')
     }
 
-    if (this.instructions.length < 1) {
+    if (this.instructions.length === 0) {
       throw new Error('No instructions provided')
     }
 
@@ -228,11 +224,12 @@ export class Transaction {
     })
 
     // Sort. Prioritizing first by signer, then by writable
-    accountMetas.sort(function(x, y) {
+    accountMetas.sort(function (x, y) {
       if (x.isSigner !== y.isSigner) {
         // Signers always come before non-signers
         return x.isSigner ? -1 : 1
       }
+
       if (x.isWritable !== y.isWritable) {
         // Writable accounts always come before read-only accounts
         return x.isWritable ? -1 : 1
@@ -323,7 +320,7 @@ export class Transaction {
       }
     })
 
-    const accountKeys = signedKeys.concat(unsignedKeys)
+    const accountKeys = [...signedKeys, ...unsignedKeys]
     const instructions = this.instructions.map((instruction) => {
       const { data, programId } = instruction
       return {
@@ -349,12 +346,14 @@ export class Transaction {
       instructions,
     })
   }
+
   /**
    * Get a buffer of the Transaction data that need to be covered by signatures
    */
   serializeMessage() {
     return this.compileMessage().serialize()
   }
+
   /**
    * Specify the public keys which will be used to sign the Transaction.
    * The first signer will be used as the transaction fee payer account.
@@ -372,13 +371,14 @@ export class Transaction {
         const key = publicKey.toString()
         if (seen.has(key)) {
           return false
-        } else {
-          seen.add(key)
-          return true
         }
+
+        seen.add(key)
+        return true
       })
       .map((publicKey) => ({ signature: null, publicKey }))
   }
+
   /**
    * Sign the Transaction with the specified accounts. Multiple signatures may
    * be applied to a Transaction. The first signature is considered "primary"
@@ -402,10 +402,10 @@ export class Transaction {
         const key = signer.publicKey.toString()
         if (seen.has(key)) {
           return false
-        } else {
-          seen.add(key)
-          return true
         }
+
+        seen.add(key)
+        return true
       })
       .map((signer) => ({
         signature: null,
@@ -414,6 +414,7 @@ export class Transaction {
 
     this.partialSign(...signers)
   }
+
   /**
    * Partially sign a transaction with the specified accounts. All accounts must
    * correspond to a public key that was previously provided to `setSigners`.
@@ -426,7 +427,7 @@ export class Transaction {
     }
 
     const message = this.compileMessage()
-    this.signatures.sort(function(x, y) {
+    this.signatures.sort(function (x, y) {
       const xIndex = message.findSignerIndex(x.publicKey)
       const yIndex = message.findSignerIndex(y.publicKey)
       return xIndex < yIndex ? -1 : 1
@@ -438,6 +439,7 @@ export class Transaction {
       this.addSignature(signer.publicKey, signature)
     })
   }
+
   /**
    * Add an externally created signature to a transaction. The public key
    * must correspond to a public key that was previously provided to `setSigners`.
@@ -452,12 +454,14 @@ export class Transaction {
 
     this.signatures[index].signature = Buffer.from(signature)
   }
+
   /**
    * Verify signatures of a complete, signed Transaction
    */
   verifySignatures() {
     return this._verifySignatures(this.serializeMessage(), true)
   }
+
   /**
    * @private
    */
@@ -473,8 +477,10 @@ export class Transaction {
         }
       }
     }
+
     return true
   }
+
   /**
    * Serialize the Transaction in the wire format.
    */
@@ -491,6 +497,7 @@ export class Transaction {
 
     return this._serialize(signData)
   }
+
   /**
    * @private
    */
@@ -515,6 +522,7 @@ export class Transaction {
     )
     return wireTransaction
   }
+
   /**
    * Deprecated method
    * @private
@@ -523,6 +531,7 @@ export class Transaction {
     invariant(this.instructions.length === 1)
     return this.instructions[0].keys.map((keyObj) => keyObj.pubkey)
   }
+
   /**
    * Deprecated method
    * @private
@@ -531,6 +540,7 @@ export class Transaction {
     invariant(this.instructions.length === 1)
     return this.instructions[0].programId
   }
+
   /**
    * Deprecated method
    * @private
@@ -539,6 +549,7 @@ export class Transaction {
     invariant(this.instructions.length === 1)
     return this.instructions[0].data
   }
+
   /**
    * Parse a wire transaction into a Transaction object.
    */
@@ -547,7 +558,7 @@ export class Transaction {
     let byteArray = [...buffer]
 
     const signatureCount = shortvec.decodeLength(byteArray)
-    let signatures = []
+    const signatures = []
     for (let i = 0; i < signatureCount; i++) {
       const signature = byteArray.slice(0, SIGNATURE_LENGTH)
       byteArray = byteArray.slice(SIGNATURE_LENGTH)
@@ -556,6 +567,7 @@ export class Transaction {
 
     return Transaction.populate(Message.from(byteArray), signatures)
   }
+
   /**
    * Populate Transaction object from message and signatures
    */

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

@@ -2,13 +2,14 @@ export function decodeLength(bytes) {
   let len = 0
   let size = 0
   for (;;) {
-    let elem = bytes.shift()
+    const elem = bytes.shift()
     len |= (elem & 0x7f) << (size * 7)
     size += 1
     if ((elem & 0x80) === 0) {
       break
     }
   }
+
   return len
 }
 

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

@@ -1,9 +1,11 @@
 export const toBuffer = (arr) => {
   if (arr instanceof Buffer) {
     return arr
-  } else if (arr instanceof Uint8Array) {
+  }
+
+  if (arr instanceof Uint8Array) {
     return Buffer.from(arr.buffer, arr.byteOffset, arr.byteLength)
-  } else {
-    return Buffer.from(arr)
   }
+
+  return Buffer.from(arr)
 }

package/src/vendor/utils/blockhash.js

@@ -1,3 +0,0 @@
-/**
- * @typedef {string} Blockhash
- */