nft-operations pinocchio: migrate to pinocchio 0.11

Rebased onto main, which bumped pinocchio 0.10 -> 0.11 and dropped the
pinocchio-pubkey crate. Adapt to the 0.11 API:

- Derive the mint-authority PDA on-chain with Address::find_program_address
  (via solana-address's curve25519 feature, matching the merged block-list
  example) instead of pinocchio_pubkey::derive_address; reject a non-canonical
  bump in each instruction.
- process_instruction / instruction handlers take &mut [AccountView]; pass
  copied AccountViews into the Metaplex CPIs.
- pinocchio-token MintTo gained multisig_signers (&[]).

Author: MarkFeder

Cargo.lock

@@ -6,10 +6,12 @@ edition = "2021"
 [dependencies]
 pinocchio.workspace = true
 pinocchio-log.workspace = true
-pinocchio-pubkey.workspace = true
 pinocchio-system.workspace = true
 pinocchio-token.workspace = true
 pinocchio-associated-token-account.workspace = true
+# `curve25519` enables on-chain `Address::find_program_address` (pinocchio 0.11
+# re-exports `Address` from `solana-address`); matches the merged block-list example.
+solana-address = { version = "2", features = ["curve25519"] }
 
 [lib]
 crate-type = ["cdylib", "lib"]

tokens/nft-operations/pinocchio/program/Cargo.toml

@@ -6,13 +6,12 @@ use pinocchio::{
 };
 use pinocchio_associated_token_account::instructions::CreateIdempotent;
 use pinocchio_log::log;
-use pinocchio_pubkey::derive_address;
 use pinocchio_system::instructions::CreateAccount;
 use pinocchio_token::instructions::{InitializeMint2, MintTo};
 
 use crate::instructions::{
-    build_metadata_data, create_master_edition_cpi, create_metadata_cpi, read_bump, AUTHORITY_SEED,
-    MINT_SIZE, TOKEN_DECIMALS,
+    build_metadata_data, create_master_edition_cpi, create_metadata_cpi, read_bump, AUTHORITY_SEED, MINT_SIZE,
+    TOKEN_DECIMALS,
 };
 
 /// Creates a collection NFT: a 0-decimal mint whose authority is the program's
@@ -32,11 +31,7 @@ use crate::instructions::{
 ///   9. `[]`                 token metadata program
 ///
 /// Instruction data: `[authority_bump: u8]`.
-pub fn create_collection(
-    program_id: &Address,
-    accounts: &[AccountView],
-    args: &[u8],
-) -> ProgramResult {
+pub fn create_collection(program_id: &Address, accounts: &mut [AccountView], args: &[u8]) -> ProgramResult {
     let [user, mint, mint_authority, metadata, master_edition, destination, system_program, token_program, _associated_token_program, _token_metadata_program] =
         accounts
     else {
@@ -49,8 +44,9 @@ pub fn create_collection(
 
     // Confirm the supplied account is the canonical mint-authority PDA.
     let bump = read_bump(args)?;
-    let pda = derive_address(&[AUTHORITY_SEED], Some(bump), program_id.as_array());
-    if mint_authority.address().as_array() != &pda {
+    // Derive the canonical PDA on-chain and reject a non-canonical bump.
+    let (pda, canonical_bump) = Address::find_program_address(&[AUTHORITY_SEED], program_id);
+    if mint_authority.address() != &pda || bump != canonical_bump {
         return Err(ProgramError::InvalidSeeds);
     }
 
@@ -59,14 +55,7 @@ pub fn create_collection(
     let rent = Rent::get()?;
     let lamports = rent.try_minimum_balance(MINT_SIZE)?;
     log!("Creating mint account");
-    CreateAccount {
-        from: user,
-        to: mint,
-        lamports,
-        space: MINT_SIZE as u64,
-        owner: &pinocchio_token::ID,
-    }
-    .invoke()?;
+    CreateAccount { from: user, to: mint, lamports, space: MINT_SIZE as u64, owner: &pinocchio_token::ID }.invoke()?;
 
     log!("Initializing mint account");
     InitializeMint2 {
@@ -83,43 +72,17 @@ pub fn create_collection(
     let signers = [Signer::from(&seeds)];
 
     log!("Creating destination token account");
-    CreateIdempotent {
-        funding_account: user,
-        account: destination,
-        wallet: user,
-        mint,
-        system_program,
-        token_program,
-    }
-    .invoke()?;
+    CreateIdempotent { funding_account: user, account: destination, wallet: user, mint, system_program, token_program }
+        .invoke()?;
 
     log!("Minting collection NFT");
-    MintTo {
-        mint,
-        account: destination,
-        mint_authority,
-        amount: 1,
-    }
-    .invoke_signed(&signers)?;
+    MintTo { mint, account: destination, mint_authority, amount: 1, multisig_signers: &[] as &[&AccountView] }
+        .invoke_signed(&signers)?;
 
     log!("Creating metadata account");
-    let metadata_data = build_metadata_data(
-        "DummyCollection",
-        "DC",
-        "",
-        mint_authority.address().as_array(),
-        None,
-        true,
-    );
-    create_metadata_cpi(
-        metadata,
-        mint,
-        mint_authority,
-        user,
-        system_program,
-        &metadata_data,
-        &signers,
-    )?;
+    let metadata_data =
+        build_metadata_data("DummyCollection", "DC", "", mint_authority.address().as_array(), None, true);
+    create_metadata_cpi(metadata, mint, mint_authority, user, system_program, &metadata_data, &signers)?;
 
     log!("Creating master edition account");
     create_master_edition_cpi(

tokens/nft-operations/pinocchio/program/src/instructions/create_collection.rs

@@ -6,13 +6,12 @@ use pinocchio::{
 };
 use pinocchio_associated_token_account::instructions::CreateIdempotent;
 use pinocchio_log::log;
-use pinocchio_pubkey::derive_address;
 use pinocchio_system::instructions::CreateAccount;
 use pinocchio_token::instructions::{InitializeMint2, MintTo};
 
 use crate::instructions::{
-    build_metadata_data, create_master_edition_cpi, create_metadata_cpi, read_bump, AUTHORITY_SEED,
-    MINT_SIZE, TOKEN_DECIMALS,
+    build_metadata_data, create_master_edition_cpi, create_metadata_cpi, read_bump, AUTHORITY_SEED, MINT_SIZE,
+    TOKEN_DECIMALS,
 };
 
 /// Mints an NFT that belongs to a collection: a 0-decimal mint (authority = the
@@ -34,7 +33,7 @@ use crate::instructions::{
 ///  10. `[]`                 token metadata program
 ///
 /// Instruction data: `[authority_bump: u8]`.
-pub fn mint_nft(program_id: &Address, accounts: &[AccountView], args: &[u8]) -> ProgramResult {
+pub fn mint_nft(program_id: &Address, accounts: &mut [AccountView], args: &[u8]) -> ProgramResult {
     let [owner, mint, mint_authority, metadata, master_edition, destination, collection_mint, system_program, token_program, _associated_token_program, _token_metadata_program] =
         accounts
     else {
@@ -47,8 +46,9 @@ pub fn mint_nft(program_id: &Address, accounts: &[AccountView], args: &[u8]) ->
 
     // Confirm the supplied account is the canonical mint-authority PDA.
     let bump = read_bump(args)?;
-    let pda = derive_address(&[AUTHORITY_SEED], Some(bump), program_id.as_array());
-    if mint_authority.address().as_array() != &pda {
+    // Derive the canonical PDA on-chain and reject a non-canonical bump.
+    let (pda, canonical_bump) = Address::find_program_address(&[AUTHORITY_SEED], program_id);
+    if mint_authority.address() != &pda || bump != canonical_bump {
         return Err(ProgramError::InvalidSeeds);
     }
 
@@ -57,14 +57,7 @@ pub fn mint_nft(program_id: &Address, accounts: &[AccountView], args: &[u8]) ->
     let rent = Rent::get()?;
     let lamports = rent.try_minimum_balance(MINT_SIZE)?;
     log!("Creating mint account");
-    CreateAccount {
-        from: owner,
-        to: mint,
-        lamports,
-        space: MINT_SIZE as u64,
-        owner: &pinocchio_token::ID,
-    }
-    .invoke()?;
+    CreateAccount { from: owner, to: mint, lamports, space: MINT_SIZE as u64, owner: &pinocchio_token::ID }.invoke()?;
 
     log!("Initializing mint account");
     InitializeMint2 {
@@ -92,13 +85,8 @@ pub fn mint_nft(program_id: &Address, accounts: &[AccountView], args: &[u8]) ->
     .invoke()?;
 
     log!("Minting NFT");
-    MintTo {
-        mint,
-        account: destination,
-        mint_authority,
-        amount: 1,
-    }
-    .invoke_signed(&signers)?;
+    MintTo { mint, account: destination, mint_authority, amount: 1, multisig_signers: &[] as &[&AccountView] }
+        .invoke_signed(&signers)?;
 
     log!("Creating metadata account");
     let metadata_data = build_metadata_data(
@@ -109,15 +97,7 @@ pub fn mint_nft(program_id: &Address, accounts: &[AccountView], args: &[u8]) ->
         Some(collection_mint.address().as_array()),
         false,
     );
-    create_metadata_cpi(
-        metadata,
-        mint,
-        mint_authority,
-        owner,
-        system_program,
-        &metadata_data,
-        &signers,
-    )?;
+    create_metadata_cpi(metadata, mint, mint_authority, owner, system_program, &metadata_data, &signers)?;
 
     log!("Creating master edition account");
     create_master_edition_cpi(

tokens/nft-operations/pinocchio/program/src/instructions/mint_nft.rs

@@ -42,9 +42,7 @@ const VERIFY_COLLECTION_V1: u8 = 1;
 
 /// Reads the `authority_bump` carried by every instruction's data.
 pub(crate) fn read_bump(args: &[u8]) -> Result<u8, ProgramError> {
-    args.first()
-        .copied()
-        .ok_or(ProgramError::InvalidInstructionData)
+    args.first().copied().ok_or(ProgramError::InvalidInstructionData)
 }
 
 /// Serializes the data for a Metaplex `CreateMetadataAccountV3` instruction.
@@ -149,23 +147,8 @@ pub(crate) fn create_metadata_cpi(
         InstructionAccount::readonly(mint_authority.address()),
         InstructionAccount::readonly(system_program.address()),
     ];
-    let instruction = InstructionView {
-        program_id: &TOKEN_METADATA_PROGRAM_ID,
-        accounts: &accounts,
-        data,
-    };
-    invoke_signed(
-        &instruction,
-        &[
-            metadata,
-            mint,
-            mint_authority,
-            payer,
-            mint_authority,
-            system_program,
-        ],
-        signers,
-    )
+    let instruction = InstructionView { program_id: &TOKEN_METADATA_PROGRAM_ID, accounts: &accounts, data };
+    invoke_signed(&instruction, &[*metadata, *mint, *mint_authority, *payer, *mint_authority, *system_program], signers)
 }
 
 /// Invokes Metaplex `CreateMasterEditionV3`, signed by the mint-authority PDA.
@@ -196,23 +179,10 @@ pub(crate) fn create_master_edition_cpi(
         InstructionAccount::readonly(token_program.address()),
         InstructionAccount::readonly(system_program.address()),
     ];
-    let instruction = InstructionView {
-        program_id: &TOKEN_METADATA_PROGRAM_ID,
-        accounts: &accounts,
-        data: &data,
-    };
+    let instruction = InstructionView { program_id: &TOKEN_METADATA_PROGRAM_ID, accounts: &accounts, data: &data };
     invoke_signed(
         &instruction,
-        &[
-            edition,
-            mint,
-            mint_authority,
-            mint_authority,
-            payer,
-            metadata,
-            token_program,
-            system_program,
-        ],
+        &[*edition, *mint, *mint_authority, *mint_authority, *payer, *metadata, *token_program, *system_program],
         signers,
     )
 }

tokens/nft-operations/pinocchio/program/src/instructions/mod.rs

@@ -5,11 +5,8 @@ use pinocchio::{
     AccountView, Address, ProgramResult,
 };
 use pinocchio_log::log;
-use pinocchio_pubkey::derive_address;
 
-use crate::instructions::{
-    build_verify_collection_data, read_bump, AUTHORITY_SEED, TOKEN_METADATA_PROGRAM_ID,
-};
+use crate::instructions::{build_verify_collection_data, read_bump, AUTHORITY_SEED, TOKEN_METADATA_PROGRAM_ID};
 
 /// Verifies an NFT as a member of its collection via the Metaplex `Verify`
 /// instruction (`VerificationArgs::CollectionV1`), signed by the collection's
@@ -27,11 +24,7 @@ use crate::instructions::{
 ///   8. `[]`                 token metadata program
 ///
 /// Instruction data: `[authority_bump: u8]`.
-pub fn verify_collection(
-    program_id: &Address,
-    accounts: &[AccountView],
-    args: &[u8],
-) -> ProgramResult {
+pub fn verify_collection(program_id: &Address, accounts: &mut [AccountView], args: &[u8]) -> ProgramResult {
     let [payer, mint_authority, metadata, collection_mint, collection_metadata, collection_master_edition, system_program, sysvar_instructions, token_metadata_program] =
         accounts
     else {
@@ -44,8 +37,9 @@ pub fn verify_collection(
 
     // Confirm the supplied account is the canonical mint-authority PDA.
     let bump = read_bump(args)?;
-    let pda = derive_address(&[AUTHORITY_SEED], Some(bump), program_id.as_array());
-    if mint_authority.address().as_array() != &pda {
+    // Derive the canonical PDA on-chain and reject a non-canonical bump.
+    let (pda, canonical_bump) = Address::find_program_address(&[AUTHORITY_SEED], program_id);
+    if mint_authority.address() != &pda || bump != canonical_bump {
         return Err(ProgramError::InvalidSeeds);
     }
 
@@ -67,24 +61,21 @@ pub fn verify_collection(
         InstructionAccount::readonly(system_program.address()),
         InstructionAccount::readonly(sysvar_instructions.address()),
     ];
-    let instruction = InstructionView {
-        program_id: &TOKEN_METADATA_PROGRAM_ID,
-        accounts: &verify_accounts,
-        data: &data,
-    };
+    let instruction =
+        InstructionView { program_id: &TOKEN_METADATA_PROGRAM_ID, accounts: &verify_accounts, data: &data };
 
     log!("Verifying collection");
     invoke_signed(
         &instruction,
         &[
-            mint_authority,
-            token_metadata_program,
-            metadata,
-            collection_mint,
-            collection_metadata,
-            collection_master_edition,
-            system_program,
-            sysvar_instructions,
+            *mint_authority,
+            *token_metadata_program,
+            *metadata,
+            *collection_mint,
+            *collection_metadata,
+            *collection_master_edition,
+            *system_program,
+            *sysvar_instructions,
         ],
         &signers,
     )?;

tokens/nft-operations/pinocchio/program/src/instructions/verify_collection.rs

@@ -15,12 +15,10 @@ use crate::instructions::{create_collection, mint_nft, verify_collection};
 /// derives this bump on-chain instead).
 pub fn process_instruction(
     program_id: &Address,
-    accounts: &[AccountView],
+    accounts: &mut [AccountView],
     instruction_data: &[u8],
 ) -> ProgramResult {
-    let (discriminator, args) = instruction_data
-        .split_first()
-        .ok_or(ProgramError::InvalidInstructionData)?;
+    let (discriminator, args) = instruction_data.split_first().ok_or(ProgramError::InvalidInstructionData)?;
 
     match *discriminator {
         0 => {