@smithii_io/mixoor 0.0.16 → 0.0.18

package/dist/src/index.js

@@ -402,6 +402,7 @@ var MIXOOR_ERROR__POSEIDON_HASH_ERROR = 6010;
 var MIXOOR_ERROR__MERKLE_TREE_FULL = 6011;
 var MIXOOR_ERROR__INVALID_MERKLE_PROOF = 6012;
 var MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH = 6013;
+var MIXOOR_ERROR__INVALID_MINT = 6014;
 var mixoorErrorMessages;
 if (process.env.NODE_ENV !== "production") {
   mixoorErrorMessages = {
@@ -411,6 +412,7 @@ if (process.env.NODE_ENV !== "production") {
     [MIXOOR_ERROR__INVALID_MERKLE_PROOF]: `Invalid merkle proof`,
     [MIXOOR_ERROR__INVALID_MERKLE_TREE]: `Invalid merkle tree structure or out of bounds access`,
     [MIXOOR_ERROR__INVALID_MERKLE_TREE_ADDRESS]: `Invalid merkle tree address`,
+    [MIXOOR_ERROR__INVALID_MINT]: `Invalid mint provided to instruction`,
     [MIXOOR_ERROR__INVALID_PROOF]: `Invalid proof`,
     [MIXOOR_ERROR__INVALID_PUBLIC_INPUTS]: `Invalid number of public inputs`,
     [MIXOOR_ERROR__MERKLE_TREE_FULL]: `Merkle tree is full`,
@@ -950,35 +952,15 @@ async function getTransferInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
-  if (!accounts.recipientTokenAccount.value) {
-    accounts.recipientTokenAccount.value = await kit.getProgramDerivedAddress({
-      programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
-      seeds: [
-        kit.getAddressEncoder().encode(expectAddress(accounts.recipient.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.tokenProgram.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.mint.value))
-      ]
-    });
-  }
   if (!accounts.feeCollector.value) {
     accounts.feeCollector.value = "9qX97Bd8dvHAknHVjCxz4uEJcPSE3NGjjgniMVdDBu6d";
   }
-  if (!accounts.feeCollectorTokenAccount.value) {
-    accounts.feeCollectorTokenAccount.value = await kit.getProgramDerivedAddress({
-      programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
-      seeds: [
-        kit.getAddressEncoder().encode(expectAddress(accounts.feeCollector.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.tokenProgram.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.mint.value))
-      ]
-    });
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
+  if (!accounts.tokenProgram.value) {
+    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+  }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
   }
@@ -1036,15 +1018,15 @@ function getTransferInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
   if (!accounts.feeCollector.value) {
     accounts.feeCollector.value = "9qX97Bd8dvHAknHVjCxz4uEJcPSE3NGjjgniMVdDBu6d";
   }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
+  if (!accounts.tokenProgram.value) {
+    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+  }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
   }
@@ -1216,7 +1198,10 @@ async function getWithdrawInstructionAsync(input, config) {
     pool: { value: input.pool ?? null, isWritable: true },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultAta: { value: input.vaultAta ?? null, isWritable: false },
-    authorityAta: { value: input.authorityAta ?? null, isWritable: false },
+    authorityTokenAccount: {
+      value: input.authorityTokenAccount ?? null,
+      isWritable: true
+    },
     mint: { value: input.mint ?? null, isWritable: true },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
@@ -1252,16 +1237,6 @@ async function getWithdrawInstructionAsync(input, config) {
       ]
     });
   }
-  if (!accounts.authorityAta.value) {
-    accounts.authorityAta.value = await kit.getProgramDerivedAddress({
-      programAddress: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
-      seeds: [
-        kit.getAddressEncoder().encode(expectAddress(accounts.authority.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.tokenProgram.value)),
-        kit.getAddressEncoder().encode(expectAddress(accounts.mint.value))
-      ]
-    });
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
@@ -1275,7 +1250,7 @@ async function getWithdrawInstructionAsync(input, config) {
       getAccountMeta(accounts.pool),
       getAccountMeta(accounts.vault),
       getAccountMeta(accounts.vaultAta),
-      getAccountMeta(accounts.authorityAta),
+      getAccountMeta(accounts.authorityTokenAccount),
       getAccountMeta(accounts.mint),
       getAccountMeta(accounts.systemProgram),
       getAccountMeta(accounts.tokenProgram),
@@ -1294,7 +1269,10 @@ function getWithdrawInstruction(input, config) {
     pool: { value: input.pool ?? null, isWritable: true },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultAta: { value: input.vaultAta ?? null, isWritable: false },
-    authorityAta: { value: input.authorityAta ?? null, isWritable: false },
+    authorityTokenAccount: {
+      value: input.authorityTokenAccount ?? null,
+      isWritable: true
+    },
     mint: { value: input.mint ?? null, isWritable: true },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
@@ -1324,7 +1302,7 @@ function getWithdrawInstruction(input, config) {
       getAccountMeta(accounts.pool),
       getAccountMeta(accounts.vault),
       getAccountMeta(accounts.vaultAta),
-      getAccountMeta(accounts.authorityAta),
+      getAccountMeta(accounts.authorityTokenAccount),
       getAccountMeta(accounts.mint),
       getAccountMeta(accounts.systemProgram),
       getAccountMeta(accounts.tokenProgram),
@@ -1346,6 +1324,10 @@ function parseWithdrawInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === MIXOOR_PROGRAM_ADDRESS ? void 0 : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
@@ -1353,7 +1335,7 @@ function parseWithdrawInstruction(instruction) {
       pool: getNextAccount(),
       vault: getNextAccount(),
       vaultAta: getNextAccount(),
-      authorityAta: getNextAccount(),
+      authorityTokenAccount: getNextOptionalAccount(),
       mint: getNextAccount(),
       systemProgram: getNextAccount(),
       tokenProgram: getNextAccount(),
@@ -1682,6 +1664,7 @@ exports.MIXOOR_ERROR__INVALID_ASSET_TYPE = MIXOOR_ERROR__INVALID_ASSET_TYPE;
 exports.MIXOOR_ERROR__INVALID_MERKLE_PROOF = MIXOOR_ERROR__INVALID_MERKLE_PROOF;
 exports.MIXOOR_ERROR__INVALID_MERKLE_TREE = MIXOOR_ERROR__INVALID_MERKLE_TREE;
 exports.MIXOOR_ERROR__INVALID_MERKLE_TREE_ADDRESS = MIXOOR_ERROR__INVALID_MERKLE_TREE_ADDRESS;
+exports.MIXOOR_ERROR__INVALID_MINT = MIXOOR_ERROR__INVALID_MINT;
 exports.MIXOOR_ERROR__INVALID_PROOF = MIXOOR_ERROR__INVALID_PROOF;
 exports.MIXOOR_ERROR__INVALID_PUBLIC_INPUTS = MIXOOR_ERROR__INVALID_PUBLIC_INPUTS;
 exports.MIXOOR_ERROR__MERKLE_TREE_FULL = MIXOOR_ERROR__MERKLE_TREE_FULL;