Skip to content

Commit f0e332e

Browse files
committed
token-extensions: finish AccountConstraints rename sweep across all 33 anchor and quasar variants
Every #[derive(Accounts)] struct now carries the AccountConstraints suffix; handler names, generated instruction-data names, and program IDs unchanged. Each project rebuilt and its tests run green after the rename. https://claude.ai/code/session_01VPj6WLMxD5KL6NwvUvuz1K
1 parent 3e10c8a commit f0e332e

88 files changed

Lines changed: 278 additions & 278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tokens/token-extensions/memo-transfer/anchor/programs/memo-transfer/src/instructions/disable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use anchor_lang::prelude::*;
22
use anchor_spl::token_interface::{memo_transfer_disable, MemoTransfer, Token2022, TokenAccount};
33

44
#[derive(Accounts)]
5-
pub struct Disable<'info> {
5+
pub struct DisableAccountConstraints<'info> {
66
#[account(mut)]
77
pub owner: Signer<'info>,
88

@@ -14,7 +14,7 @@ pub struct Disable<'info> {
1414
pub token_program: Program<'info, Token2022>,
1515
}
1616

17-
pub fn handler(context: Context<Disable>) -> Result<()> {
17+
pub fn handler(context: Context<DisableAccountConstraints>) -> Result<()> {
1818
memo_transfer_disable(CpiContext::new(
1919
context.accounts.token_program.key(),
2020
MemoTransfer {

tokens/token-extensions/memo-transfer/anchor/programs/memo-transfer/src/instructions/initialize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use anchor_spl::{
1010
};
1111

1212
#[derive(Accounts)]
13-
pub struct Initialize<'info> {
13+
pub struct InitializeAccountConstraints<'info> {
1414
#[account(mut)]
1515
pub payer: Signer<'info>,
1616

@@ -21,7 +21,7 @@ pub struct Initialize<'info> {
2121
pub system_program: Program<'info, System>,
2222
}
2323

24-
pub fn handler(context: Context<Initialize>) -> Result<()> {
24+
pub fn handler(context: Context<InitializeAccountConstraints>) -> Result<()> {
2525
// Calculate space required for token and extension data
2626
let token_account_size =
2727
ExtensionType::try_calculate_account_len::<PodAccount>(&[ExtensionType::MemoTransfer])?;

tokens/token-extensions/memo-transfer/anchor/programs/memo-transfer/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ declare_id!("5BQyC7y2Pc283woThq11uZRqsgcRbBRLKz4yQ8BJadi2");
99
pub mod memo_transfer {
1010
use super::*;
1111

12-
pub fn initialize(context: Context<Initialize>) -> Result<()> {
12+
pub fn initialize(context: Context<InitializeAccountConstraints>) -> Result<()> {
1313
instructions::initialize::handler(context)
1414
}
1515

16-
pub fn disable(context: Context<Disable>) -> Result<()> {
16+
pub fn disable(context: Context<DisableAccountConstraints>) -> Result<()> {
1717
instructions::disable::handler(context)
1818
}
1919
}

tokens/token-extensions/memo-transfer/anchor/programs/memo-transfer/tests/test_memo_transfer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn test_memo_transfer() {
119119
let initialize_ix = Instruction::new_with_bytes(
120120
program_id,
121121
&memo_transfer::instruction::Initialize {}.data(),
122-
memo_transfer::accounts::Initialize {
122+
memo_transfer::accounts::InitializeAccountConstraints {
123123
payer: payer.pubkey(),
124124
token_account: token_keypair.pubkey(),
125125
mint_account: mint,
@@ -192,7 +192,7 @@ fn test_memo_transfer() {
192192
let disable_ix = Instruction::new_with_bytes(
193193
program_id,
194194
&memo_transfer::instruction::Disable {}.data(),
195-
memo_transfer::accounts::Disable {
195+
memo_transfer::accounts::DisableAccountConstraints {
196196
owner: payer.pubkey(),
197197
token_account: token_keypair.pubkey(),
198198
token_program: TOKEN_EXTENSIONS_PROGRAM_ID,

tokens/token-extensions/memo-transfer/quasar/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ mod quasar_memo_transfer {
2626
use super::*;
2727

2828
#[instruction(discriminator = 0)]
29-
pub fn initialize(ctx: Ctx<Initialize>) -> Result<(), ProgramError> {
29+
pub fn initialize(ctx: Ctx<InitializeAccountConstraints>) -> Result<(), ProgramError> {
3030
handle_initialize(&mut ctx.accounts)
3131
}
3232

3333
#[instruction(discriminator = 1)]
34-
pub fn disable(ctx: Ctx<Disable>) -> Result<(), ProgramError> {
34+
pub fn disable(ctx: Ctx<DisableAccountConstraints>) -> Result<(), ProgramError> {
3535
handle_disable(&mut ctx.accounts)
3636
}
3737
}
3838

3939
#[derive(Accounts)]
40-
pub struct Initialize {
40+
pub struct InitializeAccountConstraints {
4141
#[account(mut)]
4242
pub payer: Signer,
4343
#[account(mut)]
@@ -48,7 +48,7 @@ pub struct Initialize {
4848
}
4949

5050
#[inline(always)]
51-
fn handle_initialize(accounts: &mut Initialize) -> Result<(), ProgramError> {
51+
fn handle_initialize(accounts: &mut InitializeAccountConstraints) -> Result<(), ProgramError> {
5252
// Token account + MemoTransfer extension = 300 bytes
5353
let account_size: u64 = 300;
5454
let lamports = Rent::get()?.try_minimum_balance(account_size as usize)?;
@@ -100,7 +100,7 @@ fn handle_initialize(accounts: &mut Initialize) -> Result<(), ProgramError> {
100100
}
101101

102102
#[derive(Accounts)]
103-
pub struct Disable {
103+
pub struct DisableAccountConstraints {
104104
#[account(mut)]
105105
pub owner: Signer,
106106
#[account(mut)]
@@ -109,7 +109,7 @@ pub struct Disable {
109109
}
110110

111111
#[inline(always)]
112-
fn handle_disable(accounts: &mut Disable) -> Result<(), ProgramError> {
112+
fn handle_disable(accounts: &mut DisableAccountConstraints) -> Result<(), ProgramError> {
113113
// MemoTransfer disable: opcode 30, sub-opcode 1
114114
CpiCall::new(
115115
accounts.token_program.to_account_view().address(),

tokens/token-extensions/metadata/anchor/programs/metadata/src/instructions/emit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use anchor_spl::token_interface::{Mint, Token2022};
44
use spl_token_metadata_interface::instruction::emit;
55

66
#[derive(Accounts)]
7-
pub struct Emit<'info> {
7+
pub struct EmitAccountConstraints<'info> {
88
pub mint_account: InterfaceAccount<'info, Mint>,
99
pub token_program: Program<'info, Token2022>,
1010
}
1111

1212
// Invoke the emit instruction from spl_token_metadata_interface directly
1313
// There is not an anchor CpiContext for this instruction
14-
pub fn process_emit(context: Context<Emit>) -> Result<()> {
14+
pub fn process_emit(context: Context<EmitAccountConstraints>) -> Result<()> {
1515
invoke(
1616
&emit(
1717
&context.accounts.token_program.key(), // token program id

tokens/token-extensions/metadata/anchor/programs/metadata/src/instructions/initialize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use spl_token_metadata_interface::state::TokenMetadata;
77
use spl_type_length_value::variable_len_pack::VariableLenPack;
88

99
#[derive(Accounts)]
10-
pub struct Initialize<'info> {
10+
pub struct InitializeAccountConstraints<'info> {
1111
#[account(mut)]
1212
pub payer: Signer<'info>,
1313

@@ -24,7 +24,7 @@ pub struct Initialize<'info> {
2424
pub system_program: Program<'info, System>,
2525
}
2626

27-
pub fn process_initialize(context: Context<Initialize>, args: TokenMetadataArgs) -> Result<()> {
27+
pub fn process_initialize(context: Context<InitializeAccountConstraints>, args: TokenMetadataArgs) -> Result<()> {
2828
let TokenMetadataArgs { name, symbol, uri } = args;
2929

3030
// Define token metadata

tokens/token-extensions/metadata/anchor/programs/metadata/src/instructions/remove_key.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use anchor_spl::token_interface::{Mint, Token2022};
44
use spl_token_metadata_interface::instruction::remove_key;
55

66
#[derive(Accounts)]
7-
pub struct RemoveKey<'info> {
7+
pub struct RemoveKeyAccountConstraints<'info> {
88
#[account(mut)]
99
pub update_authority: Signer<'info>,
1010

@@ -19,7 +19,7 @@ pub struct RemoveKey<'info> {
1919

2020
// Invoke the remove_key instruction from spl_token_metadata_interface directly
2121
// There is not an anchor CpiContext for this instruction
22-
pub fn process_remove_key(context: Context<RemoveKey>, key: String) -> Result<()> {
22+
pub fn process_remove_key(context: Context<RemoveKeyAccountConstraints>, key: String) -> Result<()> {
2323
invoke(
2424
&remove_key(
2525
&context.accounts.token_program.key(), // token program id

tokens/token-extensions/metadata/anchor/programs/metadata/src/instructions/update_authority.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use anchor_spl::token_interface::{
55
};
66

77
#[derive(Accounts)]
8-
pub struct UpdateAuthority<'info> {
8+
pub struct UpdateAuthorityAccountConstraints<'info> {
99
pub current_authority: Signer<'info>,
1010
pub new_authority: Option<UncheckedAccount<'info>>,
1111

@@ -18,7 +18,7 @@ pub struct UpdateAuthority<'info> {
1818
pub system_program: Program<'info, System>,
1919
}
2020

21-
pub fn process_update_authority(context: Context<UpdateAuthority>) -> Result<()> {
21+
pub fn process_update_authority(context: Context<UpdateAuthorityAccountConstraints>) -> Result<()> {
2222
let new_authority_key = match &context.accounts.new_authority {
2323
Some(account) => OptionalNonZeroPubkey::try_from(Some(account.key()))?,
2424
None => OptionalNonZeroPubkey::try_from(None)?,

tokens/token-extensions/metadata/anchor/programs/metadata/src/instructions/update_field.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use anchor_spl::{
1010
use spl_token_metadata_interface::state::{Field, TokenMetadata};
1111

1212
#[derive(Accounts)]
13-
pub struct UpdateField<'info> {
13+
pub struct UpdateFieldAccountConstraints<'info> {
1414
#[account(mut)]
1515
pub authority: Signer<'info>,
1616

@@ -23,7 +23,7 @@ pub struct UpdateField<'info> {
2323
pub system_program: Program<'info, System>,
2424
}
2525

26-
pub fn process_update_field(context: Context<UpdateField>, args: UpdateFieldArgs) -> Result<()> {
26+
pub fn process_update_field(context: Context<UpdateFieldAccountConstraints>, args: UpdateFieldArgs) -> Result<()> {
2727
let UpdateFieldArgs { field, value } = args;
2828

2929
// Convert to Field type from spl_token_metadata_interface

0 commit comments

Comments
 (0)