Skip to content

Safer Account #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Safer Account #234

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
333956f
Added safer code for Account. Removed copy and clone from Account. Ch…
Buzzec Aug 26, 2025
2b6e58e
Fixed Clippy
Buzzec Aug 26, 2025
1900965
Added data to account.
Buzzec Aug 26, 2025
5d90c0f
Fixed invalid logic
Buzzec Aug 26, 2025
b2d5fde
Fixed close
Buzzec Aug 26, 2025
b375b5b
Updated solana version
Buzzec Aug 26, 2025
d26e97a
Fixed clippy, 1.84 clippy has lints that are no longer valid for more…
Buzzec Aug 26, 2025
426ab4f
Merge branch 'main' into safety-update
Buzzec Aug 27, 2025
4d759ce
Added back data_ptr function
Buzzec Aug 27, 2025
fd6496d
Fixed Clippy
Buzzec Aug 27, 2025
49535d8
Fixed clippy again
Buzzec Aug 29, 2025
9ee4a3f
Fixed fmt
Buzzec Sep 2, 2025
4b4b043
Changed to const block
Buzzec Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
/node_modules
/target
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ members = [
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/anza-xyz/pinocchio"
rust-version = "1.79"
rust-version = "1.80"

[workspace.dependencies]
five8_const = "0.1.4"
Expand All @@ -28,7 +28,7 @@ regex = "1"
syn = "1.0"

[workspace.metadata.cli]
solana = "2.2.0"
solana = "2.3.0"

[workspace.metadata.toolchains]
build = "1.84.1"
Expand Down
4 changes: 2 additions & 2 deletions programs/token-2022/src/instructions/initialize_multisig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ impl InitializeMultisig<'_, '_, '_> {
};

// Account info array
const UNINIT_INFO: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [UNINIT_INFO; 2 + MAX_MULTISIG_SIGNERS];
let uninit_info: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [uninit_info; 2 + MAX_MULTISIG_SIGNERS];

unsafe {
// SAFETY:
Expand Down
4 changes: 2 additions & 2 deletions programs/token-2022/src/instructions/initialize_multisig_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ impl InitializeMultisig2<'_, '_, '_> {
};

// Account info array
const UNINIT_INFO: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [UNINIT_INFO; 1 + MAX_MULTISIG_SIGNERS];
let uninit_info: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [uninit_info; 1 + MAX_MULTISIG_SIGNERS];

unsafe {
// SAFETY:
Expand Down
4 changes: 2 additions & 2 deletions programs/token-2022/src/state/mint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl Mint {
/// This method performs owner and length validation on `AccountInfo`, safe borrowing
/// the account data.
#[inline]
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<Mint>, ProgramError> {
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<'_, Mint>, ProgramError> {
if account_info.data_len() < Self::BASE_LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -71,7 +71,7 @@ impl Mint {
if account_info.data_len() < Self::BASE_LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountOwner);
}
Ok(Self::from_bytes_unchecked(
Expand Down
6 changes: 4 additions & 2 deletions programs/token-2022/src/state/multisig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ impl Multisig {
/// This method performs owner and length validation on `AccountInfo`, safe borrowing
/// the account data.
#[inline]
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<Multisig>, ProgramError> {
pub fn from_account_info(
account_info: &AccountInfo,
) -> Result<Ref<'_, Multisig>, ProgramError> {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -57,7 +59,7 @@ impl Multisig {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountOwner);
}
Ok(Self::from_bytes_unchecked(
Expand Down
4 changes: 2 additions & 2 deletions programs/token-2022/src/state/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl TokenAccount {
#[inline]
pub fn from_account_info(
account_info: &AccountInfo,
) -> Result<Ref<TokenAccount>, ProgramError> {
) -> Result<Ref<'_, TokenAccount>, ProgramError> {
if account_info.data_len() < Self::BASE_LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -86,7 +86,7 @@ impl TokenAccount {
if account_info.data_len() < Self::BASE_LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountData);
}
Ok(Self::from_bytes_unchecked(
Expand Down
4 changes: 2 additions & 2 deletions programs/token/src/instructions/initialize_multisig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ impl InitializeMultisig<'_, '_> {
};

// Account info array
const UNINIT_INFO: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [UNINIT_INFO; 2 + MAX_MULTISIG_SIGNERS];
let uninit_info: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [uninit_info; 2 + MAX_MULTISIG_SIGNERS];

unsafe {
// SAFETY:
Expand Down
4 changes: 2 additions & 2 deletions programs/token/src/instructions/initialize_multisig_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ impl InitializeMultisig2<'_, '_> {
};

// Account info array
const UNINIT_INFO: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [UNINIT_INFO; 1 + MAX_MULTISIG_SIGNERS];
let uninit_info: MaybeUninit<&AccountInfo> = MaybeUninit::uninit();
let mut acc_infos = [uninit_info; 1 + MAX_MULTISIG_SIGNERS];

unsafe {
// SAFETY:
Expand Down
4 changes: 2 additions & 2 deletions programs/token/src/state/mint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl Mint {
/// This method performs owner and length validation on `AccountInfo`, safe borrowing
/// the account data.
#[inline]
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<Mint>, ProgramError> {
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<'_, Mint>, ProgramError> {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -71,7 +71,7 @@ impl Mint {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountOwner);
}
Ok(Self::from_bytes_unchecked(
Expand Down
6 changes: 4 additions & 2 deletions programs/token/src/state/multisig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ impl Multisig {
/// This method performs owner and length validation on `AccountInfo`, safe borrowing
/// the account data.
#[inline]
pub fn from_account_info(account_info: &AccountInfo) -> Result<Ref<Multisig>, ProgramError> {
pub fn from_account_info(
account_info: &AccountInfo,
) -> Result<Ref<'_, Multisig>, ProgramError> {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -57,7 +59,7 @@ impl Multisig {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountOwner);
}
Ok(Self::from_bytes_unchecked(
Expand Down
4 changes: 2 additions & 2 deletions programs/token/src/state/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl TokenAccount {
#[inline]
pub fn from_account_info(
account_info: &AccountInfo,
) -> Result<Ref<TokenAccount>, ProgramError> {
) -> Result<Ref<'_, TokenAccount>, ProgramError> {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
Expand Down Expand Up @@ -86,7 +86,7 @@ impl TokenAccount {
if account_info.data_len() != Self::LEN {
return Err(ProgramError::InvalidAccountData);
}
if account_info.owner() != &ID {
if !account_info.owner_is(&ID) {
return Err(ProgramError::InvalidAccountData);
}
Ok(Self::from_bytes_unchecked(
Expand Down
Loading
Loading