transfer hook: add new onchain helper

solana-labs · Jan 10, 2024 · 1b717ce · 1b717ce
1 parent 0b076b1
commit 1b717ce
Show file tree

Hide file tree

Showing 4 changed files with 521 additions and 4 deletions.
diff --git a/token/js/test/e2e-2022/tokenMetadata.test.ts b/token/js/test/e2e-2022/tokenMetadata.test.ts
@@ -51,7 +51,7 @@ describe('tokenMetadata', async () => {
     beforeEach(async () => {
         mint = Keypair.generate();
 
-        const mintLen = getMintLen(EXTENSIONS);
+        const mintLen = getMintLen(EXTENSIONS) + 1;
         const lamports = await connection.getMinimumBalanceForRentExemption(mintLen);
 
         const transaction = new Transaction().add(

diff --git a/token/program-2022-test/tests/transfer_hook.rs b/token/program-2022-test/tests/transfer_hook.rs
@@ -27,7 +27,9 @@ use {
         processor::Processor,
     },
     spl_token_client::token::{ExtensionInitializationParams, TokenError as TokenClientError},
-    spl_transfer_hook_interface::{get_extra_account_metas_address, offchain::add_extra_account_metas_for_execute},
+    spl_transfer_hook_interface::{
+        get_extra_account_metas_address, offchain::add_extra_account_metas_for_execute,
+    },
     std::{convert::TryInto, sync::Arc},
 };
 

diff --git a/token/program-2022/src/onchain.rs b/token/program-2022/src/onchain.rs
@@ -11,7 +11,6 @@ use {
         account_info::AccountInfo, entrypoint::ProgramResult, instruction::AccountMeta,
         program::invoke_signed, pubkey::Pubkey,
     },
-    spl_transfer_hook_interface::onchain::add_cpi_accounts_for_execute,
 };
 
 /// Helper to CPI into token-2022 on-chain, looking through the additional
@@ -62,7 +61,8 @@ 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) {
-            add_cpi_accounts_for_execute(
+            #[allow(deprecated)]
+            spl_transfer_hook_interface::onchain::add_cpi_accounts_for_execute(
                 &mut cpi_instruction,
                 &mut cpi_account_infos,
                 mint_info.key,