Merge branch 'solana-foundation:master' into master

Author: MicaiahReid

.github/workflows/reusable-tests.yaml

@@ -422,6 +422,8 @@ jobs:
             path: tests/declare-id
           - cmd: cd tests/declare-program && anchor test --skip-lint
             path: tests/declare-program
+          - cmd: cd tests/custom-program && anchor test --skip-lint
+            path: tests/custom-program
           - cmd: cd tests/typescript && anchor test --skip-lint && npx tsc --noEmit
             path: tests/typescript
           # zero-copy tests cause `/usr/bin/ld: final link failed: No space left on device`

CHANGELOG.md

@@ -37,6 +37,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - cli: Replace `anchor verify` to use `solana-verify` under the hood, adding automatic installation via AVM, local path support, and future-proof argument passing ([#3768](https://github.com/solana-foundation/anchor/pull/3768)).
 - lang: Replace `solana-program` crate with smaller crates ([#3819](https://github.com/solana-foundation/anchor/pull/3819)).
 - cli: Make `anchor deploy` to upload the IDL to the cluster by default unless `--no-idl` is passed ([#3863](https://github.com/solana-foundation/anchor/pull/3863)).
+- lang: Add generic program validation support to `Program` type allowing `Program<'info>` for executable-only validation ([#3878](https://github.com/solana-foundation/anchor/pull/3878)).
 - lang: Use `solana-invoke` instead of `solana_cpi::invoke` ([#3900](https://github.com/solana-foundation/anchor/pull/3900)).
 - client: remove `solana-client` from `anchor-client` and `cli` ([#3877](https://github.com/solana-foundation/anchor/pull/3877)).
 - idl: Build IDL on stable Rustc ([#3842](https://github.com/solana-foundation/anchor/pull/3842)).

Cargo.lock

@@ -16,9 +16,9 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 Solana version: 2.3.0
 
-| Program | Binary Size | -   |
-| ------- | ----------- | --- |
-| bench   | 1,126,840   | -   |
+| Program | Binary Size | -                       |
+| ------- | ----------- | ----------------------- |
+| bench   | 1,024,096   | 🟢 **-102,744 (9.12%)** |
 
 ### Notable changes
 
@@ -28,9 +28,9 @@ Solana version: 2.3.0
 
 Solana version: 2.3.0
 
-| Program | Binary Size | -                      |
-| ------- | ----------- | ---------------------- |
-| bench   | 1,126,840   | 🔴 **+84,912 (8.15%)** |
+| Program | Binary Size | -                        |
+| ------- | ----------- | ------------------------ |
+| bench   | 1,126,840   | 🔴 **+181,272 (19.17%)** |
 
 ### Notable changes
 
@@ -42,9 +42,9 @@ Solana version: 2.3.0
 
 Solana version: 2.1.0
 
-| Program | Binary Size | -   |
-| ------- | ----------- | --- |
-| bench   | 1,041,928   | -   |
+| Program | Binary Size | -                      |
+| ------- | ----------- | ---------------------- |
+| bench   | 945,568     | 🟢 **-96,360 (9.25%)** |
 
 ### Notable changes
 

bench/BINARY_SIZE.md

@@ -33,7 +33,7 @@ portpicker = "0.1.1"
 regex = "1.8.3"
 reqwest = { version = "0.11.4", default-features = false, features = ["multipart", "blocking", "rustls-tls"] }
 semver = "1.0.4"
-serde = { version = "1.0.122", features = ["derive"] }
+serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0"
 shellexpand = "2.1.0"
 solana-cli-config = "2"

bench/COMPUTE_UNITS.md

@@ -94,7 +94,7 @@ pub enum Command {
         #[clap(long)]
         no_git: bool,
         /// Rust program template to use
-        #[clap(value_enum, short, long, default_value = "single")]
+        #[clap(value_enum, short, long, default_value = "multiple")]
         template: ProgramTemplate,
         /// Test template to use
         #[clap(value_enum, long, default_value = "mocha")]
@@ -235,7 +235,7 @@ pub enum Command {
         /// Program name
         name: String,
         /// Rust program template to use
-        #[clap(value_enum, short, long, default_value = "single")]
+        #[clap(value_enum, short, long, default_value = "multiple")]
         template: ProgramTemplate,
         /// Create new program even if there is already one
         #[clap(long, action)]
@@ -2870,12 +2870,10 @@ fn deserialize_idl_type_to_json(
         }
         IdlType::F64 => json!(<f64 as AnchorDeserialize>::deserialize(data)?),
         IdlType::U128 => {
-            // TODO: Remove to_string once serde_json supports u128 deserialization
-            json!(<u128 as AnchorDeserialize>::deserialize(data)?.to_string())
+            json!(<u128 as AnchorDeserialize>::deserialize(data)?)
         }
         IdlType::I128 => {
-            // TODO: Remove to_string once serde_json supports i128 deserialization
-            json!(<i128 as AnchorDeserialize>::deserialize(data)?.to_string())
+            json!(<i128 as AnchorDeserialize>::deserialize(data)?)
         }
         IdlType::U256 => todo!("Upon completion of u256 IDL standard"),
         IdlType::I256 => todo!("Upon completion of i256 IDL standard"),

cli/Cargo.toml

@@ -23,10 +23,10 @@ const ANCHOR_MSRV: &str = "1.89.0";
 /// Program initialization template
 #[derive(Clone, Debug, Default, Eq, PartialEq, Parser, ValueEnum)]
 pub enum ProgramTemplate {
-    /// Program with a single `lib.rs` file
-    #[default]
+    /// Program with a single `lib.rs` file (not recommended for production)
     Single,
-    /// Program with multiple files for instructions, state...
+    /// Program with multiple files for instructions, state... (recommended)
+    #[default]
     Multiple,
 }
 
@@ -44,7 +44,10 @@ pub fn create_program(name: &str, template: ProgramTemplate, with_mollusk: bool)
     ];
 
     let template_files = match template {
-        ProgramTemplate::Single => create_program_template_single(name, &program_path),
+        ProgramTemplate::Single => {
+            println!("Note: Using single-file template. For better code organization and maintainability, consider using --template multiple (default).");
+            create_program_template_single(name, &program_path)
+        }
         ProgramTemplate::Multiple => create_program_template_multiple(name, &program_path),
     };
 

cli/src/lib.rs

@@ -25,6 +25,7 @@ solana-account-decoder = "2"
 solana-pubsub-client = "2"
 solana-rpc-client = "2"
 solana-rpc-client-api = "2"
+solana-account = "2"
 solana-sdk = "2"
 thiserror = "1"
 tokio = { version = "1", features = ["rt", "sync"] }

cli/src/rust_template.rs

@@ -74,6 +74,7 @@ use anchor_lang::solana_program::pubkey::Pubkey;
 use anchor_lang::{AccountDeserialize, Discriminator, InstructionData, ToAccountMetas};
 use futures::{Future, StreamExt};
 use regex::Regex;
+use solana_account::Account;
 use solana_account_decoder::UiAccountEncoding;
 use solana_pubsub_client::nonblocking::pubsub_client::{PubsubClient, PubsubClientError};
 use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient;
@@ -86,7 +87,6 @@ use solana_rpc_client_api::{
     filter::{Memcmp, RpcFilterType},
     response::{Response as RpcResponse, RpcLogsResponse},
 };
-use solana_sdk::account::Account;
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::instruction::{AccountMeta, Instruction};