anza-xyz · joncinque · Oct 10, 2025 · Oct 9, 2025 · joncinque · Oct 9, 2025
diff --git a/Cargo.toml b/Cargo.toml
@@ -189,7 +189,7 @@ memmap2 = "0.5.10"
 memoffset = "0.9"
 num-bigint = "0.4.6"
 num-derive = "0.4"
-num-traits = "0.2.18"
+num-traits = { version = "0.2.18", default-features = false }
 num_enum = "0.7.3"
 openssl = "0.10.72"
 pairing = "0.23.0"

diff --git a/frozen-abi-macro/src/lib.rs b/frozen-abi-macro/src/lib.rs
@@ -279,8 +279,6 @@ fn quote_for_test(
     type_name: &Ident,
     expected_digest: &str,
 ) -> TokenStream2 {
-    // escape from nits.sh...
-    let p = Ident::new(&("ep".to_owned() + "rintln"), Span::call_site());
     quote! {
         #[cfg(test)]
         mod #test_mod_ident {
@@ -302,7 +300,7 @@ fn quote_for_test(
                 let actual_digest = ::std::format!("{}", hash);
                 if ::std::env::var("SOLANA_ABI_BULK_UPDATE").is_ok() {
                     if #expected_digest != actual_digest {
-                        #p!("sed -i -e 's/{}/{}/g' $(git grep --files-with-matches frozen_abi)", #expected_digest, hash);
+                        ::std::eprintln!("sed -i -e 's/{}/{}/g' $(git grep --files-with-matches frozen_abi)", #expected_digest, hash);
                     }
                     ::solana_frozen_abi::__private::log::warn!("Not testing the abi digest under SOLANA_ABI_BULK_UPDATE!");
                 } else {

diff --git a/scripts/check-nits.sh b/scripts/check-nits.sh
@@ -19,6 +19,7 @@ declare print_free_tree=(
   ':**.rs'
   ':^address/src/hasher.rs'
   ':^address/src/lib.rs'
+  ':^frozen-abi-macro/src/lib.rs'
   ':^logger/src/lib.rs'
   ':^msg/src/lib.rs'
   ':^program-log/src/logger.rs'

diff --git a/scripts/check-no-std.sh b/scripts/check-no-std.sh
@@ -24,6 +24,7 @@ no_std_crates=(
   -p solana-sdk-ids
   -p solana-signature
   -p solana-sysvar-id
+  -p solana-system-interface
 )
 # Use the upstream BPF target, which doesn't support std, to make sure that our
 # no_std support really works.

diff --git a/system-interface/Cargo.toml b/system-interface/Cargo.toml
@@ -19,16 +19,19 @@ rustdoc-args = ["--cfg=docsrs"]
 crate-type = ["rlib"]
 
 [features]
-bincode = ["dep:solana-instruction", "serde"]
+alloc = []
+bincode = ["dep:solana-instruction", "alloc", "serde"]
 frozen-abi = [
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
     "dep:solana-logger",
     "serde",
+    "std",
     "solana-address/frozen-abi",
     "solana-address/std",
 ]
 serde = ["dep:serde", "dep:serde_derive", "solana-address/serde"]
+std = []
 
 [dependencies]
 num-traits = { workspace = true }

diff --git a/system-interface/src/instruction.rs b/system-interface/src/instruction.rs
@@ -46,12 +46,14 @@
 //! [`Instruction`]:
 //! https://docs.rs/solana-instruction/latest/solana_instruction/struct.Instruction.html
 
-use solana_address::Address;
 #[cfg(feature = "bincode")]
 use {
     crate::program::ID,
+    alloc::{string::ToString, vec, vec::Vec},
     solana_instruction::{AccountMeta, Instruction},
 };
+#[cfg(feature = "alloc")]
+use {alloc::string::String, solana_address::Address};
 
 // Inline some constants to avoid dependencies.
 //
@@ -85,6 +87,7 @@ const NONCE_STATE_SIZE: usize = 80;
     feature = "serde",
     derive(serde_derive::Deserialize, serde_derive::Serialize)
 )]
+#[cfg(feature = "alloc")]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum SystemInstruction {
     /// Create a new account

diff --git a/system-interface/src/lib.rs b/system-interface/src/lib.rs
@@ -1,8 +1,14 @@
 //! The System program interface.
 
+#![no_std]
 #![cfg_attr(feature = "frozen-abi", feature(min_specialization))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
+#[cfg(feature = "alloc")]
+extern crate alloc;
+#[cfg(feature = "std")]
+extern crate std;
+
 pub mod error;
 pub mod instruction;