Bump to rbpf v0.1.34 (bp #13874) (#13878)

* Bump to rbpf v0.1.34 (#13874)

(cherry picked from commit 7890957250)

# Conflicts:
#	Cargo.lock
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml

* Resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-12-01 08:14:21 +00:00
committed by GitHub
parent 141d6d1fc9
commit 3318772bfe
4 changed files with 7 additions and 7 deletions

8
Cargo.lock generated
View File

@ -1254,9 +1254,9 @@ dependencies = [
[[package]]
name = "goblin"
version = "0.2.3"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884"
checksum = "c69552f48b18aa6102ce0c82dd9bc9d3f8af5fc0a5797069b1b466b90570e39c"
dependencies = [
"log 0.4.8",
"plain",
@ -4871,9 +4871,9 @@ dependencies = [
[[package]]
name = "solana_rbpf"
version = "0.1.32"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a95dbe2b00920ac4e1524b7442cf5319f01e8fa5742930ac60148882fd7738b"
checksum = "6b54ad0656df5f2c8acdd030ce769aaf49ee32995e569225bfb5121688863a09"
dependencies = [
"byteorder",
"combine",

View File

@ -38,7 +38,7 @@ solana-config-program = { path = "../programs/config", version = "1.3.24" }
solana-faucet = { path = "../faucet", version = "1.3.24" }
solana-logger = { path = "../logger", version = "1.3.24" }
solana-net-utils = { path = "../net-utils", version = "1.3.24" }
solana_rbpf = "=0.1.32"
solana_rbpf = "=0.1.34"
solana-remote-wallet = { path = "../remote-wallet", version = "1.3.24" }
solana-runtime = { path = "../runtime", version = "1.3.24" }
solana-sdk = { path = "../sdk", version = "1.3.24" }

View File

@ -27,7 +27,7 @@ solana-logger = { path = "../../logger", version = "1.3.24" }
solana-measure = { path = "../../measure", version = "1.3.24" }
solana-runtime = { path = "../../runtime", version = "1.3.24" }
solana-sdk = { path = "../../sdk", version = "1.3.24" }
solana_rbpf = "=0.1.32"
solana_rbpf = "=0.1.34"
[[bench]]
name = "bpf_loader"

View File

@ -15,7 +15,7 @@ num-derive = "0.3"
num-traits = "0.2"
solana-runtime = { path = "../../runtime", version = "1.3.24" }
solana-sdk = { path = "../../sdk", version = "1.3.24" }
solana_rbpf = "=0.1.32"
solana_rbpf = "=0.1.34"
thiserror = "1.0"
[dev-dependencies]