Update withRemainingAccountsForPayment

solana-nft-programs · Aug 2, 2022 · c817472 · c817472
1 parent 4ba2a4b
commit c817472
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/src/programs/tokenManager/utils.ts b/src/programs/tokenManager/utils.ts
@@ -70,6 +70,24 @@ export const withRemainingAccountsForPayment = async (
  paymentMint,
  excludeCreators
  );
+ const mintMetadataId = await Metadata.getPDA(mint);
+ const paymentRemainingAccounts = [
+ {
+ pubkey: paymentMint,
+ isSigner: false,
+ isWritable: true,
+ },
+ {
+ pubkey: mint,
+ isSigner: false,
+ isWritable: true,
+ },
+ {
+ pubkey: mintMetadataId,
+ isSigner: false,
+ isWritable: true,
+ },
+ ];
 
  if (receiptMint) {
  const receiptMintLargestAccount = await connection.getTokenLargestAccounts(
@@ -123,6 +141,7 @@ export const withRemainingAccountsForPayment = async (
  isSigner: false,
  isWritable: true,
  },
+ ...paymentRemainingAccounts,
  ...royaltiesRemainingAccounts,
  ],
  ];
@@ -152,7 +171,7 @@ export const withRemainingAccountsForPayment = async (
  return [
  issuerTokenAccountId,
  feeCollectorTokenAccountId,
- royaltiesRemainingAccounts,
+ [...paymentRemainingAccounts, ...royaltiesRemainingAccounts],
  ];
  }
 };
@@ -274,22 +293,5 @@ export const withRemainingAccountsForHanldePaymentWithRoyalties = async (
  }
  }
 
- return [
- {
- pubkey: paymentMint,
- isSigner: false,
- isWritable: true,
- },
- {
- pubkey: mint,
- isSigner: false,
- isWritable: true,
- },
- {
- pubkey: mintMetadataId,
- isSigner: false,
- isWritable: true,
- },
- ...creatorsRemainingAccounts,
- ];
+ return creatorsRemainingAccounts;
 };