From 5136ed00a859500c86be786f54f2739e1a0de695 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 04:54:50 +0000 Subject: [PATCH] Bump bpf-tools to v1.23 (#22928) (cherry picked from commit a9d9a5095b645ed871316a92a9b272c5c06838d7) Co-authored-by: Dmitri Makarov --- programs/bpf/tests/programs.rs | 2 +- sdk/bpf/scripts/install.sh | 2 +- sdk/cargo-build-bpf/src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs index c7a3358ff8..75631f4766 100644 --- a/programs/bpf/tests/programs.rs +++ b/programs/bpf/tests/programs.rs @@ -1408,7 +1408,7 @@ fn assert_instruction_count() { ("solana_bpf_rust_param_passing", 46), ("solana_bpf_rust_rand", 498), ("solana_bpf_rust_sanity", 917), - ("solana_bpf_rust_secp256k1_recover", 306), + ("solana_bpf_rust_secp256k1_recover", 612), ("solana_bpf_rust_sha", 29131), ]); } diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh index 0117b235e5..fe44783753 100755 --- a/sdk/bpf/scripts/install.sh +++ b/sdk/bpf/scripts/install.sh @@ -92,7 +92,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then fi # Install Rust-BPF -version=v1.20 +version=v1.23 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then ( set -e diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs index 5b449d021f..ee840acb75 100644 --- a/sdk/cargo-build-bpf/src/main.rs +++ b/sdk/cargo-build-bpf/src/main.rs @@ -476,7 +476,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m eprintln!("Can't get home directory path: {}", err); exit(1); })); - let version = "v1.20"; + let version = "v1.23"; let package = "bpf-tools"; let target_path = home_dir .join(".cache")