single-pool: Inline and remove MPL dependency (#4589)

* single-pool: Inline and remove MPL dependency

* Link the inline file rather than copy-pasta

Author: joncinque

Cargo.lock

@@ -1,4 +1,6 @@
 //! Inlined MPL metadata types to avoid a direct dependency on `mpl-token-metadata'
+//! NOTE: this file is sym-linked in `spl-single-validator-pool`, so be careful
+//! with changes!
 
 solana_program::declare_id!("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
 

stake-pool/program/src/inline_mpl_token_metadata.rs

@@ -14,7 +14,6 @@ test-sbf = []
 [dependencies]
 arrayref = "0.3.7"
 borsh = "0.9"
-mpl-token-metadata =  { version = "1.7.0", features = [ "no-entrypoint" ] }
 num-derive = "0.3"
 num-traits = "0.2"
 num_enum = "0.6.1"

stake-pool/single-pool/Cargo.toml

@@ -0,0 +1 @@
+../../program/src/inline_mpl_token_metadata.rs

stake-pool/single-pool/src/inline_mpl_token_metadata.rs

@@ -6,10 +6,11 @@ use {
     crate::{
         find_default_deposit_account_address_and_seed, find_pool_address, find_pool_mint_address,
         find_pool_mint_authority_address, find_pool_mpl_authority_address, find_pool_stake_address,
-        find_pool_stake_authority_address, state::SinglePool,
+        find_pool_stake_authority_address,
+        inline_mpl_token_metadata::{self, pda::find_metadata_account},
+        state::SinglePool,
     },
     borsh::{BorshDeserialize, BorshSerialize},
-    mpl_token_metadata::pda::find_metadata_account,
     solana_program::{
         instruction::{AccountMeta, Instruction},
         program_pack::Pack,
@@ -377,7 +378,7 @@ pub fn create_token_metadata(
         ),
         AccountMeta::new(*payer, true),
         AccountMeta::new(token_metadata, false),
-        AccountMeta::new_readonly(mpl_token_metadata::id(), false),
+        AccountMeta::new_readonly(inline_mpl_token_metadata::id(), false),
         AccountMeta::new_readonly(system_program::id(), false),
     ];
 
@@ -413,7 +414,7 @@ pub fn update_token_metadata(
         ),
         AccountMeta::new_readonly(*authorized_withdrawer, true),
         AccountMeta::new(token_metadata, false),
-        AccountMeta::new_readonly(mpl_token_metadata::id(), false),
+        AccountMeta::new_readonly(inline_mpl_token_metadata::id(), false),
     ];
 
     Instruction {

stake-pool/single-pool/src/instruction.rs

@@ -3,6 +3,7 @@
 //! A program for liquid staking with a single validator
 
 pub mod error;
+pub mod inline_mpl_token_metadata;
 pub mod instruction;
 pub mod processor;
 pub mod state;

stake-pool/single-pool/src/lib.rs

@@ -3,6 +3,12 @@
 use {
     crate::{
         error::SinglePoolError,
+        inline_mpl_token_metadata::{
+            self,
+            instruction::{create_metadata_accounts_v3, update_metadata_accounts_v2},
+            pda::find_metadata_account,
+            state::DataV2,
+        },
         instruction::SinglePoolInstruction,
         state::{SinglePool, SinglePoolAccountType},
         MINT_DECIMALS, POOL_MINT_AUTHORITY_PREFIX, POOL_MINT_PREFIX, POOL_MPL_AUTHORITY_PREFIX,
@@ -11,11 +17,6 @@ use {
         VOTE_STATE_DISCRIMINATOR_END,
     },
     borsh::BorshDeserialize,
-    mpl_token_metadata::{
-        instruction::{create_metadata_accounts_v3, update_metadata_accounts_v2},
-        pda::find_metadata_account,
-        state::DataV2,
-    },
     solana_program::{
         account_info::{next_account_info, AccountInfo},
         borsh::{get_packed_len, try_from_slice_unchecked},
@@ -286,10 +287,10 @@ fn check_stake_program(program_id: &Pubkey) -> Result<(), ProgramError> {
 
 /// Check MPL metadata program
 fn check_mpl_metadata_program(program_id: &Pubkey) -> Result<(), ProgramError> {
-    if *program_id != mpl_token_metadata::id() {
+    if *program_id != inline_mpl_token_metadata::id() {
         msg!(
             "Expected MPL metadata program {}, received {}",
-            mpl_token_metadata::id(),
+            inline_mpl_token_metadata::id(),
             program_id
         );
         Err(ProgramError::IncorrectProgramId)
@@ -994,13 +995,6 @@ impl Processor {
             token_name,
             token_symbol,
             "".to_string(),
-            None,
-            0,
-            true,
-            true,
-            None,
-            None,
-            None,
         );
 
         let mint_authority_seeds = &[

stake-pool/single-pool/src/processor.rs

@@ -5,11 +5,6 @@ mod helpers;
 
 use {
     helpers::*,
-    mpl_token_metadata::{
-        state::Metadata,
-        state::{MAX_NAME_LENGTH, MAX_SYMBOL_LENGTH},
-        utils::puffed_out_string,
-    },
     solana_program_test::*,
     solana_sdk::{
         instruction::InstructionError, pubkey::Pubkey, signature::Signer,
@@ -22,11 +17,9 @@ fn assert_metadata(vote_account: &Pubkey, metadata: &Metadata) {
     let vote_address_str = vote_account.to_string();
     let name = format!("SPL Single Pool {}", &vote_address_str[0..15]);
     let symbol = format!("st{}", &vote_address_str[0..7]);
-    let puffy_name = puffed_out_string(&name, MAX_NAME_LENGTH);
-    let puffy_symbol = puffed_out_string(&symbol, MAX_SYMBOL_LENGTH);
 
-    assert_eq!(metadata.data.name, puffy_name);
-    assert_eq!(metadata.data.symbol, puffy_symbol);
+    assert!(metadata.name.starts_with(&name));
+    assert!(metadata.symbol.starts_with(&symbol));
 }
 
 #[tokio::test]

stake-pool/single-pool/tests/create_pool_token_metadata.rs

@@ -20,7 +20,8 @@ use {
     spl_single_validator_pool::{
         find_pool_address, find_pool_mint_address, find_pool_mint_authority_address,
         find_pool_mpl_authority_address, find_pool_stake_address,
-        find_pool_stake_authority_address, id, instruction, processor::Processor,
+        find_pool_stake_authority_address, id, inline_mpl_token_metadata, instruction,
+        processor::Processor,
     },
 };
 
@@ -35,7 +36,7 @@ pub const USER_STARTING_LAMPORTS: u64 = 10_000_000_000_000; // 10k sol
 
 pub fn program_test() -> ProgramTest {
     let mut program_test = ProgramTest::default();
-    program_test.add_program("mpl_token_metadata", mpl_token_metadata::id(), None);
+    program_test.add_program("mpl_token_metadata", inline_mpl_token_metadata::id(), None);
 
     program_test.add_program(
         "spl_single_validator_pool",

stake-pool/single-pool/tests/helpers/mod.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use {
-    mpl_token_metadata::{pda::find_metadata_account, state::Metadata},
+    borsh::BorshDeserialize,
     solana_program_test::BanksClient,
     solana_sdk::{
         borsh::try_from_slice_unchecked,
@@ -12,6 +12,7 @@ use {
         transaction::Transaction,
     },
     spl_associated_token_account as atoken,
+    spl_single_validator_pool::inline_mpl_token_metadata::pda::find_metadata_account,
     spl_token::state::{Account, Mint},
 };
 
@@ -50,6 +51,20 @@ pub async fn get_token_supply(banks_client: &mut BanksClient, mint: &Pubkey) ->
     account_info.supply
 }
 
+#[derive(Clone, BorshDeserialize, Debug, PartialEq, Eq)]
+pub struct Metadata {
+    pub key: u8,
+    pub update_authority: Pubkey,
+    pub mint: Pubkey,
+    pub name: String,
+    pub symbol: String,
+    pub uri: String,
+    pub seller_fee_basis_points: u16,
+    pub creators: Option<Vec<u8>>,
+    pub primary_sale_happened: bool,
+    pub is_mutable: bool,
+}
+
 pub async fn get_metadata_account(banks_client: &mut BanksClient, token_mint: &Pubkey) -> Metadata {
     let (token_metadata, _) = find_metadata_account(token_mint);
     let token_metadata_account = banks_client