Browse Source

spl: Rename metadata interface instruction fields from `token_program_id` to `program_id` (#3076)

JD 1 year ago
parent
commit
442541e9c5

+ 1 - 0
CHANGELOG.md

@@ -58,6 +58,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - lang: Require `Discriminator` trait impl when using the `zero` constraint ([#3118](https://github.com/coral-xyz/anchor/pull/3118)).
 - lang: Require `Discriminator` trait impl when using the `zero` constraint ([#3118](https://github.com/coral-xyz/anchor/pull/3118)).
 - ts: Remove `DISCRIMINATOR_SIZE` constant ([#3120](https://github.com/coral-xyz/anchor/pull/3120)).
 - ts: Remove `DISCRIMINATOR_SIZE` constant ([#3120](https://github.com/coral-xyz/anchor/pull/3120)).
 - lang: `#[account]` attribute arguments no longer parses identifiers as namespaces ([#3140](https://github.com/coral-xyz/anchor/pull/3140)).
 - lang: `#[account]` attribute arguments no longer parses identifiers as namespaces ([#3140](https://github.com/coral-xyz/anchor/pull/3140)).
+- spl: Rename metadata interface instruction fields from `token_program_id` to `program_id` ([3076](https://github.com/coral-xyz/anchor/pull/3076)).
 
 
 ## [0.30.1] - 2024-06-20
 ## [0.30.1] - 2024-06-20
 
 

+ 6 - 6
spl/src/token_2022_extensions/token_group.rs

@@ -9,7 +9,7 @@ pub fn token_group_initialize<'info>(
     max_size: u32,
     max_size: u32,
 ) -> Result<()> {
 ) -> Result<()> {
     let ix = spl_token_group_interface::instruction::initialize_group(
     let ix = spl_token_group_interface::instruction::initialize_group(
-        ctx.accounts.token_program_id.key,
+        ctx.accounts.program_id.key,
         ctx.accounts.group.key,
         ctx.accounts.group.key,
         ctx.accounts.mint.key,
         ctx.accounts.mint.key,
         ctx.accounts.mint_authority.key,
         ctx.accounts.mint_authority.key,
@@ -19,7 +19,7 @@ pub fn token_group_initialize<'info>(
     anchor_lang::solana_program::program::invoke_signed(
     anchor_lang::solana_program::program::invoke_signed(
         &ix,
         &ix,
         &[
         &[
-            ctx.accounts.token_program_id,
+            ctx.accounts.program_id,
             ctx.accounts.group,
             ctx.accounts.group,
             ctx.accounts.mint,
             ctx.accounts.mint,
             ctx.accounts.mint_authority,
             ctx.accounts.mint_authority,
@@ -31,7 +31,7 @@ pub fn token_group_initialize<'info>(
 
 
 #[derive(Accounts)]
 #[derive(Accounts)]
 pub struct TokenGroupInitialize<'info> {
 pub struct TokenGroupInitialize<'info> {
-    pub token_program_id: AccountInfo<'info>,
+    pub program_id: AccountInfo<'info>,
     pub group: AccountInfo<'info>,
     pub group: AccountInfo<'info>,
     pub mint: AccountInfo<'info>,
     pub mint: AccountInfo<'info>,
     pub mint_authority: AccountInfo<'info>,
     pub mint_authority: AccountInfo<'info>,
@@ -41,7 +41,7 @@ pub fn token_member_initialize<'info>(
     ctx: CpiContext<'_, '_, '_, 'info, TokenMemberInitialize<'info>>,
     ctx: CpiContext<'_, '_, '_, 'info, TokenMemberInitialize<'info>>,
 ) -> Result<()> {
 ) -> Result<()> {
     let ix = spl_token_group_interface::instruction::initialize_member(
     let ix = spl_token_group_interface::instruction::initialize_member(
-        ctx.accounts.token_program_id.key,
+        ctx.accounts.program_id.key,
         ctx.accounts.member.key,
         ctx.accounts.member.key,
         ctx.accounts.member_mint.key,
         ctx.accounts.member_mint.key,
         ctx.accounts.member_mint_authority.key,
         ctx.accounts.member_mint_authority.key,
@@ -51,7 +51,7 @@ pub fn token_member_initialize<'info>(
     anchor_lang::solana_program::program::invoke_signed(
     anchor_lang::solana_program::program::invoke_signed(
         &ix,
         &ix,
         &[
         &[
-            ctx.accounts.token_program_id,
+            ctx.accounts.program_id,
             ctx.accounts.member,
             ctx.accounts.member,
             ctx.accounts.member_mint,
             ctx.accounts.member_mint,
             ctx.accounts.member_mint_authority,
             ctx.accounts.member_mint_authority,
@@ -65,7 +65,7 @@ pub fn token_member_initialize<'info>(
 
 
 #[derive(Accounts)]
 #[derive(Accounts)]
 pub struct TokenMemberInitialize<'info> {
 pub struct TokenMemberInitialize<'info> {
-    pub token_program_id: AccountInfo<'info>,
+    pub program_id: AccountInfo<'info>,
     pub member: AccountInfo<'info>,
     pub member: AccountInfo<'info>,
     pub member_mint: AccountInfo<'info>,
     pub member_mint: AccountInfo<'info>,
     pub member_mint_authority: AccountInfo<'info>,
     pub member_mint_authority: AccountInfo<'info>,

+ 9 - 9
spl/src/token_2022_extensions/token_metadata.rs

@@ -13,7 +13,7 @@ pub fn token_metadata_initialize<'info>(
     uri: String,
     uri: String,
 ) -> Result<()> {
 ) -> Result<()> {
     let ix = spl_token_metadata_interface::instruction::initialize(
     let ix = spl_token_metadata_interface::instruction::initialize(
-        ctx.accounts.token_program_id.key,
+        ctx.accounts.program_id.key,
         ctx.accounts.metadata.key,
         ctx.accounts.metadata.key,
         ctx.accounts.update_authority.key,
         ctx.accounts.update_authority.key,
         ctx.accounts.mint.key,
         ctx.accounts.mint.key,
@@ -25,7 +25,7 @@ pub fn token_metadata_initialize<'info>(
     anchor_lang::solana_program::program::invoke_signed(
     anchor_lang::solana_program::program::invoke_signed(
         &ix,
         &ix,
         &[
         &[
-            ctx.accounts.token_program_id,
+            ctx.accounts.program_id,
             ctx.accounts.metadata,
             ctx.accounts.metadata,
             ctx.accounts.update_authority,
             ctx.accounts.update_authority,
             ctx.accounts.mint,
             ctx.accounts.mint,
@@ -38,7 +38,7 @@ pub fn token_metadata_initialize<'info>(
 
 
 #[derive(Accounts)]
 #[derive(Accounts)]
 pub struct TokenMetadataInitialize<'info> {
 pub struct TokenMetadataInitialize<'info> {
-    pub token_program_id: AccountInfo<'info>,
+    pub program_id: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub update_authority: AccountInfo<'info>,
     pub update_authority: AccountInfo<'info>,
     pub mint_authority: AccountInfo<'info>,
     pub mint_authority: AccountInfo<'info>,
@@ -50,7 +50,7 @@ pub fn token_metadata_update_authority<'info>(
     new_authority: OptionalNonZeroPubkey,
     new_authority: OptionalNonZeroPubkey,
 ) -> Result<()> {
 ) -> Result<()> {
     let ix = spl_token_metadata_interface::instruction::update_authority(
     let ix = spl_token_metadata_interface::instruction::update_authority(
-        ctx.accounts.token_program_id.key,
+        ctx.accounts.program_id.key,
         ctx.accounts.metadata.key,
         ctx.accounts.metadata.key,
         ctx.accounts.current_authority.key,
         ctx.accounts.current_authority.key,
         new_authority,
         new_authority,
@@ -58,7 +58,7 @@ pub fn token_metadata_update_authority<'info>(
     anchor_lang::solana_program::program::invoke_signed(
     anchor_lang::solana_program::program::invoke_signed(
         &ix,
         &ix,
         &[
         &[
-            ctx.accounts.token_program_id,
+            ctx.accounts.program_id,
             ctx.accounts.metadata,
             ctx.accounts.metadata,
             ctx.accounts.current_authority,
             ctx.accounts.current_authority,
         ],
         ],
@@ -69,7 +69,7 @@ pub fn token_metadata_update_authority<'info>(
 
 
 #[derive(Accounts)]
 #[derive(Accounts)]
 pub struct TokenMetadataUpdateAuthority<'info> {
 pub struct TokenMetadataUpdateAuthority<'info> {
-    pub token_program_id: AccountInfo<'info>,
+    pub program_id: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub current_authority: AccountInfo<'info>,
     pub current_authority: AccountInfo<'info>,
     pub new_authority: AccountInfo<'info>,
     pub new_authority: AccountInfo<'info>,
@@ -81,7 +81,7 @@ pub fn token_metadata_update_field<'info>(
     value: String,
     value: String,
 ) -> Result<()> {
 ) -> Result<()> {
     let ix = spl_token_metadata_interface::instruction::update_field(
     let ix = spl_token_metadata_interface::instruction::update_field(
-        ctx.accounts.token_program_id.key,
+        ctx.accounts.program_id.key,
         ctx.accounts.metadata.key,
         ctx.accounts.metadata.key,
         ctx.accounts.update_authority.key,
         ctx.accounts.update_authority.key,
         field,
         field,
@@ -90,7 +90,7 @@ pub fn token_metadata_update_field<'info>(
     anchor_lang::solana_program::program::invoke_signed(
     anchor_lang::solana_program::program::invoke_signed(
         &ix,
         &ix,
         &[
         &[
-            ctx.accounts.token_program_id,
+            ctx.accounts.program_id,
             ctx.accounts.metadata,
             ctx.accounts.metadata,
             ctx.accounts.update_authority,
             ctx.accounts.update_authority,
         ],
         ],
@@ -101,7 +101,7 @@ pub fn token_metadata_update_field<'info>(
 
 
 #[derive(Accounts)]
 #[derive(Accounts)]
 pub struct TokenMetadataUpdateField<'info> {
 pub struct TokenMetadataUpdateField<'info> {
-    pub token_program_id: AccountInfo<'info>,
+    pub program_id: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub metadata: AccountInfo<'info>,
     pub update_authority: AccountInfo<'info>,
     pub update_authority: AccountInfo<'info>,
 }
 }

+ 1 - 1
tests/spl/token-extensions/programs/token-extensions/src/instructions.rs

@@ -85,7 +85,7 @@ impl<'info> CreateMintAccount<'info> {
         uri: String,
         uri: String,
     ) -> ProgramResult {
     ) -> ProgramResult {
         let cpi_accounts = TokenMetadataInitialize {
         let cpi_accounts = TokenMetadataInitialize {
-            token_program_id: self.token_program.to_account_info(),
+            program_id: self.token_program.to_account_info(),
             mint: self.mint.to_account_info(),
             mint: self.mint.to_account_info(),
             metadata: self.mint.to_account_info(), // metadata account is the mint, since data is stored in mint
             metadata: self.mint.to_account_info(), // metadata account is the mint, since data is stored in mint
             mint_authority: self.authority.to_account_info(),
             mint_authority: self.authority.to_account_info(),