@solana-program/system 0.2.0 → 0.3.0

package/dist/src/index.js

@@ -1,8 +1,4 @@
-import { decodeAccount, assertAccountExists, fetchEncodedAccount, assertAccountsExist, fetchEncodedAccounts, BASE_ACCOUNT_SIZE } from '@solana/accounts';
-import { getAddressEncoder, getAddressDecoder, isProgramDerivedAddress } from '@solana/addresses';
-import { getScalarEnumEncoder, getU32Encoder, getScalarEnumDecoder, getU32Decoder, combineCodec, getStructEncoder, getU64Encoder, getStructDecoder, getU64Decoder, mapEncoder, getStringEncoder, getStringDecoder } from '@solana/codecs';
-import { AccountRole, upgradeRoleToSigner } from '@solana/instructions';
-import { isTransactionSigner as isTransactionSigner$1 } from '@solana/signers';
+import { getEnumEncoder, getU32Encoder, getEnumDecoder, getU32Decoder, combineCodec, getStructEncoder, getAddressEncoder, getU64Encoder, getStructDecoder, getAddressDecoder, getU64Decoder, decodeAccount, assertAccountExists, fetchEncodedAccount, assertAccountsExist, fetchEncodedAccounts, containsBytes, transformEncoder, addEncoderSizePrefix, getUtf8Encoder, addDecoderSizePrefix, getUtf8Decoder, BASE_ACCOUNT_SIZE, AccountRole, upgradeRoleToSigner, isTransactionSigner as isTransactionSigner$1 } from '@solana/web3.js';
 
 // env-shim.ts
 var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
@@ -12,10 +8,10 @@ var NonceState = /* @__PURE__ */ ((NonceState3) => {
   return NonceState3;
 })(NonceState || {});
 function getNonceStateEncoder() {
-  return getScalarEnumEncoder(NonceState, { size: getU32Encoder() });
+  return getEnumEncoder(NonceState, { size: getU32Encoder() });
 }
 function getNonceStateDecoder() {
-  return getScalarEnumDecoder(NonceState, { size: getU32Decoder() });
+  return getEnumDecoder(NonceState, { size: getU32Decoder() });
 }
 function getNonceStateCodec() {
   return combineCodec(getNonceStateEncoder(), getNonceStateDecoder());
@@ -26,17 +22,17 @@ var NonceVersion = /* @__PURE__ */ ((NonceVersion3) => {
   return NonceVersion3;
 })(NonceVersion || {});
 function getNonceVersionEncoder() {
-  return getScalarEnumEncoder(NonceVersion, { size: getU32Encoder() });
+  return getEnumEncoder(NonceVersion, { size: getU32Encoder() });
 }
 function getNonceVersionDecoder() {
-  return getScalarEnumDecoder(NonceVersion, { size: getU32Decoder() });
+  return getEnumDecoder(NonceVersion, { size: getU32Decoder() });
 }
 function getNonceVersionCodec() {
   return combineCodec(getNonceVersionEncoder(), getNonceVersionDecoder());
 }
 
 // src/generated/accounts/nonce.ts
-function getNonceAccountDataEncoder() {
+function getNonceEncoder() {
   return getStructEncoder([
     ["version", getNonceVersionEncoder()],
     ["state", getNonceStateEncoder()],
@@ -45,7 +41,7 @@ function getNonceAccountDataEncoder() {
     ["lamportsPerSignature", getU64Encoder()]
   ]);
 }
-function getNonceAccountDataDecoder() {
+function getNonceDecoder() {
   return getStructDecoder([
     ["version", getNonceVersionDecoder()],
     ["state", getNonceStateDecoder()],
@@ -54,16 +50,13 @@ function getNonceAccountDataDecoder() {
     ["lamportsPerSignature", getU64Decoder()]
   ]);
 }
-function getNonceAccountDataCodec() {
-  return combineCodec(
-    getNonceAccountDataEncoder(),
-    getNonceAccountDataDecoder()
-  );
+function getNonceCodec() {
+  return combineCodec(getNonceEncoder(), getNonceDecoder());
 }
 function decodeNonce(encodedAccount) {
   return decodeAccount(
     encodedAccount,
-    getNonceAccountDataDecoder()
+    getNonceDecoder()
   );
 }
 async function fetchNonce(rpc, address, config) {
@@ -89,153 +82,36 @@ function getNonceSize() {
 }
 
 // src/generated/errors/system.ts
-var SystemProgramErrorCode = /* @__PURE__ */ ((SystemProgramErrorCode3) => {
-  SystemProgramErrorCode3[SystemProgramErrorCode3["ACCOUNT_ALREADY_IN_USE"] = 0] = "ACCOUNT_ALREADY_IN_USE";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["RESULT_WITH_NEGATIVE_LAMPORTS"] = 1] = "RESULT_WITH_NEGATIVE_LAMPORTS";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["INVALID_PROGRAM_ID"] = 2] = "INVALID_PROGRAM_ID";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["INVALID_ACCOUNT_DATA_LENGTH"] = 3] = "INVALID_ACCOUNT_DATA_LENGTH";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["MAX_SEED_LENGTH_EXCEEDED"] = 4] = "MAX_SEED_LENGTH_EXCEEDED";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["ADDRESS_WITH_SEED_MISMATCH"] = 5] = "ADDRESS_WITH_SEED_MISMATCH";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["NONCE_NO_RECENT_BLOCKHASHES"] = 6] = "NONCE_NO_RECENT_BLOCKHASHES";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["NONCE_BLOCKHASH_NOT_EXPIRED"] = 7] = "NONCE_BLOCKHASH_NOT_EXPIRED";
-  SystemProgramErrorCode3[SystemProgramErrorCode3["NONCE_UNEXPECTED_BLOCKHASH_VALUE"] = 8] = "NONCE_UNEXPECTED_BLOCKHASH_VALUE";
-  return SystemProgramErrorCode3;
-})(SystemProgramErrorCode || {});
-var SystemProgramError = class extends Error {
-  name = "SystemProgramError";
-  code;
-  cause;
-  constructor(code, name, message, cause) {
-    super(`${name} (${code}): ${message}`);
-    this.code = code;
-    this.cause = cause;
-  }
-};
-var systemProgramErrorCodeMap;
+var SYSTEM_ERROR__ACCOUNT_ALREADY_IN_USE = 0;
+var SYSTEM_ERROR__RESULT_WITH_NEGATIVE_LAMPORTS = 1;
+var SYSTEM_ERROR__INVALID_PROGRAM_ID = 2;
+var SYSTEM_ERROR__INVALID_ACCOUNT_DATA_LENGTH = 3;
+var SYSTEM_ERROR__MAX_SEED_LENGTH_EXCEEDED = 4;
+var SYSTEM_ERROR__ADDRESS_WITH_SEED_MISMATCH = 5;
+var SYSTEM_ERROR__NONCE_NO_RECENT_BLOCKHASHES = 6;
+var SYSTEM_ERROR__NONCE_BLOCKHASH_NOT_EXPIRED = 7;
+var SYSTEM_ERROR__NONCE_UNEXPECTED_BLOCKHASH_VALUE = 8;
+var systemErrorMessages;
 if (__DEV__) {
-  systemProgramErrorCodeMap = {
-    [0 /* ACCOUNT_ALREADY_IN_USE */]: [
-      "AccountAlreadyInUse",
-      `an account with the same address already exists`
-    ],
-    [1 /* RESULT_WITH_NEGATIVE_LAMPORTS */]: [
-      "ResultWithNegativeLamports",
-      `account does not have enough SOL to perform the operation`
-    ],
-    [2 /* INVALID_PROGRAM_ID */]: [
-      "InvalidProgramId",
-      `cannot assign account to this program id`
-    ],
-    [3 /* INVALID_ACCOUNT_DATA_LENGTH */]: [
-      "InvalidAccountDataLength",
-      `cannot allocate account data of this length`
-    ],
-    [4 /* MAX_SEED_LENGTH_EXCEEDED */]: [
-      "MaxSeedLengthExceeded",
-      `length of requested seed is too long`
-    ],
-    [5 /* ADDRESS_WITH_SEED_MISMATCH */]: [
-      "AddressWithSeedMismatch",
-      `provided address does not match addressed derived from seed`
-    ],
-    [6 /* NONCE_NO_RECENT_BLOCKHASHES */]: [
-      "NonceNoRecentBlockhashes",
-      `advancing stored nonce requires a populated RecentBlockhashes sysvar`
-    ],
-    [7 /* NONCE_BLOCKHASH_NOT_EXPIRED */]: [
-      "NonceBlockhashNotExpired",
-      `stored nonce is still in recent_blockhashes`
-    ],
-    [8 /* NONCE_UNEXPECTED_BLOCKHASH_VALUE */]: [
-      "NonceUnexpectedBlockhashValue",
-      `specified nonce does not match stored nonce`
-    ]
+  systemErrorMessages = {
+    [SYSTEM_ERROR__ACCOUNT_ALREADY_IN_USE]: `an account with the same address already exists`,
+    [SYSTEM_ERROR__ADDRESS_WITH_SEED_MISMATCH]: `provided address does not match addressed derived from seed`,
+    [SYSTEM_ERROR__INVALID_ACCOUNT_DATA_LENGTH]: `cannot allocate account data of this length`,
+    [SYSTEM_ERROR__INVALID_PROGRAM_ID]: `cannot assign account to this program id`,
+    [SYSTEM_ERROR__MAX_SEED_LENGTH_EXCEEDED]: `length of requested seed is too long`,
+    [SYSTEM_ERROR__NONCE_BLOCKHASH_NOT_EXPIRED]: `stored nonce is still in recent_blockhashes`,
+    [SYSTEM_ERROR__NONCE_NO_RECENT_BLOCKHASHES]: `advancing stored nonce requires a populated RecentBlockhashes sysvar`,
+    [SYSTEM_ERROR__NONCE_UNEXPECTED_BLOCKHASH_VALUE]: `specified nonce does not match stored nonce`,
+    [SYSTEM_ERROR__RESULT_WITH_NEGATIVE_LAMPORTS]: `account does not have enough SOL to perform the operation`
   };
 }
-function getSystemProgramErrorFromCode(code, cause) {
+function getSystemErrorMessage(code) {
   if (__DEV__) {
-    return new SystemProgramError(
-      code,
-      ...systemProgramErrorCodeMap[code],
-      cause
-    );
+    return systemErrorMessages[code];
   }
-  return new SystemProgramError(
-    code,
-    "Unknown",
-    "Error message not available in production bundles. Compile with __DEV__ set to true to see more information.",
-    cause
-  );
+  return "Error message not available in production bundles. Compile with `__DEV__` set to true to see more information.";
 }
-function expectSome(value) {
-  if (value == null) {
-    throw new Error("Expected a value but received null or undefined.");
-  }
-  return value;
-}
-function expectAddress(value) {
-  if (!value) {
-    throw new Error("Expected a Address.");
-  }
-  if (typeof value === "object" && "address" in value) {
-    return value.address;
-  }
-  if (Array.isArray(value)) {
-    return value[0];
-  }
-  return value;
-}
-function expectProgramDerivedAddress(value) {
-  if (!value || !Array.isArray(value) || !isProgramDerivedAddress(value)) {
-    throw new Error("Expected a ProgramDerivedAddress.");
-  }
-  return value;
-}
-function expectTransactionSigner(value) {
-  if (!value || !isTransactionSigner(value)) {
-    throw new Error("Expected a TransactionSigner.");
-  }
-  return value;
-}
-function getAccountMetaFactory(programAddress, optionalAccountStrategy) {
-  return (account) => {
-    if (!account.value) {
-      if (optionalAccountStrategy === "omitted")
-        return;
-      return Object.freeze({
-        address: programAddress,
-        role: AccountRole.READONLY
-      });
-    }
-    const writableRole = account.isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
-    return Object.freeze({
-      address: expectAddress(account.value),
-      role: isTransactionSigner(account.value) ? upgradeRoleToSigner(writableRole) : writableRole,
-      ...isTransactionSigner(account.value) ? { signer: account.value } : {}
-    });
-  };
-}
-function isTransactionSigner(value) {
-  return !!value && typeof value === "object" && "address" in value && isTransactionSigner$1(value);
-}
-function memcmp(data, bytes, offset) {
-  const slice = data.slice(offset, offset + bytes.length);
-  if (slice.length !== bytes.length)
-    return false;
-  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;
@@ -258,53 +134,84 @@ var SystemInstruction = /* @__PURE__ */ ((SystemInstruction2) => {
 })(SystemInstruction || {});
 function identifySystemInstruction(instruction) {
   const data = instruction instanceof Uint8Array ? instruction : instruction.data;
-  if (memcmp(data, getU32Encoder().encode(0), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(0), 0)) {
     return 0 /* CreateAccount */;
   }
-  if (memcmp(data, getU32Encoder().encode(1), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(1), 0)) {
     return 1 /* Assign */;
   }
-  if (memcmp(data, getU32Encoder().encode(2), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(2), 0)) {
     return 2 /* TransferSol */;
   }
-  if (memcmp(data, getU32Encoder().encode(3), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(3), 0)) {
     return 3 /* CreateAccountWithSeed */;
   }
-  if (memcmp(data, getU32Encoder().encode(4), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(4), 0)) {
     return 4 /* AdvanceNonceAccount */;
   }
-  if (memcmp(data, getU32Encoder().encode(5), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(5), 0)) {
     return 5 /* WithdrawNonceAccount */;
   }
-  if (memcmp(data, getU32Encoder().encode(6), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(6), 0)) {
     return 6 /* InitializeNonceAccount */;
   }
-  if (memcmp(data, getU32Encoder().encode(7), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(7), 0)) {
     return 7 /* AuthorizeNonceAccount */;
   }
-  if (memcmp(data, getU32Encoder().encode(8), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(8), 0)) {
     return 8 /* Allocate */;
   }
-  if (memcmp(data, getU32Encoder().encode(9), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(9), 0)) {
     return 9 /* AllocateWithSeed */;
   }
-  if (memcmp(data, getU32Encoder().encode(10), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(10), 0)) {
     return 10 /* AssignWithSeed */;
   }
-  if (memcmp(data, getU32Encoder().encode(11), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(11), 0)) {
     return 11 /* TransferSolWithSeed */;
   }
-  if (memcmp(data, getU32Encoder().encode(12), 0)) {
+  if (containsBytes(data, getU32Encoder().encode(12), 0)) {
     return 12 /* UpgradeNonceAccount */;
   }
   throw new Error(
     "The provided instruction could not be identified as a system instruction."
   );
 }
+function expectAddress(value) {
+  if (!value) {
+    throw new Error("Expected a Address.");
+  }
+  if (typeof value === "object" && "address" in value) {
+    return value.address;
+  }
+  if (Array.isArray(value)) {
+    return value[0];
+  }
+  return value;
+}
+function getAccountMetaFactory(programAddress, optionalAccountStrategy) {
+  return (account) => {
+    if (!account.value) {
+      return Object.freeze({
+        address: programAddress,
+        role: AccountRole.READONLY
+      });
+    }
+    const writableRole = account.isWritable ? AccountRole.WRITABLE : AccountRole.READONLY;
+    return Object.freeze({
+      address: expectAddress(account.value),
+      role: isTransactionSigner(account.value) ? upgradeRoleToSigner(writableRole) : writableRole,
+      ...isTransactionSigner(account.value) ? { signer: account.value } : {}
+    });
+  };
+}
+function isTransactionSigner(value) {
+  return !!value && typeof value === "object" && "address" in value && isTransactionSigner$1(value);
+}
 
 // src/generated/instructions/advanceNonceAccount.ts
 function getAdvanceNonceAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([["discriminator", getU32Encoder()]]),
     (value) => ({ ...value, discriminator: 4 })
   );
@@ -332,7 +239,7 @@ function getAdvanceNonceAccountInstruction(input) {
   if (!accounts.recentBlockhashesSysvar.value) {
     accounts.recentBlockhashesSysvar.value = "SysvarRecentB1ockHashes11111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.nonceAccount),
@@ -367,7 +274,7 @@ function parseAdvanceNonceAccountInstruction(instruction) {
   };
 }
 function getAllocateInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["space", getU64Encoder()]
@@ -394,7 +301,7 @@ function getAllocateInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [getAccountMeta(accounts.newAccount)],
     programAddress,
@@ -423,11 +330,11 @@ function parseAllocateInstruction(instruction) {
   };
 }
 function getAllocateWithSeedInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["base", getAddressEncoder()],
-      ["seed", getStringEncoder()],
+      ["seed", addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
       ["space", getU64Encoder()],
       ["programAddress", getAddressEncoder()]
     ]),
@@ -438,7 +345,7 @@ function getAllocateWithSeedInstructionDataDecoder() {
   return getStructDecoder([
     ["discriminator", getU32Decoder()],
     ["base", getAddressDecoder()],
-    ["seed", getStringDecoder()],
+    ["seed", addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
     ["space", getU64Decoder()],
     ["programAddress", getAddressDecoder()]
   ]);
@@ -457,7 +364,7 @@ function getAllocateWithSeedInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.newAccount),
@@ -490,7 +397,7 @@ function parseAllocateWithSeedInstruction(instruction) {
   };
 }
 function getAssignInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["programAddress", getAddressEncoder()]
@@ -517,7 +424,7 @@ function getAssignInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [getAccountMeta(accounts.account)],
     programAddress,
@@ -546,11 +453,11 @@ function parseAssignInstruction(instruction) {
   };
 }
 function getAssignWithSeedInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["base", getAddressEncoder()],
-      ["seed", getStringEncoder()],
+      ["seed", addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
       ["programAddress", getAddressEncoder()]
     ]),
     (value) => ({ ...value, discriminator: 10 })
@@ -560,7 +467,7 @@ function getAssignWithSeedInstructionDataDecoder() {
   return getStructDecoder([
     ["discriminator", getU32Decoder()],
     ["base", getAddressDecoder()],
-    ["seed", getStringDecoder()],
+    ["seed", addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
     ["programAddress", getAddressDecoder()]
   ]);
 }
@@ -578,7 +485,7 @@ function getAssignWithSeedInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.account),
@@ -611,7 +518,7 @@ function parseAssignWithSeedInstruction(instruction) {
   };
 }
 function getAuthorizeNonceAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["newNonceAuthority", getAddressEncoder()]
@@ -639,7 +546,7 @@ function getAuthorizeNonceAccountInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.nonceAccount),
@@ -674,7 +581,7 @@ function parseAuthorizeNonceAccountInstruction(instruction) {
   };
 }
 function getCreateAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["lamports", getU64Encoder()],
@@ -710,7 +617,7 @@ function getCreateAccountInstruction(input) {
     (a, b) => a + b,
     0
   );
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.payer),
@@ -743,11 +650,11 @@ function parseCreateAccountInstruction(instruction) {
   };
 }
 function getCreateAccountWithSeedInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["base", getAddressEncoder()],
-      ["seed", getStringEncoder()],
+      ["seed", addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
       ["amount", getU64Encoder()],
       ["space", getU64Encoder()],
       ["programAddress", getAddressEncoder()]
@@ -759,7 +666,7 @@ function getCreateAccountWithSeedInstructionDataDecoder() {
   return getStructDecoder([
     ["discriminator", getU32Decoder()],
     ["base", getAddressDecoder()],
-    ["seed", getStringDecoder()],
+    ["seed", addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
     ["amount", getU64Decoder()],
     ["space", getU64Decoder()],
     ["programAddress", getAddressDecoder()]
@@ -780,7 +687,7 @@ function getCreateAccountWithSeedInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.payer),
@@ -817,7 +724,7 @@ function parseCreateAccountWithSeedInstruction(instruction) {
   };
 }
 function getInitializeNonceAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["nonceAuthority", getAddressEncoder()]
@@ -855,7 +762,7 @@ function getInitializeNonceAccountInstruction(input) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.nonceAccount),
@@ -892,7 +799,7 @@ function parseInitializeNonceAccountInstruction(instruction) {
   };
 }
 function getTransferSolInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["amount", getU64Encoder()]
@@ -920,7 +827,7 @@ function getTransferSolInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.source),
@@ -953,11 +860,11 @@ function parseTransferSolInstruction(instruction) {
   };
 }
 function getTransferSolWithSeedInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["amount", getU64Encoder()],
-      ["fromSeed", getStringEncoder()],
+      ["fromSeed", addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
       ["fromOwner", getAddressEncoder()]
     ]),
     (value) => ({ ...value, discriminator: 11 })
@@ -967,7 +874,7 @@ function getTransferSolWithSeedInstructionDataDecoder() {
   return getStructDecoder([
     ["discriminator", getU32Decoder()],
     ["amount", getU64Decoder()],
-    ["fromSeed", getStringDecoder()],
+    ["fromSeed", addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
     ["fromOwner", getAddressDecoder()]
   ]);
 }
@@ -986,7 +893,7 @@ function getTransferSolWithSeedInstruction(input) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.source),
@@ -1023,7 +930,7 @@ function parseTransferSolWithSeedInstruction(instruction) {
   };
 }
 function getUpgradeNonceAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([["discriminator", getU32Encoder()]]),
     (value) => ({ ...value, discriminator: 12 })
   );
@@ -1043,7 +950,7 @@ function getUpgradeNonceAccountInstruction(input) {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true }
   };
   const accounts = originalAccounts;
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [getAccountMeta(accounts.nonceAccount)],
     programAddress,
@@ -1072,7 +979,7 @@ function parseUpgradeNonceAccountInstruction(instruction) {
   };
 }
 function getWithdrawNonceAccountInstructionDataEncoder() {
-  return mapEncoder(
+  return transformEncoder(
     getStructEncoder([
       ["discriminator", getU32Encoder()],
       ["withdrawAmount", getU64Encoder()]
@@ -1115,7 +1022,7 @@ function getWithdrawNonceAccountInstruction(input) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  const getAccountMeta = getAccountMetaFactory(programAddress);
   const instruction = {
     accounts: [
       getAccountMeta(accounts.nonceAccount),
@@ -1156,6 +1063,6 @@ function parseWithdrawNonceAccountInstruction(instruction) {
   };
 }
 
-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 };
+export { NonceState, NonceVersion, SYSTEM_ERROR__ACCOUNT_ALREADY_IN_USE, SYSTEM_ERROR__ADDRESS_WITH_SEED_MISMATCH, SYSTEM_ERROR__INVALID_ACCOUNT_DATA_LENGTH, SYSTEM_ERROR__INVALID_PROGRAM_ID, SYSTEM_ERROR__MAX_SEED_LENGTH_EXCEEDED, SYSTEM_ERROR__NONCE_BLOCKHASH_NOT_EXPIRED, SYSTEM_ERROR__NONCE_NO_RECENT_BLOCKHASHES, SYSTEM_ERROR__NONCE_UNEXPECTED_BLOCKHASH_VALUE, SYSTEM_ERROR__RESULT_WITH_NEGATIVE_LAMPORTS, SYSTEM_PROGRAM_ADDRESS, SystemAccount, SystemInstruction, decodeNonce, fetchAllMaybeNonce, fetchAllNonce, fetchMaybeNonce, fetchNonce, 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, getNonceCodec, getNonceDecoder, getNonceEncoder, getNonceSize, getNonceStateCodec, getNonceStateDecoder, getNonceStateEncoder, getNonceVersionCodec, getNonceVersionDecoder, getNonceVersionEncoder, getSystemErrorMessage, getTransferSolInstruction, getTransferSolInstructionDataCodec, getTransferSolInstructionDataDecoder, getTransferSolInstructionDataEncoder, getTransferSolWithSeedInstruction, getTransferSolWithSeedInstructionDataCodec, getTransferSolWithSeedInstructionDataDecoder, getTransferSolWithSeedInstructionDataEncoder, getUpgradeNonceAccountInstruction, getUpgradeNonceAccountInstructionDataCodec, getUpgradeNonceAccountInstructionDataDecoder, getUpgradeNonceAccountInstructionDataEncoder, getWithdrawNonceAccountInstruction, getWithdrawNonceAccountInstructionDataCodec, getWithdrawNonceAccountInstructionDataDecoder, getWithdrawNonceAccountInstructionDataEncoder, identifySystemInstruction, parseAdvanceNonceAccountInstruction, parseAllocateInstruction, parseAllocateWithSeedInstruction, parseAssignInstruction, parseAssignWithSeedInstruction, parseAuthorizeNonceAccountInstruction, parseCreateAccountInstruction, parseCreateAccountWithSeedInstruction, parseInitializeNonceAccountInstruction, parseTransferSolInstruction, parseTransferSolWithSeedInstruction, parseUpgradeNonceAccountInstruction, parseWithdrawNonceAccountInstruction };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map