Fixing description of the collect IX arg. (#69)

clients/js/src/generated/instructions/collect.ts

@@ -30,8 +30,8 @@ import {
 export type CollectInstructionAccounts = {
   /** Authority to collect fees */
   authority?: Signer;
-  /** PDA to retrieve fees from */
-  pdaAccount: PublicKey | Pda;
+  /** The account to transfer collected fees to */
+  recipient: PublicKey | Pda;
 };
 
 // Data.
@@ -69,10 +69,10 @@ export function collect(
       isWritable: false as boolean,
       value: input.authority ?? null,
     },
-    pdaAccount: {
+    recipient: {
       index: 1,
       isWritable: false as boolean,
-      value: input.pdaAccount ?? null,
+      value: input.recipient ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;
 

clients/rust/src/generated/instructions/collect.rs

@@ -12,8 +12,8 @@ use borsh::BorshSerialize;
 pub struct Collect {
     /// Authority to collect fees
     pub authority: solana_program::pubkey::Pubkey,
-    /// PDA to retrieve fees from
-    pub pda_account: solana_program::pubkey::Pubkey,
+    /// The account to transfer collected fees to
+    pub recipient: solana_program::pubkey::Pubkey,
 }
 
 impl Collect {
@@ -31,7 +31,7 @@ impl Collect {
             true,
         ));
         accounts.push(solana_program::instruction::AccountMeta::new_readonly(
-            self.pda_account,
+            self.recipient,
             false,
         ));
         accounts.extend_from_slice(remaining_accounts);
@@ -61,11 +61,11 @@ impl CollectInstructionData {
 /// ### Accounts:
 ///
 ///   0. `[signer]` authority
-///   1. `[]` pda_account
+///   1. `[]` recipient
 #[derive(Default)]
 pub struct CollectBuilder {
     authority: Option<solana_program::pubkey::Pubkey>,
-    pda_account: Option<solana_program::pubkey::Pubkey>,
+    recipient: Option<solana_program::pubkey::Pubkey>,
     __remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
 }
 
@@ -79,10 +79,10 @@ impl CollectBuilder {
         self.authority = Some(authority);
         self
     }
-    /// PDA to retrieve fees from
+    /// The account to transfer collected fees to
     #[inline(always)]
-    pub fn pda_account(&mut self, pda_account: solana_program::pubkey::Pubkey) -> &mut Self {
-        self.pda_account = Some(pda_account);
+    pub fn recipient(&mut self, recipient: solana_program::pubkey::Pubkey) -> &mut Self {
+        self.recipient = Some(recipient);
         self
     }
     /// Add an aditional account to the instruction.
@@ -107,7 +107,7 @@ impl CollectBuilder {
     pub fn instruction(&self) -> solana_program::instruction::Instruction {
         let accounts = Collect {
             authority: self.authority.expect("authority is not set"),
-            pda_account: self.pda_account.expect("pda_account is not set"),
+            recipient: self.recipient.expect("recipient is not set"),
         };
 
         accounts.instruction_with_remaining_accounts(&self.__remaining_accounts)
@@ -118,8 +118,8 @@ impl CollectBuilder {
 pub struct CollectCpiAccounts<'a, 'b> {
     /// Authority to collect fees
     pub authority: &'b solana_program::account_info::AccountInfo<'a>,
-    /// PDA to retrieve fees from
-    pub pda_account: &'b solana_program::account_info::AccountInfo<'a>,
+    /// The account to transfer collected fees to
+    pub recipient: &'b solana_program::account_info::AccountInfo<'a>,
 }
 
 /// `collect` CPI instruction.
@@ -128,8 +128,8 @@ pub struct CollectCpi<'a, 'b> {
     pub __program: &'b solana_program::account_info::AccountInfo<'a>,
     /// Authority to collect fees
     pub authority: &'b solana_program::account_info::AccountInfo<'a>,
-    /// PDA to retrieve fees from
-    pub pda_account: &'b solana_program::account_info::AccountInfo<'a>,
+    /// The account to transfer collected fees to
+    pub recipient: &'b solana_program::account_info::AccountInfo<'a>,
 }
 
 impl<'a, 'b> CollectCpi<'a, 'b> {
@@ -140,7 +140,7 @@ impl<'a, 'b> CollectCpi<'a, 'b> {
         Self {
             __program: program,
             authority: accounts.authority,
-            pda_account: accounts.pda_account,
+            recipient: accounts.recipient,
         }
     }
     #[inline(always)]
@@ -182,7 +182,7 @@ impl<'a, 'b> CollectCpi<'a, 'b> {
             true,
         ));
         accounts.push(solana_program::instruction::AccountMeta::new_readonly(
-            *self.pda_account.key,
+            *self.recipient.key,
             false,
         ));
         remaining_accounts.iter().for_each(|remaining_account| {
@@ -202,7 +202,7 @@ impl<'a, 'b> CollectCpi<'a, 'b> {
         let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len());
         account_infos.push(self.__program.clone());
         account_infos.push(self.authority.clone());
-        account_infos.push(self.pda_account.clone());
+        account_infos.push(self.recipient.clone());
         remaining_accounts
             .iter()
             .for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));
@@ -220,7 +220,7 @@ impl<'a, 'b> CollectCpi<'a, 'b> {
 /// ### Accounts:
 ///
 ///   0. `[signer]` authority
-///   1. `[]` pda_account
+///   1. `[]` recipient
 pub struct CollectCpiBuilder<'a, 'b> {
     instruction: Box<CollectCpiBuilderInstruction<'a, 'b>>,
 }
@@ -230,7 +230,7 @@ impl<'a, 'b> CollectCpiBuilder<'a, 'b> {
         let instruction = Box::new(CollectCpiBuilderInstruction {
             __program: program,
             authority: None,
-            pda_account: None,
+            recipient: None,
             __remaining_accounts: Vec::new(),
         });
         Self { instruction }
@@ -244,13 +244,13 @@ impl<'a, 'b> CollectCpiBuilder<'a, 'b> {
         self.instruction.authority = Some(authority);
         self
     }
-    /// PDA to retrieve fees from
+    /// The account to transfer collected fees to
     #[inline(always)]
-    pub fn pda_account(
+    pub fn recipient(
         &mut self,
-        pda_account: &'b solana_program::account_info::AccountInfo<'a>,
+        recipient: &'b solana_program::account_info::AccountInfo<'a>,
     ) -> &mut Self {
-        self.instruction.pda_account = Some(pda_account);
+        self.instruction.recipient = Some(recipient);
         self
     }
     /// Add an additional account to the instruction.
@@ -299,10 +299,7 @@ impl<'a, 'b> CollectCpiBuilder<'a, 'b> {
 
             authority: self.instruction.authority.expect("authority is not set"),
 
-            pda_account: self
-                .instruction
-                .pda_account
-                .expect("pda_account is not set"),
+            recipient: self.instruction.recipient.expect("recipient is not set"),
         };
         instruction.invoke_signed_with_remaining_accounts(
             signers_seeds,
@@ -314,7 +311,7 @@ impl<'a, 'b> CollectCpiBuilder<'a, 'b> {
 struct CollectCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     authority: Option<&'b solana_program::account_info::AccountInfo<'a>>,
-    pda_account: Option<&'b solana_program::account_info::AccountInfo<'a>>,
+    recipient: Option<&'b solana_program::account_info::AccountInfo<'a>>,
     /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`.
     __remaining_accounts: Vec<(
         &'b solana_program::account_info::AccountInfo<'a>,

idls/token_metadata.json

@@ -4499,11 +4499,11 @@
           ]
         },
         {
-          "name": "pdaAccount",
+          "name": "recipient",
           "isMut": false,
           "isSigner": false,
           "docs": [
-            "PDA to retrieve fees from"
+            "The account to transfer collected fees to"
           ]
         }
       ],

programs/token-metadata/program/src/instruction/mod.rs

@@ -801,7 +801,7 @@ pub enum MetadataInstruction {
 
     /// Collect fees stored on PDA accounts.
     #[account(0, signer, name="authority", desc="Authority to collect fees")]
-    #[account(1, name="pda_account", desc="PDA to retrieve fees from")]
+    #[account(1, name="recipient", desc="The account to transfer collected fees to")]
     Collect,
 
     /// Given a token account containing the master edition token to prove authority, and a brand new non-metadata-ed mint with one token