fix(lang): sync CpiContext lifetimes, InterfaceAccount::reload, and lockfile

Made-with: Cursor

Author: user.email

Cargo.lock

@@ -1,7 +1,7 @@
 //! Account container that checks ownership on deserialization.
 
 use crate::accounts::account::Account;
-use crate::error::{Error, ErrorCode};
+use crate::error::ErrorCode;
 use crate::pinocchio_runtime::account_info::AccountInfo;
 use crate::pinocchio_runtime::instruction::AccountMeta;
 use crate::pinocchio_runtime::pubkey::Pubkey;
@@ -176,39 +176,13 @@ impl<T: AccountSerialize + AccountDeserialize + Clone + fmt::Debug> fmt::Debug
 
 impl<T: AccountSerialize + AccountDeserialize + Clone> InterfaceAccount<T> {
     fn new(info: AccountInfo, account: T) -> Self {
-        let owner = unsafe { *info.owner() };
+        let owner = *info.owner();
         Self {
             account: Account::new(info, account),
             owner,
         }
     }
 
-    /// Reloads the account from storage. This is useful, for example, when
-    /// observing side effects after CPI.
-    ///
-    /// No Anchor discriminator is checked during reload. Instead, this method enforces
-    /// owner stability by verifying that `info.owner == self.owner` (i.e., the pubkey
-    /// validated at construction) to avoid TOCTOU issues, and then re-deserializes `T`
-    /// from the updated bytes.
-    ///
-    /// If you need discriminator validation on reload, use `Account<T>` with an Anchor
-    /// #[account] type.
-    pub fn reload(&mut self) -> Result<()> {
-        let info = self.account.to_account_info();
-
-        // Enforce owner stability: must match the one validated at construction.
-        if info.owned_by(&self.owner) {
-            return Err(Error::from(ErrorCode::AccountOwnedByWrongProgram)
-                .with_pubkeys((unsafe { *info.owner() }, self.owner)));
-        }
-
-        // Re-deserialize fresh data into the inner account.
-        let mut data: &[u8] = &info.try_borrow()?;
-        let new_val = T::try_deserialize_unchecked(&mut data)?;
-        self.account.set_inner(new_val);
-        Ok(())
-    }
-
     pub fn into_inner(self) -> T {
         self.account.into_inner()
     }
@@ -259,7 +233,7 @@ impl<T: AccountSerialize + AccountDeserialize + CheckOwner + Clone> InterfaceAcc
         if info.owned_by(&system_program::ID) && info.lamports() == 0 {
             return Err(ErrorCode::AccountNotInitialized.into());
         }
-        T::check_owner(&unsafe { *info.owner() })?;
+        T::check_owner(info.owner())?;
         let mut data: &[u8] = &info.try_borrow()?;
         Ok(Self::new(info, T::try_deserialize_unchecked(&mut data)?))
     }

lang/src/accounts/interface_account.rs

@@ -20,7 +20,7 @@ pub struct AdvanceNonceAccount {
     pub authorized: AccountInfo,
     pub recent_blockhashes: AccountInfo,
 }
-pub fn advance_nonce_account(ctx: CpiContext<'_, '_, 'static, AdvanceNonceAccount>) -> Result<()> {
+pub fn advance_nonce_account(ctx: CpiContext<'_, '_, AdvanceNonceAccount>) -> Result<()> {
     let instruction = system_instruction::AdvanceNonceAccount {
         account: &ctx.accounts.nonce,
         recent_blockhashes_sysvar: &ctx.accounts.recent_blockhashes,
@@ -37,7 +37,7 @@ pub struct Allocate {
     pub account_to_allocate: AccountInfo,
 }
 
-pub fn allocate(ctx: CpiContext<'_, '_, 'static, Allocate>, space: u64) -> Result<()> {
+pub fn allocate(ctx: CpiContext<'_, '_, Allocate>, space: u64) -> Result<()> {
     let instruction = system_instruction::Allocate {
         account: &ctx.accounts.account_to_allocate,
         space,
@@ -54,7 +54,7 @@ pub struct AllocateWithSeed {
 }
 
 pub fn allocate_with_seed(
-    ctx: CpiContext<'_, '_, 'static, AllocateWithSeed>,
+    ctx: CpiContext<'_, '_, AllocateWithSeed>,
     seed: &str,
     space: u64,
     owner: &Pubkey,
@@ -76,7 +76,7 @@ pub struct Assign {
     pub account_to_assign: AccountInfo,
 }
 
-pub fn assign(ctx: CpiContext<'_, '_, 'static, Assign>, owner: &Pubkey) -> Result<()> {
+pub fn assign(ctx: CpiContext<'_, '_, Assign>, owner: &Pubkey) -> Result<()> {
     // Build instruction accounts
     let instruction = system_instruction::Assign {
         account: &ctx.accounts.account_to_assign,
@@ -95,7 +95,7 @@ pub struct AssignWithSeed {
 }
 
 pub fn assign_with_seed(
-    ctx: CpiContext<'_, '_, 'static, AssignWithSeed>,
+    ctx: CpiContext<'_, '_, AssignWithSeed>,
     seed: &str,
     owner: &Pubkey,
 ) -> Result<()> {
@@ -117,7 +117,7 @@ pub struct AuthorizeNonceAccount {
 }
 
 pub fn authorize_nonce_account(
-    ctx: CpiContext<'_, '_, 'static, AuthorizeNonceAccount>,
+    ctx: CpiContext<'_, '_, AuthorizeNonceAccount>,
     new_authority: &Pubkey,
 ) -> Result<()> {
     let instruction = system_instruction::AuthorizeNonceAccount {
@@ -138,7 +138,7 @@ pub struct CreateAccount {
 }
 
 pub fn create_account(
-    ctx: CpiContext<'_, '_, 'static, CreateAccount>,
+    ctx: CpiContext<'_, '_, CreateAccount>,
     lamports: u64,
     space: u64,
     owner: &Pubkey,
@@ -163,7 +163,7 @@ pub struct CreateAccountWithSeed {
 }
 
 pub fn create_account_with_seed(
-    ctx: CpiContext<'_, '_, 'static, CreateAccountWithSeed>,
+    ctx: CpiContext<'_, '_, CreateAccountWithSeed>,
     seed: &str,
     lamports: u64,
     space: u64,
@@ -246,7 +246,7 @@ pub struct InitializeNonceAccount {
 }
 
 pub fn initialize_nonce_account(
-    ctx: CpiContext<'_, '_, 'static, InitializeNonceAccount>,
+    ctx: CpiContext<'_, '_, InitializeNonceAccount>,
     authority: &Pubkey,
 ) -> Result<()> {
     let instruction = system_instruction::InitializeNonceAccount {
@@ -264,7 +264,7 @@ pub struct Transfer {
     pub to: AccountInfo,
 }
 
-pub fn transfer(ctx: CpiContext<'_, '_, 'static, Transfer>, lamports: u64) -> Result<()> {
+pub fn transfer(ctx: CpiContext<'_, '_, Transfer>, lamports: u64) -> Result<()> {
     let instruction = system_instruction::Transfer {
         from: &ctx.accounts.from,
         to: &ctx.accounts.to,
@@ -283,7 +283,7 @@ pub struct TransferWithSeed {
 }
 
 pub fn transfer_with_seed(
-    ctx: CpiContext<'_, '_, 'static, TransferWithSeed>,
+    ctx: CpiContext<'_, '_, TransferWithSeed>,
     seed: &str,
     owner: &Pubkey,
     lamports: u64,
@@ -312,7 +312,7 @@ pub struct WithdrawNonceAccount {
 }
 
 pub fn withdraw_nonce_account(
-    ctx: CpiContext<'_, '_, 'static, WithdrawNonceAccount>,
+    ctx: CpiContext<'_, '_, WithdrawNonceAccount>,
     lamports: u64,
 ) -> Result<()> {
     let instruction = system_instruction::WithdrawNonceAccount {

lang/src/system_program.rs

@@ -1,9 +1,8 @@
 #[path = "support/mod.rs"]
 mod support;
 
-use std::cell::RefMut;
-
 use anchor_lang::prelude::*;
+use anchor_lang::RefMut;
 
 use support::OwnedPinocchioAccount;
 

lang/tests/account_reload.rs

@@ -63,7 +63,7 @@ fn cpi_context_create_account_triple_lifetime() {
         from: from_o.info,
         to: to_o.info,
     };
-    let _ctx: CpiContext<'_, '_, 'static, CreateAccount> =
+    let _ctx: CpiContext<'_, '_, CreateAccount> =
         CpiContext::new(system_program::ID, accs);
 }