refactor: libs to nostd #1997
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,11 @@ use crate::error::AccountError; | |
| impl AccountInfoTrait for solana_account_info::AccountInfo<'_> { | ||
| type Pubkey = solana_pubkey::Pubkey; | ||
| type DataRef<'b> | ||
| = core::cell::Ref<'b, [u8]> | ||
| where | ||
| Self: 'b; | ||
| type DataRefMut<'b> | ||
| = core::cell::RefMut<'b, [u8]> | ||
| where | ||
| Self: 'b; | ||
|
|
||
|
|
@@ -48,14 +48,14 @@ impl AccountInfoTrait for solana_account_info::AccountInfo<'_> { | |
| fn try_borrow_data(&self) -> Result<Self::DataRef<'_>, AccountError> { | ||
| self.data | ||
| .try_borrow() | ||
| .map(|r| core::cell::Ref::map(r, |data| &**data)) | ||
| .map_err(Into::into) | ||
| } | ||
|
|
||
| fn try_borrow_mut_data(&self) -> Result<Self::DataRefMut<'_>, AccountError> { | ||
| self.data | ||
| .try_borrow_mut() | ||
| .map(|r| core::cell::RefMut::map(r, |data| &mut **data)) | ||
| .map_err(Into::into) | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,9 @@ | |
|
|
||
| #[cfg(feature = "pinocchio")] | ||
| pub mod pinocchio { | ||
| extern crate std; | ||
| use std::vec::Vec; | ||
|
|
||
| use pinocchio::{account_info::AccountInfo, instruction::Account, pubkey::Pubkey}; | ||
| use rand::{prelude::Rng, thread_rng}; | ||
|
|
||
|
|
@@ -23,7 +26,7 @@ | |
| let account_size = 88; // Total size of Account struct | ||
|
|
||
| // Allocate memory for Account + data | ||
| let mut raw_data = vec![0u8; account_size + data.len()]; | ||
|
Check failure on line 29 in program-libs/account-checks/src/account_info/test_account_info.rs
|
||
|
|
||
| // Set the boolean flags - use 1 for true as the AccountInfo implementation checks for non-zero | ||
| // IMPORTANT: borrow_state needs to be 0xFF (all bits set) to indicate unborrowed state | ||
|
|
@@ -54,14 +57,14 @@ | |
|
|
||
| // Create the AccountInfo by pointing to our raw Account data | ||
| let account_ptr = raw_data.as_mut_ptr() as *mut Account; | ||
| let mut account_info_raw = vec![0u8; core::mem::size_of::<AccountInfo>()]; | ||
|
Check failure on line 60 in program-libs/account-checks/src/account_info/test_account_info.rs
|
||
| account_info_raw[0..8].copy_from_slice(&(account_ptr as u64).to_le_bytes()); | ||
|
|
||
| // Need to leak the memory so it doesn't get dropped while the AccountInfo is still using it | ||
| core::mem::forget(raw_data); | ||
| core::mem::forget(account_info_raw); | ||
|
|
||
| unsafe { core::mem::transmute::<*mut Account, AccountInfo>(account_ptr) } | ||
| } | ||
|
|
||
| #[test] | ||
|
|
@@ -103,9 +106,10 @@ | |
| } | ||
| } | ||
|
|
||
| #[cfg(all(feature = "solana", feature = "std"))] | ||
| pub mod solana_program { | ||
| extern crate std; | ||
| use std::{cell::RefCell, rc::Rc, vec, vec::Vec}; | ||
|
|
||
| use solana_account_info::AccountInfo; | ||
| use solana_pubkey::Pubkey; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| use core::panic::Location; | ||
|
|
||
| use crate::{ | ||
| checks::{check_mut, check_non_mut, check_signer}, | ||
|
|
@@ -46,13 +46,16 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| /// * `Err(AccountError::NotEnoughAccountKeys)` - If no more accounts are available | ||
| #[track_caller] | ||
| #[inline(always)] | ||
| pub fn next_account(&mut self, _account_name: &str) -> Result<&'info T, AccountError> { | ||
| if self.position >= self.accounts.len() { | ||
| #[cfg(feature = "std")] | ||
| { | ||
| let location = Location::caller(); | ||
| solana_msg::msg!( | ||
| "ERROR: Not enough accounts. Requested '{}' at index {} but only {} accounts available. {}:{}:{}", | ||
| _account_name, self.position, self.accounts.len(), location.file(), location.line(), location.column() | ||
| ); | ||
| } | ||
| return Err(AccountError::NotEnoughAccountKeys); | ||
| } | ||
|
|
||
|
|
@@ -165,12 +168,15 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| #[track_caller] | ||
| pub fn remaining(&self) -> Result<&'info [T], AccountError> { | ||
| if self.position >= self.accounts.len() { | ||
| #[cfg(feature = "std")] | ||
| { | ||
| let location = Location::caller(); | ||
| let account_name = "remaining accounts"; | ||
| solana_msg::msg!( | ||
| "ERROR: Not enough accounts. Requested '{}' at index {} but only {} accounts available. {}:{}:{}", | ||
| account_name, self.position, self.accounts.len(), location.file(), location.line(), location.column() | ||
| ); | ||
| } | ||
| return Err(AccountError::NotEnoughAccountKeys); | ||
| } | ||
| Ok(&self.accounts[self.position..]) | ||
|
|
@@ -212,6 +218,7 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
|
|
||
| #[cold] | ||
| fn print_on_error(&self, error: &AccountError, account_name: &str, location: &Location) { | ||
| #[cfg(feature = "std")] | ||
| solana_msg::msg!( | ||
| "ERROR: {}. for account '{}' at index {} {}:{}:{}", | ||
| error, | ||
|
|
@@ -221,6 +228,8 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| location.line(), | ||
| location.column() | ||
| ); | ||
| #[cfg(not(feature = "std"))] | ||
| let _ = (error, account_name, location); | ||
| } | ||
| #[cold] | ||
| fn print_on_error_pubkey( | ||
|
|
@@ -231,7 +240,7 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| account_name: &str, | ||
| location: &Location, | ||
| ) { | ||
| #[cfg(all(feature = "std", feature = "solana"))] | ||
| solana_msg::msg!( | ||
| "ERROR: {}. for account '{}' address: {:?}, expected: {:?}, at index {} {}:{}:{}", | ||
| error, | ||
|
|
@@ -243,7 +252,7 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| location.line(), | ||
| location.column() | ||
| ); | ||
| #[cfg(all(feature = "std", not(feature = "solana")))] | ||
| solana_msg::msg!( | ||
| "ERROR: {}. for account '{}' address: {:?}, expected: {:?}, at index {} {}:{}:{}", | ||
| error, | ||
|
|
@@ -255,5 +264,7 @@ impl<'info, T: AccountInfoTrait> AccountIterator<'info, T> { | |
| location.line(), | ||
| location.column() | ||
| ); | ||
| #[cfg(not(feature = "std"))] | ||
| let _ = (error, pubkey1, pubkey2, account_name, location); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
Major refactoring: default-features = false for 4 core crates.
Disabling default features for light-hasher, light-sdk-types, light-compressed-account, and light-account-checks is a significant architectural change enabling no_std support. This requires ALL downstream crate dependencies to explicitly enable needed features or risk compilation failure.
Verify that every workspace member depending on these 4 crates has explicit feature enablement where required. The 7 provided files show this pattern, but a comprehensive audit of all workspace members is needed to prevent regressions.
🏁 Script executed:
Length of output: 914
I've identified a critical issue. The script found 5 workspace members that depend on the 4 affected crates using
{ workspace = true }without explicit feature enablement. These will inheritdefault-features = falsefrom the root workspace.Let me verify if the 4 core crates are actually designed to compile with no features enabled:
Now I need to verify if the 4 core crates are designed to compile with no features. Let me check their feature definitions:Let me check the actual Cargo.toml files of the 4 core crates to see their feature definitions:
Length of output: 1493
Now I need to check if the 5 downstream crates can actually compile with the 4 core crates having
default-features = false. Let me inspect whether they have feature gates or conditional code that requires those features:Length of output: 4630
Based on the investigation, I've identified critical compilation issues. The workspace change sets
default-features = falsefor 4 core crates, but those crates still havedefault = ["std"]ordefault = ["alloc"]defined. Additionally, 5 workspace members depend on these crates via{ workspace = true }without explicit feature enablement, meaning they inherit thedefault-features = falsesetting.The critical problems:
program-tests/merkle-tree uses
light_hasherAPIs in main code (lib.rs line 5, indexed.rs line 3) but won't have access to the std feature required to compile those APIs.program-libs/compressible uses
light_account_checksin main code (config.rs line 2) without feature gates—no guarantee it works with no features enabled.sdk-libs/sdk-types imports from
light_compressed_accountin main code with conditionally-gated std/alloc code, but won't have those features enabled.The 4 affected crates (light-hasher, light-account-checks, light-compressed-account, sdk-types) still have
default = ["std"]ordefault = ["alloc"]. Whendefault-features = falseis applied at workspace level, these defaults are ignored entirely. The crates will compile with NO features unless their code is refactored to not require std/alloc internally.Critical fixes required:
default = [...]lines from the 4 core crates' Cargo.toml files (change todefault = []), OR{ workspace = true }to{ workspace = true, features = ["std"] }etc.)The refactoring is incomplete—the PR must ensure all affected crates either compile without defaults or explicitly re-enable needed features.
🤖 Prompt for AI Agents