@solana-program/system 0.15.0 → 0.16.0

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,
@@ -66,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(
@@ -113,7 +114,7 @@ export function getInitializeNonceAccountInstruction<
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: InitializeNonceAccountInput<TAccountNonceAccount, TAccountRecentBlockhashesSysvar, TAccountRentSysvar>,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): InitializeNonceAccountInstruction<
     TProgramAddress,
     ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
@@ -124,7 +125,8 @@ export function getInitializeNonceAccountInstruction<
     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');

package/src/generated/instructions/transferSol.ts

@@ -106,14 +106,15 @@ export function getTransferSolInstruction<
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: TransferSolInput<TAccountSource, TAccountDestination>,
-    config?: { programAddress?: TProgramAddress },
+    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');

package/src/generated/instructions/transferSolWithSeed.ts

@@ -29,6 +29,7 @@ import {
     type Codec,
     type Decoder,
     type Encoder,
+    type HasAddress,
     type Instruction,
     type InstructionWithAccounts,
     type InstructionWithData,
@@ -78,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(
@@ -128,7 +133,7 @@ export function getTransferSolWithSeedInstruction<
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: TransferSolWithSeedInput<TAccountSource, TAccountBaseAccount, TAccountDestination>,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): TransferSolWithSeedInstruction<
     TProgramAddress,
     ResolvedInstructionAccountMeta<TAccountSource, InstructionAccountInputAddress<TAccountSource>>,
@@ -136,7 +141,8 @@ export function getTransferSolWithSeedInstruction<
     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');

package/src/generated/instructions/upgradeNonceAccount.ts

@@ -85,13 +85,14 @@ export function getUpgradeNonceAccountInstruction<
     TProgramAddress extends Address = typeof SYSTEM_PROGRAM_ADDRESS,
 >(
     input: UpgradeNonceAccountInput<TAccountNonceAccount>,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): UpgradeNonceAccountInstruction<
     TProgramAddress,
     ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>
 > {
     // 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');

package/src/generated/instructions/withdrawNonceAccount.ts

@@ -136,7 +136,7 @@ export function getWithdrawNonceAccountInstruction<
         TAccountRentSysvar,
         TAccountNonceAuthority
     >,
-    config?: { programAddress?: TProgramAddress },
+    config?: { programAddress?: TProgramAddress | { readonly address: TProgramAddress } },
 ): WithdrawNonceAccountInstruction<
     TProgramAddress,
     ResolvedInstructionAccountMeta<TAccountNonceAccount, InstructionAccountInputAddress<TAccountNonceAccount>>,
@@ -149,7 +149,8 @@ export function getWithdrawNonceAccountInstruction<
     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');

package/src/generated/programs/system.ts

@@ -22,6 +22,7 @@ import {
     type ExtendedClient,
     type GetAccountInfoApi,
     type GetMultipleAccountsApi,
+    type HasAddress,
     type Instruction,
     type InstructionWithData,
     type ReadonlyUint8Array,
@@ -298,39 +299,59 @@ export type SystemPluginAccounts = { nonce: ReturnType<typeof getNonceCodec> & S
 export type SystemPluginInstructions = {
     createAccount: (
         input: MakeOptional<CreateAccountInput, 'payer'>,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getCreateAccountInstruction> & SelfPlanAndSendFunctions;
-    assign: (input: AssignInput) => ReturnType<typeof getAssignInstruction> & SelfPlanAndSendFunctions;
-    transferSol: (input: TransferSolInput) => ReturnType<typeof getTransferSolInstruction> & SelfPlanAndSendFunctions;
+    assign: (
+        input: AssignInput,
+        config?: { programAddress?: Address | HasAddress },
+    ) => ReturnType<typeof getAssignInstruction> & SelfPlanAndSendFunctions;
+    transferSol: (
+        input: TransferSolInput,
+        config?: { programAddress?: Address | HasAddress },
+    ) => ReturnType<typeof getTransferSolInstruction> & SelfPlanAndSendFunctions;
     createAccountWithSeed: (
         input: MakeOptional<CreateAccountWithSeedInput, 'payer'>,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getCreateAccountWithSeedInstruction> & SelfPlanAndSendFunctions;
     advanceNonceAccount: (
         input: AdvanceNonceAccountInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getAdvanceNonceAccountInstruction> & SelfPlanAndSendFunctions;
     withdrawNonceAccount: (
         input: WithdrawNonceAccountInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getWithdrawNonceAccountInstruction> & SelfPlanAndSendFunctions;
     initializeNonceAccount: (
         input: InitializeNonceAccountInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getInitializeNonceAccountInstruction> & SelfPlanAndSendFunctions;
     authorizeNonceAccount: (
         input: AuthorizeNonceAccountInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getAuthorizeNonceAccountInstruction> & SelfPlanAndSendFunctions;
-    allocate: (input: AllocateInput) => ReturnType<typeof getAllocateInstruction> & SelfPlanAndSendFunctions;
+    allocate: (
+        input: AllocateInput,
+        config?: { programAddress?: Address | HasAddress },
+    ) => ReturnType<typeof getAllocateInstruction> & SelfPlanAndSendFunctions;
     allocateWithSeed: (
         input: AllocateWithSeedInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getAllocateWithSeedInstruction> & SelfPlanAndSendFunctions;
     assignWithSeed: (
         input: AssignWithSeedInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getAssignWithSeedInstruction> & SelfPlanAndSendFunctions;
     transferSolWithSeed: (
         input: TransferSolWithSeedInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getTransferSolWithSeedInstruction> & SelfPlanAndSendFunctions;
     upgradeNonceAccount: (
         input: UpgradeNonceAccountInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getUpgradeNonceAccountInstruction> & SelfPlanAndSendFunctions;
     createAccountAllowPrefund: (
         input: CreateAccountAllowPrefundInput,
+        config?: { programAddress?: Address | HasAddress },
     ) => ReturnType<typeof getCreateAccountAllowPrefundInstruction> & SelfPlanAndSendFunctions;
 };
 
@@ -339,42 +360,112 @@ export type SystemPluginRequirements = ClientWithRpc<GetAccountInfoApi & GetMult
     ClientWithTransactionPlanning &
     ClientWithTransactionSending;
 
-export function systemProgram() {
+export function systemProgram(config: { programAddress?: Address | HasAddress } = {}) {
     return <T extends SystemPluginRequirements>(client: T): ExtendedClient<T, { system: SystemPlugin }> => {
         return extendClient(client, {
             system: <SystemPlugin>{
                 accounts: { nonce: addSelfFetchFunctions(client, getNonceCodec()) },
                 instructions: {
-                    createAccount: input =>
+                    createAccount: (input, instructionConfig) =>
                         addSelfPlanAndSendFunctions(
                             client,
-                            getCreateAccountInstruction({ ...input, payer: input.payer ?? client.payer }),
+                            getCreateAccountInstruction(
+                                { ...input, payer: input.payer ?? client.payer },
+                                { programAddress: instructionConfig?.programAddress ?? config.programAddress },
+                            ),
                         ),
-                    assign: input => addSelfPlanAndSendFunctions(client, getAssignInstruction(input)),
-                    transferSol: input => addSelfPlanAndSendFunctions(client, getTransferSolInstruction(input)),
-                    createAccountWithSeed: input =>
+                    assign: (input, instructionConfig) =>
                         addSelfPlanAndSendFunctions(
                             client,
-                            getCreateAccountWithSeedInstruction({ ...input, payer: input.payer ?? client.payer }),
+                            getAssignInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    transferSol: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getTransferSolInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    createAccountWithSeed: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getCreateAccountWithSeedInstruction(
+                                { ...input, payer: input.payer ?? client.payer },
+                                { programAddress: instructionConfig?.programAddress ?? config.programAddress },
+                            ),
+                        ),
+                    advanceNonceAccount: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getAdvanceNonceAccountInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    withdrawNonceAccount: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getWithdrawNonceAccountInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    initializeNonceAccount: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getInitializeNonceAccountInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    authorizeNonceAccount: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getAuthorizeNonceAccountInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    allocate: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getAllocateInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    allocateWithSeed: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getAllocateWithSeedInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    assignWithSeed: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getAssignWithSeedInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    transferSolWithSeed: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getTransferSolWithSeedInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    upgradeNonceAccount: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getUpgradeNonceAccountInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
+                        ),
+                    createAccountAllowPrefund: (input, instructionConfig) =>
+                        addSelfPlanAndSendFunctions(
+                            client,
+                            getCreateAccountAllowPrefundInstruction(input, {
+                                programAddress: instructionConfig?.programAddress ?? config.programAddress,
+                            }),
                         ),
-                    advanceNonceAccount: input =>
-                        addSelfPlanAndSendFunctions(client, getAdvanceNonceAccountInstruction(input)),
-                    withdrawNonceAccount: input =>
-                        addSelfPlanAndSendFunctions(client, getWithdrawNonceAccountInstruction(input)),
-                    initializeNonceAccount: input =>
-                        addSelfPlanAndSendFunctions(client, getInitializeNonceAccountInstruction(input)),
-                    authorizeNonceAccount: input =>
-                        addSelfPlanAndSendFunctions(client, getAuthorizeNonceAccountInstruction(input)),
-                    allocate: input => addSelfPlanAndSendFunctions(client, getAllocateInstruction(input)),
-                    allocateWithSeed: input =>
-                        addSelfPlanAndSendFunctions(client, getAllocateWithSeedInstruction(input)),
-                    assignWithSeed: input => addSelfPlanAndSendFunctions(client, getAssignWithSeedInstruction(input)),
-                    transferSolWithSeed: input =>
-                        addSelfPlanAndSendFunctions(client, getTransferSolWithSeedInstruction(input)),
-                    upgradeNonceAccount: input =>
-                        addSelfPlanAndSendFunctions(client, getUpgradeNonceAccountInstruction(input)),
-                    createAccountAllowPrefund: input =>
-                        addSelfPlanAndSendFunctions(client, getCreateAccountAllowPrefundInstruction(input)),
                 },
                 identifyInstruction: identifySystemInstruction,
                 parseInstruction: parseSystemInstruction,