Add exclude array for withRemainingAccountsForHanldePaymentWithRoyalties

solana-nft-programs · Aug 2, 2022 · c46b1b1 · c46b1b1
1 parent aa43993
commit c46b1b1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cardinal/token-manager",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Cardinal token manager SDK",
   "keywords": [
     "solana",

diff --git a/src/programs/tokenManager/utils.ts b/src/programs/tokenManager/utils.ts
@@ -58,15 +58,17 @@ export const withRemainingAccountsForPayment = async (
   issuerId: PublicKey,
   paymentManagerId: PublicKey,
   receiptMint?: PublicKey | null,
-  payer = wallet.publicKey
+  payer = wallet.publicKey,
+  excludeATAs?: string[]
 ): Promise<[PublicKey, PublicKey, AccountMeta[]]> => {
   const royaltiesRemainingAccounts =
     await withRemainingAccountsForHanldePaymentWithRoyalties(
       transaction,
       connection,
       wallet,
       mint,
-      paymentMint
+      paymentMint,
+      excludeATAs
     );
   const mintMetadataId = await Metadata.getPDA(mint);
   const paymentRemainingAccounts = [
@@ -252,7 +254,8 @@ export const withRemainingAccountsForHanldePaymentWithRoyalties = async (
   connection: Connection,
   wallet: Wallet,
   mint: PublicKey,
-  paymentMint: PublicKey
+  paymentMint: PublicKey,
+  excludeATAs?: string[]
 ): Promise<AccountMeta[]> => {
   const creatorsRemainingAccounts: AccountMeta[] = [];
   const mintMetadataId = await Metadata.getPDA(mint);
@@ -270,14 +273,16 @@ export const withRemainingAccountsForHanldePaymentWithRoyalties = async (
       if (creator.share !== 0) {
         const creatorAddress = new PublicKey(creator.address);
         const creatorMintTokenAccount =
-          await withFindOrInitAssociatedTokenAccount(
-            transaction,
-            connection,
-            paymentMint,
-            creatorAddress,
-            wallet.publicKey,
-            true
-          );
+          !excludeATAs || !excludeATAs.includes(creator.address.toString())
+            ? await withFindOrInitAssociatedTokenAccount(
+                transaction,
+                connection,
+                paymentMint,
+                creatorAddress,
+                wallet.publicKey,
+                true
+              )
+            : await findAta(mint, wallet.publicKey, true);
         creatorsRemainingAccounts.push({
           pubkey: creatorMintTokenAccount,
           isSigner: false,