@solana-program/system 0.14.1 → 0.16.0

package/src/generated/instructions/advanceNonceAccount.ts

@@ -27,10 +27,16 @@ import {
     type ReadonlyAccount,
     type ReadonlySignerAccount,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInput,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const ADVANCE_NONCE_ACCOUNT_DISCRIMINATOR = 4;
@@ -84,37 +90,44 @@ export function getAdvanceNonceAccountInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type AdvanceNonceAccountInput<
-    TAccountNonceAccount extends string = string,
-    TAccountRecentBlockhashesSysvar extends string = string,
-    TAccountNonceAuthority extends string = string,
+    TAccountNonceAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput = InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    nonceAccount: Address<TAccountNonceAccount>;
-    recentBlockhashesSysvar?: Address<TAccountRecentBlockhashesSysvar>;
-    nonceAuthority: TransactionSigner<TAccountNonceAuthority>;
+    nonceAccount: TAccountNonceAccount;
+    recentBlockhashesSysvar?: TAccountRecentBlockhashesSysvar;
+    nonceAuthority: TAccountNonceAuthority;
 };
 
 export function getAdvanceNonceAccountInstruction<
-    TAccountNonceAccount extends string,
-    TAccountRecentBlockhashesSysvar extends string,
-    TAccountNonceAuthority extends string,
+    TAccountNonceAccount extends InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AdvanceNonceAccountInput<TAccountNonceAccount, TAccountRecentBlockhashesSysvar, TAccountNonceAuthority>,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): AdvanceNonceAccountInstruction<
     TProgramAddress,
-    TAccountNonceAccount,
-    TAccountRecentBlockhashesSysvar,
-    TAccountNonceAuthority
+    ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+    ResolvedInstructionAccountMeta<
+        TAccountRecentBlockhashesSysvar,
+        InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+    >,
+    ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
 > {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
     const originalAccounts = {
-        nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
-        recentBlockhashesSysvar: { value: input.recentBlockhashesSysvar ?? null, isWritable: false },
-        nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false },
+        nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
+        recentBlockhashesSysvar: { value: input.recentBlockhashesSysvar ?? null, isSigner: false, isWritable: false },
+        nonceAuthority: { value: input.nonceAuthority ?? null, isSigner: true, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
@@ -124,7 +137,6 @@ export function getAdvanceNonceAccountInstruction<
             'SysvarRecentB1ockHashes11111111111111111111' as Address<'SysvarRecentB1ockHashes11111111111111111111'>;
     }
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [
             getAccountMeta('nonceAccount', accounts.nonceAccount),
@@ -135,9 +147,12 @@ export function getAdvanceNonceAccountInstruction<
         programAddress,
     } as AdvanceNonceAccountInstruction<
         TProgramAddress,
-        TAccountNonceAccount,
-        TAccountRecentBlockhashesSysvar,
-        TAccountNonceAuthority
+        ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+        ResolvedInstructionAccountMeta<
+            TAccountRecentBlockhashesSysvar,
+            InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+        >,
+        ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
     >);
 }
 

package/src/generated/instructions/allocate.ts

@@ -27,10 +27,15 @@ import {
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableSignerAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const ALLOCATE_DISCRIMINATOR = 8;
@@ -82,34 +87,43 @@ export function getAllocateInstructionDataCodec(): FixedSizeCodec<
     return combineCodec(getAllocateInstructionDataEncoder(), getAllocateInstructionDataDecoder());
 }
 
-export type AllocateInput<TAccountNewAccount extends string = string> = {
-    newAccount: TransactionSigner<TAccountNewAccount>;
+export type AllocateInput<TAccountNewAccount extends InstructionSignerInput = InstructionSignerInput> = {
+    newAccount: TAccountNewAccount;
     space: AllocateInstructionDataArgs['space'];
 };
 
 export function getAllocateInstruction<
-    TAccountNewAccount extends string,
+    TAccountNewAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AllocateInput<TAccountNewAccount>,
-    config?: { programAddress?: TProgramAddress },
-): AllocateInstruction<TProgramAddress, TAccountNewAccount> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): AllocateInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>
+> {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
-    const originalAccounts = { newAccount: { value: input.newAccount ?? null, isWritable: true } };
+    const originalAccounts = { newAccount: { value: input.newAccount ?? null, isSigner: true, isWritable: true } };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
     // Original args.
     const args = { ...input };
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('newAccount', accounts.newAccount)],
         data: getAllocateInstructionDataEncoder().encode(args as AllocateInstructionDataArgs),
         programAddress,
-    } as AllocateInstruction<TProgramAddress, TAccountNewAccount>);
+    } as AllocateInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>
+    >);
 }
 
 export type ParsedAllocateInstruction<

package/src/generated/instructions/allocateWithSeed.ts

@@ -29,15 +29,22 @@ import {
     type Codec,
     type Decoder,
     type Encoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlySignerAccount,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInput,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const ALLOCATE_WITH_SEED_DISCRIMINATOR = 9;
@@ -72,10 +79,10 @@ export type AllocateWithSeedInstructionData = {
 };
 
 export type AllocateWithSeedInstructionDataArgs = {
-    base: Address;
+    base: Address | HasAddress;
     seed: string;
     space: number | bigint;
-    programAddress: Address;
+    programAddress: Address | HasAddress;
 };
 
 export function getAllocateWithSeedInstructionDataEncoder(): Encoder<AllocateWithSeedInstructionDataArgs> {
@@ -109,11 +116,11 @@ export function getAllocateWithSeedInstructionDataCodec(): Codec<
 }
 
 export type AllocateWithSeedInput<
-    TAccountNewAccount extends string = string,
-    TAccountBaseAccount extends string = string,
+    TAccountNewAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    newAccount: Address<TAccountNewAccount>;
-    baseAccount: TransactionSigner<TAccountBaseAccount>;
+    newAccount: TAccountNewAccount;
+    baseAccount: TAccountBaseAccount;
     base: AllocateWithSeedInstructionDataArgs['base'];
     seed: AllocateWithSeedInstructionDataArgs['seed'];
     space: AllocateWithSeedInstructionDataArgs['space'];
@@ -121,27 +128,34 @@ export type AllocateWithSeedInput<
 };
 
 export function getAllocateWithSeedInstruction<
-    TAccountNewAccount extends string,
-    TAccountBaseAccount extends string,
+    TAccountNewAccount extends InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AllocateWithSeedInput<TAccountNewAccount, TAccountBaseAccount>,
-    config?: { programAddress?: TProgramAddress },
-): AllocateWithSeedInstruction<TProgramAddress, TAccountNewAccount, TAccountBaseAccount> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): AllocateWithSeedInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>,
+    ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>
+> {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
     const originalAccounts = {
-        newAccount: { value: input.newAccount ?? null, isWritable: true },
-        baseAccount: { value: input.baseAccount ?? null, isWritable: false },
+        newAccount: { value: input.newAccount ?? null, isSigner: false, isWritable: true },
+        baseAccount: { value: input.baseAccount ?? null, isSigner: true, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
     // Original args.
     const args = { ...input };
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [
             getAccountMeta('newAccount', accounts.newAccount),
@@ -149,7 +163,11 @@ export function getAllocateWithSeedInstruction<
         ],
         data: getAllocateWithSeedInstructionDataEncoder().encode(args as AllocateWithSeedInstructionDataArgs),
         programAddress,
-    } as AllocateWithSeedInstruction<TProgramAddress, TAccountNewAccount, TAccountBaseAccount>);
+    } as AllocateWithSeedInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>,
+        ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>
+    >);
 }
 
 export type ParsedAllocateWithSeedInstruction<

package/src/generated/instructions/assign.ts

@@ -23,14 +23,20 @@ import {
     type FixedSizeCodec,
     type FixedSizeDecoder,
     type FixedSizeEncoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableSignerAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const ASSIGN_DISCRIMINATOR = 1;
@@ -56,7 +62,7 @@ export type AssignInstruction<
 
 export type AssignInstructionData = { discriminator: number; programAddress: Address };
 
-export type AssignInstructionDataArgs = { programAddress: Address };
+export type AssignInstructionDataArgs = { programAddress: Address | HasAddress };
 
 export function getAssignInstructionDataEncoder(): FixedSizeEncoder<AssignInstructionDataArgs> {
     return transformEncoder(
@@ -79,34 +85,43 @@ export function getAssignInstructionDataCodec(): FixedSizeCodec<AssignInstructio
     return combineCodec(getAssignInstructionDataEncoder(), getAssignInstructionDataDecoder());
 }
 
-export type AssignInput<TAccountAccount extends string = string> = {
-    account: TransactionSigner<TAccountAccount>;
+export type AssignInput<TAccountAccount extends InstructionSignerInput = InstructionSignerInput> = {
+    account: TAccountAccount;
     programAddress: AssignInstructionDataArgs['programAddress'];
 };
 
 export function getAssignInstruction<
-    TAccountAccount extends string,
+    TAccountAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AssignInput<TAccountAccount>,
-    config?: { programAddress?: TProgramAddress },
-): AssignInstruction<TProgramAddress, TAccountAccount> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): AssignInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountAccount, InstructionAccountInputAddress<TAccountAccount>>
+> {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
-    const originalAccounts = { account: { value: input.account ?? null, isWritable: true } };
+    const originalAccounts = { account: { value: input.account ?? null, isSigner: true, isWritable: true } };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
     // Original args.
     const args = { ...input };
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('account', accounts.account)],
         data: getAssignInstructionDataEncoder().encode(args as AssignInstructionDataArgs),
         programAddress,
-    } as AssignInstruction<TProgramAddress, TAccountAccount>);
+    } as AssignInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountAccount, InstructionAccountInputAddress<TAccountAccount>>
+    >);
 }
 
 export type ParsedAssignInstruction<

package/src/generated/instructions/assignWithSeed.ts

@@ -29,15 +29,22 @@ import {
     type Codec,
     type Decoder,
     type Encoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlySignerAccount,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInput,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const ASSIGN_WITH_SEED_DISCRIMINATOR = 10;
@@ -70,7 +77,11 @@ export type AssignWithSeedInstructionData = {
     programAddress: Address;
 };
 
-export type AssignWithSeedInstructionDataArgs = { base: Address; seed: string; programAddress: Address };
+export type AssignWithSeedInstructionDataArgs = {
+    base: Address | HasAddress;
+    seed: string;
+    programAddress: Address | HasAddress;
+};
 
 export function getAssignWithSeedInstructionDataEncoder(): Encoder<AssignWithSeedInstructionDataArgs> {
     return transformEncoder(
@@ -101,43 +112,54 @@ export function getAssignWithSeedInstructionDataCodec(): Codec<
 }
 
 export type AssignWithSeedInput<
-    TAccountAccount extends string = string,
-    TAccountBaseAccount extends string = string,
+    TAccountAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    account: Address<TAccountAccount>;
-    baseAccount: TransactionSigner<TAccountBaseAccount>;
+    account: TAccountAccount;
+    baseAccount: TAccountBaseAccount;
     base: AssignWithSeedInstructionDataArgs['base'];
     seed: AssignWithSeedInstructionDataArgs['seed'];
     programAddress: AssignWithSeedInstructionDataArgs['programAddress'];
 };
 
 export function getAssignWithSeedInstruction<
-    TAccountAccount extends string,
-    TAccountBaseAccount extends string,
+    TAccountAccount extends InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AssignWithSeedInput<TAccountAccount, TAccountBaseAccount>,
-    config?: { programAddress?: TProgramAddress },
-): AssignWithSeedInstruction<TProgramAddress, TAccountAccount, TAccountBaseAccount> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): AssignWithSeedInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountAccount, InstructionAccountInputAddress<TAccountAccount>>,
+    ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>
+> {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
     const originalAccounts = {
-        account: { value: input.account ?? null, isWritable: true },
-        baseAccount: { value: input.baseAccount ?? null, isWritable: false },
+        account: { value: input.account ?? null, isSigner: false, isWritable: true },
+        baseAccount: { value: input.baseAccount ?? null, isSigner: true, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
     // Original args.
     const args = { ...input };
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('account', accounts.account), getAccountMeta('baseAccount', accounts.baseAccount)],
         data: getAssignWithSeedInstructionDataEncoder().encode(args as AssignWithSeedInstructionDataArgs),
         programAddress,
-    } as AssignWithSeedInstruction<TProgramAddress, TAccountAccount, TAccountBaseAccount>);
+    } as AssignWithSeedInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountAccount, InstructionAccountInputAddress<TAccountAccount>>,
+        ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>
+    >);
 }
 
 export type ParsedAssignWithSeedInstruction<

package/src/generated/instructions/authorizeNonceAccount.ts

@@ -23,15 +23,22 @@ import {
     type FixedSizeCodec,
     type FixedSizeDecoder,
     type FixedSizeEncoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlySignerAccount,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInput,
+    type InstructionAccountInputAddress,
+    type InstructionSignerInput,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const AUTHORIZE_NONCE_ACCOUNT_DISCRIMINATOR = 7;
@@ -59,7 +66,7 @@ export type AuthorizeNonceAccountInstruction<
 
 export type AuthorizeNonceAccountInstructionData = { discriminator: number; newNonceAuthority: Address };
 
-export type AuthorizeNonceAccountInstructionDataArgs = { newNonceAuthority: Address };
+export type AuthorizeNonceAccountInstructionDataArgs = { newNonceAuthority: Address | HasAddress };
 
 export function getAuthorizeNonceAccountInstructionDataEncoder(): FixedSizeEncoder<AuthorizeNonceAccountInstructionDataArgs> {
     return transformEncoder(
@@ -89,36 +96,43 @@ export function getAuthorizeNonceAccountInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type AuthorizeNonceAccountInput<
-    TAccountNonceAccount extends string = string,
-    TAccountNonceAuthority extends string = string,
+    TAccountNonceAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    nonceAccount: Address<TAccountNonceAccount>;
-    nonceAuthority: TransactionSigner<TAccountNonceAuthority>;
+    nonceAccount: TAccountNonceAccount;
+    nonceAuthority: TAccountNonceAuthority;
     newNonceAuthority: AuthorizeNonceAccountInstructionDataArgs['newNonceAuthority'];
 };
 
 export function getAuthorizeNonceAccountInstruction<
-    TAccountNonceAccount extends string,
-    TAccountNonceAuthority extends string,
+    TAccountNonceAccount extends InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: AuthorizeNonceAccountInput<TAccountNonceAccount, TAccountNonceAuthority>,
-    config?: { programAddress?: TProgramAddress },
-): AuthorizeNonceAccountInstruction<TProgramAddress, TAccountNonceAccount, TAccountNonceAuthority> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): AuthorizeNonceAccountInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+    ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
+> {
     // Program address.
-    const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+    const programAddress = typeof programAddressInput === 'string' ? programAddressInput : programAddressInput.address;
+
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
 
     // Original accounts.
     const originalAccounts = {
-        nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
-        nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false },
+        nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
+        nonceAuthority: { value: input.nonceAuthority ?? null, isSigner: true, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
     // Original args.
     const args = { ...input };
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [
             getAccountMeta('nonceAccount', accounts.nonceAccount),
@@ -126,7 +140,11 @@ export function getAuthorizeNonceAccountInstruction<
         ],
         data: getAuthorizeNonceAccountInstructionDataEncoder().encode(args as AuthorizeNonceAccountInstructionDataArgs),
         programAddress,
-    } as AuthorizeNonceAccountInstruction<TProgramAddress, TAccountNonceAccount, TAccountNonceAuthority>);
+    } as AuthorizeNonceAccountInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+        ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
+    >);
 }
 
 export type ParsedAuthorizeNonceAccountInstruction<