@solana-program/system 0.8.0 → 0.9.0

package/dist/src/index.js

@@ -201,10 +201,7 @@ function expectAddress(value) {
 function getAccountMetaFactory(programAddress, optionalAccountStrategy) {
   return (account) => {
     if (!account.value) {
-      return Object.freeze({
-        address: programAddress,
-        role: kit.AccountRole.READONLY
-      });
+      return;
     }
     const writableRole = account.isWritable ? kit.AccountRole.WRITABLE : kit.AccountRole.READONLY;
     return Object.freeze({
@@ -255,17 +252,16 @@ function getAdvanceNonceAccountInstruction(input, config) {
   if (!accounts.recentBlockhashesSysvar.value) {
     accounts.recentBlockhashesSysvar.value = "SysvarRecentB1ockHashes11111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.nonceAccount),
       getAccountMeta(accounts.recentBlockhashesSysvar),
       getAccountMeta(accounts.nonceAuthority)
     ],
-    programAddress,
-    data: getAdvanceNonceAccountInstructionDataEncoder().encode({})
-  };
-  return instruction;
+    data: getAdvanceNonceAccountInstructionDataEncoder().encode({}),
+    programAddress
+  });
 }
 function parseAdvanceNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -321,15 +317,14 @@ function getAllocateInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [getAccountMeta(accounts.newAccount)],
-    programAddress,
     data: getAllocateInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseAllocateInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -343,9 +338,7 @@ function parseAllocateInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      newAccount: getNextAccount()
-    },
+    accounts: { newAccount: getNextAccount() },
     data: getAllocateInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -388,18 +381,17 @@ function getAllocateWithSeedInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.newAccount),
       getAccountMeta(accounts.baseAccount)
     ],
-    programAddress,
     data: getAllocateWithSeedInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseAllocateWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -413,10 +405,7 @@ function parseAllocateWithSeedInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      newAccount: getNextAccount(),
-      baseAccount: getNextAccount()
-    },
+    accounts: { newAccount: getNextAccount(), baseAccount: getNextAccount() },
     data: getAllocateWithSeedInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -452,15 +441,14 @@ function getAssignInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [getAccountMeta(accounts.account)],
-    programAddress,
     data: getAssignInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseAssignInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -474,9 +462,7 @@ function parseAssignInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      account: getNextAccount()
-    },
+    accounts: { account: getNextAccount() },
     data: getAssignInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -517,18 +503,17 @@ function getAssignWithSeedInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.account),
       getAccountMeta(accounts.baseAccount)
     ],
-    programAddress,
     data: getAssignWithSeedInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseAssignWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -542,10 +527,7 @@ function parseAssignWithSeedInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      account: getNextAccount(),
-      baseAccount: getNextAccount()
-    },
+    accounts: { account: getNextAccount(), baseAccount: getNextAccount() },
     data: getAssignWithSeedInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -585,18 +567,17 @@ function getAuthorizeNonceAccountInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.nonceAccount),
       getAccountMeta(accounts.nonceAuthority)
     ],
-    programAddress,
     data: getAuthorizeNonceAccountInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseAuthorizeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -660,18 +641,18 @@ function getCreateAccountInstruction(input, config) {
     (a, b) => a + b,
     0
   );
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.payer),
       getAccountMeta(accounts.newAccount)
     ],
-    programAddress,
+    byteDelta,
     data: getCreateAccountInstructionDataEncoder().encode(
       args
-    )
-  };
-  return Object.freeze({ ...instruction, byteDelta });
+    ),
+    programAddress
+  });
 }
 function parseCreateAccountInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -685,10 +666,7 @@ function parseCreateAccountInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      payer: getNextAccount(),
-      newAccount: getNextAccount()
-    },
+    accounts: { payer: getNextAccount(), newAccount: getNextAccount() },
     data: getCreateAccountInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -737,22 +715,21 @@ function getCreateAccountWithSeedInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.payer),
       getAccountMeta(accounts.newAccount),
       getAccountMeta(accounts.baseAccount)
-    ],
-    programAddress,
+    ].filter((x) => x !== void 0),
     data: getCreateAccountWithSeedInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseCreateAccountWithSeedInstruction(instruction) {
-  if (instruction.accounts.length < 3) {
+  if (instruction.accounts.length < 2) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -761,12 +738,18 @@ function parseCreateAccountWithSeedInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  let optionalAccountsRemaining = instruction.accounts.length - 2;
+  const getNextOptionalAccount = () => {
+    if (optionalAccountsRemaining === 0) return void 0;
+    optionalAccountsRemaining -= 1;
+    return getNextAccount();
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
       payer: getNextAccount(),
       newAccount: getNextAccount(),
-      baseAccount: getNextAccount()
+      baseAccount: getNextOptionalAccount()
     },
     data: getCreateAccountWithSeedInstructionDataDecoder().decode(
       instruction.data
@@ -819,19 +802,18 @@ function getInitializeNonceAccountInstruction(input, config) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.nonceAccount),
       getAccountMeta(accounts.recentBlockhashesSysvar),
       getAccountMeta(accounts.rentSysvar)
     ],
-    programAddress,
     data: getInitializeNonceAccountInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseInitializeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -888,18 +870,17 @@ function getTransferSolInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.source),
       getAccountMeta(accounts.destination)
     ],
-    programAddress,
     data: getTransferSolInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseTransferSolInstruction(instruction) {
   if (instruction.accounts.length < 2) {
@@ -913,10 +894,7 @@ function parseTransferSolInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      source: getNextAccount(),
-      destination: getNextAccount()
-    },
+    accounts: { source: getNextAccount(), destination: getNextAccount() },
     data: getTransferSolInstructionDataDecoder().decode(instruction.data)
   };
 }
@@ -961,19 +939,18 @@ function getTransferSolWithSeedInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.source),
       getAccountMeta(accounts.baseAccount),
       getAccountMeta(accounts.destination)
     ],
-    programAddress,
     data: getTransferSolWithSeedInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseTransferSolWithSeedInstruction(instruction) {
   if (instruction.accounts.length < 3) {
@@ -1025,13 +1002,12 @@ function getUpgradeNonceAccountInstruction(input, config) {
     nonceAccount: { value: input.nonceAccount ?? null, isWritable: true }
   };
   const accounts = originalAccounts;
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [getAccountMeta(accounts.nonceAccount)],
-    programAddress,
-    data: getUpgradeNonceAccountInstructionDataEncoder().encode({})
-  };
-  return instruction;
+    data: getUpgradeNonceAccountInstructionDataEncoder().encode({}),
+    programAddress
+  });
 }
 function parseUpgradeNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 1) {
@@ -1045,9 +1021,7 @@ function parseUpgradeNonceAccountInstruction(instruction) {
   };
   return {
     programAddress: instruction.programAddress,
-    accounts: {
-      nonceAccount: getNextAccount()
-    },
+    accounts: { nonceAccount: getNextAccount() },
     data: getUpgradeNonceAccountInstructionDataDecoder().decode(
       instruction.data
     )
@@ -1104,8 +1078,8 @@ function getWithdrawNonceAccountInstruction(input, config) {
   if (!accounts.rentSysvar.value) {
     accounts.rentSysvar.value = "SysvarRent111111111111111111111111111111111";
   }
-  const getAccountMeta = getAccountMetaFactory(programAddress);
-  const instruction = {
+  const getAccountMeta = getAccountMetaFactory();
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.nonceAccount),
       getAccountMeta(accounts.recipientAccount),
@@ -1113,12 +1087,11 @@ function getWithdrawNonceAccountInstruction(input, config) {
       getAccountMeta(accounts.rentSysvar),
       getAccountMeta(accounts.nonceAuthority)
     ],
-    programAddress,
     data: getWithdrawNonceAccountInstructionDataEncoder().encode(
       args
-    )
-  };
-  return instruction;
+    ),
+    programAddress
+  });
 }
 function parseWithdrawNonceAccountInstruction(instruction) {
   if (instruction.accounts.length < 5) {