@solana/web3.js 1.58.0 → 1.60.0

package/lib/index.d.ts

@@ -1402,6 +1402,17 @@ declare module '@solana/web3.js' {
     newAuthorizedPubkey: PublicKey;
     voteAuthorizationType: VoteAuthorizationType;
   };
+  /**
+   * AuthorizeWithSeed instruction params
+   */
+  export type AuthorizeVoteWithSeedParams = {
+    currentAuthorityDerivedKeyBasePubkey: PublicKey;
+    currentAuthorityDerivedKeyOwnerPubkey: PublicKey;
+    currentAuthorityDerivedKeySeed: string;
+    newAuthorizedPubkey: PublicKey;
+    voteAuthorizationType: VoteAuthorizationType;
+    votePubkey: PublicKey;
+  };
   /**
    * Withdraw from vote account transaction params
    */
@@ -1433,6 +1444,12 @@ declare module '@solana/web3.js' {
     static decodeAuthorize(
       instruction: TransactionInstruction,
     ): AuthorizeVoteParams;
+    /**
+     * Decode an authorize instruction and retrieve the instruction params.
+     */
+    static decodeAuthorizeWithSeed(
+      instruction: TransactionInstruction,
+    ): AuthorizeVoteWithSeedParams;
     /**
      * Decode a withdraw instruction and retrieve the instruction params.
      */
@@ -1445,6 +1462,7 @@ declare module '@solana/web3.js' {
    */
   export type VoteInstructionType =
     | 'Authorize'
+    | 'AuthorizeWithSeed'
     | 'InitializeAccount'
     | 'Withdraw';
   /**
@@ -1495,6 +1513,11 @@ declare module '@solana/web3.js' {
      * Generate a transaction that authorizes a new Voter or Withdrawer on the Vote account.
      */
     static authorize(params: AuthorizeVoteParams): Transaction;
+    /**
+     * Generate a transaction that authorizes a new Voter or Withdrawer on the Vote account
+     * where the current Voter or Withdrawer authority is a derived key.
+     */
+    static authorizeWithSeed(params: AuthorizeVoteWithSeedParams): Transaction;
     /**
      * Generate a transaction to withdraw from a Vote account.
      */
@@ -1824,7 +1847,7 @@ declare module '@solana/web3.js' {
   }
 
   export type TransactionMessageArgs = {
-    accountKeys: MessageAccountKeys;
+    payerKey: PublicKey;
     instructions: Array<TransactionInstruction>;
     recentBlockhash: Blockhash;
   };
@@ -1836,7 +1859,7 @@ declare module '@solana/web3.js' {
         addressLookupTableAccounts: AddressLookupTableAccount[];
       };
   export class TransactionMessage {
-    accountKeys: MessageAccountKeys;
+    payerKey: PublicKey;
     instructions: Array<TransactionInstruction>;
     recentBlockhash: Blockhash;
     constructor(args: TransactionMessageArgs);
@@ -2409,6 +2432,8 @@ declare module '@solana/web3.js' {
     signer: boolean;
     /** Indicates if the account is writable for this transaction */
     writable: boolean;
+    /** Indicates if the account key came from the transaction or a lookup table */
+    source?: 'transaction' | 'lookupTable';
   };
   /**
    * A parsed transaction instruction

package/lib/index.esm.js

@@ -14,7 +14,7 @@ import RpcClient from 'jayson/lib/client/browser';
 import http from 'http';
 import https from 'https';
 import * as nodeFetch from 'node-fetch';
-import sha3 from 'js-sha3';
+import { keccak_256 } from '@noble/hashes/sha3';
 import { hmac } from '@noble/hashes/hmac';
 import * as secp256k1 from '@noble/secp256k1';
 
@@ -489,7 +489,6 @@ class MessageAccountKeys {
 /**
  * Layout for a public key
  */
-
 const publicKey = (property = 'publicKey') => {
   return BufferLayout.blob(32, property);
 };
@@ -553,6 +552,13 @@ const lockup = (property = 'lockup') => {
 const voteInit = (property = 'voteInit') => {
   return BufferLayout.struct([publicKey('nodePubkey'), publicKey('authorizedVoter'), publicKey('authorizedWithdrawer'), BufferLayout.u8('commission')], property);
 };
+/**
+ *  Layout for a VoteAuthorizeWithSeedArgs object
+ */
+
+const voteAuthorizeWithSeedArgs = (property = 'voteAuthorizeWithSeedArgs') => {
+  return BufferLayout.struct([BufferLayout.u32('voteAuthorizationType'), publicKey('currentAuthorityDerivedKeyOwnerPubkey'), rustString('currentAuthorityDerivedKeySeed'), publicKey('newAuthorized')], property);
+};
 function getAlloc(type, fields) {
   const getItemAlloc = item => {
     if (item.span >= 0) {
@@ -565,6 +571,11 @@ function getAlloc(type, fields) {
       if (Array.isArray(field)) {
         return field.length * getItemAlloc(item.elementLayout);
       }
+    } else if ('fields' in item) {
+      // This is a `Structure` whose size needs to be recursively measured.
+      return getAlloc({
+        layout: item
+      }, fields[item.property]);
     } // Couldn't determine allocated size of layout
 
 
@@ -1934,10 +1945,10 @@ class Transaction {
 
 class TransactionMessage {
   constructor(args) {
-    this.accountKeys = void 0;
+    this.payerKey = void 0;
     this.instructions = void 0;
     this.recentBlockhash = void 0;
-    this.accountKeys = args.accountKeys;
+    this.payerKey = args.payerKey;
     this.instructions = args.instructions;
     this.recentBlockhash = args.recentBlockhash;
   }
@@ -1958,6 +1969,12 @@ class TransactionMessage {
     const numWritableUnsignedAccounts = message.staticAccountKeys.length - numReadonlyUnsignedAccounts;
     assert(numWritableUnsignedAccounts >= 0, 'Message header is invalid');
     const accountKeys = message.getAccountKeys(args);
+    const payerKey = accountKeys.get(0);
+
+    if (payerKey === undefined) {
+      throw new Error('Failed to decompile message because no account keys were found');
+    }
+
     const instructions = [];
 
     for (const compiledIx of compiledInstructions) {
@@ -2003,35 +2020,23 @@ class TransactionMessage {
     }
 
     return new TransactionMessage({
-      accountKeys,
+      payerKey,
       instructions,
       recentBlockhash
     });
   }
 
   compileToLegacyMessage() {
-    const payerKey = this.accountKeys.get(0);
-
-    if (payerKey === undefined) {
-      throw new Error('Failed to compile message because no account keys were found');
-    }
-
     return Message.compile({
-      payerKey,
+      payerKey: this.payerKey,
       recentBlockhash: this.recentBlockhash,
       instructions: this.instructions
     });
   }
 
   compileToV0Message(addressLookupTableAccounts) {
-    const payerKey = this.accountKeys.get(0);
-
-    if (payerKey === undefined) {
-      throw new Error('Failed to compile message because no account keys were found');
-    }
-
     return MessageV0.compile({
-      payerKey,
+      payerKey: this.payerKey,
       recentBlockhash: this.recentBlockhash,
       instructions: this.instructions,
       addressLookupTableAccounts
@@ -4327,7 +4332,8 @@ const ParsedConfirmedTransactionResult = type({
     accountKeys: array(type({
       pubkey: PublicKeyFromString,
       signer: boolean(),
-      writable: boolean()
+      writable: boolean(),
+      source: optional(union([literal('transaction'), literal('lookupTable')]))
     })),
     instructions: array(ParsedOrRawInstruction),
     recentBlockhash: string(),
@@ -7503,7 +7509,7 @@ class Keypair {
 
 
   get secretKey() {
-    return this._keypair.secretKey;
+    return new Uint8Array(this._keypair.secretKey);
   }
 
 }
@@ -8096,7 +8102,7 @@ class Secp256k1Program {
     assert(publicKey.length === PUBLIC_KEY_BYTES, `Public key must be ${PUBLIC_KEY_BYTES} bytes but received ${publicKey.length} bytes`);
 
     try {
-      return Buffer.from(sha3.keccak_256.update(toBuffer(publicKey)).digest()).slice(-ETHEREUM_ADDRESS_BYTES);
+      return Buffer.from(keccak_256(toBuffer(publicKey))).slice(-ETHEREUM_ADDRESS_BYTES);
     } catch (error) {
       throw new Error(`Error constructing Ethereum address: ${error}`);
     }
@@ -8196,7 +8202,7 @@ class Secp256k1Program {
       /* isCompressed */
       ).slice(1); // throw away leading byte
 
-      const messageHash = Buffer.from(sha3.keccak_256.update(toBuffer(message)).digest());
+      const messageHash = Buffer.from(keccak_256(toBuffer(message)));
       const [signature, recoveryId] = ecdsaSign(messageHash, privateKey);
       return this.createInstructionWithPublicKey({
         publicKey,
@@ -9090,6 +9096,33 @@ class VoteInstruction {
       }
     };
   }
+  /**
+   * Decode an authorize instruction and retrieve the instruction params.
+   */
+
+
+  static decodeAuthorizeWithSeed(instruction) {
+    this.checkProgramId(instruction.programId);
+    this.checkKeyLength(instruction.keys, 3);
+    const {
+      voteAuthorizeWithSeedArgs: {
+        currentAuthorityDerivedKeyOwnerPubkey,
+        currentAuthorityDerivedKeySeed,
+        newAuthorized,
+        voteAuthorizationType
+      }
+    } = decodeData$1(VOTE_INSTRUCTION_LAYOUTS.AuthorizeWithSeed, instruction.data);
+    return {
+      currentAuthorityDerivedKeyBasePubkey: instruction.keys[2].pubkey,
+      currentAuthorityDerivedKeyOwnerPubkey: new PublicKey(currentAuthorityDerivedKeyOwnerPubkey),
+      currentAuthorityDerivedKeySeed: currentAuthorityDerivedKeySeed,
+      newAuthorizedPubkey: new PublicKey(newAuthorized),
+      voteAuthorizationType: {
+        index: voteAuthorizationType
+      },
+      votePubkey: instruction.keys[0].pubkey
+    };
+  }
   /**
    * Decode a withdraw instruction and retrieve the instruction params.
    */
@@ -9146,6 +9179,10 @@ const VOTE_INSTRUCTION_LAYOUTS = Object.freeze({
   Withdraw: {
     index: 3,
     layout: BufferLayout.struct([BufferLayout.u32('instruction'), BufferLayout.ns64('lamports')])
+  },
+  AuthorizeWithSeed: {
+    index: 10,
+    layout: BufferLayout.struct([BufferLayout.u32('instruction'), voteAuthorizeWithSeedArgs()])
   }
 });
 /**
@@ -9274,6 +9311,49 @@ class VoteProgram {
       data
     });
   }
+  /**
+   * Generate a transaction that authorizes a new Voter or Withdrawer on the Vote account
+   * where the current Voter or Withdrawer authority is a derived key.
+   */
+
+
+  static authorizeWithSeed(params) {
+    const {
+      currentAuthorityDerivedKeyBasePubkey,
+      currentAuthorityDerivedKeyOwnerPubkey,
+      currentAuthorityDerivedKeySeed,
+      newAuthorizedPubkey,
+      voteAuthorizationType,
+      votePubkey
+    } = params;
+    const type = VOTE_INSTRUCTION_LAYOUTS.AuthorizeWithSeed;
+    const data = encodeData(type, {
+      voteAuthorizeWithSeedArgs: {
+        currentAuthorityDerivedKeyOwnerPubkey: toBuffer(currentAuthorityDerivedKeyOwnerPubkey.toBuffer()),
+        currentAuthorityDerivedKeySeed: currentAuthorityDerivedKeySeed,
+        newAuthorized: toBuffer(newAuthorizedPubkey.toBuffer()),
+        voteAuthorizationType: voteAuthorizationType.index
+      }
+    });
+    const keys = [{
+      pubkey: votePubkey,
+      isSigner: false,
+      isWritable: true
+    }, {
+      pubkey: SYSVAR_CLOCK_PUBKEY,
+      isSigner: false,
+      isWritable: false
+    }, {
+      pubkey: currentAuthorityDerivedKeyBasePubkey,
+      isSigner: true,
+      isWritable: false
+    }];
+    return new Transaction().add({
+      keys,
+      programId: this.programId,
+      data
+    });
+  }
   /**
    * Generate a transaction to withdraw from a Vote account.
    */