From f3f4a80618d690de84fb46d385c12e3fc7cd40af Mon Sep 17 00:00:00 2001 From: Lucas Ste <38472950+LucasSte@users.noreply.github.com> Date: Thu, 13 Mar 2025 11:05:14 -0300 Subject: [PATCH] Bump platform tools version (#5267) --- .../cargo-build-sbf/src/main.rs | 2 +- .../tests/crates/package-metadata/Cargo.toml | 2 +- .../crates/workspace-metadata/Cargo.toml | 2 +- platform-tools-sdk/sbf/scripts/install.sh | 2 +- programs/sbf/tests/programs.rs | 28 +++++++++---------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/platform-tools-sdk/cargo-build-sbf/src/main.rs b/platform-tools-sdk/cargo-build-sbf/src/main.rs index a318d97efe9..e0f0c3296ec 100644 --- a/platform-tools-sdk/cargo-build-sbf/src/main.rs +++ b/platform-tools-sdk/cargo-build-sbf/src/main.rs @@ -21,7 +21,7 @@ use { tar::Archive, }; -const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.44"; +const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.45"; #[derive(Debug)] struct Config<'a> { diff --git a/platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml b/platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml index 934402e4151..f6c62a0ddac 100644 --- a/platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml +++ b/platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" publish = false [package.metadata.solana] -tools-version = "v1.44" +tools-version = "v1.45" program-id = "MyProgram1111111111111111111111111111111111" [dependencies] diff --git a/platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml b/platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml index c782301c0e4..1e2bd157aaa 100644 --- a/platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml +++ b/platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml @@ -21,4 +21,4 @@ crate-type = ["cdylib"] [workspace] [workspace.metadata.solana] -tools-version = "v1.44" +tools-version = "v1.45" diff --git a/platform-tools-sdk/sbf/scripts/install.sh b/platform-tools-sdk/sbf/scripts/install.sh index cb1663dc57a..b0e19bc2713 100755 --- a/platform-tools-sdk/sbf/scripts/install.sh +++ b/platform-tools-sdk/sbf/scripts/install.sh @@ -109,7 +109,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then fi # Install platform tools -version=v1.44 +version=v1.45 if [[ ! -e platform-tools-$version.md || ! -e platform-tools ]]; then ( set -e diff --git a/programs/sbf/tests/programs.rs b/programs/sbf/tests/programs.rs index cfd1f28acad..f0614bcea6d 100644 --- a/programs/sbf/tests/programs.rs +++ b/programs/sbf/tests/programs.rs @@ -1266,17 +1266,17 @@ fn assert_instruction_count() { #[cfg(feature = "sbf_c")] { programs.extend_from_slice(&[ - ("alloc", 14575), - ("sbf_to_sbf", 313), - ("multiple_static", 208), - ("noop", 5), - ("noop++", 5), - ("relative_call", 210), - ("return_data", 980), - ("sanity", 2377), - ("sanity++", 2277), - ("secp256k1_recover", 25383), - ("sha", 1355), + ("alloc", 19332), + ("sbf_to_sbf", 316), + ("multiple_static", 210), + ("noop", 6), + ("noop++", 6), + ("relative_call", 212), + ("return_data", 1027), + ("sanity", 2396), + ("sanity++", 2296), + ("secp256k1_recover", 25483), + ("sha", 1447), ("struct_pass", 108), ("struct_ret", 122), ]); @@ -1284,9 +1284,9 @@ fn assert_instruction_count() { #[cfg(feature = "sbf_rust")] { programs.extend_from_slice(&[ - ("solana_sbf_rust_128bit", 1218), - ("solana_sbf_rust_alloc", 5077), - ("solana_sbf_rust_custom_heap", 398), + ("solana_sbf_rust_128bit", 967), + ("solana_sbf_rust_alloc", 4940), + ("solana_sbf_rust_custom_heap", 286), ("solana_sbf_rust_dep_crate", 2), ("solana_sbf_rust_iter", 1514), ("solana_sbf_rust_many_args", 1289),