@solana-program/system 0.1.3 → 0.2.0

package/dist/src/index.cjs

@@ -199,32 +199,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: instructions.AccountRole.READONLY
-      };
-      return;
+      });
     }
     const writableRole = account.isWritable ? instructions.AccountRole.WRITABLE : instructions.AccountRole.READONLY;
-    accountMetas[key] = Object.freeze({
+    return Object.freeze({
       address: expectAddress(account.value),
       role: isTransactionSigner(account.value) ? instructions.upgradeRoleToSigner(writableRole) : writableRole,
       ...isTransactionSigner(account.value) ? { signer: account.value } : {}
     });
-  });
-  return accountMetas;
+  };
 }
 function isTransactionSigner(value) {
   return !!value && typeof value === "object" && "address" in value && signers.isTransactionSigner(value);
@@ -236,6 +227,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, codecs.getU32Encoder().encode(0), 0)) {
+    return 0 /* CreateAccount */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(1), 0)) {
+    return 1 /* Assign */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(2), 0)) {
+    return 2 /* TransferSol */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(3), 0)) {
+    return 3 /* CreateAccountWithSeed */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(4), 0)) {
+    return 4 /* AdvanceNonceAccount */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(5), 0)) {
+    return 5 /* WithdrawNonceAccount */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(6), 0)) {
+    return 6 /* InitializeNonceAccount */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(7), 0)) {
+    return 7 /* AuthorizeNonceAccount */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(8), 0)) {
+    return 8 /* Allocate */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(9), 0)) {
+    return 9 /* AllocateWithSeed */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(10), 0)) {
+    return 10 /* AssignWithSeed */;
+  }
+  if (memcmp(data, codecs.getU32Encoder().encode(11), 0)) {
+    return 11 /* TransferSolWithSeed */;
+  }
+  if (memcmp(data, codecs.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 codecs.mapEncoder(
@@ -253,8 +321,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,
@@ -262,37 +330,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        instructions.AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        instructions.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) {
@@ -338,32 +390,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, instructions.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) {
@@ -411,34 +452,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, instructions.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) {
@@ -481,32 +513,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, instructions.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) {
@@ -552,34 +573,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, instructions.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) {
@@ -622,37 +634,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        instructions.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) {
@@ -701,38 +701,29 @@ function getCreateAccountInstructionDataCodec() {
   );
 }
 function getCreateAccountInstruction(input) {
-  const programAddress = "11111111111111111111111111111111";
-  const accounts$1 = {
+  const programAddress = SYSTEM_PROGRAM_ADDRESS;
+  const originalAccounts = {
     payer: { value: input.payer ?? null, isWritable: true },
     newAccount: { value: input.newAccount ?? null, isWritable: true }
   };
+  const accounts$1 = originalAccounts;
   const args = { ...input };
   const byteDelta = [Number(args.space) + accounts.BASE_ACCOUNT_SIZE].reduce(
     (a, b) => a + b,
     0
   );
-  const accountMetas = getAccountMetasWithSigners(
-    accounts$1,
-    "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, instructions.AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.newAccount, instructions.AccountRole.WRITABLE_SIGNER),
-      ...remainingAccounts ?? []
+      getAccountMeta(accounts$1.payer),
+      getAccountMeta(accounts$1.newAccount)
     ],
-    data: getCreateAccountInstructionDataEncoder().encode(args),
-    programAddress
+    programAddress,
+    data: getCreateAccountInstructionDataEncoder().encode(
+      args
+    )
   };
+  return Object.freeze({ ...instruction, byteDelta });
 }
 function parseCreateAccountInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -783,36 +774,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, instructions.AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.newAccount, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, instructions.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) {
@@ -858,8 +840,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,
@@ -867,6 +849,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";
@@ -874,35 +857,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        instructions.AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.rentSysvar ?? "SysvarRent111111111111111111111111111111111",
-        instructions.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) {
@@ -948,34 +915,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, instructions.AccountRole.WRITABLE_SIGNER),
-      accountMetaWithDefault(accounts.destination, instructions.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) {
@@ -1022,36 +980,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.baseAccount, instructions.AccountRole.READONLY_SIGNER),
-      accountMetaWithDefault(accounts.destination, instructions.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) {
@@ -1091,30 +1040,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, instructions.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) {
@@ -1158,8 +1095,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,
@@ -1172,6 +1109,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";
@@ -1179,40 +1117,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, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(accounts.recipientAccount, instructions.AccountRole.WRITABLE),
-      accountMetaWithDefault(
-        accounts.recentBlockhashesSysvar ?? "SysvarRecentB1ockHashes11111111111111111111",
-        instructions.AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.rentSysvar ?? "SysvarRent111111111111111111111111111111111",
-        instructions.AccountRole.READONLY
-      ),
-      accountMetaWithDefault(
-        accounts.nonceAuthority,
-        instructions.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) {
@@ -1238,81 +1157,6 @@ 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, codecs.getU32Encoder().encode(0), 0)) {
-    return 0 /* CreateAccount */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(1), 0)) {
-    return 1 /* Assign */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(2), 0)) {
-    return 2 /* TransferSol */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(3), 0)) {
-    return 3 /* CreateAccountWithSeed */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(4), 0)) {
-    return 4 /* AdvanceNonceAccount */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(5), 0)) {
-    return 5 /* WithdrawNonceAccount */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(6), 0)) {
-    return 6 /* InitializeNonceAccount */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(7), 0)) {
-    return 7 /* AuthorizeNonceAccount */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(8), 0)) {
-    return 8 /* Allocate */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(9), 0)) {
-    return 9 /* AllocateWithSeed */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(10), 0)) {
-    return 10 /* AssignWithSeed */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(11), 0)) {
-    return 11 /* TransferSolWithSeed */;
-  }
-  if (memcmp(data, codecs.getU32Encoder().encode(12), 0)) {
-    return 12 /* UpgradeNonceAccount */;
-  }
-  throw new Error(
-    "The provided instruction could not be identified as a system instruction."
-  );
-}
 
 exports.NonceState = NonceState;
 exports.NonceVersion = NonceVersion;
@@ -1321,7 +1165,6 @@ exports.SystemAccount = SystemAccount;
 exports.SystemInstruction = SystemInstruction;
 exports.SystemProgramError = SystemProgramError;
 exports.SystemProgramErrorCode = SystemProgramErrorCode;
-exports.accountMetaWithDefault = accountMetaWithDefault;
 exports.decodeNonce = decodeNonce;
 exports.expectAddress = expectAddress;
 exports.expectProgramDerivedAddress = expectProgramDerivedAddress;
@@ -1331,52 +1174,43 @@ exports.fetchAllMaybeNonce = fetchAllMaybeNonce;
 exports.fetchAllNonce = fetchAllNonce;
 exports.fetchMaybeNonce = fetchMaybeNonce;
 exports.fetchNonce = fetchNonce;
-exports.getAccountMetasWithSigners = getAccountMetasWithSigners;
+exports.getAccountMetaFactory = getAccountMetaFactory;
 exports.getAdvanceNonceAccountInstruction = getAdvanceNonceAccountInstruction;
 exports.getAdvanceNonceAccountInstructionDataCodec = getAdvanceNonceAccountInstructionDataCodec;
 exports.getAdvanceNonceAccountInstructionDataDecoder = getAdvanceNonceAccountInstructionDataDecoder;
 exports.getAdvanceNonceAccountInstructionDataEncoder = getAdvanceNonceAccountInstructionDataEncoder;
-exports.getAdvanceNonceAccountInstructionRaw = getAdvanceNonceAccountInstructionRaw;
 exports.getAllocateInstruction = getAllocateInstruction;
 exports.getAllocateInstructionDataCodec = getAllocateInstructionDataCodec;
 exports.getAllocateInstructionDataDecoder = getAllocateInstructionDataDecoder;
 exports.getAllocateInstructionDataEncoder = getAllocateInstructionDataEncoder;
-exports.getAllocateInstructionRaw = getAllocateInstructionRaw;
 exports.getAllocateWithSeedInstruction = getAllocateWithSeedInstruction;
 exports.getAllocateWithSeedInstructionDataCodec = getAllocateWithSeedInstructionDataCodec;
 exports.getAllocateWithSeedInstructionDataDecoder = getAllocateWithSeedInstructionDataDecoder;
 exports.getAllocateWithSeedInstructionDataEncoder = getAllocateWithSeedInstructionDataEncoder;
-exports.getAllocateWithSeedInstructionRaw = getAllocateWithSeedInstructionRaw;
 exports.getAssignInstruction = getAssignInstruction;
 exports.getAssignInstructionDataCodec = getAssignInstructionDataCodec;
 exports.getAssignInstructionDataDecoder = getAssignInstructionDataDecoder;
 exports.getAssignInstructionDataEncoder = getAssignInstructionDataEncoder;
-exports.getAssignInstructionRaw = getAssignInstructionRaw;
 exports.getAssignWithSeedInstruction = getAssignWithSeedInstruction;
 exports.getAssignWithSeedInstructionDataCodec = getAssignWithSeedInstructionDataCodec;
 exports.getAssignWithSeedInstructionDataDecoder = getAssignWithSeedInstructionDataDecoder;
 exports.getAssignWithSeedInstructionDataEncoder = getAssignWithSeedInstructionDataEncoder;
-exports.getAssignWithSeedInstructionRaw = getAssignWithSeedInstructionRaw;
 exports.getAuthorizeNonceAccountInstruction = getAuthorizeNonceAccountInstruction;
 exports.getAuthorizeNonceAccountInstructionDataCodec = getAuthorizeNonceAccountInstructionDataCodec;
 exports.getAuthorizeNonceAccountInstructionDataDecoder = getAuthorizeNonceAccountInstructionDataDecoder;
 exports.getAuthorizeNonceAccountInstructionDataEncoder = getAuthorizeNonceAccountInstructionDataEncoder;
-exports.getAuthorizeNonceAccountInstructionRaw = getAuthorizeNonceAccountInstructionRaw;
 exports.getCreateAccountInstruction = getCreateAccountInstruction;
 exports.getCreateAccountInstructionDataCodec = getCreateAccountInstructionDataCodec;
 exports.getCreateAccountInstructionDataDecoder = getCreateAccountInstructionDataDecoder;
 exports.getCreateAccountInstructionDataEncoder = getCreateAccountInstructionDataEncoder;
-exports.getCreateAccountInstructionRaw = getCreateAccountInstructionRaw;
 exports.getCreateAccountWithSeedInstruction = getCreateAccountWithSeedInstruction;
 exports.getCreateAccountWithSeedInstructionDataCodec = getCreateAccountWithSeedInstructionDataCodec;
 exports.getCreateAccountWithSeedInstructionDataDecoder = getCreateAccountWithSeedInstructionDataDecoder;
 exports.getCreateAccountWithSeedInstructionDataEncoder = getCreateAccountWithSeedInstructionDataEncoder;
-exports.getCreateAccountWithSeedInstructionRaw = getCreateAccountWithSeedInstructionRaw;
 exports.getInitializeNonceAccountInstruction = getInitializeNonceAccountInstruction;
 exports.getInitializeNonceAccountInstructionDataCodec = getInitializeNonceAccountInstructionDataCodec;
 exports.getInitializeNonceAccountInstructionDataDecoder = getInitializeNonceAccountInstructionDataDecoder;
 exports.getInitializeNonceAccountInstructionDataEncoder = getInitializeNonceAccountInstructionDataEncoder;
-exports.getInitializeNonceAccountInstructionRaw = getInitializeNonceAccountInstructionRaw;
 exports.getNonceAccountDataCodec = getNonceAccountDataCodec;
 exports.getNonceAccountDataDecoder = getNonceAccountDataDecoder;
 exports.getNonceAccountDataEncoder = getNonceAccountDataEncoder;
@@ -1393,22 +1227,18 @@ exports.getTransferSolInstruction = getTransferSolInstruction;
 exports.getTransferSolInstructionDataCodec = getTransferSolInstructionDataCodec;
 exports.getTransferSolInstructionDataDecoder = getTransferSolInstructionDataDecoder;
 exports.getTransferSolInstructionDataEncoder = getTransferSolInstructionDataEncoder;
-exports.getTransferSolInstructionRaw = getTransferSolInstructionRaw;
 exports.getTransferSolWithSeedInstruction = getTransferSolWithSeedInstruction;
 exports.getTransferSolWithSeedInstructionDataCodec = getTransferSolWithSeedInstructionDataCodec;
 exports.getTransferSolWithSeedInstructionDataDecoder = getTransferSolWithSeedInstructionDataDecoder;
 exports.getTransferSolWithSeedInstructionDataEncoder = getTransferSolWithSeedInstructionDataEncoder;
-exports.getTransferSolWithSeedInstructionRaw = getTransferSolWithSeedInstructionRaw;
 exports.getUpgradeNonceAccountInstruction = getUpgradeNonceAccountInstruction;
 exports.getUpgradeNonceAccountInstructionDataCodec = getUpgradeNonceAccountInstructionDataCodec;
 exports.getUpgradeNonceAccountInstructionDataDecoder = getUpgradeNonceAccountInstructionDataDecoder;
 exports.getUpgradeNonceAccountInstructionDataEncoder = getUpgradeNonceAccountInstructionDataEncoder;
-exports.getUpgradeNonceAccountInstructionRaw = getUpgradeNonceAccountInstructionRaw;
 exports.getWithdrawNonceAccountInstruction = getWithdrawNonceAccountInstruction;
 exports.getWithdrawNonceAccountInstructionDataCodec = getWithdrawNonceAccountInstructionDataCodec;
 exports.getWithdrawNonceAccountInstructionDataDecoder = getWithdrawNonceAccountInstructionDataDecoder;
 exports.getWithdrawNonceAccountInstructionDataEncoder = getWithdrawNonceAccountInstructionDataEncoder;
-exports.getWithdrawNonceAccountInstructionRaw = getWithdrawNonceAccountInstructionRaw;
 exports.identifySystemInstruction = identifySystemInstruction;
 exports.isTransactionSigner = isTransactionSigner;
 exports.memcmp = memcmp;