Update Codama and regenerate clients

clients/js/src/generated/errors/associatedToken.ts

@@ -20,14 +20,14 @@ export const ASSOCIATED_TOKEN_ERROR__INVALID_OWNER = 0x0; // 0
 export type AssociatedTokenError = typeof ASSOCIATED_TOKEN_ERROR__INVALID_OWNER;
 
 let associatedTokenErrorMessages: Record<AssociatedTokenError, string> | undefined;
-if (process.env.NODE_ENV !== 'production') {
+if (process.env['NODE_ENV'] !== 'production') {
     associatedTokenErrorMessages = {
         [ASSOCIATED_TOKEN_ERROR__INVALID_OWNER]: `Associated token account owner does not match address derivation`,
     };
 }
 
 export function getAssociatedTokenErrorMessage(code: AssociatedTokenError): string {
-    if (process.env.NODE_ENV !== 'production') {
+    if (process.env['NODE_ENV'] !== 'production') {
         return (associatedTokenErrorMessages as Record<AssociatedTokenError, string>)[code];
     }
 

clients/js/src/generated/errors/token.ts

@@ -78,7 +78,7 @@ export type TokenError =
     | typeof TOKEN_ERROR__UNINITIALIZED_STATE;
 
 let tokenErrorMessages: Record<TokenError, string> | undefined;
-if (process.env.NODE_ENV !== 'production') {
+if (process.env['NODE_ENV'] !== 'production') {
     tokenErrorMessages = {
         [TOKEN_ERROR__ACCOUNT_FROZEN]: `Account is frozen`,
         [TOKEN_ERROR__ALREADY_IN_USE]: `Already in use`,
@@ -104,7 +104,7 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export function getTokenErrorMessage(code: TokenError): string {
-    if (process.env.NODE_ENV !== 'production') {
+    if (process.env['NODE_ENV'] !== 'production') {
         return (tokenErrorMessages as Record<TokenError, string>)[code];
     }
 

clients/js/src/generated/instructions/amountToUiAmount.ts

@@ -33,7 +33,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const AMOUNT_TO_UI_AMOUNT_DISCRIMINATOR = 23;
 
-export function getAmountToUiAmountDiscriminatorBytes() {
+export function getAmountToUiAmountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(AMOUNT_TO_UI_AMOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/approve.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const APPROVE_DISCRIMINATOR = 4;
 
-export function getApproveDiscriminatorBytes() {
+export function getApproveDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(APPROVE_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/approveChecked.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const APPROVE_CHECKED_DISCRIMINATOR = 13;
 
-export function getApproveCheckedDiscriminatorBytes() {
+export function getApproveCheckedDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(APPROVE_CHECKED_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/batch.ts

@@ -33,7 +33,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const BATCH_DISCRIMINATOR = 255;
 
-export function getBatchDiscriminatorBytes() {
+export function getBatchDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(BATCH_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/burn.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const BURN_DISCRIMINATOR = 8;
 
-export function getBurnDiscriminatorBytes() {
+export function getBurnDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(BURN_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/burnChecked.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const BURN_CHECKED_DISCRIMINATOR = 15;
 
-export function getBurnCheckedDiscriminatorBytes() {
+export function getBurnCheckedDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(BURN_CHECKED_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/closeAccount.ts

@@ -36,7 +36,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const CLOSE_ACCOUNT_DISCRIMINATOR = 9;
 
-export function getCloseAccountDiscriminatorBytes() {
+export function getCloseAccountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(CLOSE_ACCOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/createAssociatedToken.ts

@@ -40,7 +40,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const CREATE_ASSOCIATED_TOKEN_DISCRIMINATOR = 0;
 
-export function getCreateAssociatedTokenDiscriminatorBytes() {
+export function getCreateAssociatedTokenDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(CREATE_ASSOCIATED_TOKEN_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/createAssociatedTokenIdempotent.ts

@@ -40,7 +40,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const CREATE_ASSOCIATED_TOKEN_IDEMPOTENT_DISCRIMINATOR = 1;
 
-export function getCreateAssociatedTokenIdempotentDiscriminatorBytes() {
+export function getCreateAssociatedTokenIdempotentDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(CREATE_ASSOCIATED_TOKEN_IDEMPOTENT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/freezeAccount.ts

@@ -36,7 +36,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const FREEZE_ACCOUNT_DISCRIMINATOR = 10;
 
-export function getFreezeAccountDiscriminatorBytes() {
+export function getFreezeAccountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(FREEZE_ACCOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/getAccountDataSize.ts

@@ -31,7 +31,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const GET_ACCOUNT_DATA_SIZE_DISCRIMINATOR = 21;
 
-export function getGetAccountDataSizeDiscriminatorBytes() {
+export function getGetAccountDataSizeDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(GET_ACCOUNT_DATA_SIZE_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeAccount.ts

@@ -32,7 +32,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_ACCOUNT_DISCRIMINATOR = 1;
 
-export function getInitializeAccountDiscriminatorBytes() {
+export function getInitializeAccountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_ACCOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeAccount2.ts

@@ -34,7 +34,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_ACCOUNT2_DISCRIMINATOR = 16;
 
-export function getInitializeAccount2DiscriminatorBytes() {
+export function getInitializeAccount2DiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_ACCOUNT2_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeAccount3.ts

@@ -34,7 +34,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_ACCOUNT3_DISCRIMINATOR = 18;
 
-export function getInitializeAccount3DiscriminatorBytes() {
+export function getInitializeAccount3DiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_ACCOUNT3_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeImmutableOwner.ts

@@ -31,7 +31,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_IMMUTABLE_OWNER_DISCRIMINATOR = 22;
 
-export function getInitializeImmutableOwnerDiscriminatorBytes() {
+export function getInitializeImmutableOwnerDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_IMMUTABLE_OWNER_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeMint.ts

@@ -39,7 +39,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_MINT_DISCRIMINATOR = 0;
 
-export function getInitializeMintDiscriminatorBytes() {
+export function getInitializeMintDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_MINT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeMint2.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_MINT2_DISCRIMINATOR = 20;
 
-export function getInitializeMint2DiscriminatorBytes() {
+export function getInitializeMint2DiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_MINT2_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeMultisig.ts

@@ -33,7 +33,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_MULTISIG_DISCRIMINATOR = 2;
 
-export function getInitializeMultisigDiscriminatorBytes() {
+export function getInitializeMultisigDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_MULTISIG_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/initializeMultisig2.ts

@@ -32,7 +32,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_MULTISIG2_DISCRIMINATOR = 19;
 
-export function getInitializeMultisig2DiscriminatorBytes() {
+export function getInitializeMultisig2DiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(INITIALIZE_MULTISIG2_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/mintTo.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const MINT_TO_DISCRIMINATOR = 7;
 
-export function getMintToDiscriminatorBytes() {
+export function getMintToDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(MINT_TO_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/mintToChecked.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const MINT_TO_CHECKED_DISCRIMINATOR = 14;
 
-export function getMintToCheckedDiscriminatorBytes() {
+export function getMintToCheckedDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(MINT_TO_CHECKED_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/recoverNestedAssociatedToken.ts

@@ -40,7 +40,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const RECOVER_NESTED_ASSOCIATED_TOKEN_DISCRIMINATOR = 2;
 
-export function getRecoverNestedAssociatedTokenDiscriminatorBytes() {
+export function getRecoverNestedAssociatedTokenDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(RECOVER_NESTED_ASSOCIATED_TOKEN_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/revoke.ts

@@ -36,7 +36,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const REVOKE_DISCRIMINATOR = 5;
 
-export function getRevokeDiscriminatorBytes() {
+export function getRevokeDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(REVOKE_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/setAuthority.ts

@@ -43,7 +43,7 @@ import { getAuthorityTypeDecoder, getAuthorityTypeEncoder, type AuthorityType, t
 
 export const SET_AUTHORITY_DISCRIMINATOR = 6;
 
-export function getSetAuthorityDiscriminatorBytes() {
+export function getSetAuthorityDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(SET_AUTHORITY_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/syncNative.ts

@@ -32,7 +32,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const SYNC_NATIVE_DISCRIMINATOR = 17;
 
-export function getSyncNativeDiscriminatorBytes() {
+export function getSyncNativeDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(SYNC_NATIVE_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/thawAccount.ts

@@ -36,7 +36,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const THAW_ACCOUNT_DISCRIMINATOR = 11;
 
-export function getThawAccountDiscriminatorBytes() {
+export function getThawAccountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(THAW_ACCOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/transfer.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const TRANSFER_DISCRIMINATOR = 3;
 
-export function getTransferDiscriminatorBytes() {
+export function getTransferDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(TRANSFER_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/transferChecked.ts

@@ -38,7 +38,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const TRANSFER_CHECKED_DISCRIMINATOR = 12;
 
-export function getTransferCheckedDiscriminatorBytes() {
+export function getTransferCheckedDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(TRANSFER_CHECKED_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/uiAmountToAmount.ts

@@ -33,7 +33,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const UI_AMOUNT_TO_AMOUNT_DISCRIMINATOR = 24;
 
-export function getUiAmountToAmountDiscriminatorBytes() {
+export function getUiAmountToAmountDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(UI_AMOUNT_TO_AMOUNT_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/unwrapLamports.ts

@@ -43,7 +43,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const UNWRAP_LAMPORTS_DISCRIMINATOR = 45;
 
-export function getUnwrapLamportsDiscriminatorBytes() {
+export function getUnwrapLamportsDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(UNWRAP_LAMPORTS_DISCRIMINATOR);
 }
 

clients/js/src/generated/instructions/withdrawExcessLamports.ts

@@ -36,7 +36,7 @@ import { TOKEN_PROGRAM_ADDRESS } from '../programs';
 
 export const WITHDRAW_EXCESS_LAMPORTS_DISCRIMINATOR = 38;
 
-export function getWithdrawExcessLamportsDiscriminatorBytes() {
+export function getWithdrawExcessLamportsDiscriminatorBytes(): ReadonlyUint8Array {
     return getU8Encoder().encode(WITHDRAW_EXCESS_LAMPORTS_DISCRIMINATOR);
 }
 

clients/js/src/generated/programs/associatedToken.ts

@@ -9,6 +9,7 @@
 import {
     assertIsInstructionWithAccounts,
     containsBytes,
+    extendClient,
     getU8Encoder,
     SOLANA_ERROR__PROGRAM_CLIENTS__FAILED_TO_IDENTIFY_INSTRUCTION,
     SOLANA_ERROR__PROGRAM_CLIENTS__UNRECOGNIZED_INSTRUCTION_TYPE,
@@ -36,6 +37,7 @@ import {
     type ParsedRecoverNestedAssociatedTokenInstruction,
     type RecoverNestedAssociatedTokenAsyncInput,
 } from '../instructions';
+import { findAssociatedTokenPda } from '../pdas';
 
 export const ASSOCIATED_TOKEN_PROGRAM_ADDRESS =
     'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL' as Address<'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'>;
@@ -110,7 +112,10 @@ export function parseAssociatedTokenInstruction<TProgram extends string>(
     }
 }
 
-export type AssociatedTokenPlugin = { instructions: AssociatedTokenPluginInstructions };
+export type AssociatedTokenPlugin = {
+    instructions: AssociatedTokenPluginInstructions;
+    pdas: AssociatedTokenPluginPdas;
+};
 
 export type AssociatedTokenPluginInstructions = {
     createAssociatedToken: (
@@ -124,14 +129,17 @@ export type AssociatedTokenPluginInstructions = {
     ) => ReturnType<typeof getRecoverNestedAssociatedTokenInstructionAsync> & SelfPlanAndSendFunctions;
 };
 
+export type AssociatedTokenPluginPdas = { associatedToken: typeof findAssociatedTokenPda };
+
 export type AssociatedTokenPluginRequirements = ClientWithPayer &
     ClientWithTransactionPlanning &
     ClientWithTransactionSending;
 
 export function associatedTokenProgram() {
-    return <T extends AssociatedTokenPluginRequirements>(client: T) => {
-        return {
-            ...client,
+    return <T extends AssociatedTokenPluginRequirements>(
+        client: T,
+    ): Omit<T, 'associatedToken'> & { associatedToken: AssociatedTokenPlugin } => {
+        return extendClient(client, {
             associatedToken: <AssociatedTokenPlugin>{
                 instructions: {
                     createAssociatedToken: input =>
@@ -150,8 +158,9 @@ export function associatedTokenProgram() {
                     recoverNestedAssociatedToken: input =>
                         addSelfPlanAndSendFunctions(client, getRecoverNestedAssociatedTokenInstructionAsync(input)),
                 },
+                pdas: { associatedToken: findAssociatedTokenPda },
             },
-        };
+        });
     };
 }