Skip to content

repo: Update toolchains #178

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
joncinque wants to merge 2 commits into
base: main
Choose a base branch
from
+60 −17
Open

repo: Update toolchains #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14da9f0
Update toolchains
joncinque Mar 5, 2026
9047286
Bump toolchain in codama, fix other issues
joncinque Mar 5, 2026
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RUST_TOOLCHAIN_NIGHTLY = nightly-2025-05-09
SOLANA_CLI_VERSION = 3.0.0
RUST_TOOLCHAIN_NIGHTLY = nightly-2026-01-22
SOLANA_CLI_VERSION = 3.1.8

nightly = +${RUST_TOOLCHAIN_NIGHTLY}

Expand Down
2 changes: 1 addition & 1 deletion interface/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![cfg_attr(docsrs, feature(doc_cfg))]
#![allow(clippy::arithmetic_side_effects)]
#[cfg(feature = "bincode")]
pub mod instruction;
Expand Down
43 changes: 43 additions & 0 deletions program/benches/compute_units.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
#### 2026-03-05 23:00:25.920913340 UTC

Solana CLI Version: solana-cli 3.1.8 (src:416d86e6; feat:1620780344, client:Agave)

| Name | CUs | Delta |
|------|------|-------|
| config_small_init_0_keys | 680 | +25 |
| config_small_init_1_keys | 1138 | +7 |
| config_small_init_5_keys | 2604 | -159 |
| config_small_init_10_keys | 4414 | -369 |
| config_small_init_25_keys | 10173 | -1,116 |
| config_small_init_37_keys | 14514 | -1,685 |
| config_small_store_0_keys | 680 | +25 |
| config_small_store_1_keys | 1420 | +6 |
| config_small_store_5_keys | 3894 | -172 |
| config_small_store_10_keys | 6964 | -397 |
| config_small_store_25_keys | 16503 | -1,189 |
| config_small_store_37_keys | 23868 | -1,794 |
| config_medium_init_0_keys | 680 | +25 |
| config_medium_init_1_keys | 1138 | +7 |
| config_medium_init_5_keys | 2604 | -159 |
| config_medium_init_10_keys | 4414 | -369 |
| config_medium_init_25_keys | 10173 | -1,116 |
| config_medium_init_37_keys | 14514 | -1,685 |
| config_medium_store_0_keys | 680 | +25 |
| config_medium_store_1_keys | 1420 | +6 |
| config_medium_store_5_keys | 3894 | -172 |
| config_medium_store_10_keys | 6964 | -397 |
| config_medium_store_25_keys | 16503 | -1,189 |
| config_medium_store_37_keys | 23868 | -1,794 |
| config_large_init_0_keys | 801 | +25 |
| config_large_init_1_keys | 1259 | +7 |
| config_large_init_5_keys | 2725 | -159 |
| config_large_init_10_keys | 4536 | -369 |
| config_large_init_25_keys | 10297 | -1,116 |
| config_large_init_37_keys | 14639 | -1,685 |
| config_large_store_0_keys | 801 | +25 |
| config_large_store_1_keys | 1541 | +6 |
| config_large_store_5_keys | 4015 | -172 |
| config_large_store_10_keys | 7086 | -397 |
| config_large_store_25_keys | 16627 | -1,189 |
| config_large_store_37_keys | 23993 | -1,794 |

#### 2025-10-29 22:42:22.511198962 UTC

Solana CLI Version: solana-cli 3.0.7 (src:ea24c1fd; feat:3604001754, client:Agave)
Expand Down
2 changes: 1 addition & 1 deletion program/benches/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub struct BenchContext {

impl BenchContext {
/// Convert to a `Bench`.
pub fn bench(&self) -> Bench {
pub fn bench(&self) -> Bench<'_> {
(self.label.as_str(), &self.instruction, &self.accounts)
}
}
Expand Down
20 changes: 10 additions & 10 deletions program/tests/functional.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fn test_process_create_ok() {
&[(config, config_account)],
&[
Check::success(),
Check::compute_units(655),
Check::compute_units(680),
Check::account(&config)
.data(
&bincode::serialize(&(ConfigKeys { keys: vec![] }, MyConfig::default()))
Expand Down Expand Up @@ -104,7 +104,7 @@ fn test_process_store_ok() {
&[(config, config_account)],
&[
Check::success(),
Check::compute_units(655),
Check::compute_units(680),
Check::account(&config)
.data(&bincode::serialize(&(ConfigKeys { keys }, my_config)).unwrap())
.build(),
Expand Down Expand Up @@ -179,7 +179,7 @@ fn test_process_store_with_additional_signers() {
],
&[
Check::success(),
Check::compute_units(3_325),
Check::compute_units(3_289),
Check::account(&config)
.data(&bincode::serialize(&(ConfigKeys { keys }, my_config)).unwrap())
.build(),
Expand Down Expand Up @@ -321,7 +321,7 @@ fn test_config_updates() {
(signer0, Account::default()),
(signer1, Account::default()),
],
&[Check::success(), Check::compute_units(3_325)],
&[Check::success(), Check::compute_units(3_289)],
);

// Use this for next invoke.
Expand All @@ -339,7 +339,7 @@ fn test_config_updates() {
],
&[
Check::success(),
Check::compute_units(3_327),
Check::compute_units(3_291),
Check::account(&config)
.data(&bincode::serialize(&(ConfigKeys { keys }, new_config)).unwrap())
.build(),
Expand Down Expand Up @@ -452,7 +452,7 @@ fn test_config_update_contains_duplicates_fails() {
(signer0, Account::default()),
(signer1, Account::default()),
],
&[Check::success(), Check::compute_units(3_325)],
&[Check::success(), Check::compute_units(3_289)],
);

// Attempt update with duplicate signer inputs.
Expand Down Expand Up @@ -493,7 +493,7 @@ fn test_config_updates_requiring_config() {
&[(config, config_account), (signer0, Account::default())],
&[
Check::success(),
Check::compute_units(3_169),
Check::compute_units(3_107),
Check::account(&config)
.data(&bincode::serialize(&(ConfigKeys { keys: keys.clone() }, my_config)).unwrap())
.build(),
Expand All @@ -514,7 +514,7 @@ fn test_config_updates_requiring_config() {
],
&[
Check::success(),
Check::compute_units(3_169),
Check::compute_units(3_107),
Check::account(&config)
.data(&bincode::serialize(&(ConfigKeys { keys }, new_config)).unwrap())
.build(),
Expand Down Expand Up @@ -611,7 +611,7 @@ fn test_maximum_keys_input() {
let result = mollusk.process_and_validate_instruction(
&instruction,
&[(config, config_account)],
&[Check::success(), Check::compute_units(25_662)],
&[Check::success(), Check::compute_units(23_868)],
);

// Use this for next invoke.
Expand All @@ -624,7 +624,7 @@ fn test_maximum_keys_input() {
let result = mollusk.process_and_validate_instruction(
&instruction,
&[(config, updated_config_account)],
&[Check::success(), Check::compute_units(25_662)],
&[Check::success(), Check::compute_units(23_868)],
);

// Use this for next invoke.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.88.0"
channel = "1.93.1"
4 changes: 2 additions & 2 deletions vars.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
RUST_TOOLCHAIN_NIGHTLY="nightly-2025-05-09"
SOLANA_CLI_VERSION="2.3.4"
RUST_TOOLCHAIN_NIGHTLY="nightly-2026-01-22"
SOLANA_CLI_VERSION="3.1.8"
Loading