From 2cb173161c3750ba468196eeb7982c4e9c92b6c4 Mon Sep 17 00:00:00 2001
From: jpbogle <jpbogle22@gmail.com>
Date: Tue, 14 Feb 2023 20:16:43 -0500
Subject: [PATCH] Pop token metadata program

---
 package.json                                       |  2 +-
 .../src/instructions/claim.rs                      |  2 +-
 src/programs/tokenManager/utils.ts                 | 14 ++++++++------
 src/transaction.ts                                 |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index c72233ed..e86da47d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cardinal/token-manager",
-  "version": "4.3.1",
+  "version": "4.3.2-beta.1",
   "description": "Cardinal token manager SDK",
   "keywords": [
     "solana",
diff --git a/programs/cardinal-token-manager/src/instructions/claim.rs b/programs/cardinal-token-manager/src/instructions/claim.rs
index 1e567969..640d1f34 100644
--- a/programs/cardinal-token-manager/src/instructions/claim.rs
+++ b/programs/cardinal-token-manager/src/instructions/claim.rs
@@ -228,6 +228,7 @@ pub fn handler<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts,
             let associated_token_program_info = next_account_info(remaining_accs)?;
             let authorization_rules_program_info = next_account_info(remaining_accs)?;
             let authorization_rules_info = next_account_info(remaining_accs)?;
+            let _token_metadata_program = next_account_info(remaining_accs)?;
             invoke_signed(
                 &Instruction {
                     program_id: mpl_token_metadata::id(),
@@ -328,7 +329,6 @@ pub fn handler<'key, 'accounts, 'remaining, 'info>(ctx: Context<'key, 'accounts,
                     mint_info.to_account_info(),
                     ctx.accounts.recipient_token_account.to_account_info(),
                     ctx.accounts.recipient.to_account_info(),
-                    ctx.accounts.recipient.to_account_info(),
                     ctx.accounts.system_program.to_account_info(),
                     sysvar_instructions_info.to_account_info(),
                     ctx.accounts.token_program.to_account_info(),
diff --git a/src/programs/tokenManager/utils.ts b/src/programs/tokenManager/utils.ts
index 22e54f11..81ed93c9 100644
--- a/src/programs/tokenManager/utils.ts
+++ b/src/programs/tokenManager/utils.ts
@@ -662,12 +662,14 @@ export const getRemainingAccountsForClaim = (
       )
     );
   }
-  return claimReceiptId
-    ? [
-        ...remainingAccounts,
-        { pubkey: claimReceiptId, isSigner: false, isWritable: true },
-      ]
-    : remainingAccounts;
+  if (claimReceiptId) {
+    remainingAccounts.push({
+      pubkey: claimReceiptId,
+      isSigner: false,
+      isWritable: true,
+    });
+  }
+  return remainingAccounts;
 };
 
 export function findTokenRecordId(
diff --git a/src/transaction.ts b/src/transaction.ts
index 6654b177..79a0eeeb 100644
--- a/src/transaction.ts
+++ b/src/transaction.ts
@@ -568,7 +568,7 @@ export const withClaimToken = async (
   ) {
     transaction.add(
       ComputeBudgetProgram.setComputeUnitLimit({
-        units: 400000,
+        units: 1000000,
       })
     );
   }
@@ -781,7 +781,7 @@ export const withInvalidate = async (
   ) {
     transaction.add(
       ComputeBudgetProgram.setComputeUnitLimit({
-        units: 400000,
+        units: 1000000,
       })
     );
   }