@solana-program/system 0.15.0 → 0.16.0

package/dist/src/index.js

@@ -64,7 +64,11 @@ async function fetchNonce(rpc, address, config) {
   return maybeAccount;
 }
 async function fetchMaybeNonce(rpc, address, config) {
-  const maybeAccount = await kit.fetchEncodedAccount(rpc, address, config);
+  const maybeAccount = await kit.fetchEncodedAccount(
+    rpc,
+    typeof address === "string" ? address : address.address,
+    config
+  );
   return decodeNonce(maybeAccount);
 }
 async function fetchAllNonce(rpc, addresses, config) {
@@ -73,7 +77,11 @@ async function fetchAllNonce(rpc, addresses, config) {
   return maybeAccounts;
 }
 async function fetchAllMaybeNonce(rpc, addresses, config) {
-  const maybeAccounts = await kit.fetchEncodedAccounts(rpc, addresses, config);
+  const maybeAccounts = await kit.fetchEncodedAccounts(
+    rpc,
+    addresses.map((a) => typeof a === "string" ? a : a.address),
+    config
+  );
   return maybeAccounts.map((maybeAccount) => decodeNonce(maybeAccount));
 }
 function getNonceSize() {
@@ -96,7 +104,8 @@ function getAdvanceNonceAccountInstructionDataCodec() {
   return kit.combineCodec(getAdvanceNonceAccountInstructionDataEncoder(), getAdvanceNonceAccountInstructionDataDecoder());
 }
 function getAdvanceNonceAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
@@ -163,7 +172,8 @@ function getAllocateInstructionDataCodec() {
   return kit.combineCodec(getAllocateInstructionDataEncoder(), getAllocateInstructionDataDecoder());
 }
 function getAllocateInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = { newAccount: { value: input.newAccount ?? null, isSigner: true, isWritable: true } };
   const accounts = originalAccounts;
@@ -222,7 +232,8 @@ function getAllocateWithSeedInstructionDataCodec() {
   return kit.combineCodec(getAllocateWithSeedInstructionDataEncoder(), getAllocateWithSeedInstructionDataDecoder());
 }
 function getAllocateWithSeedInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     newAccount: { value: input.newAccount ?? null, isSigner: false, isWritable: true },
@@ -281,7 +292,8 @@ function getAssignInstructionDataCodec() {
   return kit.combineCodec(getAssignInstructionDataEncoder(), getAssignInstructionDataDecoder());
 }
 function getAssignInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = { account: { value: input.account ?? null, isSigner: true, isWritable: true } };
   const accounts = originalAccounts;
@@ -338,7 +350,8 @@ function getAssignWithSeedInstructionDataCodec() {
   return kit.combineCodec(getAssignWithSeedInstructionDataEncoder(), getAssignWithSeedInstructionDataDecoder());
 }
 function getAssignWithSeedInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     account: { value: input.account ?? null, isSigner: false, isWritable: true },
@@ -397,7 +410,8 @@ function getAuthorizeNonceAccountInstructionDataCodec() {
   );
 }
 function getAuthorizeNonceAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
@@ -460,7 +474,8 @@ function getCreateAccountInstructionDataCodec() {
   return kit.combineCodec(getCreateAccountInstructionDataEncoder(), getCreateAccountInstructionDataDecoder());
 }
 function getCreateAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
@@ -529,7 +544,8 @@ function getCreateAccountAllowPrefundInstructionDataCodec() {
   );
 }
 function getCreateAccountAllowPrefundInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     newAccount: { value: input.newAccount ?? null, isSigner: true, isWritable: true },
@@ -608,7 +624,8 @@ function getCreateAccountWithSeedInstructionDataCodec() {
   );
 }
 function getCreateAccountWithSeedInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
@@ -678,7 +695,8 @@ function getInitializeNonceAccountInstructionDataCodec() {
   );
 }
 function getInitializeNonceAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
@@ -751,7 +769,8 @@ function getTransferSolInstructionDataCodec() {
   return kit.combineCodec(getTransferSolInstructionDataEncoder(), getTransferSolInstructionDataDecoder());
 }
 function getTransferSolInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     source: { value: input.source ?? null, isSigner: true, isWritable: true },
@@ -811,7 +830,8 @@ function getTransferSolWithSeedInstructionDataCodec() {
   return kit.combineCodec(getTransferSolWithSeedInstructionDataEncoder(), getTransferSolWithSeedInstructionDataDecoder());
 }
 function getTransferSolWithSeedInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     source: { value: input.source ?? null, isSigner: false, isWritable: true },
@@ -866,7 +886,8 @@ function getUpgradeNonceAccountInstructionDataCodec() {
   return kit.combineCodec(getUpgradeNonceAccountInstructionDataEncoder(), getUpgradeNonceAccountInstructionDataDecoder());
 }
 function getUpgradeNonceAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = { nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true } };
   const accounts = originalAccounts;
@@ -921,7 +942,8 @@ function getWithdrawNonceAccountInstructionDataCodec() {
   );
 }
 function getWithdrawNonceAccountInstruction(input, config) {
-  const programAddress = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddressInput = config?.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
   const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "omitted");
   const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isSigner: false, isWritable: true },
@@ -1144,32 +1166,98 @@ function parseSystemInstruction(instruction) {
       });
   }
 }
-function systemProgram() {
+function systemProgram(config = {}) {
   return (client) => {
     return kit.extendClient(client, {
       system: {
         accounts: { nonce: programClientCore.addSelfFetchFunctions(client, getNonceCodec()) },
         instructions: {
-          createAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(
+          createAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getCreateAccountInstruction(
+              { ...input, payer: input.payer ?? client.payer },
+              { programAddress: instructionConfig?.programAddress ?? config.programAddress }
+            )
+          ),
+          assign: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
             client,
-            getCreateAccountInstruction({ ...input, payer: input.payer ?? client.payer })
+            getAssignInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
           ),
-          assign: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAssignInstruction(input)),
-          transferSol: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getTransferSolInstruction(input)),
-          createAccountWithSeed: (input) => programClientCore.addSelfPlanAndSendFunctions(
+          transferSol: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
             client,
-            getCreateAccountWithSeedInstruction({ ...input, payer: input.payer ?? client.payer })
+            getTransferSolInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
           ),
-          advanceNonceAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAdvanceNonceAccountInstruction(input)),
-          withdrawNonceAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getWithdrawNonceAccountInstruction(input)),
-          initializeNonceAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getInitializeNonceAccountInstruction(input)),
-          authorizeNonceAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAuthorizeNonceAccountInstruction(input)),
-          allocate: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAllocateInstruction(input)),
-          allocateWithSeed: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAllocateWithSeedInstruction(input)),
-          assignWithSeed: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getAssignWithSeedInstruction(input)),
-          transferSolWithSeed: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getTransferSolWithSeedInstruction(input)),
-          upgradeNonceAccount: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getUpgradeNonceAccountInstruction(input)),
-          createAccountAllowPrefund: (input) => programClientCore.addSelfPlanAndSendFunctions(client, getCreateAccountAllowPrefundInstruction(input))
+          createAccountWithSeed: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getCreateAccountWithSeedInstruction(
+              { ...input, payer: input.payer ?? client.payer },
+              { programAddress: instructionConfig?.programAddress ?? config.programAddress }
+            )
+          ),
+          advanceNonceAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getAdvanceNonceAccountInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          withdrawNonceAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getWithdrawNonceAccountInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          initializeNonceAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getInitializeNonceAccountInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          authorizeNonceAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getAuthorizeNonceAccountInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          allocate: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getAllocateInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          allocateWithSeed: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getAllocateWithSeedInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          assignWithSeed: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getAssignWithSeedInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          transferSolWithSeed: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getTransferSolWithSeedInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          upgradeNonceAccount: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getUpgradeNonceAccountInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          ),
+          createAccountAllowPrefund: (input, instructionConfig) => programClientCore.addSelfPlanAndSendFunctions(
+            client,
+            getCreateAccountAllowPrefundInstruction(input, {
+              programAddress: instructionConfig?.programAddress ?? config.programAddress
+            })
+          )
         },
         identifyInstruction: identifySystemInstruction,
         parseInstruction: parseSystemInstruction
@@ -1208,8 +1296,10 @@ function getSystemErrorMessage(code) {
   }
   return "Error message not available in production bundles.";
 }
-function isSystemError(error, transactionMessage, code) {
-  return kit.isProgramError(error, transactionMessage, SYSTEM_PROGRAM_ADDRESS, code);
+function isSystemError(error, transactionMessage, code, config = {}) {
+  const programAddressInput = config.programAddress ?? SYSTEM_PROGRAM_ADDRESS;
+  const programAddress = typeof programAddressInput === "string" ? programAddressInput : programAddressInput.address;
+  return kit.isProgramError(error, transactionMessage, programAddress, code);
 }
 
 exports.ADVANCE_NONCE_ACCOUNT_DISCRIMINATOR = ADVANCE_NONCE_ACCOUNT_DISCRIMINATOR;