@solana-program/system 0.14.1 → 0.15.0

package/src/generated/instructions/upgradeNonceAccount.ts

@@ -26,7 +26,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 UPGRADE_NONCE_ACCOUNT_DISCRIMINATOR = 12;
@@ -70,30 +76,38 @@ export function getUpgradeNonceAccountInstructionDataCodec(): FixedSizeCodec<
     return combineCodec(getUpgradeNonceAccountInstructionDataEncoder(), getUpgradeNonceAccountInstructionDataDecoder());
 }
 
-export type UpgradeNonceAccountInput<TAccountNonceAccount extends string = string> = {
-    nonceAccount: Address<TAccountNonceAccount>;
+export type UpgradeNonceAccountInput<TAccountNonceAccount extends InstructionAccountInput = InstructionAccountInput> = {
+    nonceAccount: TAccountNonceAccount;
 };
 
 export function getUpgradeNonceAccountInstruction<
-    TAccountNonceAccount extends string,
+    TAccountNonceAccount extends InstructionAccountInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: UpgradeNonceAccountInput<TAccountNonceAccount>,
     config?: { programAddress?: TProgramAddress },
-): UpgradeNonceAccountInstruction<TProgramAddress, TAccountNonceAccount> {
+): UpgradeNonceAccountInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>
+> {
     // Program address.
     const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
 
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
+
     // Original accounts.
-    const originalAccounts = { nonceAccount: { value: input.nonceAccount ?? null, isWritable: true } };
+    const originalAccounts = { nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true } };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [getAccountMeta('nonceAccount', accounts.nonceAccount)],
         data: getUpgradeNonceAccountInstructionDataEncoder().encode({}),
         programAddress,
-    } as UpgradeNonceAccountInstruction<TProgramAddress, TAccountNonceAccount>);
+    } as UpgradeNonceAccountInstruction<
+        TProgramAddress,
+        ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>
+    >);
 }
 
 export type ParsedUpgradeNonceAccountInstruction<

package/src/generated/instructions/withdrawNonceAccount.ts

@@ -29,10 +29,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 WITHDRAW_NONCE_ACCOUNT_DISCRIMINATOR = 5;
@@ -101,26 +107,26 @@ export function getWithdrawNonceAccountInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type WithdrawNonceAccountInput<
-    TAccountNonceAccount extends string = string,
-    TAccountRecipientAccount extends string = string,
-    TAccountRecentBlockhashesSysvar extends string = string,
-    TAccountRentSysvar extends string = string,
-    TAccountNonceAuthority extends string = string,
+    TAccountNonceAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRecipientAccount extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput = InstructionAccountInput,
+    TAccountRentSysvar extends InstructionAccountInput = InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput = InstructionSignerInput,
 > = {
-    nonceAccount: Address<TAccountNonceAccount>;
-    recipientAccount: Address<TAccountRecipientAccount>;
-    recentBlockhashesSysvar?: Address<TAccountRecentBlockhashesSysvar>;
-    rentSysvar?: Address<TAccountRentSysvar>;
-    nonceAuthority: TransactionSigner<TAccountNonceAuthority>;
+    nonceAccount: TAccountNonceAccount;
+    recipientAccount: TAccountRecipientAccount;
+    recentBlockhashesSysvar?: TAccountRecentBlockhashesSysvar;
+    rentSysvar?: TAccountRentSysvar;
+    nonceAuthority: TAccountNonceAuthority;
     withdrawAmount: WithdrawNonceAccountInstructionDataArgs['withdrawAmount'];
 };
 
 export function getWithdrawNonceAccountInstruction<
-    TAccountNonceAccount extends string,
-    TAccountRecipientAccount extends string,
-    TAccountRecentBlockhashesSysvar extends string,
-    TAccountRentSysvar extends string,
-    TAccountNonceAuthority extends string,
+    TAccountNonceAccount extends InstructionAccountInput,
+    TAccountRecipientAccount extends InstructionAccountInput,
+    TAccountRecentBlockhashesSysvar extends InstructionAccountInput,
+    TAccountRentSysvar extends InstructionAccountInput,
+    TAccountNonceAuthority extends InstructionSignerInput,
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: WithdrawNonceAccountInput<
@@ -133,22 +139,28 @@ export function getWithdrawNonceAccountInstruction<
     config?: { programAddress?: TProgramAddress },
 ): WithdrawNonceAccountInstruction<
     TProgramAddress,
-    TAccountNonceAccount,
-    TAccountRecipientAccount,
-    TAccountRecentBlockhashesSysvar,
-    TAccountRentSysvar,
-    TAccountNonceAuthority
+    ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+    ResolvedInstructionAccountMeta<TAccountRecipientAccount, InstructionAccountInputAddress<TAccountRecipientAccount>>,
+    ResolvedInstructionAccountMeta<
+        TAccountRecentBlockhashesSysvar,
+        InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+    >,
+    ResolvedInstructionAccountMeta<TAccountRentSysvar, InstructionAccountInputAddress<TAccountRentSysvar>>,
+    ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
 > {
     // Program address.
     const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
 
+    // Account meta helper.
+    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
+
     // Original accounts.
     const originalAccounts = {
-        nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
-        recipientAccount: { value: input.recipientAccount ?? null, isWritable: true },
-        recentBlockhashesSysvar: { value: input.recentBlockhashesSysvar ?? null, isWritable: false },
-        rentSysvar: { value: input.rentSysvar ?? null, isWritable: false },
-        nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false },
+        nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
+        recipientAccount: { value: input.recipientAccount ?? null, isSigner: false, isWritable: true },
+        recentBlockhashesSysvar: { value: input.recentBlockhashesSysvar ?? null, isSigner: false, isWritable: false },
+        rentSysvar: { value: input.rentSysvar ?? null, isSigner: false, isWritable: false },
+        nonceAuthority: { value: input.nonceAuthority ?? null, isSigner: true, isWritable: false },
     };
     const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedInstructionAccount>;
 
@@ -165,7 +177,6 @@ export function getWithdrawNonceAccountInstruction<
             'SysvarRent111111111111111111111111111111111' as Address<'SysvarRent111111111111111111111111111111111'>;
     }
 
-    const getAccountMeta = getAccountMetaFactory(programAddress, 'omitted');
     return Object.freeze({
         accounts: [
             getAccountMeta('nonceAccount', accounts.nonceAccount),
@@ -178,11 +189,17 @@ export function getWithdrawNonceAccountInstruction<
         programAddress,
     } as WithdrawNonceAccountInstruction<
         TProgramAddress,
-        TAccountNonceAccount,
-        TAccountRecipientAccount,
-        TAccountRecentBlockhashesSysvar,
-        TAccountRentSysvar,
-        TAccountNonceAuthority
+        ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
+        ResolvedInstructionAccountMeta<
+            TAccountRecipientAccount,
+            InstructionAccountInputAddress<TAccountRecipientAccount>
+        >,
+        ResolvedInstructionAccountMeta<
+            TAccountRecentBlockhashesSysvar,
+            InstructionAccountInputAddress<TAccountRecentBlockhashesSysvar>
+        >,
+        ResolvedInstructionAccountMeta<TAccountRentSysvar, InstructionAccountInputAddress<TAccountRentSysvar>>,
+        ResolvedInstructionAccountMeta<TAccountNonceAuthority, InstructionAccountInputAddress<TAccountNonceAuthority>>
     >);
 }