gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump sbf-tools version to v1.24

Browse Source 
(cherry picked from commit 689064a4f4)
This commit is contained in:
Dmitri Makarov
2022-03-30 10:19:04 -07:00
committed by Dmitri Makarov
parent 2ae5b411f5
commit 89c0357ec8
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
programs/bpf/tests/programs.rs
View File

@ -1412,22 +1412,6 @@ fn assert_instruction_count() {
{ {
programs.extend_from_slice(&[ programs.extend_from_slice(&[
("solana_bpf_rust_128bit", 584), ("solana_bpf_rust_128bit", 584),
<<<<<<< HEAD
("solana_bpf_rust_alloc", 7388),
("solana_bpf_rust_custom_heap", 536),
("solana_bpf_rust_dep_crate", 47),
("solana_bpf_rust_external_spend", 507),
("solana_bpf_rust_iter", 824),
("solana_bpf_rust_many_args", 1289),
("solana_bpf_rust_mem", 5997),
("solana_bpf_rust_membuiltins", 3976),
("solana_bpf_rust_noop", 481),
("solana_bpf_rust_param_passing", 146),
("solana_bpf_rust_rand", 488),
("solana_bpf_rust_sanity", 9128),
("solana_bpf_rust_secp256k1_recover", 25889),
("solana_bpf_rust_sha", 30692),
=======
("solana_bpf_rust_alloc", 4459), ("solana_bpf_rust_alloc", 4459),
("solana_bpf_rust_custom_heap", 469), ("solana_bpf_rust_custom_heap", 469),
("solana_bpf_rust_dep_crate", 2), ("solana_bpf_rust_dep_crate", 2),
@ -1439,10 +1423,9 @@ fn assert_instruction_count() {
("solana_bpf_rust_noop", 326), ("solana_bpf_rust_noop", 326),
("solana_bpf_rust_param_passing", 146), ("solana_bpf_rust_param_passing", 146),
("solana_bpf_rust_rand", 429), ("solana_bpf_rust_rand", 429),
("solana_bpf_rust_sanity", 9139), ("solana_bpf_rust_sanity", 52290),
("solana_bpf_rust_secp256k1_recover", 25707), ("solana_bpf_rust_secp256k1_recover", 25707),
("solana_bpf_rust_sha", 26390), ("solana_bpf_rust_sha", 26384),
>>>>>>> 03ed334eb (Double the chunk size for sending the program binary data in tx)
]); ]);
} }

2
sdk/bpf/scripts/install.sh
View File

@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi fi
# Install Rust-BPF # Install Rust-BPF
version=v1.23 version=v1.24
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
( (
set -e set -e

2
sdk/cargo-build-bpf/src/main.rs
View File

@ -477,7 +477,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
// The following line is scanned by CI configuration script to // The following line is scanned by CI configuration script to
// separate cargo caches according to the version of sbf-tools. // separate cargo caches according to the version of sbf-tools.
let bpf_tools_version = "v1.23"; let bpf_tools_version = "v1.24";
let package = "bpf-tools"; let package = "bpf-tools";
let target_path = home_dir let target_path = home_dir
.join(".cache") .join(".cache")