@solana-program/system 0.14.1 → 0.16.0

package/src/generated/instructions/createAccount.ts

@@ -26,17 +26,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 InstructionAccountInputAddress,
+    type InstructionSignerInput,
     type InstructionWithByteDelta,
     type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
 } from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
@@ -75,7 +78,7 @@ export type CreateAccountInstructionData = {
 export type CreateAccountInstructionDataArgs = {
     lamports: number | bigint;
     space: number | bigint;
-    programAddress: Address;
+    programAddress: Address | HasAddress;
 };
 
 export function getCreateAccountInstructionDataEncoder(): FixedSizeEncoder<CreateAccountInstructionDataArgs> {
@@ -106,29 +109,41 @@ export function getCreateAccountInstructionDataCodec(): FixedSizeCodec<
     return combineCodec(getCreateAccountInstructionDataEncoder(), getCreateAccountInstructionDataDecoder());
 }
 
-export type CreateAccountInput<TAccountPayer extends string = string, TAccountNewAccount extends string = string> = {
-    payer: TransactionSigner<TAccountPayer>;
-    newAccount: TransactionSigner<TAccountNewAccount>;
+export type CreateAccountInput<
+    TAccountPayer extends InstructionSignerInput = InstructionSignerInput,
+    TAccountNewAccount extends InstructionSignerInput = InstructionSignerInput,
+> = {
+    payer: TAccountPayer;
+    newAccount: TAccountNewAccount;
     lamports: CreateAccountInstructionDataArgs['lamports'];
     space: CreateAccountInstructionDataArgs['space'];
     programAddress: CreateAccountInstructionDataArgs['programAddress'];
 };
 
 export function getCreateAccountInstruction<
-    TAccountPayer extends string,
-    TAccountNewAccount extends string,
+    TAccountPayer extends InstructionSignerInput,
+    TAccountNewAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: CreateAccountInput<TAccountPayer, TAccountNewAccount>,
-    config?: { programAddress?: TProgramAddress },
-): CreateAccountInstruction<TProgramAddress, TAccountPayer, TAccountNewAccount> & InstructionWithByteDelta {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): CreateAccountInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>,
+    ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>
+> &
+    InstructionWithByteDelta {
     // 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 = {
-        payer: { value: input.payer ?? null, isWritable: true },
-        newAccount: { value: input.newAccount ?? null, isWritable: true },
+        payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
+        newAccount: { value: input.newAccount ?? null, isSigner: true, isWritable: true },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
@@ -138,13 +153,17 @@ export function getCreateAccountInstruction<
     // Bytes created or reallocated by the instruction.
     const byteDelta: number = [Number(args.space) + BASE_ACCOUNT_SIZE].reduce((a, b) => a + b, 0);
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('payer', accounts.payer), getAccountMeta('newAccount', accounts.newAccount)],
         byteDelta,
         data: getCreateAccountInstructionDataEncoder().encode(args as CreateAccountInstructionDataArgs),
         programAddress,
-    } as CreateAccountInstruction<TProgramAddress, TAccountPayer, TAccountNewAccount> & InstructionWithByteDelta);
+    } as CreateAccountInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>,
+        ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>
+    > &
+        InstructionWithByteDelta);
 }
 
 export type ParsedCreateAccountInstruction<

package/src/generated/instructions/createAccountAllowPrefund.ts

@@ -26,17 +26,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 InstructionAccountInputAddress,
+    type InstructionSignerInput,
     type InstructionWithByteDelta,
     type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
 } from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
@@ -79,7 +82,7 @@ export type CreateAccountAllowPrefundInstructionData = {
 export type CreateAccountAllowPrefundInstructionDataArgs = {
     lamports?: number | bigint;
     space: number | bigint;
-    programAddress: Address;
+    programAddress: Address | HasAddress;
 };
 
 export function getCreateAccountAllowPrefundInstructionDataEncoder(): FixedSizeEncoder<CreateAccountAllowPrefundInstructionDataArgs> {
@@ -118,31 +121,40 @@ export function getCreateAccountAllowPrefundInstructionDataCodec(): FixedSizeCod
 }
 
 export type CreateAccountAllowPrefundInput<
-    TAccountNewAccount extends string = string,
-    TAccountPayer extends string = string,
+    TAccountNewAccount extends InstructionSignerInput = InstructionSignerInput,
+    TAccountPayer extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    newAccount: TransactionSigner<TAccountNewAccount>;
-    payer?: TransactionSigner<TAccountPayer>;
+    newAccount: TAccountNewAccount;
+    payer?: TAccountPayer;
     lamports?: CreateAccountAllowPrefundInstructionDataArgs['lamports'];
     space: CreateAccountAllowPrefundInstructionDataArgs['space'];
     programAddress: CreateAccountAllowPrefundInstructionDataArgs['programAddress'];
 };
 
 export function getCreateAccountAllowPrefundInstruction<
-    TAccountNewAccount extends string,
-    TAccountPayer extends string,
+    TAccountNewAccount extends InstructionSignerInput,
+    TAccountPayer extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: CreateAccountAllowPrefundInput<TAccountNewAccount, TAccountPayer>,
-    config?: { programAddress?: TProgramAddress },
-): CreateAccountAllowPrefundInstruction<TProgramAddress, TAccountNewAccount, TAccountPayer> & InstructionWithByteDelta {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): CreateAccountAllowPrefundInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>,
+    ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>
+> &
+    InstructionWithByteDelta {
     // 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 },
-        payer: { value: input.payer ?? null, isWritable: true },
+        newAccount: { value: input.newAccount ?? null, isSigner: true, isWritable: true },
+        payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
@@ -152,7 +164,6 @@ export function getCreateAccountAllowPrefundInstruction<
     // Bytes created or reallocated by the instruction.
     const byteDelta: number = [Number(args.space) + BASE_ACCOUNT_SIZE].reduce((a, b) => a + b, 0);
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('newAccount', accounts.newAccount), getAccountMeta('payer', accounts.payer)].filter(
             <T>(x: T | undefined): x is T => x !== undefined,
@@ -162,7 +173,11 @@ export function getCreateAccountAllowPrefundInstruction<
             args as CreateAccountAllowPrefundInstructionDataArgs,
         ),
         programAddress,
-    } as CreateAccountAllowPrefundInstruction<TProgramAddress, TAccountNewAccount, TAccountPayer> &
+    } as CreateAccountAllowPrefundInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>,
+        ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>
+    > &
         InstructionWithByteDelta);
 }
 

package/src/generated/instructions/createAccountWithSeed.ts

@@ -29,16 +29,23 @@ import {
     type Codec,
     type Decoder,
     type Encoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlySignerAccount,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
     type WritableSignerAccount,
 } 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 CREATE_ACCOUNT_WITH_SEED_DISCRIMINATOR = 3;
@@ -82,11 +89,11 @@ export type CreateAccountWithSeedInstructionData = {
 };
 
 export type CreateAccountWithSeedInstructionDataArgs = {
-    base: Address;
+    base: Address | HasAddress;
     seed: string;
     amount: number | bigint;
     space: number | bigint;
-    programAddress: Address;
+    programAddress: Address | HasAddress;
 };
 
 export function getCreateAccountWithSeedInstructionDataEncoder(): Encoder<CreateAccountWithSeedInstructionDataArgs> {
@@ -125,13 +132,13 @@ export function getCreateAccountWithSeedInstructionDataCodec(): Codec<
 }
 
 export type CreateAccountWithSeedInput<
-    TAccountPayer extends string = string,
-    TAccountNewAccount extends string = string,
-    TAccountBaseAccount extends string = string,
+    TAccountPayer extends InstructionSignerInput = InstructionSignerInput,
+    TAccountNewAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    payer: TransactionSigner<TAccountPayer>;
-    newAccount: Address<TAccountNewAccount>;
-    baseAccount?: TransactionSigner<TAccountBaseAccount>;
+    payer: TAccountPayer;
+    newAccount: TAccountNewAccount;
+    baseAccount?: TAccountBaseAccount;
     base: CreateAccountWithSeedInstructionDataArgs['base'];
     seed: CreateAccountWithSeedInstructionDataArgs['seed'];
     amount: CreateAccountWithSeedInstructionDataArgs['amount'];
@@ -140,29 +147,37 @@ export type CreateAccountWithSeedInput<
 };
 
 export function getCreateAccountWithSeedInstruction<
-    TAccountPayer extends string,
-    TAccountNewAccount extends string,
-    TAccountBaseAccount extends string,
+    TAccountPayer extends InstructionSignerInput,
+    TAccountNewAccount extends InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: CreateAccountWithSeedInput<TAccountPayer, TAccountNewAccount, TAccountBaseAccount>,
-    config?: { programAddress?: TProgramAddress },
-): CreateAccountWithSeedInstruction<TProgramAddress, TAccountPayer, TAccountNewAccount, TAccountBaseAccount> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): CreateAccountWithSeedInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>,
+    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 = {
-        payer: { value: input.payer ?? null, isWritable: true },
-        newAccount: { value: input.newAccount ?? null, isWritable: true },
-        baseAccount: { value: input.baseAccount ?? null, isWritable: false },
+        payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
+        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('payer', accounts.payer),
@@ -171,7 +186,12 @@ export function getCreateAccountWithSeedInstruction<
         ].filter(<T>(x: T | undefined): x is T => x !== undefined),
         data: getCreateAccountWithSeedInstructionDataEncoder().encode(args as CreateAccountWithSeedInstructionDataArgs),
         programAddress,
-    } as CreateAccountWithSeedInstruction<TProgramAddress, TAccountPayer, TAccountNewAccount, TAccountBaseAccount>);
+    } as CreateAccountWithSeedInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountPayer, InstructionAccountInputAddress<TAccountPayer>>,
+        ResolvedInstructionAccountMeta<TAccountNewAccount, InstructionAccountInputAddress<TAccountNewAccount>>,
+        ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>
+    >);
 }
 
 export type ParsedCreateAccountWithSeedInstruction<

package/src/generated/instructions/initializeNonceAccount.ts

@@ -22,6 +22,7 @@ import {
     type FixedSizeCodec,
     type FixedSizeDecoder,
     type FixedSizeEncoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
@@ -29,7 +30,13 @@ import {
     type ReadonlyUint8Array,
     type WritableAccount,
 } from '@solana/kit';
-import { getAccountMetaFactory, type ResolvedInstructionAccount } from '@solana/kit/program-client-core';
+import {
+    getAccountMetaFactory,
+    type InstructionAccountInput,
+    type InstructionAccountInputAddress,
+    type ResolvedInstructionAccount,
+    type ResolvedInstructionAccountMeta,
+} from '@solana/kit/program-client-core';
 import { SYSTEM_PROGRAM_ADDRESS } from '../programs';
 
 export const INITIALIZE_NONCE_ACCOUNT_DISCRIMINATOR = 6;
@@ -60,7 +67,7 @@ export type InitializeNonceAccountInstruction<
 
 export type InitializeNonceAccountInstructionData = { discriminator: number; nonceAuthority: Address };
 
-export type InitializeNonceAccountInstructionDataArgs = { nonceAuthority: Address };
+export type InitializeNonceAccountInstructionDataArgs = { nonceAuthority: Address | HasAddress };
 
 export function getInitializeNonceAccountInstructionDataEncoder(): FixedSizeEncoder<InitializeNonceAccountInstructionDataArgs> {
     return transformEncoder(
@@ -90,38 +97,45 @@ export function getInitializeNonceAccountInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type InitializeNonceAccountInput<
-    TAccountNonceAccount extends string = string,
-    TAccountRecentBlockhashesSysvar extends string = string,
-    TAccountRentSysvar extends string = string,
+    TAccountNonceAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRentSysvar extends InstructionAccountInput = InstructionAccountInput,
 > = {
-    nonceAccount: Address<TAccountNonceAccount>;
-    recentBlockhashesSysvar?: Address<TAccountRecentBlockhashesSysvar>;
-    rentSysvar?: Address<TAccountRentSysvar>;
+    nonceAccount: TAccountNonceAccount;
+    recentBlockhashesSysvar?: TAccountRecentBlockhashesSysvar;
+    rentSysvar?: TAccountRentSysvar;
     nonceAuthority: InitializeNonceAccountInstructionDataArgs['nonceAuthority'];
 };
 
 export function getInitializeNonceAccountInstruction<
-    TAccountNonceAccount extends string,
-    TAccountRecentBlockhashesSysvar extends string,
-    TAccountRentSysvar extends string,
+    TAccountNonceAccount extends InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput,
+    TAccountRentSysvar extends InstructionAccountInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: InitializeNonceAccountInput<TAccountNonceAccount, TAccountRecentBlockhashesSysvar, TAccountRentSysvar>,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): InitializeNonceAccountInstruction<
     TProgramAddress,
-    TAccountNonceAccount,
-    TAccountRecentBlockhashesSysvar,
-    TAccountRentSysvar
+    ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+    ResolvedInstructionAccountMeta<
+        TAccountRecentBlockhashesSysvar,
+        InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+    >,
+    ResolvedInstructionAccountMeta<TAccountRentSysvar, InstructionAccountInputAddress<TAccountRentSysvar>>
 > {
     // 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 },
-        rentSysvar: { value: input.rentSysvar ?? null, isWritable: false },
+        nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
+        recentBlockhashesSysvar: { value: input.recentBlockhashesSysvar ?? null, isSigner: false, isWritable: false },
+        rentSysvar: { value: input.rentSysvar ?? null, isSigner: false, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
@@ -138,7 +152,6 @@ export function getInitializeNonceAccountInstruction<
             'SysvarRent111111111111111111111111111111111' as Address<'SysvarRent111111111111111111111111111111111'>;
     }
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [
             getAccountMeta('nonceAccount', accounts.nonceAccount),
@@ -151,9 +164,12 @@ export function getInitializeNonceAccountInstruction<
         programAddress,
     } as InitializeNonceAccountInstruction<
         TProgramAddress,
-        TAccountNonceAccount,
-        TAccountRecentBlockhashesSysvar,
-        TAccountRentSysvar
+        ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+        ResolvedInstructionAccountMeta<
+            TAccountRecentBlockhashesSysvar,
+            InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+        >,
+        ResolvedInstructionAccountMeta<TAccountRentSysvar, InstructionAccountInputAddress<TAccountRentSysvar>>
     >);
 }
 

package/src/generated/instructions/transferSol.ts

@@ -27,11 +27,17 @@ import {
     type InstructionWithAccounts,
     type InstructionWithData,
     type ReadonlyUint8Array,
-    type TransactionSigner,
     type WritableAccount,
     type WritableSignerAccount,
 } 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 TRANSFER_SOL_DISCRIMINATOR = 2;
@@ -85,39 +91,53 @@ export function getTransferSolInstructionDataCodec(): FixedSizeCodec<
     return combineCodec(getTransferSolInstructionDataEncoder(), getTransferSolInstructionDataDecoder());
 }
 
-export type TransferSolInput<TAccountSource extends string = string, TAccountDestination extends string = string> = {
-    source: TransactionSigner<TAccountSource>;
-    destination: Address<TAccountDestination>;
+export type TransferSolInput<
+    TAccountSource extends InstructionSignerInput = InstructionSignerInput,
+    TAccountDestination extends InstructionAccountInput = InstructionAccountInput,
+> = {
+    source: TAccountSource;
+    destination: TAccountDestination;
     amount: TransferSolInstructionDataArgs['amount'];
 };
 
 export function getTransferSolInstruction<
-    TAccountSource extends string,
-    TAccountDestination extends string,
+    TAccountSource extends InstructionSignerInput,
+    TAccountDestination extends InstructionAccountInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: TransferSolInput<TAccountSource, TAccountDestination>,
-    config?: { programAddress?: TProgramAddress },
-): TransferSolInstruction<TProgramAddress, TAccountSource, TAccountDestination> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): TransferSolInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountSource, InstructionAccountInputAddress<TAccountSource>>,
+    ResolvedInstructionAccountMeta<TAccountDestination, InstructionAccountInputAddress<TAccountDestination>>
+> {
     // 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 = {
-        source: { value: input.source ?? null, isWritable: true },
-        destination: { value: input.destination ?? null, isWritable: true },
+        source: { value: input.source ?? null, isSigner: true, isWritable: true },
+        destination: { value: input.destination ?? null, isSigner: false, 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('source', accounts.source), getAccountMeta('destination', accounts.destination)],
         data: getTransferSolInstructionDataEncoder().encode(args as TransferSolInstructionDataArgs),
         programAddress,
-    } as TransferSolInstruction<TProgramAddress, TAccountSource, TAccountDestination>);
+    } as TransferSolInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountSource, InstructionAccountInputAddress<TAccountSource>>,
+        ResolvedInstructionAccountMeta<TAccountDestination, InstructionAccountInputAddress<TAccountDestination>>
+    >);
 }
 
 export type ParsedTransferSolInstruction<

package/src/generated/instructions/transferSolWithSeed.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 TRANSFER_SOL_WITH_SEED_DISCRIMINATOR = 11;
@@ -72,7 +79,11 @@ export type TransferSolWithSeedInstructionData = {
     fromOwner: Address;
 };
 
-export type TransferSolWithSeedInstructionDataArgs = { amount: number | bigint; fromSeed: string; fromOwner: Address };
+export type TransferSolWithSeedInstructionDataArgs = {
+    amount: number | bigint;
+    fromSeed: string;
+    fromOwner: Address | HasAddress;
+};
 
 export function getTransferSolWithSeedInstructionDataEncoder(): Encoder<TransferSolWithSeedInstructionDataArgs> {
     return transformEncoder(
@@ -103,42 +114,50 @@ export function getTransferSolWithSeedInstructionDataCodec(): Codec<
 }
 
 export type TransferSolWithSeedInput<
-    TAccountSource extends string = string,
-    TAccountBaseAccount extends string = string,
-    TAccountDestination extends string = string,
+    TAccountSource extends InstructionAccountInput = InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput = InstructionSignerInput,
+    TAccountDestination extends InstructionAccountInput = InstructionAccountInput,
 > = {
-    source: Address<TAccountSource>;
-    baseAccount: TransactionSigner<TAccountBaseAccount>;
-    destination: Address<TAccountDestination>;
+    source: TAccountSource;
+    baseAccount: TAccountBaseAccount;
+    destination: TAccountDestination;
     amount: TransferSolWithSeedInstructionDataArgs['amount'];
     fromSeed: TransferSolWithSeedInstructionDataArgs['fromSeed'];
     fromOwner: TransferSolWithSeedInstructionDataArgs['fromOwner'];
 };
 
 export function getTransferSolWithSeedInstruction<
-    TAccountSource extends string,
-    TAccountBaseAccount extends string,
-    TAccountDestination extends string,
+    TAccountSource extends InstructionAccountInput,
+    TAccountBaseAccount extends InstructionSignerInput,
+    TAccountDestination extends InstructionAccountInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: TransferSolWithSeedInput<TAccountSource, TAccountBaseAccount, TAccountDestination>,
-    config?: { programAddress?: TProgramAddress },
-): TransferSolWithSeedInstruction<TProgramAddress, TAccountSource, TAccountBaseAccount, TAccountDestination> {
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
+): TransferSolWithSeedInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountSource, InstructionAccountInputAddress<TAccountSource>>,
+    ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>,
+    ResolvedInstructionAccountMeta<TAccountDestination, InstructionAccountInputAddress<TAccountDestination>>
+> {
     // 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 = {
-        source: { value: input.source ?? null, isWritable: true },
-        baseAccount: { value: input.baseAccount ?? null, isWritable: false },
-        destination: { value: input.destination ?? null, isWritable: true },
+        source: { value: input.source ?? null, isSigner: false, isWritable: true },
+        baseAccount: { value: input.baseAccount ?? null, isSigner: true, isWritable: false },
+        destination: { value: input.destination ?? null, isSigner: false, 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('source', accounts.source),
@@ -147,7 +166,12 @@ export function getTransferSolWithSeedInstruction<
         ],
         data: getTransferSolWithSeedInstructionDataEncoder().encode(args as TransferSolWithSeedInstructionDataArgs),
         programAddress,
-    } as TransferSolWithSeedInstruction<TProgramAddress, TAccountSource, TAccountBaseAccount, TAccountDestination>);
+    } as TransferSolWithSeedInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountSource, InstructionAccountInputAddress<TAccountSource>>,
+        ResolvedInstructionAccountMeta<TAccountBaseAccount, InstructionAccountInputAddress<TAccountBaseAccount>>,
+        ResolvedInstructionAccountMeta<TAccountDestination, InstructionAccountInputAddress<TAccountDestination>>
+    >);
 }
 
 export type ParsedTransferSolWithSeedInstruction<