@solana-program/system 0.1.2 → 0.2.0

package/dist/src/index.js

@@ -197,32 +197,23 @@ function expectTransactionSigner(value) {
   }
   return value;
 }
-function accountMetaWithDefault(account, role) {
-  if (account === void 0)
-    return void 0;
-  return typeof account === "string" ? { address: account, role } : account;
-}
-function getAccountMetasWithSigners(accounts, optionalAccountStrategy, programAddress) {
-  const accountMetas = {};
-  Object.keys(accounts).forEach((key) => {
-    const account = accounts[key];
+function getAccountMetaFactory(programAddress, optionalAccountStrategy) {
+  return (account) => {
     if (!account.value) {
       if (optionalAccountStrategy === "omitted")
         return;
-      accountMetas[key] = {
+      return Object.freeze({
         address: programAddress,
         role: AccountRole.READONLY
-      };
-      return;
+      });
     }
     const writableRole = account.isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
-    accountMetas[key] = Object.freeze({
+    return Object.freeze({
       address: expectAddress(account.value),
       role: isTransactionSigner(account.value) ? upgradeRoleToSigner(writableRole) : writableRole,
       ...isTransactionSigner(account.value) ? { signer: account.value } : {}
     });
-  });
-  return accountMetas;
+  };
 }
 function isTransactionSigner(value) {
   return !!value && typeof value === "object" && "address" in value && isTransactionSigner$1(value);
@@ -234,6 +225,83 @@ function memcmp(data, bytes, offset) {
   return bytes.every((b, i) => b === slice[i]);
 }
 
+// src/generated/programs/system.ts
+var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
+function getSystemProgram() {
+  return {
+    name: "system",
+    address: SYSTEM_PROGRAM_ADDRESS,
+    getErrorFromCode(code, cause) {
+      return getSystemProgramErrorFromCode(code, cause);
+    }
+  };
+}
+var SystemAccount = /* @__PURE__ */ ((SystemAccount2) => {
+  SystemAccount2[SystemAccount2["Nonce"] = 0] = "Nonce";
+  return SystemAccount2;
+})(SystemAccount || {});
+var SystemInstruction = /* @__PURE__ */ ((SystemInstruction2) => {
+  SystemInstruction2[SystemInstruction2["CreateAccount"] = 0] = "CreateAccount";
+  SystemInstruction2[SystemInstruction2["Assign"] = 1] = "Assign";
+  SystemInstruction2[SystemInstruction2["TransferSol"] = 2] = "TransferSol";
+  SystemInstruction2[SystemInstruction2["CreateAccountWithSeed"] = 3] = "CreateAccountWithSeed";
+  SystemInstruction2[SystemInstruction2["AdvanceNonceAccount"] = 4] = "AdvanceNonceAccount";
+  SystemInstruction2[SystemInstruction2["WithdrawNonceAccount"] = 5] = "WithdrawNonceAccount";
+  SystemInstruction2[SystemInstruction2["InitializeNonceAccount"] = 6] = "InitializeNonceAccount";
+  SystemInstruction2[SystemInstruction2["AuthorizeNonceAccount"] = 7] = "AuthorizeNonceAccount";
+  SystemInstruction2[SystemInstruction2["Allocate"] = 8] = "Allocate";
+  SystemInstruction2[SystemInstruction2["AllocateWithSeed"] = 9] = "AllocateWithSeed";
+  SystemInstruction2[SystemInstruction2["AssignWithSeed"] = 10] = "AssignWithSeed";
+  SystemInstruction2[SystemInstruction2["TransferSolWithSeed"] = 11] = "TransferSolWithSeed";
+  SystemInstruction2[SystemInstruction2["UpgradeNonceAccount"] = 12] = "UpgradeNonceAccount";
+  return SystemInstruction2;
+})(SystemInstruction || {});
+function identifySystemInstruction(instruction) {
+  const data = instruction instanceof Uint8Array ? instruction : instruction.data;
+  if (memcmp(data, getU32Encoder().encode(0), 0)) {
+    return 0 /* CreateAccount */;
+  }
+  if (memcmp(data, getU32Encoder().encode(1), 0)) {
+    return 1 /* Assign */;
+  }
+  if (memcmp(data, getU32Encoder().encode(2), 0)) {
+    return 2 /* TransferSol */;
+  }
+  if (memcmp(data, getU32Encoder().encode(3), 0)) {
+    return 3 /* CreateAccountWithSeed */;
+  }
+  if (memcmp(data, getU32Encoder().encode(4), 0)) {
+    return 4 /* AdvanceNonceAccount */;
+  }
+  if (memcmp(data, getU32Encoder().encode(5), 0)) {
+    return 5 /* WithdrawNonceAccount */;
+  }
+  if (memcmp(data, getU32Encoder().encode(6), 0)) {
+    return 6 /* InitializeNonceAccount */;
+  }
+  if (memcmp(data, getU32Encoder().encode(7), 0)) {
+    return 7 /* AuthorizeNonceAccount */;
+  }
+  if (memcmp(data, getU32Encoder().encode(8), 0)) {
+    return 8 /* Allocate */;
+  }
+  if (memcmp(data, getU32Encoder().encode(9), 0)) {
+    return 9 /* AllocateWithSeed */;
+  }
+  if (memcmp(data, getU32Encoder().encode(10), 0)) {
+    return 10 /* AssignWithSeed */;
+  }
+  if (memcmp(data, getU32Encoder().encode(11), 0)) {
+    return 11 /* TransferSolWithSeed */;
+  }
+  if (memcmp(data, getU32Encoder().encode(12), 0)) {
+    return 12 /* UpgradeNonceAccount */;
+  }
+  throw new Error(
+    "The provided instruction could not be identified as a system instruction."
+  );
+}
+
 // src/generated/instructions/advanceNonceAccount.ts
 function getAdvanceNonceAccountInstructionDataEncoder() {
   return mapEncoder(
@@ -251,8 +319,8 @@ function getAdvanceNonceAccountInstructionDataCodec() {
   );
 }
 function getAdvanceNonceAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
     recentBlockhashesSysvar: {
       value: input.recentBlockhashesSysvar ?? null,
@@ -260,37 +328,21 @@ function getAdvanceNonceAccountInstruction(input) {
     },
     nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   if (!accounts.recentBlockhashesSysvar.value) {
     accounts.recentBlockhashesSysvar.value = "SysvarRecentB1ockHashes11111111111111111111";
   }
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAdvanceNonceAccountInstructionRaw(
-    accountMetas,
-    programAddress
-  );
-  return instruction;
-}
-function getAdvanceNonceAccountInstructionRaw(accounts, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.nonceAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        AccountRole.READONLY_SIGNER
-      ),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.nonceAccount),
+      getAccountMeta(accounts.recentBlockhashesSysvar),
+      getAccountMeta(accounts.nonceAuthority)
     ],
-    data: getAdvanceNonceAccountInstructionDataEncoder().encode({}),
-    programAddress
+    programAddress,
+    data: getAdvanceNonceAccountInstructionDataEncoder().encode({})
   };
+  return instruction;
 }
 function parseAdvanceNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -336,32 +388,21 @@ function getAllocateInstructionDataCodec() {
   );
 }
 function getAllocateInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     newAccount: { value: input.newAccount ?? null, isWritable: true }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAllocateInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getAllocateInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
-    accounts: [
-      accountMetaWithDefault(accounts.newAccount, AccountRole.WRITABLE_SIGNER),
-      ...remainingAccounts ?? []
-    ],
-    data: getAllocateInstructionDataEncoder().encode(args),
-    programAddress
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
+    accounts: [getAccountMeta(accounts.newAccount)],
+    programAddress,
+    data: getAllocateInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseAllocateInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -409,34 +450,25 @@ function getAllocateWithSeedInstructionDataCodec() {
   );
 }
 function getAllocateWithSeedInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     newAccount: { value: input.newAccount ?? null, isWritable: true },
     baseAccount: { value: input.baseAccount ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAllocateWithSeedInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getAllocateWithSeedInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.newAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, AccountRole.READONLY_SIGNER),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.newAccount),
+      getAccountMeta(accounts.baseAccount)
     ],
-    data: getAllocateWithSeedInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getAllocateWithSeedInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseAllocateWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -479,32 +511,21 @@ function getAssignInstructionDataCodec() {
   );
 }
 function getAssignInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     account: { value: input.account ?? null, isWritable: true }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAssignInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getAssignInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
-    accounts: [
-      accountMetaWithDefault(accounts.account, AccountRole.WRITABLE_SIGNER),
-      ...remainingAccounts ?? []
-    ],
-    data: getAssignInstructionDataEncoder().encode(args),
-    programAddress
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
+    accounts: [getAccountMeta(accounts.account)],
+    programAddress,
+    data: getAssignInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseAssignInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -550,34 +571,25 @@ function getAssignWithSeedInstructionDataCodec() {
   );
 }
 function getAssignWithSeedInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     account: { value: input.account ?? null, isWritable: true },
     baseAccount: { value: input.baseAccount ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAssignWithSeedInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getAssignWithSeedInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.account, AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, AccountRole.READONLY_SIGNER),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.account),
+      getAccountMeta(accounts.baseAccount)
     ],
-    data: getAssignWithSeedInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getAssignWithSeedInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseAssignWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -620,37 +632,25 @@ function getAuthorizeNonceAccountInstructionDataCodec() {
   );
 }
 function getAuthorizeNonceAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
     nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getAuthorizeNonceAccountInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getAuthorizeNonceAccountInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.nonceAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        AccountRole.READONLY_SIGNER
-      ),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.nonceAccount),
+      getAccountMeta(accounts.nonceAuthority)
     ],
-    data: getAuthorizeNonceAccountInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getAuthorizeNonceAccountInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseAuthorizeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -699,38 +699,29 @@ function getCreateAccountInstructionDataCodec() {
   );
 }
 function getCreateAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     payer: { value: input.payer ?? null, isWritable: true },
     newAccount: { value: input.newAccount ?? null, isWritable: true }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
   const byteDelta = [Number(args.space) + BASE_ACCOUNT_SIZE].reduce(
     (a, b) => a + b,
     0
   );
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getCreateAccountInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return Object.freeze({ ...instruction, byteDelta });
-}
-function getCreateAccountInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.payer, AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.newAccount, AccountRole.WRITABLE_SIGNER),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.payer),
+      getAccountMeta(accounts.newAccount)
     ],
-    data: getCreateAccountInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getCreateAccountInstructionDataEncoder().encode(
+      args
+    )
   };
+  return Object.freeze({ ...instruction, byteDelta });
 }
 function parseCreateAccountInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -781,36 +772,27 @@ function getCreateAccountWithSeedInstructionDataCodec() {
   );
 }
 function getCreateAccountWithSeedInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     payer: { value: input.payer ?? null, isWritable: true },
     newAccount: { value: input.newAccount ?? null, isWritable: true },
     baseAccount: { value: input.baseAccount ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getCreateAccountWithSeedInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getCreateAccountWithSeedInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.payer, AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.newAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, AccountRole.READONLY_SIGNER),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.payer),
+      getAccountMeta(accounts.newAccount),
+      getAccountMeta(accounts.baseAccount)
     ],
-    data: getCreateAccountWithSeedInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getCreateAccountWithSeedInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseCreateAccountWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -856,8 +838,8 @@ function getInitializeNonceAccountInstructionDataCodec() {
   );
 }
 function getInitializeNonceAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
     recentBlockhashesSysvar: {
       value: input.recentBlockhashesSysvar ?? null,
@@ -865,6 +847,7 @@ function getInitializeNonceAccountInstruction(input) {
     },
     rentSysvar: { value: input.rentSysvar ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.recentBlockhashesSysvar.value) {
     accounts.recentBlockhashesSysvar.value = "SysvarRecentB1ockHashes11111111111111111111";
@@ -872,35 +855,19 @@ function getInitializeNonceAccountInstruction(input) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getInitializeNonceAccountInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getInitializeNonceAccountInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.nonceAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.rentSysvar ?? "SysvarRent111111111111111111111111111111111",
-        AccountRole.READONLY
-      ),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.nonceAccount),
+      getAccountMeta(accounts.recentBlockhashesSysvar),
+      getAccountMeta(accounts.rentSysvar)
     ],
-    data: getInitializeNonceAccountInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getInitializeNonceAccountInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseInitializeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -946,34 +913,25 @@ function getTransferSolInstructionDataCodec() {
   );
 }
 function getTransferSolInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     source: { value: input.source ?? null, isWritable: true },
     destination: { value: input.destination ?? null, isWritable: true }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getTransferSolInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getTransferSolInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.source, AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.destination, AccountRole.WRITABLE),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.source),
+      getAccountMeta(accounts.destination)
     ],
-    data: getTransferSolInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getTransferSolInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseTransferSolInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -1020,36 +978,27 @@ function getTransferSolWithSeedInstructionDataCodec() {
   );
 }
 function getTransferSolWithSeedInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     source: { value: input.source ?? null, isWritable: true },
     baseAccount: { value: input.baseAccount ?? null, isWritable: false },
     destination: { value: input.destination ?? null, isWritable: true }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getTransferSolWithSeedInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getTransferSolWithSeedInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.source, AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, AccountRole.READONLY_SIGNER),
-      accountMetaWithDefault(accounts.destination, AccountRole.WRITABLE),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.source),
+      getAccountMeta(accounts.baseAccount),
+      getAccountMeta(accounts.destination)
     ],
-    data: getTransferSolWithSeedInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getTransferSolWithSeedInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseTransferSolWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -1089,30 +1038,18 @@ function getUpgradeNonceAccountInstructionDataCodec() {
   );
 }
 function getUpgradeNonceAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true }
   };
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getUpgradeNonceAccountInstructionRaw(
-    accountMetas,
-    programAddress
-  );
-  return instruction;
-}
-function getUpgradeNonceAccountInstructionRaw(accounts, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
-    accounts: [
-      accountMetaWithDefault(accounts.nonceAccount, AccountRole.WRITABLE),
-      ...remainingAccounts ?? []
-    ],
-    data: getUpgradeNonceAccountInstructionDataEncoder().encode({}),
-    programAddress
+  const accounts = originalAccounts;
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
+    accounts: [getAccountMeta(accounts.nonceAccount)],
+    programAddress,
+    data: getUpgradeNonceAccountInstructionDataEncoder().encode({})
   };
+  return instruction;
 }
 function parseUpgradeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -1156,8 +1093,8 @@ function getWithdrawNonceAccountInstructionDataCodec() {
   );
 }
 function getWithdrawNonceAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true },
     recipientAccount: {
       value: input.recipientAccount ?? null,
@@ -1170,6 +1107,7 @@ function getWithdrawNonceAccountInstruction(input) {
     rentSysvar: { value: input.rentSysvar ?? null, isWritable: false },
     nonceAuthority: { value: input.nonceAuthority ?? null, isWritable: false }
   };
+  const accounts = originalAccounts;
   const args = { ...input };
   if (!accounts.recentBlockhashesSysvar.value) {
     accounts.recentBlockhashesSysvar.value = "SysvarRecentB1ockHashes11111111111111111111";
@@ -1177,40 +1115,21 @@ function getWithdrawNonceAccountInstruction(input) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const accountMetas = getAccountMetasWithSigners(
-    accounts,
-    "programId",
-    programAddress
-  );
-  const instruction = getWithdrawNonceAccountInstructionRaw(
-    accountMetas,
-    args,
-    programAddress
-  );
-  return instruction;
-}
-function getWithdrawNonceAccountInstructionRaw(accounts, args, programAddress = "11111111111111111111111111111111", remainingAccounts) {
-  return {
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const instruction = {
     accounts: [
-      accountMetaWithDefault(accounts.nonceAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.recipientAccount, AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.rentSysvar ?? "SysvarRent111111111111111111111111111111111",
-        AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        AccountRole.READONLY_SIGNER
-      ),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts.nonceAccount),
+      getAccountMeta(accounts.recipientAccount),
+      getAccountMeta(accounts.recentBlockhashesSysvar),
+      getAccountMeta(accounts.rentSysvar),
+      getAccountMeta(accounts.nonceAuthority)
     ],
-    data: getWithdrawNonceAccountInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getWithdrawNonceAccountInstructionDataEncoder().encode(
+      args
+    )
   };
+  return instruction;
 }
 function parseWithdrawNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 5) {
@@ -1236,82 +1155,7 @@ function parseWithdrawNonceAccountInstruction(instruction) {
     )
   };
 }
-var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
-function getSystemProgram() {
-  return {
-    name: "system",
-    address: SYSTEM_PROGRAM_ADDRESS,
-    getErrorFromCode(code, cause) {
-      return getSystemProgramErrorFromCode(code, cause);
-    }
-  };
-}
-var SystemAccount = /* @__PURE__ */ ((SystemAccount2) => {
-  SystemAccount2[SystemAccount2["Nonce"] = 0] = "Nonce";
-  return SystemAccount2;
-})(SystemAccount || {});
-var SystemInstruction = /* @__PURE__ */ ((SystemInstruction2) => {
-  SystemInstruction2[SystemInstruction2["CreateAccount"] = 0] = "CreateAccount";
-  SystemInstruction2[SystemInstruction2["Assign"] = 1] = "Assign";
-  SystemInstruction2[SystemInstruction2["TransferSol"] = 2] = "TransferSol";
-  SystemInstruction2[SystemInstruction2["CreateAccountWithSeed"] = 3] = "CreateAccountWithSeed";
-  SystemInstruction2[SystemInstruction2["AdvanceNonceAccount"] = 4] = "AdvanceNonceAccount";
-  SystemInstruction2[SystemInstruction2["WithdrawNonceAccount"] = 5] = "WithdrawNonceAccount";
-  SystemInstruction2[SystemInstruction2["InitializeNonceAccount"] = 6] = "InitializeNonceAccount";
-  SystemInstruction2[SystemInstruction2["AuthorizeNonceAccount"] = 7] = "AuthorizeNonceAccount";
-  SystemInstruction2[SystemInstruction2["Allocate"] = 8] = "Allocate";
-  SystemInstruction2[SystemInstruction2["AllocateWithSeed"] = 9] = "AllocateWithSeed";
-  SystemInstruction2[SystemInstruction2["AssignWithSeed"] = 10] = "AssignWithSeed";
-  SystemInstruction2[SystemInstruction2["TransferSolWithSeed"] = 11] = "TransferSolWithSeed";
-  SystemInstruction2[SystemInstruction2["UpgradeNonceAccount"] = 12] = "UpgradeNonceAccount";
-  return SystemInstruction2;
-})(SystemInstruction || {});
-function identifySystemInstruction(instruction) {
-  const data = instruction instanceof Uint8Array ? instruction : instruction.data;
-  if (memcmp(data, getU32Encoder().encode(0), 0)) {
-    return 0 /* CreateAccount */;
-  }
-  if (memcmp(data, getU32Encoder().encode(1), 0)) {
-    return 1 /* Assign */;
-  }
-  if (memcmp(data, getU32Encoder().encode(2), 0)) {
-    return 2 /* TransferSol */;
-  }
-  if (memcmp(data, getU32Encoder().encode(3), 0)) {
-    return 3 /* CreateAccountWithSeed */;
-  }
-  if (memcmp(data, getU32Encoder().encode(4), 0)) {
-    return 4 /* AdvanceNonceAccount */;
-  }
-  if (memcmp(data, getU32Encoder().encode(5), 0)) {
-    return 5 /* WithdrawNonceAccount */;
-  }
-  if (memcmp(data, getU32Encoder().encode(6), 0)) {
-    return 6 /* InitializeNonceAccount */;
-  }
-  if (memcmp(data, getU32Encoder().encode(7), 0)) {
-    return 7 /* AuthorizeNonceAccount */;
-  }
-  if (memcmp(data, getU32Encoder().encode(8), 0)) {
-    return 8 /* Allocate */;
-  }
-  if (memcmp(data, getU32Encoder().encode(9), 0)) {
-    return 9 /* AllocateWithSeed */;
-  }
-  if (memcmp(data, getU32Encoder().encode(10), 0)) {
-    return 10 /* AssignWithSeed */;
-  }
-  if (memcmp(data, getU32Encoder().encode(11), 0)) {
-    return 11 /* TransferSolWithSeed */;
-  }
-  if (memcmp(data, getU32Encoder().encode(12), 0)) {
-    return 12 /* UpgradeNonceAccount */;
-  }
-  throw new Error(
-    "The provided instruction could not be identified as a system instruction."
-  );
-}
 
-export { NonceState, NonceVersion, SYSTEM_PROGRAM_ADDRESS, SystemAccount, SystemInstruction, SystemProgramError, SystemProgramErrorCode, accountMetaWithDefault, decodeNonce, expectAddress, expectProgramDerivedAddress, expectSome, expectTransactionSigner, fetchAllMaybeNonce, fetchAllNonce, fetchMaybeNonce, fetchNonce, getAccountMetasWithSigners, getAdvanceNonceAccountInstruction, getAdvanceNonceAccountInstructionDataCodec, getAdvanceNonceAccountInstructionDataDecoder, getAdvanceNonceAccountInstructionDataEncoder, getAdvanceNonceAccountInstructionRaw, getAllocateInstruction, getAllocateInstructionDataCodec, getAllocateInstructionDataDecoder, getAllocateInstructionDataEncoder, getAllocateInstructionRaw, getAllocateWithSeedInstruction, getAllocateWithSeedInstructionDataCodec, getAllocateWithSeedInstructionDataDecoder, getAllocateWithSeedInstructionDataEncoder, getAllocateWithSeedInstructionRaw, getAssignInstruction, getAssignInstructionDataCodec, getAssignInstructionDataDecoder, getAssignInstructionDataEncoder, getAssignInstructionRaw, getAssignWithSeedInstruction, getAssignWithSeedInstructionDataCodec, getAssignWithSeedInstructionDataDecoder, getAssignWithSeedInstructionDataEncoder, getAssignWithSeedInstructionRaw, getAuthorizeNonceAccountInstruction, getAuthorizeNonceAccountInstructionDataCodec, getAuthorizeNonceAccountInstructionDataDecoder, getAuthorizeNonceAccountInstructionDataEncoder, getAuthorizeNonceAccountInstructionRaw, getCreateAccountInstruction, getCreateAccountInstructionDataCodec, getCreateAccountInstructionDataDecoder, getCreateAccountInstructionDataEncoder, getCreateAccountInstructionRaw, getCreateAccountWithSeedInstruction, getCreateAccountWithSeedInstructionDataCodec, getCreateAccountWithSeedInstructionDataDecoder, getCreateAccountWithSeedInstructionDataEncoder, getCreateAccountWithSeedInstructionRaw, getInitializeNonceAccountInstruction, getInitializeNonceAccountInstructionDataCodec, getInitializeNonceAccountInstructionDataDecoder, getInitializeNonceAccountInstructionDataEncoder, getInitializeNonceAccountInstructionRaw, getNonceAccountDataCodec, getNonceAccountDataDecoder, getNonceAccountDataEncoder, getNonceSize, getNonceStateCodec, getNonceStateDecoder, getNonceStateEncoder, getNonceVersionCodec, getNonceVersionDecoder, getNonceVersionEncoder, getSystemProgram, getSystemProgramErrorFromCode, getTransferSolInstruction, getTransferSolInstructionDataCodec, getTransferSolInstructionDataDecoder, getTransferSolInstructionDataEncoder, getTransferSolInstructionRaw, getTransferSolWithSeedInstruction, getTransferSolWithSeedInstructionDataCodec, getTransferSolWithSeedInstructionDataDecoder, getTransferSolWithSeedInstructionDataEncoder, getTransferSolWithSeedInstructionRaw, getUpgradeNonceAccountInstruction, getUpgradeNonceAccountInstructionDataCodec, getUpgradeNonceAccountInstructionDataDecoder, getUpgradeNonceAccountInstructionDataEncoder, getUpgradeNonceAccountInstructionRaw, getWithdrawNonceAccountInstruction, getWithdrawNonceAccountInstructionDataCodec, getWithdrawNonceAccountInstructionDataDecoder, getWithdrawNonceAccountInstructionDataEncoder, getWithdrawNonceAccountInstructionRaw, identifySystemInstruction, isTransactionSigner, memcmp, parseAdvanceNonceAccountInstruction, parseAllocateInstruction, parseAllocateWithSeedInstruction, parseAssignInstruction, parseAssignWithSeedInstruction, parseAuthorizeNonceAccountInstruction, parseCreateAccountInstruction, parseCreateAccountWithSeedInstruction, parseInitializeNonceAccountInstruction, parseTransferSolInstruction, parseTransferSolWithSeedInstruction, parseUpgradeNonceAccountInstruction, parseWithdrawNonceAccountInstruction };
+export { NonceState, NonceVersion, SYSTEM_PROGRAM_ADDRESS, SystemAccount, SystemInstruction, SystemProgramError, SystemProgramErrorCode, decodeNonce, expectAddress, expectProgramDerivedAddress, expectSome, expectTransactionSigner, fetchAllMaybeNonce, fetchAllNonce, fetchMaybeNonce, fetchNonce, getAccountMetaFactory, getAdvanceNonceAccountInstruction, getAdvanceNonceAccountInstructionDataCodec, getAdvanceNonceAccountInstructionDataDecoder, getAdvanceNonceAccountInstructionDataEncoder, getAllocateInstruction, getAllocateInstructionDataCodec, getAllocateInstructionDataDecoder, getAllocateInstructionDataEncoder, getAllocateWithSeedInstruction, getAllocateWithSeedInstructionDataCodec, getAllocateWithSeedInstructionDataDecoder, getAllocateWithSeedInstructionDataEncoder, getAssignInstruction, getAssignInstructionDataCodec, getAssignInstructionDataDecoder, getAssignInstructionDataEncoder, getAssignWithSeedInstruction, getAssignWithSeedInstructionDataCodec, getAssignWithSeedInstructionDataDecoder, getAssignWithSeedInstructionDataEncoder, getAuthorizeNonceAccountInstruction, getAuthorizeNonceAccountInstructionDataCodec, getAuthorizeNonceAccountInstructionDataDecoder, getAuthorizeNonceAccountInstructionDataEncoder, getCreateAccountInstruction, getCreateAccountInstructionDataCodec, getCreateAccountInstructionDataDecoder, getCreateAccountInstructionDataEncoder, getCreateAccountWithSeedInstruction, getCreateAccountWithSeedInstructionDataCodec, getCreateAccountWithSeedInstructionDataDecoder, getCreateAccountWithSeedInstructionDataEncoder, getInitializeNonceAccountInstruction, getInitializeNonceAccountInstructionDataCodec, getInitializeNonceAccountInstructionDataDecoder, getInitializeNonceAccountInstructionDataEncoder, getNonceAccountDataCodec, getNonceAccountDataDecoder, getNonceAccountDataEncoder, getNonceSize, getNonceStateCodec, getNonceStateDecoder, getNonceStateEncoder, getNonceVersionCodec, getNonceVersionDecoder, getNonceVersionEncoder, getSystemProgram, getSystemProgramErrorFromCode, getTransferSolInstruction, getTransferSolInstructionDataCodec, getTransferSolInstructionDataDecoder, getTransferSolInstructionDataEncoder, getTransferSolWithSeedInstruction, getTransferSolWithSeedInstructionDataCodec, getTransferSolWithSeedInstructionDataDecoder, getTransferSolWithSeedInstructionDataEncoder, getUpgradeNonceAccountInstruction, getUpgradeNonceAccountInstructionDataCodec, getUpgradeNonceAccountInstructionDataDecoder, getUpgradeNonceAccountInstructionDataEncoder, getWithdrawNonceAccountInstruction, getWithdrawNonceAccountInstructionDataCodec, getWithdrawNonceAccountInstructionDataDecoder, getWithdrawNonceAccountInstructionDataEncoder, identifySystemInstruction, isTransactionSigner, memcmp, parseAdvanceNonceAccountInstruction, parseAllocateInstruction, parseAllocateWithSeedInstruction, parseAssignInstruction, parseAssignWithSeedInstruction, parseAuthorizeNonceAccountInstruction, parseCreateAccountInstruction, parseCreateAccountWithSeedInstruction, parseInitializeNonceAccountInstruction, parseTransferSolInstruction, parseTransferSolWithSeedInstruction, parseUpgradeNonceAccountInstruction, parseWithdrawNonceAccountInstruction };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map