From 52e4de258ce0022d3ff91c3c0a49e66aea62ab00 Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Sat, 24 Sep 2022 15:00:13 +0000 Subject: [PATCH 1/2] updates reed-solomon-erasure crate version to 6.0.0 (#28033) Need to pick up: https://github.com/rust-rse/reed-solomon-erasure/pull/104 in order to unblock: https://github.com/solana-labs/solana/pull/27510 (cherry picked from commit f02fe9c7e7aca59a3406a7b06b799aaa75d09122) # Conflicts: # ledger/Cargo.toml --- Cargo.lock | 11 ++++++----- ledger/Cargo.toml | 24 ++++++++++++++++++++++++ programs/bpf/Cargo.lock | 11 ++++++----- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17e24f6f19ab24..a59f906bc034e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2514,11 +2514,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] @@ -3810,13 +3810,14 @@ dependencies = [ [[package]] name = "reed-solomon-erasure" -version = "5.0.3" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fe31452b684b8b33f65f8730c8b8812c3f5a0bb8a096934717edb1ac488641" +checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" dependencies = [ "cc", "libc", "libm", + "lru", "parking_lot 0.11.2", "smallvec", "spin 0.9.2", diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index fb1b1c1a7ab805..0b99e07adc7800 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -30,6 +30,7 @@ prost = "0.11.0" rand = "0.7.0" rand_chacha = "0.2.2" rayon = "1.5.3" +<<<<<<< HEAD reed-solomon-erasure = { version = "5.0.3", features = ["simd-accel"] } serde = "1.0.138" serde_bytes = "0.11.6" @@ -51,6 +52,29 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.14.3" } solana-storage-proto = { path = "../storage-proto", version = "=1.14.3" } solana-transaction-status = { path = "../transaction-status", version = "=1.14.3" } solana-vote-program = { path = "../programs/vote", version = "=1.14.3" } +======= +reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] } +serde = "1.0.144" +serde_bytes = "0.11.7" +sha2 = "0.10.5" +solana-account-decoder = { path = "../account-decoder", version = "=1.15.0" } +solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.15.0" } +solana-entry = { path = "../entry", version = "=1.15.0" } +solana-frozen-abi = { path = "../frozen-abi", version = "=1.15.0" } +solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.15.0" } +solana-measure = { path = "../measure", version = "=1.15.0" } +solana-metrics = { path = "../metrics", version = "=1.15.0" } +solana-perf = { path = "../perf", version = "=1.15.0" } +solana-program-runtime = { path = "../program-runtime", version = "=1.15.0" } +solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.15.0" } +solana-runtime = { path = "../runtime", version = "=1.15.0" } +solana-sdk = { path = "../sdk", version = "=1.15.0" } +solana-stake-program = { path = "../programs/stake", version = "=1.15.0" } +solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.15.0" } +solana-storage-proto = { path = "../storage-proto", version = "=1.15.0" } +solana-transaction-status = { path = "../transaction-status", version = "=1.15.0" } +solana-vote-program = { path = "../programs/vote", version = "=1.15.0" } +>>>>>>> f02fe9c7e (updates reed-solomon-erasure crate version to 6.0.0 (#28033)) spl-token = { version = "=3.5.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] } static_assertions = "1.1.0" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 25e64c33da0b93..8d64ea892a92c2 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -2318,11 +2318,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] @@ -3481,13 +3481,14 @@ dependencies = [ [[package]] name = "reed-solomon-erasure" -version = "5.0.3" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fe31452b684b8b33f65f8730c8b8812c3f5a0bb8a096934717edb1ac488641" +checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" dependencies = [ "cc", "libc", "libm", + "lru", "parking_lot 0.11.2", "smallvec", "spin 0.9.3", From 059ae3008cefdb2acc41c2f5330b8c94fe1b41e4 Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Sat, 24 Sep 2022 12:34:28 -0400 Subject: [PATCH 2/2] removes mergify merge conflicts --- ledger/Cargo.toml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 0b99e07adc7800..fd93fdcbcc1a0d 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -30,8 +30,7 @@ prost = "0.11.0" rand = "0.7.0" rand_chacha = "0.2.2" rayon = "1.5.3" -<<<<<<< HEAD -reed-solomon-erasure = { version = "5.0.3", features = ["simd-accel"] } +reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] } serde = "1.0.138" serde_bytes = "0.11.6" sha2 = "0.10.2" @@ -52,29 +51,6 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.14.3" } solana-storage-proto = { path = "../storage-proto", version = "=1.14.3" } solana-transaction-status = { path = "../transaction-status", version = "=1.14.3" } solana-vote-program = { path = "../programs/vote", version = "=1.14.3" } -======= -reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] } -serde = "1.0.144" -serde_bytes = "0.11.7" -sha2 = "0.10.5" -solana-account-decoder = { path = "../account-decoder", version = "=1.15.0" } -solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.15.0" } -solana-entry = { path = "../entry", version = "=1.15.0" } -solana-frozen-abi = { path = "../frozen-abi", version = "=1.15.0" } -solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.15.0" } -solana-measure = { path = "../measure", version = "=1.15.0" } -solana-metrics = { path = "../metrics", version = "=1.15.0" } -solana-perf = { path = "../perf", version = "=1.15.0" } -solana-program-runtime = { path = "../program-runtime", version = "=1.15.0" } -solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.15.0" } -solana-runtime = { path = "../runtime", version = "=1.15.0" } -solana-sdk = { path = "../sdk", version = "=1.15.0" } -solana-stake-program = { path = "../programs/stake", version = "=1.15.0" } -solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.15.0" } -solana-storage-proto = { path = "../storage-proto", version = "=1.15.0" } -solana-transaction-status = { path = "../transaction-status", version = "=1.15.0" } -solana-vote-program = { path = "../programs/vote", version = "=1.15.0" } ->>>>>>> f02fe9c7e (updates reed-solomon-erasure crate version to 6.0.0 (#28033)) spl-token = { version = "=3.5.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] } static_assertions = "1.1.0"