fix(macros): Provide full import paths in light_accounts macro (#1063)

vadorovsky · web-flow · commit 4926032e7af7 · 2024-08-13T18:44:52.000+01:00
* fix(macros): Provide full import paths in `light_accounts` macro Before this change, using `#[light_accounts]` macro required adding necessary imports manually, e.g. ```rust use account_compression::program::AccountCompression; use light_system_program::program::LightSystemProgram; ``` Which might've been annoying for developers. This change uses full paths for all foregin types used inside macros, so no additional imports are needed. * fix(macros): Provide full import paths in `LightTraits` (#1069) Before this change, using `#[derive(LightTraits)]` macro required adding necessary imports manually, e.g. ```rust use light_sdk::traits::{InvokeAccounts, SignerAccounts}; ``` Which might've been annoying for developers. This change uses full paths for all foreign types used inside macros, so no additional imports are needed. * style: Use all avaiable light macros in token-escrow Also, remove unnecessary imports. * style: Use `AccountInfo` instead of `UncheckedAccount`
diff --git a/examples/token-escrow/programs/token-escrow/src/escrow_with_compressed_pda/escrow.rs b/examples/token-escrow/programs/token-escrow/src/escrow_with_compressed_pda/escrow.rs
@@ -1,5 +1,4 @@
 use crate::{create_change_output_compressed_token_account, program::TokenEscrow, EscrowTimeLock};
-use account_compression::{program::AccountCompression, RegisteredProgram};
 use anchor_lang::prelude::*;
 use light_compressed_token::{
     process_transfer::{
@@ -15,7 +14,6 @@ use light_sdk::{
 use light_system_program::{
     invoke::processor::CompressedProof,
     invoke_cpi::account::CpiContextAccount,
-    program::LightSystemProgram,
     sdk::{
         address::derive_address,
         compressed_account::{CompressedAccount, CompressedAccountData, PackedMerkleContext},
@@ -24,8 +22,6 @@ use light_system_program::{
     NewAddressParamsPacked, OutputCompressedAccountWithPackedContext,
 };
 
-use light_sdk::traits::*;
-
 #[light_accounts]
 #[derive(Accounts, LightTraits)]
 pub struct EscrowCompressedTokensWithCompressedPda<'info> {
diff --git a/examples/token-escrow/programs/token-escrow/src/escrow_with_pda/escrow.rs b/examples/token-escrow/programs/token-escrow/src/escrow_with_pda/escrow.rs
@@ -1,5 +1,4 @@
 use crate::create_change_output_compressed_token_account;
-use account_compression::{program::AccountCompression, RegisteredProgram};
 use anchor_lang::prelude::*;
 use light_compressed_token::{
     process_transfer::{
@@ -8,13 +7,10 @@ use light_compressed_token::{
     },
     program::LightCompressedToken,
 };
-use light_sdk::traits::*;
-use light_sdk::LightTraits;
-use light_system_program::{
-    invoke::processor::CompressedProof, invoke_cpi::account::CpiContextAccount,
-    program::LightSystemProgram,
-};
+use light_sdk::{light_accounts, LightTraits};
+use light_system_program::invoke::processor::CompressedProof;
 
+#[light_accounts]
 #[derive(Accounts, LightTraits)]
 pub struct EscrowCompressedTokensWithPda<'info> {
     #[account(mut)]
@@ -26,19 +22,10 @@ pub struct EscrowCompressedTokensWithPda<'info> {
     pub token_owner_pda: AccountInfo<'info>,
     #[self_program]
     pub compressed_token_program: Program<'info, LightCompressedToken>,
-    pub light_system_program: Program<'info, LightSystemProgram>,
-    pub account_compression_program: Program<'info, AccountCompression>,
-    /// CHECK:
-    pub account_compression_authority: AccountInfo<'info>,
     /// CHECK:
     pub compressed_token_cpi_authority_pda: AccountInfo<'info>,
-    /// CHECK:
-    pub registered_program_pda: Account<'info, RegisteredProgram>,
-    /// CHECK:
-    pub noop_program: AccountInfo<'info>,
     #[account(init_if_needed, seeds = [b"timelock".as_slice(), signer.key.to_bytes().as_slice()],bump, payer = signer, space = 8 + 8)]
     pub timelock_pda: Account<'info, EscrowTimeLock>,
-    pub system_program: Program<'info, System>,
 }
 
 #[derive(Debug)]
diff --git a/macros/light/src/accounts.rs b/macros/light/src/accounts.rs
@@ -8,17 +8,20 @@ pub(crate) fn process_light_accounts(input: DeriveInput) -> Result<TokenStream>
     if let Data::Struct(ref mut data_struct) = output.data {
         if let Fields::Named(ref mut fields) = data_struct.fields {
             let fields_to_add = [
-                ("light_system_program", "Program<'info, LightSystemProgram>"),
+                (
+                    "light_system_program",
+                    "Program<'info, ::light_system_program::program::LightSystemProgram>",
+                ),
                 ("system_program", "Program<'info, System>"),
                 (
                     "account_compression_program",
-                    "Program<'info, AccountCompression>",
+                    "Program<'info, ::account_compression::program::AccountCompression>",
                 ),
             ];
             let fields_to_add_check = [
                 (
                     "registered_program_pda",
-                    "Account<'info, RegisteredProgram>",
+                    "Account<'info, ::account_compression::RegisteredProgram>",
                 ),
                 ("noop_program", "AccountInfo<'info>"),
                 ("account_compression_authority", "AccountInfo<'info>"),
diff --git a/macros/light/src/traits.rs b/macros/light/src/traits.rs
@@ -198,46 +198,55 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre
         }
     } else {
         let base_impls = quote! {
-            impl<'info> InvokeCpiAccounts<'info> for #name<'info> {
+            impl<'info> ::light_sdk::traits::InvokeCpiAccounts<'info> for #name<'info> {
                 fn get_invoking_program(&self) -> &AccountInfo<'info> {
                     &self.#self_program_field
                 }
             }
-            impl<'info> SignerAccounts<'info> for #name<'info> {
-                fn get_fee_payer(&self) -> &Signer<'info> {
+            impl<'info> ::light_sdk::traits::SignerAccounts<'info> for #name<'info> {
+                fn get_fee_payer(&self) -> &::anchor_lang::prelude::Signer<'info> {
                     &self.#fee_payer_field
                 }
-                fn get_authority(&self) -> &AccountInfo<'info> {
+                fn get_authority(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {
                     &self.#authority_field
                 }
             }
-            impl<'info> LightSystemAccount<'info> for #name<'info> {
-                fn get_light_system_program(&self) -> &Program<'info, LightSystemProgram> {
+            impl<'info> ::light_sdk::traits::LightSystemAccount<'info> for #name<'info> {
+                fn get_light_system_program(&self) -> &::anchor_lang::prelude::Program<
+                    'info,
+                    ::light_system_program::program::LightSystemProgram
+                > {
                     &self.#light_system_program_field
                 }
             }
         };
         let invoke_accounts_impl = quote! {
-            impl<'info> InvokeAccounts<'info> for #name<'info> {
-                fn get_registered_program_pda(&self) -> &Account<'info, RegisteredProgram> {
+            impl<'info> ::light_sdk::traits::InvokeAccounts<'info> for #name<'info> {
+                fn get_registered_program_pda(&self) -> &::anchor_lang::prelude::Account<
+                    'info,
+                    ::account_compression::RegisteredProgram
+                > {
                     &self.#registered_program_pda_field
                 }
-                fn get_noop_program(&self) -> &AccountInfo<'info> {
+                fn get_noop_program(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {
                     &self.#noop_program_field
                 }
-                fn get_account_compression_authority(&self) -> &AccountInfo<'info> {
+                fn get_account_compression_authority(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {
                     &self.#account_compression_authority_field
                 }
-                fn get_account_compression_program(&self) -> &Program<'info, AccountCompression> {
+                fn get_account_compression_program(&self) -> &::anchor_lang::prelude::Program<
+                    'info,
+                    ::account_compression::program::AccountCompression
+                > {
                     &self.#account_compression_program_field
                 }
-                fn get_system_program(&self) -> &Program<'info, System> {
+                fn get_system_program(&self) -> &::anchor_lang::prelude::Program<'info, System> {
                     &self.#system_program_field
                 }
-                fn get_compressed_sol_pda(&self) -> Option<&UncheckedAccount<'info>> {
+                fn get_compressed_sol_pda(&self) -> Option<&::anchor_lang::prelude::AccountInfo<'info>> {
                     #compressed_sol_pda_field
                 }
-                fn get_compression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+                fn get_compression_recipient(&self) -> Option<&::anchor_lang::prelude::AccountInfo<'info>> {
                     #compression_recipient_field
                 }
             }
@@ -246,8 +255,13 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre
             quote! {
                 #base_impls
                 #invoke_accounts_impl
-                impl<'info> InvokeCpiContextAccount<'info> for #name<'info> {
-                    fn get_cpi_context_account(&self) -> Option<&Account<'info, CpiContextAccount>> {
+                impl<'info> ::light_sdk::traits::InvokeCpiContextAccount<'info> for #name<'info> {
+                    fn get_cpi_context_account(&self) -> Option<
+                        &::anchor_lang::prelude::Account<
+                            'info,
+                            ::light_system_program::invoke_cpi::account::CpiContextAccount
+                        >
+                    > {
                         None
                     }
                 }
@@ -256,8 +270,13 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre
             quote! {
                 #base_impls
                 #invoke_accounts_impl
-                impl<'info> InvokeCpiContextAccount<'info> for #name<'info> {
-                    fn get_cpi_context_account(&self) -> Option<&Account<'info, CpiContextAccount>> {
+                impl<'info> ::light_sdk::traits::InvokeCpiContextAccount<'info> for #name<'info> {
+                    fn get_cpi_context_account(&self) -> Option<
+                        &::anchor_lang::prelude::Account<
+                            'info,
+                            ::light_system_program::invoke_cpi::account::CpiContextAccount
+                        >
+                    > {
                         Some(&self.#cpi_context_account_field)
                     }
                 }
diff --git a/programs/compressed-token/src/instructions/burn.rs b/programs/compressed-token/src/instructions/burn.rs
@@ -60,11 +60,11 @@ impl<'info> InvokeAccounts<'info> for BurnInstruction<'info> {
         &self.system_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 }
diff --git a/programs/compressed-token/src/instructions/freeze.rs b/programs/compressed-token/src/instructions/freeze.rs
@@ -52,11 +52,11 @@ impl<'info> InvokeAccounts<'info> for FreezeInstruction<'info> {
         &self.system_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 }
diff --git a/programs/compressed-token/src/instructions/generic.rs b/programs/compressed-token/src/instructions/generic.rs
@@ -51,11 +51,11 @@ impl<'info> InvokeAccounts<'info> for GenericInstruction<'info> {
         &self.system_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 }
diff --git a/programs/compressed-token/src/instructions/transfer.rs b/programs/compressed-token/src/instructions/transfer.rs
@@ -61,11 +61,11 @@ impl<'info> InvokeAccounts<'info> for TransferInstruction<'info> {
         &self.system_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         None
     }
 }
diff --git a/programs/system/src/invoke/instruction.rs b/programs/system/src/invoke/instruction.rs
@@ -39,12 +39,12 @@ pub struct InvokeInstruction<'info> {
         mut,
         seeds = [SOL_POOL_PDA_SEED], bump
     )]
-    pub sol_pool_pda: Option<UncheckedAccount<'info>>,
+    pub sol_pool_pda: Option<AccountInfo<'info>>,
     /// Only needs to be provided for decompression as a recipient for the
     /// decompressed sol.
     /// Compressed sol originate from authority.
     #[account(mut)]
-    pub decompression_recipient: Option<UncheckedAccount<'info>>,
+    pub decompression_recipient: Option<AccountInfo<'info>>,
     pub system_program: Program<'info, System>,
 }
 
@@ -79,11 +79,11 @@ impl<'info> InvokeAccounts<'info> for InvokeInstruction<'info> {
         &self.system_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         self.sol_pool_pda.as_ref()
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         self.decompression_recipient.as_ref()
     }
 }
diff --git a/programs/system/src/invoke_cpi/instruction.rs b/programs/system/src/invoke_cpi/instruction.rs
@@ -39,9 +39,9 @@ pub struct InvokeCpiInstruction<'info> {
         mut,
         seeds = [SOL_POOL_PDA_SEED], bump
     )]
-    pub sol_pool_pda: Option<UncheckedAccount<'info>>,
+    pub sol_pool_pda: Option<AccountInfo<'info>>,
     #[account(mut)]
-    pub decompression_recipient: Option<UncheckedAccount<'info>>,
+    pub decompression_recipient: Option<AccountInfo<'info>>,
     pub system_program: Program<'info, System>,
     #[account(mut)]
     pub cpi_context_account: Option<Account<'info, CpiContextAccount>>,
@@ -74,11 +74,11 @@ impl<'info> InvokeAccounts<'info> for InvokeCpiInstruction<'info> {
         &self.account_compression_program
     }
 
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {
         self.sol_pool_pda.as_ref()
     }
 
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {
         self.decompression_recipient.as_ref()
     }
 
diff --git a/programs/system/src/sdk/accounts.rs b/programs/system/src/sdk/accounts.rs
@@ -7,8 +7,8 @@ pub trait InvokeAccounts<'info> {
     fn get_account_compression_authority(&self) -> &UncheckedAccount<'info>;
     fn get_account_compression_program(&self) -> &Program<'info, AccountCompression>;
     fn get_system_program(&self) -> &Program<'info, System>;
-    fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>>;
-    fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>>;
+    fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>>;
+    fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>>;
 }
 
 pub trait SignerAccounts<'info> {
diff --git a/sdk/src/traits.rs b/sdk/src/traits.rs
@@ -11,8 +11,8 @@ pub trait InvokeAccounts<'info> {
     fn get_account_compression_authority(&self) -> &AccountInfo<'info>;
     fn get_account_compression_program(&self) -> &Program<'info, AccountCompression>;
     fn get_system_program(&self) -> &Program<'info, System>;
-    fn get_compressed_sol_pda(&self) -> Option<&UncheckedAccount<'info>>;
-    fn get_compression_recipient(&self) -> Option<&UncheckedAccount<'info>>;
+    fn get_compressed_sol_pda(&self) -> Option<&AccountInfo<'info>>;
+    fn get_compression_recipient(&self) -> Option<&AccountInfo<'info>>;
 }
 
 pub trait LightSystemAccount<'info> {

Original file line number	Diff line number	Diff line change
`@@ -198,46 +198,55 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre`
`198`	`198`	`}`
`199`	`199`	`} else {`
`200`	`200`	`let base_impls = quote! {`
`201`		`- impl<'info> InvokeCpiAccounts<'info> for #name<'info> {`
	`201`	`+ impl<'info> ::light_sdk::traits::InvokeCpiAccounts<'info> for #name<'info> {`
`202`	`202`	`fn get_invoking_program(&self) -> &AccountInfo<'info> {`
`203`	`203`	`&self.#self_program_field`
`204`	`204`	`}`
`205`	`205`	`}`
`206`		`- impl<'info> SignerAccounts<'info> for #name<'info> {`
`207`		`- fn get_fee_payer(&self) -> &Signer<'info> {`
	`206`	`+ impl<'info> ::light_sdk::traits::SignerAccounts<'info> for #name<'info> {`
	`207`	`+ fn get_fee_payer(&self) -> &::anchor_lang::prelude::Signer<'info> {`
`208`	`208`	`&self.#fee_payer_field`
`209`	`209`	`}`
`210`		`- fn get_authority(&self) -> &AccountInfo<'info> {`
	`210`	`+ fn get_authority(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {`
`211`	`211`	`&self.#authority_field`
`212`	`212`	`}`
`213`	`213`	`}`
`214`		`- impl<'info> LightSystemAccount<'info> for #name<'info> {`
`215`		`- fn get_light_system_program(&self) -> &Program<'info, LightSystemProgram> {`
	`214`	`+ impl<'info> ::light_sdk::traits::LightSystemAccount<'info> for #name<'info> {`
	`215`	`+ fn get_light_system_program(&self) -> &::anchor_lang::prelude::Program<`
	`216`	`+ 'info,`
	`217`	`+ ::light_system_program::program::LightSystemProgram`
	`218`	`+ > {`
`216`	`219`	`&self.#light_system_program_field`
`217`	`220`	`}`
`218`	`221`	`}`
`219`	`222`	`};`
`220`	`223`	`let invoke_accounts_impl = quote! {`
`221`		`- impl<'info> InvokeAccounts<'info> for #name<'info> {`
`222`		`- fn get_registered_program_pda(&self) -> &Account<'info, RegisteredProgram> {`
	`224`	`+ impl<'info> ::light_sdk::traits::InvokeAccounts<'info> for #name<'info> {`
	`225`	`+ fn get_registered_program_pda(&self) -> &::anchor_lang::prelude::Account<`
	`226`	`+ 'info,`
	`227`	`+ ::account_compression::RegisteredProgram`
	`228`	`+ > {`
`223`	`229`	`&self.#registered_program_pda_field`
`224`	`230`	`}`
`225`		`- fn get_noop_program(&self) -> &AccountInfo<'info> {`
	`231`	`+ fn get_noop_program(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {`
`226`	`232`	`&self.#noop_program_field`
`227`	`233`	`}`
`228`		`- fn get_account_compression_authority(&self) -> &AccountInfo<'info> {`
	`234`	`+ fn get_account_compression_authority(&self) -> &::anchor_lang::prelude::AccountInfo<'info> {`
`229`	`235`	`&self.#account_compression_authority_field`
`230`	`236`	`}`
`231`		`- fn get_account_compression_program(&self) -> &Program<'info, AccountCompression> {`
	`237`	`+ fn get_account_compression_program(&self) -> &::anchor_lang::prelude::Program<`
	`238`	`+ 'info,`
	`239`	`+ ::account_compression::program::AccountCompression`
	`240`	`+ > {`
`232`	`241`	`&self.#account_compression_program_field`
`233`	`242`	`}`
`234`		`- fn get_system_program(&self) -> &Program<'info, System> {`
	`243`	`+ fn get_system_program(&self) -> &::anchor_lang::prelude::Program<'info, System> {`
`235`	`244`	`&self.#system_program_field`
`236`	`245`	`}`
`237`		`- fn get_compressed_sol_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`246`	`+ fn get_compressed_sol_pda(&self) -> Option<&::anchor_lang::prelude::AccountInfo<'info>> {`
`238`	`247`	`#compressed_sol_pda_field`
`239`	`248`	`}`
`240`		`- fn get_compression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`249`	`+ fn get_compression_recipient(&self) -> Option<&::anchor_lang::prelude::AccountInfo<'info>> {`
`241`	`250`	`#compression_recipient_field`
`242`	`251`	`}`
`243`	`252`	`}`
`@@ -246,8 +255,13 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre`
`246`	`255`	`quote! {`
`247`	`256`	`#base_impls`
`248`	`257`	`#invoke_accounts_impl`
`249`		`- impl<'info> InvokeCpiContextAccount<'info> for #name<'info> {`
`250`		`- fn get_cpi_context_account(&self) -> Option<&Account<'info, CpiContextAccount>> {`
	`258`	`+ impl<'info> ::light_sdk::traits::InvokeCpiContextAccount<'info> for #name<'info> {`
	`259`	`+ fn get_cpi_context_account(&self) -> Option<`
	`260`	`+ &::anchor_lang::prelude::Account<`
	`261`	`+ 'info,`
	`262`	`+ ::light_system_program::invoke_cpi::account::CpiContextAccount`
	`263`	`+ >`
	`264`	`+ > {`
`251`	`265`	`None`
`252`	`266`	`}`
`253`	`267`	`}`
`@@ -256,8 +270,13 @@ fn process_fields_and_attributes(name: &Ident, fields: FieldsNamed) -> TokenStre`
`256`	`270`	`quote! {`
`257`	`271`	`#base_impls`
`258`	`272`	`#invoke_accounts_impl`
`259`		`- impl<'info> InvokeCpiContextAccount<'info> for #name<'info> {`
`260`		`- fn get_cpi_context_account(&self) -> Option<&Account<'info, CpiContextAccount>> {`
	`273`	`+ impl<'info> ::light_sdk::traits::InvokeCpiContextAccount<'info> for #name<'info> {`
	`274`	`+ fn get_cpi_context_account(&self) -> Option<`
	`275`	`+ &::anchor_lang::prelude::Account<`
	`276`	`+ 'info,`
	`277`	`+ ::light_system_program::invoke_cpi::account::CpiContextAccount`
	`278`	`+ >`
	`279`	`+ > {`
`261`	`280`	`Some(&self.#cpi_context_account_field)`
`262`	`281`	`}`
`263`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ impl<'info> InvokeAccounts<'info> for BurnInstruction<'info> {`
`60`	`60`	`&self.system_program`
`61`	`61`	`}`
`62`	`62`
`63`		`- fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`63`	`+ fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {`
`64`	`64`	`None`
`65`	`65`	`}`
`66`	`66`
`67`		`- fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`67`	`+ fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {`
`68`	`68`	`None`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,11 @@ impl<'info> InvokeAccounts<'info> for FreezeInstruction<'info> {`
`52`	`52`	`&self.system_program`
`53`	`53`	`}`
`54`	`54`
`55`		`- fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`55`	`+ fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {`
`56`	`56`	`None`
`57`	`57`	`}`
`58`	`58`
`59`		`- fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`59`	`+ fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {`
`60`	`60`	`None`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ impl<'info> InvokeAccounts<'info> for GenericInstruction<'info> {`
`51`	`51`	`&self.system_program`
`52`	`52`	`}`
`53`	`53`
`54`		`- fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`54`	`+ fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {`
`55`	`55`	`None`
`56`	`56`	`}`
`57`	`57`
`58`		`- fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`58`	`+ fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {`
`59`	`59`	`None`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ impl<'info> InvokeAccounts<'info> for TransferInstruction<'info> {`
`61`	`61`	`&self.system_program`
`62`	`62`	`}`
`63`	`63`
`64`		`- fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`64`	`+ fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {`
`65`	`65`	`None`
`66`	`66`	`}`
`67`	`67`
`68`		`- fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`68`	`+ fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {`
`69`	`69`	`None`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ pub struct InvokeInstruction<'info> {`
`39`	`39`	`mut,`
`40`	`40`	`seeds = [SOL_POOL_PDA_SEED], bump`
`41`	`41`	`)]`
`42`		`- pub sol_pool_pda: Option<UncheckedAccount<'info>>,`
	`42`	`+ pub sol_pool_pda: Option<AccountInfo<'info>>,`
`43`	`43`	`/// Only needs to be provided for decompression as a recipient for the`
`44`	`44`	`/// decompressed sol.`
`45`	`45`	`/// Compressed sol originate from authority.`
`46`	`46`	`#[account(mut)]`
`47`		`- pub decompression_recipient: Option<UncheckedAccount<'info>>,`
	`47`	`+ pub decompression_recipient: Option<AccountInfo<'info>>,`
`48`	`48`	`pub system_program: Program<'info, System>,`
`49`	`49`	`}`
`50`	`50`
`@@ -79,11 +79,11 @@ impl<'info> InvokeAccounts<'info> for InvokeInstruction<'info> {`
`79`	`79`	`&self.system_program`
`80`	`80`	`}`
`81`	`81`
`82`		`- fn get_sol_pool_pda(&self) -> Option<&UncheckedAccount<'info>> {`
	`82`	`+ fn get_sol_pool_pda(&self) -> Option<&AccountInfo<'info>> {`
`83`	`83`	`self.sol_pool_pda.as_ref()`
`84`	`84`	`}`
`85`	`85`
`86`		`- fn get_decompression_recipient(&self) -> Option<&UncheckedAccount<'info>> {`
	`86`	`+ fn get_decompression_recipient(&self) -> Option<&AccountInfo<'info>> {`
`87`	`87`	`self.decompression_recipient.as_ref()`
`88`	`88`	`}`
`89`	`89`	`}`