@solana/web3.js 1.68.2 → 1.69.1

package/lib/index.d.ts

@@ -26,7 +26,7 @@ declare module '@solana/web3.js' {
   /**
    * Value to be converted into public key
    */
-  export type PublicKeyInitData =
+  type PublicKeyInitData =
     | number
     | string
     | Uint8Array
@@ -35,7 +35,7 @@ declare module '@solana/web3.js' {
   /**
    * JSON object representation of PublicKey class
    */
-  export type PublicKeyData = {};
+  type PublicKeyData = {};
   /**
    * A public key
    */
@@ -159,14 +159,14 @@ declare module '@solana/web3.js' {
   /**
    * Blockhash as Base58 string.
    */
-  export type Blockhash = string;
+  type Blockhash = string;
 
   export const BPF_LOADER_DEPRECATED_PROGRAM_ID: PublicKey;
 
   /**
    * Epoch schedule
    * (see https://docs.solana.com/terminology#epoch)
-   * Can be retrieved with the {@link connection.getEpochSchedule} method
+   * Can be retrieved with the {@link Connection.getEpochSchedule} method
    */
   export class EpochSchedule {
     /** The maximum number of slots in each epoch */
@@ -212,7 +212,7 @@ declare module '@solana/web3.js' {
   /**
    * A durable nonce is a 32 byte value encoded as a base58 string.
    */
-  export type DurableNonce = string;
+  type DurableNonce = string;
   /**
    * NonceAccount class
    */
@@ -236,7 +236,7 @@ declare module '@solana/web3.js' {
    * private scalar and the last 32 bytes is the public key.
    * Read more: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/
    */
-  export type Ed25519SecretKey = Uint8Array;
+  type Ed25519SecretKey = Uint8Array;
   /**
    * Ed25519 Keypair
    */
@@ -326,7 +326,7 @@ declare module '@solana/web3.js' {
     constructor(signature: string);
   }
 
-  export type AccountKeysFromLookups = LoadedAddresses;
+  type AccountKeysFromLookups = LoadedAddresses;
   export class MessageAccountKeys {
     staticAccountKeys: Array<PublicKey>;
     accountKeysFromLookups?: AccountKeysFromLookups;
@@ -349,7 +349,7 @@ declare module '@solana/web3.js' {
    * @property {number[]} accounts
    * @property {string} data
    */
-  export type CompiledInstruction = {
+  type CompiledInstruction = {
     /** Index into the transaction keys array indicating the program account that executes this instruction */
     programIdIndex: number;
     /** Ordered indices into the transaction keys array indicating which accounts to pass to the program */
@@ -360,7 +360,7 @@ declare module '@solana/web3.js' {
   /**
    * Message constructor arguments
    */
-  export type MessageArgs = {
+  type MessageArgs = {
     /** The message header, identifying signed and read-only `accountKeys` */
     header: MessageHeader;
     /** All the account keys used by this transaction */
@@ -370,7 +370,7 @@ declare module '@solana/web3.js' {
     /** Instructions that will be executed in sequence and committed in one atomic transaction if all succeed. */
     instructions: CompiledInstruction[];
   };
-  export type CompileLegacyArgs = {
+  type CompileLegacyArgs = {
     payerKey: PublicKey;
     instructions: Array<TransactionInstruction>;
     recentBlockhash: Blockhash;
@@ -403,14 +403,14 @@ declare module '@solana/web3.js' {
     static from(buffer: Buffer | Uint8Array | Array<number>): Message;
   }
 
-  export type AddressLookupTableState = {
+  type AddressLookupTableState = {
     deactivationSlot: bigint;
     lastExtendedSlot: number;
     lastExtendedSlotStartIndex: number;
     authority?: PublicKey;
     addresses: Array<PublicKey>;
   };
-  export type AddressLookupTableAccountArgs = {
+  type AddressLookupTableAccountArgs = {
     key: PublicKey;
     state: AddressLookupTableState;
   };
@@ -422,7 +422,7 @@ declare module '@solana/web3.js' {
     static deserialize(accountData: Uint8Array): AddressLookupTableState;
   }
 
-  export type CreateLookupTableParams = {
+  type CreateLookupTableParams = {
     /** Account used to derive and control the new address lookup table. */
     authority: PublicKey;
     /** Account that will fund the new address lookup table. */
@@ -430,13 +430,13 @@ declare module '@solana/web3.js' {
     /** A recent slot must be used in the derivation path for each initialized table. */
     recentSlot: bigint | number;
   };
-  export type FreezeLookupTableParams = {
+  type FreezeLookupTableParams = {
     /** Address lookup table account to freeze. */
     lookupTable: PublicKey;
     /** Account which is the current authority. */
     authority: PublicKey;
   };
-  export type ExtendLookupTableParams = {
+  type ExtendLookupTableParams = {
     /** Address lookup table account to extend. */
     lookupTable: PublicKey;
     /** Account which is the current authority. */
@@ -447,13 +447,13 @@ declare module '@solana/web3.js' {
     /** List of Public Keys to be added to the lookup table. */
     addresses: Array<PublicKey>;
   };
-  export type DeactivateLookupTableParams = {
+  type DeactivateLookupTableParams = {
     /** Address lookup table account to deactivate. */
     lookupTable: PublicKey;
     /** Account which is the current authority. */
     authority: PublicKey;
   };
-  export type CloseLookupTableParams = {
+  type CloseLookupTableParams = {
     /** Address lookup table account to close. */
     lookupTable: PublicKey;
     /** Account which is the current authority. */
@@ -464,7 +464,7 @@ declare module '@solana/web3.js' {
   /**
    * An enumeration of valid LookupTableInstructionType's
    */
-  export type LookupTableInstructionType =
+  type LookupTableInstructionType =
     | 'CreateLookupTable'
     | 'ExtendLookupTable'
     | 'CloseLookupTable'
@@ -547,7 +547,7 @@ declare module '@solana/web3.js' {
   /**
    * An enumeration of valid ComputeBudgetInstructionType's
    */
-  export type ComputeBudgetInstructionType =
+  type ComputeBudgetInstructionType =
     | 'RequestUnits'
     | 'RequestHeapFrame'
     | 'SetComputeUnitLimit'
@@ -564,7 +564,7 @@ declare module '@solana/web3.js' {
   /**
    * Request heap frame instruction params
    */
-  export type RequestHeapFrameParams = {
+  type RequestHeapFrameParams = {
     /** Requested transaction-wide program heap size in bytes. Must be multiple of 1024. Applies to each program, including CPIs. */
     bytes: number;
   };
@@ -608,7 +608,7 @@ declare module '@solana/web3.js' {
   /**
    * Params for creating an ed25519 instruction using a public key
    */
-  export type CreateEd25519InstructionWithPublicKeyParams = {
+  type CreateEd25519InstructionWithPublicKeyParams = {
     publicKey: Uint8Array;
     message: Uint8Array;
     signature: Uint8Array;
@@ -617,7 +617,7 @@ declare module '@solana/web3.js' {
   /**
    * Params for creating an ed25519 instruction using a private key
    */
-  export type CreateEd25519InstructionWithPrivateKeyParams = {
+  type CreateEd25519InstructionWithPrivateKeyParams = {
     privateKey: Uint8Array;
     message: Uint8Array;
     instructionIndex?: number;
@@ -647,7 +647,7 @@ declare module '@solana/web3.js' {
   /**
    * Params for creating an secp256k1 instruction using a public key
    */
-  export type CreateSecp256k1InstructionWithPublicKeyParams = {
+  type CreateSecp256k1InstructionWithPublicKeyParams = {
     publicKey: Buffer | Uint8Array | Array<number>;
     message: Buffer | Uint8Array | Array<number>;
     signature: Buffer | Uint8Array | Array<number>;
@@ -657,7 +657,7 @@ declare module '@solana/web3.js' {
   /**
    * Params for creating an secp256k1 instruction using an Ethereum address
    */
-  export type CreateSecp256k1InstructionWithEthAddressParams = {
+  type CreateSecp256k1InstructionWithEthAddressParams = {
     ethAddress: Buffer | Uint8Array | Array<number> | string;
     message: Buffer | Uint8Array | Array<number>;
     signature: Buffer | Uint8Array | Array<number>;
@@ -667,7 +667,7 @@ declare module '@solana/web3.js' {
   /**
    * Params for creating an secp256k1 instruction using a private key
    */
-  export type CreateSecp256k1InstructionWithPrivateKeyParams = {
+  type CreateSecp256k1InstructionWithPrivateKeyParams = {
     privateKey: Buffer | Uint8Array | Array<number>;
     message: Buffer | Uint8Array | Array<number>;
     instructionIndex?: number;
@@ -749,7 +749,7 @@ declare module '@solana/web3.js' {
   /**
    * Create stake account transaction params
    */
-  export type CreateStakeAccountParams = {
+  type CreateStakeAccountParams = {
     /** Address of the account which will fund creation */
     fromPubkey: PublicKey;
     /** Address of the new stake account */
@@ -764,7 +764,7 @@ declare module '@solana/web3.js' {
   /**
    * Create stake account with seed transaction params
    */
-  export type CreateStakeAccountWithSeedParams = {
+  type CreateStakeAccountWithSeedParams = {
     fromPubkey: PublicKey;
     stakePubkey: PublicKey;
     basePubkey: PublicKey;
@@ -776,7 +776,7 @@ declare module '@solana/web3.js' {
   /**
    * Initialize stake instruction params
    */
-  export type InitializeStakeParams = {
+  type InitializeStakeParams = {
     stakePubkey: PublicKey;
     authorized: Authorized;
     lockup?: Lockup;
@@ -784,7 +784,7 @@ declare module '@solana/web3.js' {
   /**
    * Delegate stake instruction params
    */
-  export type DelegateStakeParams = {
+  type DelegateStakeParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
     votePubkey: PublicKey;
@@ -792,7 +792,7 @@ declare module '@solana/web3.js' {
   /**
    * Authorize stake instruction params
    */
-  export type AuthorizeStakeParams = {
+  type AuthorizeStakeParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
     newAuthorizedPubkey: PublicKey;
@@ -802,7 +802,7 @@ declare module '@solana/web3.js' {
   /**
    * Authorize stake instruction params using a derived key
    */
-  export type AuthorizeWithSeedStakeParams = {
+  type AuthorizeWithSeedStakeParams = {
     stakePubkey: PublicKey;
     authorityBase: PublicKey;
     authoritySeed: string;
@@ -814,7 +814,7 @@ declare module '@solana/web3.js' {
   /**
    * Split stake instruction params
    */
-  export type SplitStakeParams = {
+  type SplitStakeParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
     splitStakePubkey: PublicKey;
@@ -823,7 +823,7 @@ declare module '@solana/web3.js' {
   /**
    * Split with seed transaction params
    */
-  export type SplitStakeWithSeedParams = {
+  type SplitStakeWithSeedParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
     splitStakePubkey: PublicKey;
@@ -834,7 +834,7 @@ declare module '@solana/web3.js' {
   /**
    * Withdraw stake instruction params
    */
-  export type WithdrawStakeParams = {
+  type WithdrawStakeParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
     toPubkey: PublicKey;
@@ -844,14 +844,14 @@ declare module '@solana/web3.js' {
   /**
    * Deactivate stake instruction params
    */
-  export type DeactivateStakeParams = {
+  type DeactivateStakeParams = {
     stakePubkey: PublicKey;
     authorizedPubkey: PublicKey;
   };
   /**
    * Merge stake instruction params
    */
-  export type MergeStakeParams = {
+  type MergeStakeParams = {
     stakePubkey: PublicKey;
     sourceStakePubKey: PublicKey;
     authorizedPubkey: PublicKey;
@@ -914,7 +914,7 @@ declare module '@solana/web3.js' {
   /**
    * An enumeration of valid StakeInstructionType's
    */
-  export type StakeInstructionType =
+  type StakeInstructionType =
     | 'Authorize'
     | 'AuthorizeWithSeed'
     | 'Deactivate'
@@ -926,7 +926,7 @@ declare module '@solana/web3.js' {
   /**
    * Stake authorization type
    */
-  export type StakeAuthorizationType = {
+  type StakeAuthorizationType = {
     /** The Stake Authorization index (from solana-stake-program) */
     index: number;
   };
@@ -1014,7 +1014,7 @@ declare module '@solana/web3.js' {
   /**
    * Create account system transaction params
    */
-  export type CreateAccountParams = {
+  type CreateAccountParams = {
     /** The account that will transfer lamports to the created account */
     fromPubkey: PublicKey;
     /** Public key of the created account */
@@ -1029,7 +1029,7 @@ declare module '@solana/web3.js' {
   /**
    * Transfer system transaction params
    */
-  export type TransferParams = {
+  type TransferParams = {
     /** Account that will transfer lamports */
     fromPubkey: PublicKey;
     /** Account that will receive transferred lamports */
@@ -1040,7 +1040,7 @@ declare module '@solana/web3.js' {
   /**
    * Assign system transaction params
    */
-  export type AssignParams = {
+  type AssignParams = {
     /** Public key of the account which will be assigned a new owner */
     accountPubkey: PublicKey;
     /** Public key of the program to assign as the owner */
@@ -1049,7 +1049,7 @@ declare module '@solana/web3.js' {
   /**
    * Create account with seed system transaction params
    */
-  export type CreateAccountWithSeedParams = {
+  type CreateAccountWithSeedParams = {
     /** The account that will transfer lamports to the created account */
     fromPubkey: PublicKey;
     /** Public key of the created account. Must be pre-calculated with PublicKey.createWithSeed() */
@@ -1068,7 +1068,7 @@ declare module '@solana/web3.js' {
   /**
    * Create nonce account system transaction params
    */
-  export type CreateNonceAccountParams = {
+  type CreateNonceAccountParams = {
     /** The account that will transfer lamports to the created nonce account */
     fromPubkey: PublicKey;
     /** Public key of the created nonce account */
@@ -1081,7 +1081,7 @@ declare module '@solana/web3.js' {
   /**
    * Create nonce account with seed system transaction params
    */
-  export type CreateNonceAccountWithSeedParams = {
+  type CreateNonceAccountWithSeedParams = {
     /** The account that will transfer lamports to the created nonce account */
     fromPubkey: PublicKey;
     /** Public key of the created nonce account */
@@ -1098,7 +1098,7 @@ declare module '@solana/web3.js' {
   /**
    * Initialize nonce account system instruction params
    */
-  export type InitializeNonceParams = {
+  type InitializeNonceParams = {
     /** Nonce account which will be initialized */
     noncePubkey: PublicKey;
     /** Public key to set as authority of the initialized nonce account */
@@ -1107,7 +1107,7 @@ declare module '@solana/web3.js' {
   /**
    * Advance nonce account system instruction params
    */
-  export type AdvanceNonceParams = {
+  type AdvanceNonceParams = {
     /** Nonce account */
     noncePubkey: PublicKey;
     /** Public key of the nonce authority */
@@ -1116,7 +1116,7 @@ declare module '@solana/web3.js' {
   /**
    * Withdraw nonce account system transaction params
    */
-  export type WithdrawNonceParams = {
+  type WithdrawNonceParams = {
     /** Nonce account */
     noncePubkey: PublicKey;
     /** Public key of the nonce authority */
@@ -1129,7 +1129,7 @@ declare module '@solana/web3.js' {
   /**
    * Authorize nonce account system transaction params
    */
-  export type AuthorizeNonceParams = {
+  type AuthorizeNonceParams = {
     /** Nonce account */
     noncePubkey: PublicKey;
     /** Public key of the current nonce authority */
@@ -1140,7 +1140,7 @@ declare module '@solana/web3.js' {
   /**
    * Allocate account system transaction params
    */
-  export type AllocateParams = {
+  type AllocateParams = {
     /** Account to allocate */
     accountPubkey: PublicKey;
     /** Amount of space in bytes to allocate */
@@ -1149,7 +1149,7 @@ declare module '@solana/web3.js' {
   /**
    * Allocate account with seed system transaction params
    */
-  export type AllocateWithSeedParams = {
+  type AllocateWithSeedParams = {
     /** Account to allocate */
     accountPubkey: PublicKey;
     /** Base public key to use to derive the address of the allocated account */
@@ -1164,7 +1164,7 @@ declare module '@solana/web3.js' {
   /**
    * Assign account with seed system transaction params
    */
-  export type AssignWithSeedParams = {
+  type AssignWithSeedParams = {
     /** Public key of the account which will be assigned a new owner */
     accountPubkey: PublicKey;
     /** Base public key to use to derive the address of the assigned account */
@@ -1177,7 +1177,7 @@ declare module '@solana/web3.js' {
   /**
    * Transfer with seed system transaction params
    */
-  export type TransferWithSeedParams = {
+  type TransferWithSeedParams = {
     /** Account that will transfer lamports */
     fromPubkey: PublicKey;
     /** Base public key to use to derive the funding account address */
@@ -1192,7 +1192,7 @@ declare module '@solana/web3.js' {
     programId: PublicKey;
   };
   /** Decoded transfer system transaction instruction */
-  export type DecodedTransferInstruction = {
+  type DecodedTransferInstruction = {
     /** Account that will transfer lamports */
     fromPubkey: PublicKey;
     /** Account that will receive transferred lamports */
@@ -1201,7 +1201,7 @@ declare module '@solana/web3.js' {
     lamports: bigint;
   };
   /** Decoded transferWithSeed system transaction instruction */
-  export type DecodedTransferWithSeedInstruction = {
+  type DecodedTransferWithSeedInstruction = {
     /** Account that will transfer lamports */
     fromPubkey: PublicKey;
     /** Base public key to use to derive the funding account address */
@@ -1297,7 +1297,7 @@ declare module '@solana/web3.js' {
   /**
    * An enumeration of valid SystemInstructionType's
    */
-  export type SystemInstructionType =
+  type SystemInstructionType =
     | 'AdvanceNonceAccount'
     | 'Allocate'
     | 'AllocateWithSeed'
@@ -1393,7 +1393,7 @@ declare module '@solana/web3.js' {
   /**
    * Create vote account transaction params
    */
-  export type CreateVoteAccountParams = {
+  type CreateVoteAccountParams = {
     fromPubkey: PublicKey;
     votePubkey: PublicKey;
     voteInit: VoteInit;
@@ -1402,7 +1402,7 @@ declare module '@solana/web3.js' {
   /**
    * InitializeAccount instruction params
    */
-  export type InitializeAccountParams = {
+  type InitializeAccountParams = {
     votePubkey: PublicKey;
     nodePubkey: PublicKey;
     voteInit: VoteInit;
@@ -1410,7 +1410,7 @@ declare module '@solana/web3.js' {
   /**
    * Authorize instruction params
    */
-  export type AuthorizeVoteParams = {
+  type AuthorizeVoteParams = {
     votePubkey: PublicKey;
     /** Current vote or withdraw authority, depending on `voteAuthorizationType` */
     authorizedPubkey: PublicKey;
@@ -1420,7 +1420,7 @@ declare module '@solana/web3.js' {
   /**
    * AuthorizeWithSeed instruction params
    */
-  export type AuthorizeVoteWithSeedParams = {
+  type AuthorizeVoteWithSeedParams = {
     currentAuthorityDerivedKeyBasePubkey: PublicKey;
     currentAuthorityDerivedKeyOwnerPubkey: PublicKey;
     currentAuthorityDerivedKeySeed: string;
@@ -1431,7 +1431,7 @@ declare module '@solana/web3.js' {
   /**
    * Withdraw from vote account transaction params
    */
-  export type WithdrawFromVoteAccountParams = {
+  type WithdrawFromVoteAccountParams = {
     votePubkey: PublicKey;
     authorizedWithdrawerPubkey: PublicKey;
     lamports: number;
@@ -1475,7 +1475,7 @@ declare module '@solana/web3.js' {
   /**
    * An enumeration of valid VoteInstructionType's
    */
-  export type VoteInstructionType =
+  type VoteInstructionType =
     | 'Authorize'
     | 'AuthorizeWithSeed'
     | 'InitializeAccount'
@@ -1483,7 +1483,7 @@ declare module '@solana/web3.js' {
   /**
    * VoteAuthorize type
    */
-  export type VoteAuthorizationType = {
+  type VoteAuthorizationType = {
     /** The VoteAuthorize index (from solana-vote-program) */
     index: number;
   };
@@ -1555,7 +1555,7 @@ declare module '@solana/web3.js' {
   /**
    * Message constructor arguments
    */
-  export type MessageV0Args = {
+  type MessageV0Args = {
     /** The message header, identifying signed and read-only `accountKeys` */
     header: MessageHeader;
     /** The static account keys used by this transaction */
@@ -1567,13 +1567,13 @@ declare module '@solana/web3.js' {
     /** Instructions that will be executed in sequence and committed in one atomic transaction if all succeed. */
     addressTableLookups: MessageAddressTableLookup[];
   };
-  export type CompileV0Args = {
+  type CompileV0Args = {
     payerKey: PublicKey;
     instructions: Array<TransactionInstruction>;
     recentBlockhash: Blockhash;
     addressLookupTableAccounts?: Array<AddressLookupTableAccount>;
   };
-  export type GetAccountKeysArgs =
+  type GetAccountKeysArgs =
     | {
         accountKeysFromLookups?: AccountKeysFromLookups | null;
       }
@@ -1602,7 +1602,7 @@ declare module '@solana/web3.js' {
     static deserialize(serializedMessage: Uint8Array): MessageV0;
   }
 
-  export type VersionedMessage = Message | MessageV0;
+  type VersionedMessage = Message | MessageV0;
   export const VersionedMessage: {
     deserializeMessageVersion(serializedMessage: Uint8Array): 'legacy' | number;
     deserialize: (serializedMessage: Uint8Array) => VersionedMessage;
@@ -1611,7 +1611,7 @@ declare module '@solana/web3.js' {
   /**
    * The message header, identifying signed and read-only account
    */
-  export type MessageHeader = {
+  type MessageHeader = {
     /**
      * The number of signatures required for this message to be considered valid. The
      * signatures must match the first `numRequiredSignatures` of `accountKeys`.
@@ -1625,7 +1625,7 @@ declare module '@solana/web3.js' {
   /**
    * An address table lookup used to load additional accounts
    */
-  export type MessageAddressTableLookup = {
+  type MessageAddressTableLookup = {
     accountKey: PublicKey;
     writableIndexes: Array<number>;
     readonlyIndexes: Array<number>;
@@ -1637,7 +1637,7 @@ declare module '@solana/web3.js' {
    * @property {number[]} accountKeyIndexes
    * @property {Uint8Array} data
    */
-  export type MessageCompiledInstruction = {
+  type MessageCompiledInstruction = {
     /** Index into the transaction keys array indicating the program account that executes this instruction */
     programIdIndex: number;
     /** Ordered indices into the transaction keys array indicating which accounts to pass to the program */
@@ -1649,7 +1649,7 @@ declare module '@solana/web3.js' {
   /**
    * Transaction signature as base-58 encoded string
    */
-  export type TransactionSignature = string;
+  type TransactionSignature = string;
   export const enum TransactionStatus {
     BLOCKHEIGHT_EXCEEDED = 0,
     PROCESSED = 1,
@@ -1659,7 +1659,7 @@ declare module '@solana/web3.js' {
   /**
    * Account metadata used to define instructions
    */
-  export type AccountMeta = {
+  type AccountMeta = {
     /** An account's public key */
     pubkey: PublicKey;
     /** True if an instruction requires a transaction signature matching `pubkey` */
@@ -1670,7 +1670,7 @@ declare module '@solana/web3.js' {
   /**
    * List of TransactionInstruction object fields that may be initialized at construction
    */
-  export type TransactionInstructionCtorFields = {
+  type TransactionInstructionCtorFields = {
     keys: Array<AccountMeta>;
     programId: PublicKey;
     data?: Buffer;
@@ -1678,7 +1678,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for Transaction.serialize()
    */
-  export type SerializeConfig = {
+  type SerializeConfig = {
     /** Require all transaction signatures be present (default: true) */
     requireAllSignatures?: boolean;
     /** Verify provided signatures (default: true) */
@@ -1706,14 +1706,14 @@ declare module '@solana/web3.js' {
   /**
    * Pair of signature and corresponding public key
    */
-  export type SignaturePubkeyPair = {
+  type SignaturePubkeyPair = {
     signature: Buffer | null;
     publicKey: PublicKey;
   };
   /**
    * List of Transaction object fields that may be initialized at construction
    */
-  export type TransactionCtorFields_DEPRECATED = {
+  type TransactionCtorFields_DEPRECATED = {
     /** Optional nonce information used for offline nonce'd transactions */
     nonceInfo?: NonceInformation | null;
     /** The transaction fee payer */
@@ -1723,13 +1723,13 @@ declare module '@solana/web3.js' {
     /** A recent blockhash */
     recentBlockhash?: Blockhash;
   };
-  export type TransactionCtorFields = TransactionCtorFields_DEPRECATED;
+  type TransactionCtorFields = TransactionCtorFields_DEPRECATED;
   /**
    * Blockhash-based transactions have a lifetime that are defined by
    * the blockhash they include. Any transaction whose blockhash is
    * too old will be rejected.
    */
-  export type TransactionBlockhashCtor = {
+  type TransactionBlockhashCtor = {
     /** The transaction fee payer */
     feePayer?: PublicKey | null;
     /** One or more signatures */
@@ -1742,7 +1742,7 @@ declare module '@solana/web3.js' {
   /**
    * Use these options to construct a durable nonce transaction.
    */
-  export type TransactionNonceCtor = {
+  type TransactionNonceCtor = {
     /** The transaction fee payer */
     feePayer?: PublicKey | null;
     minContextSlot: number;
@@ -1753,7 +1753,7 @@ declare module '@solana/web3.js' {
   /**
    * Nonce information to be used to build an offline Transaction.
    */
-  export type NonceInformation = {
+  type NonceInformation = {
     /** The current blockhash stored in the nonce */
     nonce: Blockhash;
     /** AdvanceNonceAccount Instruction */
@@ -1886,12 +1886,12 @@ declare module '@solana/web3.js' {
     static populate(message: Message, signatures?: Array<string>): Transaction;
   }
 
-  export type TransactionMessageArgs = {
+  type TransactionMessageArgs = {
     payerKey: PublicKey;
     instructions: Array<TransactionInstruction>;
     recentBlockhash: Blockhash;
   };
-  export type DecompileArgs =
+  type DecompileArgs =
     | {
         accountKeysFromLookups: AccountKeysFromLookups;
       }
@@ -1913,7 +1913,7 @@ declare module '@solana/web3.js' {
     ): MessageV0;
   }
 
-  export type TransactionVersion = 'legacy' | 0;
+  type TransactionVersion = 'legacy' | 0;
   /**
    * Versioned transaction class
    */
@@ -1928,8 +1928,8 @@ declare module '@solana/web3.js' {
     addSignature(publicKey: PublicKey, signature: Uint8Array): void;
   }
 
-  export type ClientSubscriptionId = number;
-  export type TokenAccountsFilter =
+  type ClientSubscriptionId = number;
+  type TokenAccountsFilter =
     | {
         mint: PublicKey;
       }
@@ -1939,13 +1939,13 @@ declare module '@solana/web3.js' {
   /**
    * Extra contextual information for RPC responses
    */
-  export type Context = {
+  type Context = {
     slot: number;
   };
   /**
    * Options for sending transactions
    */
-  export type SendOptions = {
+  type SendOptions = {
     /** disable transaction verification step */
     skipPreflight?: boolean;
     /** preflight commitment level */
@@ -1958,7 +1958,7 @@ declare module '@solana/web3.js' {
   /**
    * Options for confirming transactions
    */
-  export type ConfirmOptions = {
+  type ConfirmOptions = {
     /** disable transaction verification step */
     skipPreflight?: boolean;
     /** desired commitment level */
@@ -1973,7 +1973,7 @@ declare module '@solana/web3.js' {
   /**
    * Options for getConfirmedSignaturesForAddress2
    */
-  export type ConfirmedSignaturesForAddress2Options = {
+  type ConfirmedSignaturesForAddress2Options = {
     /**
      * Start searching backwards from this transaction signature.
      * @remark If not provided the search starts from the highest max confirmed block.
@@ -1987,7 +1987,7 @@ declare module '@solana/web3.js' {
   /**
    * Options for getSignaturesForAddress
    */
-  export type SignaturesForAddressOptions = {
+  type SignaturesForAddressOptions = {
     /**
      * Start searching backwards from this transaction signature.
      * @remark If not provided the search starts from the highest max confirmed block.
@@ -2003,13 +2003,13 @@ declare module '@solana/web3.js' {
   /**
    * RPC Response with extra contextual information
    */
-  export type RpcResponseAndContext<T> = {
+  type RpcResponseAndContext<T> = {
     /** response context */
     context: Context;
     /** response value */
     value: T;
   };
-  export type BlockhashWithExpiryBlockHeight = Readonly<{
+  type BlockhashWithExpiryBlockHeight = Readonly<{
     blockhash: Blockhash;
     lastValidBlockHeight: number;
   }>;
@@ -2017,30 +2017,37 @@ declare module '@solana/web3.js' {
    * A strategy for confirming transactions that uses the last valid
    * block height for a given blockhash to check for transaction expiration.
    */
-  export type BlockheightBasedTransactionConfirmationStrategy = {
-    signature: TransactionSignature;
-  } & BlockhashWithExpiryBlockHeight;
+  type BlockheightBasedTransactionConfirmationStrategy =
+    BaseTransactionConfirmationStrategy & BlockhashWithExpiryBlockHeight;
   /**
    * A strategy for confirming durable nonce transactions.
    */
-  export type DurableNonceTransactionConfirmationStrategy = {
-    /**
-     * The lowest slot at which to fetch the nonce value from the
-     * nonce account. This should be no lower than the slot at
-     * which the last-known value of the nonce was fetched.
-     */
-    minContextSlot: number;
-    /**
-     * The account where the current value of the nonce is stored.
-     */
-    nonceAccountPubkey: PublicKey;
-    /**
-     * The nonce value that was used to sign the transaction
-     * for which confirmation is being sought.
-     */
-    nonceValue: DurableNonce;
+  type DurableNonceTransactionConfirmationStrategy =
+    BaseTransactionConfirmationStrategy & {
+      /**
+       * The lowest slot at which to fetch the nonce value from the
+       * nonce account. This should be no lower than the slot at
+       * which the last-known value of the nonce was fetched.
+       */
+      minContextSlot: number;
+      /**
+       * The account where the current value of the nonce is stored.
+       */
+      nonceAccountPubkey: PublicKey;
+      /**
+       * The nonce value that was used to sign the transaction
+       * for which confirmation is being sought.
+       */
+      nonceValue: DurableNonce;
+    };
+  /**
+   * Properties shared by all transaction confirmation strategies
+   */
+  type BaseTransactionConfirmationStrategy = Readonly<{
+    /** A signal that, when aborted, cancels any outstanding transaction confirmation operations */
+    abortSignal?: AbortSignal;
     signature: TransactionSignature;
-  };
+  }>;
   /**
    * The level of commitment desired when querying state
    * <pre>
@@ -2049,7 +2056,7 @@ declare module '@solana/web3.js' {
    *   'finalized': Query the most recent block which has been finalized by the cluster
    * </pre>
    */
-  export type Commitment =
+  type Commitment =
     | 'processed'
     | 'confirmed'
     | 'finalized'
@@ -2065,7 +2072,7 @@ declare module '@solana/web3.js' {
    *   'finalized': Query the most recent block which has been finalized by the cluster
    * </pre>
    */
-  export type Finality = 'confirmed' | 'finalized';
+  type Finality = 'confirmed' | 'finalized';
   /**
    * Filter for largest accounts query
    * <pre>
@@ -2073,11 +2080,11 @@ declare module '@solana/web3.js' {
    *   'nonCirculating': Return the largest accounts that are not part of the circulating supply
    * </pre>
    */
-  export type LargestAccountsFilter = 'circulating' | 'nonCirculating';
+  type LargestAccountsFilter = 'circulating' | 'nonCirculating';
   /**
    * Configuration object for changing `getAccountInfo` query behavior
    */
-  export type GetAccountInfoConfig = {
+  type GetAccountInfoConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2088,7 +2095,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getBalance` query behavior
    */
-  export type GetBalanceConfig = {
+  type GetBalanceConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2097,7 +2104,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getBlock` query behavior
    */
-  export type GetBlockConfig = {
+  type GetBlockConfig = {
     /** The level of finality desired */
     commitment?: Finality;
     /**
@@ -2116,7 +2123,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getBlock` query behavior
    */
-  export type GetVersionedBlockConfig = {
+  type GetVersionedBlockConfig = {
     /** The level of finality desired */
     commitment?: Finality;
     /** The max transaction version to return in responses. If the requested transaction is a higher version, an error will be returned */
@@ -2137,14 +2144,14 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getStakeMinimumDelegation` query behavior
    */
-  export type GetStakeMinimumDelegationConfig = {
+  type GetStakeMinimumDelegationConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
   };
   /**
    * Configuration object for changing `getBlockHeight` query behavior
    */
-  export type GetBlockHeightConfig = {
+  type GetBlockHeightConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2153,7 +2160,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getEpochInfo` query behavior
    */
-  export type GetEpochInfoConfig = {
+  type GetEpochInfoConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2162,7 +2169,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getInflationReward` query behavior
    */
-  export type GetInflationRewardConfig = {
+  type GetInflationRewardConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** An epoch for which the reward occurs. If omitted, the previous epoch will be used */
@@ -2173,7 +2180,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getLatestBlockhash` query behavior
    */
-  export type GetLatestBlockhashConfig = {
+  type GetLatestBlockhashConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2182,7 +2189,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getSlot` query behavior
    */
-  export type GetSlotConfig = {
+  type GetSlotConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2191,7 +2198,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getSlotLeader` query behavior
    */
-  export type GetSlotLeaderConfig = {
+  type GetSlotLeaderConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -2200,14 +2207,14 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getTransaction` query behavior
    */
-  export type GetTransactionConfig = {
+  type GetTransactionConfig = {
     /** The level of finality desired */
     commitment?: Finality;
   };
   /**
    * Configuration object for changing `getTransaction` query behavior
    */
-  export type GetVersionedTransactionConfig = {
+  type GetVersionedTransactionConfig = {
     /** The level of finality desired */
     commitment?: Finality;
     /** The max transaction version to return in responses. If the requested transaction is a higher version, an error will be returned */
@@ -2216,7 +2223,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getLargestAccounts` query behavior
    */
-  export type GetLargestAccountsConfig = {
+  type GetLargestAccountsConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** Filter largest accounts by whether they are part of the circulating supply */
@@ -2225,7 +2232,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing `getSupply` request behavior
    */
-  export type GetSupplyConfig = {
+  type GetSupplyConfig = {
     /** The level of commitment desired */
     commitment?: Commitment;
     /** Exclude non circulating accounts list from response */
@@ -2234,14 +2241,14 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for changing query behavior
    */
-  export type SignatureStatusConfig = {
+  type SignatureStatusConfig = {
     /** enable searching status history, not needed for recent transactions */
     searchTransactionHistory: boolean;
   };
   /**
    * Information describing a cluster node
    */
-  export type ContactInfo = {
+  type ContactInfo = {
     /** Identity public key of the node */
     pubkey: string;
     /** Gossip network address for the node */
@@ -2256,7 +2263,7 @@ declare module '@solana/web3.js' {
   /**
    * Information describing a vote account
    */
-  export type VoteAccountInfo = {
+  type VoteAccountInfo = {
     /** Public key of the vote account */
     votePubkey: string;
     /** Identity public key of the node voting with this account */
@@ -2275,7 +2282,7 @@ declare module '@solana/web3.js' {
   /**
    * A collection of cluster vote accounts
    */
-  export type VoteAccountStatus = {
+  type VoteAccountStatus = {
     /** Active vote accounts */
     current: Array<VoteAccountInfo>;
     /** Inactive vote accounts */
@@ -2285,7 +2292,7 @@ declare module '@solana/web3.js' {
    * Network Inflation
    * (see https://docs.solana.com/implemented-proposals/ed_overview)
    */
-  export type InflationGovernor = {
+  type InflationGovernor = {
     foundation: number;
     foundationTerm: number;
     initial: number;
@@ -2295,7 +2302,7 @@ declare module '@solana/web3.js' {
   /**
    * The inflation reward for an epoch
    */
-  export type InflationReward = {
+  type InflationReward = {
     /** epoch for which the reward occurs */
     epoch: number;
     /** the slot in which the rewards are effective */
@@ -2308,7 +2315,7 @@ declare module '@solana/web3.js' {
   /**
    * Information about the current epoch
    */
-  export type EpochInfo = {
+  type EpochInfo = {
     epoch: number;
     slotIndex: number;
     slotsInEpoch: number;
@@ -2320,18 +2327,18 @@ declare module '@solana/web3.js' {
    * Leader schedule
    * (see https://docs.solana.com/terminology#leader-schedule)
    */
-  export type LeaderSchedule = {
+  type LeaderSchedule = {
     [address: string]: number[];
   };
   /**
    * Version info for a node
    */
-  export type Version = {
+  type Version = {
     /** Version of solana-core */
     'solana-core': string;
     'feature-set'?: number;
   };
-  export type SimulatedTransactionAccountInfo = {
+  type SimulatedTransactionAccountInfo = {
     /** `true` if this account's data contains a loaded program */
     executable: boolean;
     /** Identifier of the program that owns the account */
@@ -2343,12 +2350,12 @@ declare module '@solana/web3.js' {
     /** Optional rent epoch info for account */
     rentEpoch?: number;
   };
-  export type TransactionReturnDataEncoding = 'base64';
-  export type TransactionReturnData = {
+  type TransactionReturnDataEncoding = 'base64';
+  type TransactionReturnData = {
     programId: string;
     data: [string, TransactionReturnDataEncoding];
   };
-  export type SimulateTransactionConfig = {
+  type SimulateTransactionConfig = {
     /** Optional parameter used to enable signature verification before simulation */
     sigVerify?: boolean;
     /** Optional parameter used to replace the simulated transaction's recent blockhash with the latest blockhash */
@@ -2363,18 +2370,18 @@ declare module '@solana/web3.js' {
     /** Optional parameter used to specify the minimum block slot that can be used for simulation */
     minContextSlot?: number;
   };
-  export type SimulatedTransactionResponse = {
+  type SimulatedTransactionResponse = {
     err: TransactionError | string | null;
     logs: Array<string> | null;
     accounts?: (SimulatedTransactionAccountInfo | null)[] | null;
     unitsConsumed?: number;
     returnData?: TransactionReturnData | null;
   };
-  export type ParsedInnerInstruction = {
+  type ParsedInnerInstruction = {
     index: number;
     instructions: (ParsedInstruction | PartiallyDecodedInstruction)[];
   };
-  export type TokenBalance = {
+  type TokenBalance = {
     accountIndex: number;
     mint: string;
     owner?: string;
@@ -2385,18 +2392,18 @@ declare module '@solana/web3.js' {
    *
    * @deprecated Deprecated since Solana v1.8.0. Please use {@link ParsedTransactionMeta} instead.
    */
-  export type ParsedConfirmedTransactionMeta = ParsedTransactionMeta;
+  type ParsedConfirmedTransactionMeta = ParsedTransactionMeta;
   /**
    * Collection of addresses loaded by a transaction using address table lookups
    */
-  export type LoadedAddresses = {
+  type LoadedAddresses = {
     writable: Array<PublicKey>;
     readonly: Array<PublicKey>;
   };
   /**
    * Metadata for a parsed transaction on the ledger
    */
-  export type ParsedTransactionMeta = {
+  type ParsedTransactionMeta = {
     /** The fee charged for processing the transaction */
     fee: number;
     /** An array of cross program invoked parsed instructions */
@@ -2418,14 +2425,14 @@ declare module '@solana/web3.js' {
     /** The compute units consumed after processing the transaction */
     computeUnitsConsumed?: number;
   };
-  export type CompiledInnerInstruction = {
+  type CompiledInnerInstruction = {
     index: number;
     instructions: CompiledInstruction[];
   };
   /**
    * Metadata for a confirmed transaction on the ledger
    */
-  export type ConfirmedTransactionMeta = {
+  type ConfirmedTransactionMeta = {
     /** The fee charged for processing the transaction */
     fee: number;
     /** An array of cross program invoked instructions */
@@ -2450,7 +2457,7 @@ declare module '@solana/web3.js' {
   /**
    * A processed transaction from the RPC API
    */
-  export type TransactionResponse = {
+  type TransactionResponse = {
     /** The slot during which the transaction was processed */
     slot: number;
     /** The transaction */
@@ -2468,7 +2475,7 @@ declare module '@solana/web3.js' {
   /**
    * A processed transaction from the RPC API
    */
-  export type VersionedTransactionResponse = {
+  type VersionedTransactionResponse = {
     /** The slot during which the transaction was processed */
     slot: number;
     /** The transaction */
@@ -2490,7 +2497,7 @@ declare module '@solana/web3.js' {
    *
    * @deprecated Deprecated since Solana v1.8.0.
    */
-  export type ConfirmedTransaction = {
+  type ConfirmedTransaction = {
     /** The slot during which the transaction was processed */
     slot: number;
     /** The details of the transaction */
@@ -2503,7 +2510,7 @@ declare module '@solana/web3.js' {
   /**
    * A partially decoded transaction instruction
    */
-  export type PartiallyDecodedInstruction = {
+  type PartiallyDecodedInstruction = {
     /** Program id called by this instruction */
     programId: PublicKey;
     /** Public keys of accounts passed to this instruction */
@@ -2514,7 +2521,7 @@ declare module '@solana/web3.js' {
   /**
    * A parsed transaction message account
    */
-  export type ParsedMessageAccount = {
+  type ParsedMessageAccount = {
     /** Public key of the account */
     pubkey: PublicKey;
     /** Indicates if the account signed the transaction */
@@ -2527,7 +2534,7 @@ declare module '@solana/web3.js' {
   /**
    * A parsed transaction instruction
    */
-  export type ParsedInstruction = {
+  type ParsedInstruction = {
     /** Name of the program for this instruction */
     program: string;
     /** ID of the program for this instruction */
@@ -2538,7 +2545,7 @@ declare module '@solana/web3.js' {
   /**
    * A parsed address table lookup
    */
-  export type ParsedAddressTableLookup = {
+  type ParsedAddressTableLookup = {
     /** Address lookup table account key */
     accountKey: PublicKey;
     /** Parsed instruction info */
@@ -2549,7 +2556,7 @@ declare module '@solana/web3.js' {
   /**
    * A parsed transaction message
    */
-  export type ParsedMessage = {
+  type ParsedMessage = {
     /** Accounts used in the instructions */
     accountKeys: ParsedMessageAccount[];
     /** The atomically executed instructions for the transaction */
@@ -2562,7 +2569,7 @@ declare module '@solana/web3.js' {
   /**
    * A parsed transaction
    */
-  export type ParsedTransaction = {
+  type ParsedTransaction = {
     /** Signatures for the transaction */
     signatures: Array<string>;
     /** Message of the transaction */
@@ -2573,11 +2580,11 @@ declare module '@solana/web3.js' {
    *
    * @deprecated Deprecated since Solana v1.8.0. Please use {@link ParsedTransactionWithMeta} instead.
    */
-  export type ParsedConfirmedTransaction = ParsedTransactionWithMeta;
+  type ParsedConfirmedTransaction = ParsedTransactionWithMeta;
   /**
    * A parsed transaction on the ledger with meta
    */
-  export type ParsedTransactionWithMeta = {
+  type ParsedTransactionWithMeta = {
     /** The slot during which the transaction was processed */
     slot: number;
     /** The details of the transaction */
@@ -2592,7 +2599,7 @@ declare module '@solana/web3.js' {
   /**
    * A processed block fetched from the RPC API
    */
-  export type BlockResponse = {
+  type BlockResponse = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -2630,15 +2637,15 @@ declare module '@solana/web3.js' {
   /**
    * A processed block fetched from the RPC API where the `transactionDetails` mode is `accounts`
    */
-  export type AccountsModeBlockResponse = VersionedAccountsModeBlockResponse;
+  type AccountsModeBlockResponse = VersionedAccountsModeBlockResponse;
   /**
    * A processed block fetched from the RPC API where the `transactionDetails` mode is `none`
    */
-  export type NoneModeBlockResponse = VersionedNoneModeBlockResponse;
+  type NoneModeBlockResponse = VersionedNoneModeBlockResponse;
   /**
    * A block with parsed transactions
    */
-  export type ParsedBlockResponse = {
+  type ParsedBlockResponse = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -2673,7 +2680,7 @@ declare module '@solana/web3.js' {
   /**
    * A block with parsed transactions where the `transactionDetails` mode is `accounts`
    */
-  export type ParsedAccountsModeBlockResponse = Omit<
+  type ParsedAccountsModeBlockResponse = Omit<
     ParsedBlockResponse,
     'transactions'
   > & {
@@ -2691,14 +2698,11 @@ declare module '@solana/web3.js' {
   /**
    * A block with parsed transactions where the `transactionDetails` mode is `none`
    */
-  export type ParsedNoneModeBlockResponse = Omit<
-    ParsedBlockResponse,
-    'transactions'
-  >;
+  type ParsedNoneModeBlockResponse = Omit<ParsedBlockResponse, 'transactions'>;
   /**
    * A processed block fetched from the RPC API
    */
-  export type VersionedBlockResponse = {
+  type VersionedBlockResponse = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -2736,7 +2740,7 @@ declare module '@solana/web3.js' {
   /**
    * A processed block fetched from the RPC API where the `transactionDetails` mode is `accounts`
    */
-  export type VersionedAccountsModeBlockResponse = Omit<
+  type VersionedAccountsModeBlockResponse = Omit<
     VersionedBlockResponse,
     'transactions'
   > & {
@@ -2754,7 +2758,7 @@ declare module '@solana/web3.js' {
   /**
    * A processed block fetched from the RPC API where the `transactionDetails` mode is `none`
    */
-  export type VersionedNoneModeBlockResponse = Omit<
+  type VersionedNoneModeBlockResponse = Omit<
     VersionedBlockResponse,
     'transactions'
   >;
@@ -2763,7 +2767,7 @@ declare module '@solana/web3.js' {
    *
    * @deprecated Deprecated since Solana v1.8.0.
    */
-  export type ConfirmedBlock = {
+  type ConfirmedBlock = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -2788,7 +2792,7 @@ declare module '@solana/web3.js' {
   /**
    * A Block on the ledger with signatures only
    */
-  export type BlockSignatures = {
+  type BlockSignatures = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -2803,7 +2807,7 @@ declare module '@solana/web3.js' {
   /**
    * recent block production information
    */
-  export type BlockProduction = Readonly<{
+  type BlockProduction = Readonly<{
     /** a dictionary of validator identities, as base-58 encoded strings. Value is a two element array containing the number of leader slots and the number of blocks produced */
     byIdentity: Readonly<Record<string, ReadonlyArray<number>>>;
     /** Block production slot range */
@@ -2814,7 +2818,7 @@ declare module '@solana/web3.js' {
       lastSlot: number;
     }>;
   }>;
-  export type GetBlockProductionConfig = {
+  type GetBlockProductionConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** Slot range to return block production for. If parameter not provided, defaults to current epoch. */
@@ -2830,7 +2834,7 @@ declare module '@solana/web3.js' {
   /**
    * A performance sample
    */
-  export type PerfSample = {
+  type PerfSample = {
     /** Slot number of sample */
     slot: number;
     /** Number of transactions in a sample window */
@@ -2843,7 +2847,7 @@ declare module '@solana/web3.js' {
   /**
    * Supply
    */
-  export type Supply = {
+  type Supply = {
     /** Total supply in lamports */
     total: number;
     /** Circulating supply in lamports */
@@ -2857,7 +2861,7 @@ declare module '@solana/web3.js' {
    * Token amount object which returns a token amount in different formats
    * for various client use cases.
    */
-  export type TokenAmount = {
+  type TokenAmount = {
     /** Raw amount of tokens as string ignoring decimals */
     amount: string;
     /** Number of decimals configured for token's mint */
@@ -2870,7 +2874,7 @@ declare module '@solana/web3.js' {
   /**
    * Token address and balance.
    */
-  export type TokenAccountBalancePair = {
+  type TokenAccountBalancePair = {
     /** Address of the token account */
     address: PublicKey;
     /** Raw amount of tokens as string ignoring decimals */
@@ -2885,7 +2889,7 @@ declare module '@solana/web3.js' {
   /**
    * Pair of an account address and its balance
    */
-  export type AccountBalancePair = {
+  type AccountBalancePair = {
     address: PublicKey;
     lamports: number;
   };
@@ -2903,7 +2907,7 @@ declare module '@solana/web3.js' {
    * - `"frozen"`: the connected node has validated this block.
    * - `"dead"`: the connected node failed to validate this block.
    */
-  export type SlotUpdate =
+  type SlotUpdate =
     | {
         type: 'firstShredReceived';
         slot: number;
@@ -2950,7 +2954,7 @@ declare module '@solana/web3.js' {
   /**
    * Information about the latest slot being processed by a node
    */
-  export type SlotInfo = {
+  type SlotInfo = {
     /** Currently processing slot */
     slot: number;
     /** Parent of the current slot */
@@ -2961,7 +2965,7 @@ declare module '@solana/web3.js' {
   /**
    * Parsed account data
    */
-  export type ParsedAccountData = {
+  type ParsedAccountData = {
     /** Name of the program that owns this account */
     program: string;
     /** Parsed account data */
@@ -2972,7 +2976,7 @@ declare module '@solana/web3.js' {
   /**
    * Stake Activation data
    */
-  export type StakeActivationData = {
+  type StakeActivationData = {
     /** the stake account's activation state */
     state: 'active' | 'inactive' | 'activating' | 'deactivating';
     /** stake active during the epoch */
@@ -2983,7 +2987,7 @@ declare module '@solana/web3.js' {
   /**
    * Data slice argument for getProgramAccounts
    */
-  export type DataSlice = {
+  type DataSlice = {
     /** offset of data slice */
     offset: number;
     /** length of data slice */
@@ -2992,7 +2996,7 @@ declare module '@solana/web3.js' {
   /**
    * Memory comparison filter for getProgramAccounts
    */
-  export type MemcmpFilter = {
+  type MemcmpFilter = {
     memcmp: {
       /** offset into program account data to start comparison */
       offset: number;
@@ -3003,18 +3007,18 @@ declare module '@solana/web3.js' {
   /**
    * Data size comparison filter for getProgramAccounts
    */
-  export type DataSizeFilter = {
+  type DataSizeFilter = {
     /** Size of data for program account data length comparison */
     dataSize: number;
   };
   /**
    * A filter object for getProgramAccounts
    */
-  export type GetProgramAccountsFilter = MemcmpFilter | DataSizeFilter;
+  type GetProgramAccountsFilter = MemcmpFilter | DataSizeFilter;
   /**
    * Configuration object for getProgramAccounts requests
    */
-  export type GetProgramAccountsConfig = {
+  type GetProgramAccountsConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** Optional encoding for account data (default base64)
@@ -3031,7 +3035,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for getParsedProgramAccounts
    */
-  export type GetParsedProgramAccountsConfig = {
+  type GetParsedProgramAccountsConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** Optional array of filters to apply to accounts */
@@ -3042,7 +3046,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for getMultipleAccounts
    */
-  export type GetMultipleAccountsConfig = {
+  type GetMultipleAccountsConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -3053,7 +3057,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for `getStakeActivation`
    */
-  export type GetStakeActivationConfig = {
+  type GetStakeActivationConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** Epoch for which to calculate activation details. If parameter not provided, defaults to current epoch */
@@ -3064,7 +3068,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for `getStakeActivation`
    */
-  export type GetTokenAccountsByOwnerConfig = {
+  type GetTokenAccountsByOwnerConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -3073,7 +3077,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for `getStakeActivation`
    */
-  export type GetTransactionCountConfig = {
+  type GetTransactionCountConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -3082,7 +3086,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for `getNonce`
    */
-  export type GetNonceConfig = {
+  type GetNonceConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -3091,7 +3095,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration object for `getNonceAndContext`
    */
-  export type GetNonceAndContextConfig = {
+  type GetNonceAndContextConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** The minimum slot that the request can be evaluated at */
@@ -3100,7 +3104,7 @@ declare module '@solana/web3.js' {
   /**
    * Information describing an account
    */
-  export type AccountInfo<T> = {
+  type AccountInfo<T> = {
     /** `true` if this account's data contains a loaded program */
     executable: boolean;
     /** Identifier of the program that owns the account */
@@ -3115,74 +3119,74 @@ declare module '@solana/web3.js' {
   /**
    * Account information identified by pubkey
    */
-  export type KeyedAccountInfo = {
+  type KeyedAccountInfo = {
     accountId: PublicKey;
     accountInfo: AccountInfo<Buffer>;
   };
   /**
    * Callback function for account change notifications
    */
-  export type AccountChangeCallback = (
+  type AccountChangeCallback = (
     accountInfo: AccountInfo<Buffer>,
     context: Context,
   ) => void;
   /**
    * Callback function for program account change notifications
    */
-  export type ProgramAccountChangeCallback = (
+  type ProgramAccountChangeCallback = (
     keyedAccountInfo: KeyedAccountInfo,
     context: Context,
   ) => void;
   /**
    * Callback function for slot change notifications
    */
-  export type SlotChangeCallback = (slotInfo: SlotInfo) => void;
+  type SlotChangeCallback = (slotInfo: SlotInfo) => void;
   /**
    * Callback function for slot update notifications
    */
-  export type SlotUpdateCallback = (slotUpdate: SlotUpdate) => void;
+  type SlotUpdateCallback = (slotUpdate: SlotUpdate) => void;
   /**
    * Callback function for signature status notifications
    */
-  export type SignatureResultCallback = (
+  type SignatureResultCallback = (
     signatureResult: SignatureResult,
     context: Context,
   ) => void;
   /**
    * Signature status notification with transaction result
    */
-  export type SignatureStatusNotification = {
+  type SignatureStatusNotification = {
     type: 'status';
     result: SignatureResult;
   };
   /**
    * Signature received notification
    */
-  export type SignatureReceivedNotification = {
+  type SignatureReceivedNotification = {
     type: 'received';
   };
   /**
    * Callback function for signature notifications
    */
-  export type SignatureSubscriptionCallback = (
+  type SignatureSubscriptionCallback = (
     notification: SignatureStatusNotification | SignatureReceivedNotification,
     context: Context,
   ) => void;
   /**
    * Signature subscription options
    */
-  export type SignatureSubscriptionOptions = {
+  type SignatureSubscriptionOptions = {
     commitment?: Commitment;
     enableReceivedNotification?: boolean;
   };
   /**
    * Callback function for root change notifications
    */
-  export type RootChangeCallback = (root: number) => void;
+  type RootChangeCallback = (root: number) => void;
   /**
    * Logs result.
    */
-  export type Logs = {
+  type Logs = {
     err: TransactionError | null;
     logs: string[];
     signature: string;
@@ -3190,21 +3194,21 @@ declare module '@solana/web3.js' {
   /**
    * Filter for log subscriptions.
    */
-  export type LogsFilter = PublicKey | 'all' | 'allWithVotes';
+  type LogsFilter = PublicKey | 'all' | 'allWithVotes';
   /**
    * Callback function for log notifications.
    */
-  export type LogsCallback = (logs: Logs, ctx: Context) => void;
+  type LogsCallback = (logs: Logs, ctx: Context) => void;
   /**
    * Signature result
    */
-  export type SignatureResult = {
+  type SignatureResult = {
     err: TransactionError | null;
   };
   /**
    * Transaction error
    */
-  export type TransactionError = {} | string;
+  type TransactionError = {} | string;
   /**
    * Transaction confirmation status
    * <pre>
@@ -3213,14 +3217,11 @@ declare module '@solana/web3.js' {
    *   'finalized': Transaction landed in a block which has been finalized by the cluster
    * </pre>
    */
-  export type TransactionConfirmationStatus =
-    | 'processed'
-    | 'confirmed'
-    | 'finalized';
+  type TransactionConfirmationStatus = 'processed' | 'confirmed' | 'finalized';
   /**
    * Signature status
    */
-  export type SignatureStatus = {
+  type SignatureStatus = {
     /** when the transaction was processed */
     slot: number;
     /** the number of blocks that have been confirmed and voted on in the fork containing `slot` */
@@ -3233,7 +3234,7 @@ declare module '@solana/web3.js' {
   /**
    * A confirmed signature with its status
    */
-  export type ConfirmedSignatureInfo = {
+  type ConfirmedSignatureInfo = {
     /** the transaction signature */
     signature: string;
     /** when the transaction was processed */
@@ -3250,7 +3251,7 @@ declare module '@solana/web3.js' {
   /**
    * An object defining headers to be passed to the RPC server
    */
-  export type HttpHeaders = {
+  type HttpHeaders = {
     [header: string]: string;
   } & {
     'solana-client'?: never;
@@ -3258,11 +3259,11 @@ declare module '@solana/web3.js' {
   /**
    * The type of the JavaScript `fetch()` API
    */
-  export type FetchFn = typeof export_default;
+  type FetchFn = typeof export_default;
   /**
    * A callback used to augment the outgoing HTTP request
    */
-  export type FetchMiddleware = (
+  type FetchMiddleware = (
     info: Parameters<FetchFn>[0],
     init: Parameters<FetchFn>[1],
     fetch: (...a: Parameters<FetchFn>) => void,
@@ -3270,7 +3271,7 @@ declare module '@solana/web3.js' {
   /**
    * Configuration for instantiating a Connection
    */
-  export type ConnectionConfig = {
+  type ConnectionConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
     /** Optional endpoint URL to the fullnode JSON RPC PubSub WebSocket Endpoint */
@@ -3496,6 +3497,7 @@ declare module '@solana/web3.js' {
       strategy: TransactionSignature,
       commitment?: Commitment,
     ): Promise<RpcResponseAndContext<SignatureResult>>;
+    private getCancellationPromise;
     private getTransactionConfirmationPromise;
     private confirmTransactionUsingBlockHeightExceedanceStrategy;
     private confirmTransactionUsingDurableNonceStrategy;
@@ -4178,7 +4180,7 @@ declare module '@solana/web3.js' {
     readonly JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION: -32015;
     readonly JSON_RPC_SERVER_ERROR_MIN_CONTEXT_SLOT_NOT_REACHED: -32016;
   };
-  export type SolanaJSONRPCErrorCodeEnum =
+  type SolanaJSONRPCErrorCodeEnum =
     typeof SolanaJSONRPCErrorCode[keyof typeof SolanaJSONRPCErrorCode];
   export class SolanaJSONRPCError extends Error {
     code: SolanaJSONRPCErrorCodeEnum | unknown;
@@ -4235,7 +4237,7 @@ declare module '@solana/web3.js' {
   /**
    * Info used to identity validators.
    */
-  export type Info = {
+  type Info = {
     /** validator name */
     name: string;
     /** optional, validator website */
@@ -4277,28 +4279,28 @@ declare module '@solana/web3.js' {
   }
 
   export const VOTE_PROGRAM_ID: PublicKey;
-  export type Lockout = {
+  type Lockout = {
     slot: number;
     confirmationCount: number;
   };
   /**
    * History of how many credits earned by the end of each epoch
    */
-  export type EpochCredits = Readonly<{
+  type EpochCredits = Readonly<{
     epoch: number;
     credits: number;
     prevCredits: number;
   }>;
-  export type AuthorizedVoter = Readonly<{
+  type AuthorizedVoter = Readonly<{
     epoch: number;
     authorizedVoter: PublicKey;
   }>;
-  export type PriorVoter = Readonly<{
+  type PriorVoter = Readonly<{
     authorizedPubkey: PublicKey;
     epochOfLastAuthorizedSwitch: number;
     targetEpoch: number;
   }>;
-  export type BlockTimestamp = Readonly<{
+  type BlockTimestamp = Readonly<{
     slot: number;
     timestamp: number;
   }>;
@@ -4336,7 +4338,7 @@ declare module '@solana/web3.js' {
   export const SYSVAR_SLOT_HISTORY_PUBKEY: PublicKey;
   export const SYSVAR_STAKE_HISTORY_PUBKEY: PublicKey;
 
-  export type Cluster = 'devnet' | 'testnet' | 'mainnet-beta';
+  type Cluster = 'devnet' | 'testnet' | 'mainnet-beta';
   /**
    * Retrieves the RPC API URL for the specified cluster
    */
@@ -4384,7 +4386,10 @@ declare module '@solana/web3.js' {
     connection: Connection,
     transaction: Transaction,
     signers: Array<Signer>,
-    options?: ConfirmOptions,
+    options?: ConfirmOptions &
+      Readonly<{
+        abortSignal?: AbortSignal;
+      }>,
   ): Promise<TransactionSignature>;
 
   /**