Add derive to instruction builders

src/renderers/rust/templates/instructionsCpiPageBuilder.njk

@@ -15,6 +15,7 @@
   {% endif %}
   {{ '///   ' + loop.index0 + '. `[' + modifiers + ']` ' + account.name | snakeCase }}
 {% endfor %}
+#[derive(Clone, Debug)]
 pub struct {{ instruction.name | pascalCase }}CpiBuilder<'a, 'b> {
   instruction: Box<{{ instruction.name | pascalCase }}CpiBuilderInstruction<'a, 'b>>,
 }
@@ -124,6 +125,7 @@ impl<'a, 'b> {{ instruction.name | pascalCase }}CpiBuilder<'a, 'b> {
   }
 }
 
+#[derive(Clone, Debug)]
 struct {{ instruction.name | pascalCase }}CpiBuilderInstruction<'a, 'b> {
   __program: &'b solana_program::account_info::AccountInfo<'a>,
   {% for account in instruction.accounts %}

src/renderers/rust/templates/instructionsPageBuilder.njk

@@ -16,7 +16,7 @@
   {{ '///   ' + loop.index0 + '. `[' + modifiers + ']` ' + account.name | snakeCase }}
   {{- " (default to `" + account.defaultValue.publicKey + "`)" if account.defaultValue.kind === 'publicKeyValueNode' }}
 {% endfor %}
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct {{ instruction.name | pascalCase }}Builder {
   {% for account in instruction.accounts %}
     {% if account.isSigner === 'either' %}

test/packages/rust/src/generated/instructions/add_config_lines.rs

@@ -79,7 +79,7 @@ pub struct AddConfigLinesInstructionArgs {
 ///
 ///   0. `[writable]` candy_machine
 ///   1. `[signer]` authority
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct AddConfigLinesBuilder {
     candy_machine: Option<solana_program::pubkey::Pubkey>,
     authority: Option<solana_program::pubkey::Pubkey>,
@@ -264,6 +264,7 @@ impl<'a, 'b> AddConfigLinesCpi<'a, 'b> {
 ///
 ///   0. `[writable]` candy_machine
 ///   1. `[signer]` authority
+#[derive(Clone, Debug)]
 pub struct AddConfigLinesCpiBuilder<'a, 'b> {
     instruction: Box<AddConfigLinesCpiBuilderInstruction<'a, 'b>>,
 }
@@ -384,6 +385,7 @@ impl<'a, 'b> AddConfigLinesCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct AddConfigLinesCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     candy_machine: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/add_memo.rs

@@ -57,7 +57,7 @@ pub struct AddMemoInstructionArgs {
 ///
 /// ### Accounts:
 ///
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct AddMemoBuilder {
     memo: Option<String>,
     __remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
@@ -187,6 +187,7 @@ impl<'a, 'b> AddMemoCpi<'a, 'b> {
 ///
 /// ### Accounts:
 ///
+#[derive(Clone, Debug)]
 pub struct AddMemoCpiBuilder<'a, 'b> {
     instruction: Box<AddMemoCpiBuilderInstruction<'a, 'b>>,
 }
@@ -260,6 +261,7 @@ impl<'a, 'b> AddMemoCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct AddMemoCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     memo: Option<String>,

test/packages/rust/src/generated/instructions/approve_collection_authority.rs

@@ -110,7 +110,7 @@ impl ApproveCollectionAuthorityInstructionData {
 ///   5. `[]` mint
 ///   6. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   7. `[optional]` rent
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct ApproveCollectionAuthorityBuilder {
     collection_authority_record: Option<solana_program::pubkey::Pubkey>,
     new_collection_authority: Option<solana_program::pubkey::Pubkey>,
@@ -410,6 +410,7 @@ impl<'a, 'b> ApproveCollectionAuthorityCpi<'a, 'b> {
 ///   5. `[]` mint
 ///   6. `[]` system_program
 ///   7. `[optional]` rent
+#[derive(Clone, Debug)]
 pub struct ApproveCollectionAuthorityCpiBuilder<'a, 'b> {
     instruction: Box<ApproveCollectionAuthorityCpiBuilderInstruction<'a, 'b>>,
 }
@@ -576,6 +577,7 @@ impl<'a, 'b> ApproveCollectionAuthorityCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct ApproveCollectionAuthorityCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     collection_authority_record: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/approve_use_authority.rs

@@ -141,7 +141,7 @@ pub struct ApproveUseAuthorityInstructionArgs {
 ///   8. `[optional]` token_program (default to `TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA`)
 ///   9. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   10. `[optional]` rent
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct ApproveUseAuthorityBuilder {
     use_authority_record: Option<solana_program::pubkey::Pubkey>,
     owner: Option<solana_program::pubkey::Pubkey>,
@@ -516,6 +516,7 @@ impl<'a, 'b> ApproveUseAuthorityCpi<'a, 'b> {
 ///   8. `[]` token_program
 ///   9. `[]` system_program
 ///   10. `[optional]` rent
+#[derive(Clone, Debug)]
 pub struct ApproveUseAuthorityCpiBuilder<'a, 'b> {
     instruction: Box<ApproveUseAuthorityCpiBuilderInstruction<'a, 'b>>,
 }
@@ -726,6 +727,7 @@ impl<'a, 'b> ApproveUseAuthorityCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct ApproveUseAuthorityCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     use_authority_record: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/bubblegum_set_collection_size.rs

@@ -105,7 +105,7 @@ pub struct BubblegumSetCollectionSizeInstructionArgs {
 ///   2. `[]` collection_mint
 ///   3. `[signer]` bubblegum_signer
 ///   4. `[optional]` collection_authority_record
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct BubblegumSetCollectionSizeBuilder {
     collection_metadata: Option<solana_program::pubkey::Pubkey>,
     collection_authority: Option<solana_program::pubkey::Pubkey>,
@@ -373,6 +373,7 @@ impl<'a, 'b> BubblegumSetCollectionSizeCpi<'a, 'b> {
 ///   2. `[]` collection_mint
 ///   3. `[signer]` bubblegum_signer
 ///   4. `[optional]` collection_authority_record
+#[derive(Clone, Debug)]
 pub struct BubblegumSetCollectionSizeCpiBuilder<'a, 'b> {
     instruction: Box<BubblegumSetCollectionSizeCpiBuilderInstruction<'a, 'b>>,
 }
@@ -526,6 +527,7 @@ impl<'a, 'b> BubblegumSetCollectionSizeCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct BubblegumSetCollectionSizeCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     collection_metadata: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/burn.rs

@@ -143,7 +143,7 @@ pub struct BurnInstructionArgs {
 ///   6. `[writable, optional]` collection_metadata
 ///   7. `[optional]` authorization_rules
 ///   8. `[optional]` authorization_rules_program
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct BurnBuilder {
     metadata: Option<solana_program::pubkey::Pubkey>,
     owner: Option<solana_program::pubkey::Pubkey>,
@@ -500,6 +500,7 @@ impl<'a, 'b> BurnCpi<'a, 'b> {
 ///   6. `[writable, optional]` collection_metadata
 ///   7. `[optional]` authorization_rules
 ///   8. `[optional]` authorization_rules_program
+#[derive(Clone, Debug)]
 pub struct BurnCpiBuilder<'a, 'b> {
     instruction: Box<BurnCpiBuilderInstruction<'a, 'b>>,
 }
@@ -691,6 +692,7 @@ impl<'a, 'b> BurnCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct BurnCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     metadata: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/burn_edition_nft.rs

@@ -117,7 +117,7 @@ impl BurnEditionNftInstructionData {
 ///   7. `[writable]` print_edition_account
 ///   8. `[writable]` edition_marker_account
 ///   9. `[optional]` spl_token_program (default to `TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA`)
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct BurnEditionNftBuilder {
     metadata: Option<solana_program::pubkey::Pubkey>,
     owner: Option<solana_program::pubkey::Pubkey>,
@@ -469,6 +469,7 @@ impl<'a, 'b> BurnEditionNftCpi<'a, 'b> {
 ///   7. `[writable]` print_edition_account
 ///   8. `[writable]` edition_marker_account
 ///   9. `[]` spl_token_program
+#[derive(Clone, Debug)]
 pub struct BurnEditionNftCpiBuilder<'a, 'b> {
     instruction: Box<BurnEditionNftCpiBuilderInstruction<'a, 'b>>,
 }
@@ -673,6 +674,7 @@ impl<'a, 'b> BurnEditionNftCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct BurnEditionNftCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     metadata: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/burn_nft.rs

@@ -102,7 +102,7 @@ impl BurnNftInstructionData {
 ///   4. `[writable]` master_edition_account
 ///   5. `[optional]` spl_token_program (default to `TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA`)
 ///   6. `[writable, optional]` collection_metadata
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct BurnNftBuilder {
     metadata: Option<solana_program::pubkey::Pubkey>,
     owner: Option<solana_program::pubkey::Pubkey>,
@@ -380,6 +380,7 @@ impl<'a, 'b> BurnNftCpi<'a, 'b> {
 ///   4. `[writable]` master_edition_account
 ///   5. `[]` spl_token_program
 ///   6. `[writable, optional]` collection_metadata
+#[derive(Clone, Debug)]
 pub struct BurnNftCpiBuilder<'a, 'b> {
     instruction: Box<BurnNftCpiBuilderInstruction<'a, 'b>>,
 }
@@ -531,6 +532,7 @@ impl<'a, 'b> BurnNftCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct BurnNftCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     metadata: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/close_escrow_account.rs

@@ -104,7 +104,7 @@ impl CloseEscrowAccountInstructionData {
 ///   5. `[writable, signer]` payer
 ///   6. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   7. `[optional]` sysvar_instructions (default to `Sysvar1nstructions1111111111111111111111111`)
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CloseEscrowAccountBuilder {
     escrow: Option<solana_program::pubkey::Pubkey>,
     metadata: Option<solana_program::pubkey::Pubkey>,
@@ -388,6 +388,7 @@ impl<'a, 'b> CloseEscrowAccountCpi<'a, 'b> {
 ///   5. `[writable, signer]` payer
 ///   6. `[]` system_program
 ///   7. `[]` sysvar_instructions
+#[derive(Clone, Debug)]
 pub struct CloseEscrowAccountCpiBuilder<'a, 'b> {
     instruction: Box<CloseEscrowAccountCpiBuilderInstruction<'a, 'b>>,
 }
@@ -550,6 +551,7 @@ impl<'a, 'b> CloseEscrowAccountCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CloseEscrowAccountCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     escrow: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/convert_master_edition_v1_to_v2.rs

@@ -71,7 +71,7 @@ impl ConvertMasterEditionV1ToV2InstructionData {
 ///   0. `[writable]` master_edition
 ///   1. `[writable]` one_time_auth
 ///   2. `[writable]` printing_mint
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct ConvertMasterEditionV1ToV2Builder {
     master_edition: Option<solana_program::pubkey::Pubkey>,
     one_time_auth: Option<solana_program::pubkey::Pubkey>,
@@ -251,6 +251,7 @@ impl<'a, 'b> ConvertMasterEditionV1ToV2Cpi<'a, 'b> {
 ///   0. `[writable]` master_edition
 ///   1. `[writable]` one_time_auth
 ///   2. `[writable]` printing_mint
+#[derive(Clone, Debug)]
 pub struct ConvertMasterEditionV1ToV2CpiBuilder<'a, 'b> {
     instruction: Box<ConvertMasterEditionV1ToV2CpiBuilderInstruction<'a, 'b>>,
 }
@@ -359,6 +360,7 @@ impl<'a, 'b> ConvertMasterEditionV1ToV2CpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct ConvertMasterEditionV1ToV2CpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     master_edition: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/create_account.rs

@@ -75,7 +75,7 @@ pub struct CreateAccountInstructionArgs {
 ///
 ///   0. `[writable, signer]` payer
 ///   1. `[writable, signer]` new_account
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CreateAccountBuilder {
     payer: Option<solana_program::pubkey::Pubkey>,
     new_account: Option<solana_program::pubkey::Pubkey>,
@@ -260,6 +260,7 @@ impl<'a, 'b> CreateAccountCpi<'a, 'b> {
 ///
 ///   0. `[writable, signer]` payer
 ///   1. `[writable, signer]` new_account
+#[derive(Clone, Debug)]
 pub struct CreateAccountCpiBuilder<'a, 'b> {
     instruction: Box<CreateAccountCpiBuilderInstruction<'a, 'b>>,
 }
@@ -377,6 +378,7 @@ impl<'a, 'b> CreateAccountCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CreateAccountCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     payer: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/create_escrow_account.rs

@@ -117,7 +117,7 @@ impl CreateEscrowAccountInstructionData {
 ///   6. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   7. `[optional]` sysvar_instructions (default to `Sysvar1nstructions1111111111111111111111111`)
 ///   8. `[signer, optional]` authority
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CreateEscrowAccountBuilder {
     escrow: Option<solana_program::pubkey::Pubkey>,
     metadata: Option<solana_program::pubkey::Pubkey>,
@@ -430,6 +430,7 @@ impl<'a, 'b> CreateEscrowAccountCpi<'a, 'b> {
 ///   6. `[]` system_program
 ///   7. `[]` sysvar_instructions
 ///   8. `[signer, optional]` authority
+#[derive(Clone, Debug)]
 pub struct CreateEscrowAccountCpiBuilder<'a, 'b> {
     instruction: Box<CreateEscrowAccountCpiBuilderInstruction<'a, 'b>>,
 }
@@ -605,6 +606,7 @@ impl<'a, 'b> CreateEscrowAccountCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CreateEscrowAccountCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     escrow: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/create_frequency_rule.rs

@@ -85,7 +85,7 @@ pub struct CreateFrequencyRuleInstructionArgs {
 ///   0. `[writable, signer]` payer
 ///   1. `[writable]` frequency_pda
 ///   2. `[optional]` system_program (default to `11111111111111111111111111111111`)
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CreateFrequencyRuleBuilder {
     payer: Option<solana_program::pubkey::Pubkey>,
     frequency_pda: Option<solana_program::pubkey::Pubkey>,
@@ -310,6 +310,7 @@ impl<'a, 'b> CreateFrequencyRuleCpi<'a, 'b> {
 ///   0. `[writable, signer]` payer
 ///   1. `[writable]` frequency_pda
 ///   2. `[]` system_program
+#[derive(Clone, Debug)]
 pub struct CreateFrequencyRuleCpiBuilder<'a, 'b> {
     instruction: Box<CreateFrequencyRuleCpiBuilderInstruction<'a, 'b>>,
 }
@@ -455,6 +456,7 @@ impl<'a, 'b> CreateFrequencyRuleCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CreateFrequencyRuleCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     payer: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/create_master_edition.rs

@@ -123,7 +123,7 @@ pub struct CreateMasterEditionInstructionArgs {
 ///   6. `[optional]` token_program (default to `TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA`)
 ///   7. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   8. `[optional]` rent (default to `SysvarRent111111111111111111111111111111111`)
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CreateMasterEditionBuilder {
     edition: Option<solana_program::pubkey::Pubkey>,
     mint: Option<solana_program::pubkey::Pubkey>,
@@ -450,6 +450,7 @@ impl<'a, 'b> CreateMasterEditionCpi<'a, 'b> {
 ///   6. `[]` token_program
 ///   7. `[]` system_program
 ///   8. `[]` rent
+#[derive(Clone, Debug)]
 pub struct CreateMasterEditionCpiBuilder<'a, 'b> {
     instruction: Box<CreateMasterEditionCpiBuilderInstruction<'a, 'b>>,
 }
@@ -641,6 +642,7 @@ impl<'a, 'b> CreateMasterEditionCpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CreateMasterEditionCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     edition: Option<&'b solana_program::account_info::AccountInfo<'a>>,

test/packages/rust/src/generated/instructions/create_master_edition_v3.rs

@@ -130,7 +130,7 @@ pub struct CreateMasterEditionV3InstructionArgs {
 ///   6. `[optional]` token_program (default to `TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA`)
 ///   7. `[optional]` system_program (default to `11111111111111111111111111111111`)
 ///   8. `[optional]` rent
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub struct CreateMasterEditionV3Builder {
     edition: Option<solana_program::pubkey::Pubkey>,
     mint: Option<solana_program::pubkey::Pubkey>,
@@ -463,6 +463,7 @@ impl<'a, 'b> CreateMasterEditionV3Cpi<'a, 'b> {
 ///   6. `[]` token_program
 ///   7. `[]` system_program
 ///   8. `[optional]` rent
+#[derive(Clone, Debug)]
 pub struct CreateMasterEditionV3CpiBuilder<'a, 'b> {
     instruction: Box<CreateMasterEditionV3CpiBuilderInstruction<'a, 'b>>,
 }
@@ -658,6 +659,7 @@ impl<'a, 'b> CreateMasterEditionV3CpiBuilder<'a, 'b> {
     }
 }
 
+#[derive(Clone, Debug)]
 struct CreateMasterEditionV3CpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_program::account_info::AccountInfo<'a>,
     edition: Option<&'b solana_program::account_info::AccountInfo<'a>>,