token 2022: repair onchain helper

Continuing on from the new helper introduced in #6111.

Here the onchain helper in Token2022 is updated to use the non-deprecated new
onchain helper from SPL Transfer Hook interface.

PDAs as extra meta configs are also added to the transfer hook test in
`program-2022-test` for additional assurance.

token/program-2022-test/Cargo.toml

@@ -27,6 +27,7 @@ spl-memo = { version = "4.0.0", path = "../../memo/program", features = ["no-ent
 spl-pod = { version = "0.1.0", path = "../../libraries/pod" }
 spl-token-2022 = { version = "1.0", path="../program-2022", features = ["no-entrypoint"] }
 spl-instruction-padding = { version = "0.1.0", path="../../instruction-padding/program", features = ["no-entrypoint"] }
+spl-tlv-account-resolution = { version = "0.5.0", path = "../../libraries/tlv-account-resolution" }
 spl-token-client = { version = "0.8", path = "../client" }
 spl-token-group-interface = { version = "0.1", path = "../../token-group/interface" }
 spl-token-metadata-interface = { version = "0.2", path = "../../token-metadata/interface" }

token/program-2022-test/tests/transfer_hook.rs

@@ -17,6 +17,7 @@ use {
         transaction::TransactionError,
         transport::TransportError,
     },
+    spl_tlv_account_resolution::{account::ExtraAccountMeta, seeds::Seed},
     spl_token_2022::{
         error::TokenError,
         extension::{
@@ -191,6 +192,28 @@ fn add_validation_account(program_test: &mut ProgramTest, mint: &Pubkey, program
             is_writable: false,
         }
         .into(),
+        ExtraAccountMeta::new_with_seeds(
+            &[
+                Seed::AccountKey { index: 0 }, // source
+                Seed::AccountKey { index: 2 }, // destination
+                Seed::AccountKey { index: 4 }, // validation state
+            ],
+            false,
+            true,
+        )
+        .unwrap(),
+        ExtraAccountMeta::new_with_seeds(
+            &[
+                Seed::Literal {
+                    bytes: vec![1, 2, 3, 4, 5, 6],
+                },
+                Seed::AccountKey { index: 2 }, // destination
+                Seed::AccountKey { index: 5 }, // extra meta 1
+            ],
+            false,
+            true,
+        )
+        .unwrap(),
     ];
     program_test.add_account(
         validation_address,

token/program-2022/src/onchain.rs

@@ -11,6 +11,7 @@ use {
         account_info::AccountInfo, entrypoint::ProgramResult, instruction::AccountMeta,
         program::invoke_signed, pubkey::Pubkey,
     },
+    spl_transfer_hook_interface::onchain::add_extra_accounts_for_execute_cpi,
 };
 
 /// Helper to CPI into token-2022 on-chain, looking through the additional
@@ -39,10 +40,10 @@ pub fn invoke_transfer_checked<'a>(
     )?;
 
     let mut cpi_account_infos = vec![
-        source_info,
+        source_info.clone(),
         mint_info.clone(),
-        destination_info,
-        authority_info,
+        destination_info.clone(),
+        authority_info.clone(),
     ];
 
     // if it's a signer, it might be a multisig signer, throw it in!
@@ -61,12 +62,15 @@ pub fn invoke_transfer_checked<'a>(
         let mint_data = mint_info.try_borrow_data()?;
         let mint = StateWithExtensions::<Mint>::unpack(&mint_data)?;
         if let Some(program_id) = transfer_hook::get_program_id(&mint) {
-            #[allow(deprecated)]
-            spl_transfer_hook_interface::onchain::add_cpi_accounts_for_execute(
+            add_extra_accounts_for_execute_cpi(
                 &mut cpi_instruction,
                 &mut cpi_account_infos,
-                mint_info.key,
                 &program_id,
+                source_info,
+                mint_info.clone(),
+                destination_info,
+                authority_info,
+                amount,
                 additional_accounts,
             )?;
         }