blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump solana-rbpf to v0.2.25 (#24213)

This commit is contained in:
Jack May 2022-04-11 10:38:47 -07:00 committed by GitHub
parent b22abbce7d
commit 85e5b1e902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 56 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Cargo.lock generated
View File

@ -256,7 +256,7 @@ dependencies = [
"getrandom 0.2.3", "getrandom 0.2.3",
"instant", "instant",
"pin-project-lite", "pin-project-lite",
"rand 0.8.4", "rand 0.8.5",
"tokio", "tokio",
] ]
@ -1750,9 +1750,9 @@ dependencies = [
[[package]] [[package]]
name = "goblin" name = "goblin"
version = "0.4.3" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f"
dependencies = [ dependencies = [
"log", "log",
"plain", "plain",
@ -1786,9 +1786,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
[[package]] [[package]]
name = "hash32" name = "hash32"
version = "0.1.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
dependencies = [ dependencies = [
"byteorder", "byteorder",
] ]
@ -2824,7 +2824,7 @@ dependencies = [
"lazy_static", "lazy_static",
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
"pin-project", "pin-project",
"rand 0.8.4", "rand 0.8.5",
"thiserror", "thiserror",
] ]
@ -3229,7 +3229,7 @@ dependencies = [
"lazy_static", "lazy_static",
"num-traits", "num-traits",
"quick-error 2.0.1", "quick-error 2.0.1",
"rand 0.8.4", "rand 0.8.5",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rand_xorshift", "rand_xorshift",
"regex-syntax", "regex-syntax",
@ -3340,7 +3340,7 @@ checksum = "063dedf7983c8d57db474218f258daa85b627de6f2dbc458b690a93b1de790e8"
dependencies = [ dependencies = [
"bytes", "bytes",
"fxhash", "fxhash",
"rand 0.8.4", "rand 0.8.5",
"ring", "ring",
"rustls", "rustls",
"rustls-native-certs", "rustls-native-certs",
@ -3414,20 +3414,18 @@ dependencies = [
"libc", "libc",
"rand_chacha 0.2.2", "rand_chacha 0.2.2",
"rand_core 0.5.1", "rand_core 0.5.1",
"rand_hc 0.2.0", "rand_hc",
"rand_pcg",
] ]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.8.4" version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [ dependencies = [
"libc", "libc",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rand_core 0.6.3", "rand_core 0.6.3",
"rand_hc 0.3.1",
] ]
[[package]] [[package]]
@ -3492,24 +3490,6 @@ dependencies = [
"rand_core 0.5.1", "rand_core 0.5.1",
] ]
[[package]]
name = "rand_hc"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
dependencies = [
"rand_core 0.6.3",
]
[[package]]
name = "rand_pcg"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
"rand_core 0.5.1",
]
[[package]] [[package]]
name = "rand_xorshift" name = "rand_xorshift"
version = "0.3.0" version = "0.3.0"
@ -3889,18 +3869,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]] [[package]]
name = "scroll" name = "scroll"
version = "0.10.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
dependencies = [ dependencies = [
"scroll_derive", "scroll_derive",
] ]
[[package]] [[package]]
name = "scroll_derive" name = "scroll_derive"
version = "0.10.5" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
dependencies = [ dependencies = [
"proc-macro2 1.0.32", "proc-macro2 1.0.32",
"quote 1.0.10", "quote 1.0.10",
@ -4273,7 +4253,7 @@ dependencies = [
"futures 0.3.21", "futures 0.3.21",
"httparse", "httparse",
"log", "log",
"rand 0.8.4", "rand 0.8.5",
"sha-1 0.9.8", "sha-1 0.9.8",
] ]
@ -6188,9 +6168,9 @@ dependencies = [
[[package]] [[package]]
name = "solana_rbpf" name = "solana_rbpf"
version = "0.2.24" version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" checksum = "ccd266a6c58aa37380b52e6ee627762d794840116d796879867e7419445e6fe5"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"combine", "combine",
@ -6198,11 +6178,10 @@ dependencies = [
"hash32", "hash32",
"libc", "libc",
"log", "log",
"rand 0.7.3", "rand 0.8.5",
"rustc-demangle", "rustc-demangle",
"scroll", "scroll",
"thiserror", "thiserror",
"time 0.1.43",
] ]
[[package]] [[package]]
@ -6471,7 +6450,7 @@ dependencies = [
"humantime", "humantime",
"opentelemetry", "opentelemetry",
"pin-project", "pin-project",
"rand 0.8.4", "rand 0.8.5",
"serde", "serde",
"static_assertions", "static_assertions",
"tarpc-plugins", "tarpc-plugins",
@ -6898,7 +6877,7 @@ dependencies = [
"indexmap", "indexmap",
"pin-project", "pin-project",
"pin-project-lite", "pin-project-lite",
"rand 0.8.4", "rand 0.8.5",
"slab", "slab",
"tokio", "tokio",
"tokio-util 0.7.1", "tokio-util 0.7.1",
@ -7028,7 +7007,7 @@ dependencies = [
"http", "http",
"httparse", "httparse",
"log", "log",
"rand 0.8.4", "rand 0.8.5",
"rustls", "rustls",
"sha-1 0.10.0", "sha-1 0.10.0",
"thiserror", "thiserror",

2
cli/Cargo.toml
View File

@ -42,7 +42,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" } solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" } solana-version = { path = "../version", version = "=1.11.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" } solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
solana_rbpf = "=0.2.24" solana_rbpf = "=0.2.25"
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] } spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0.30" thiserror = "1.0.30"
tiny-bip39 = "0.8.2" tiny-bip39 = "0.8.2"

57
programs/bpf/Cargo.lock generated
View File

@ -1202,9 +1202,9 @@ dependencies = [
[[package]] [[package]]
name = "goblin" name = "goblin"
version = "0.4.2" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b1800b95efee8ad4ef04517d4d69f8e209e763b1668f1179aeeedd0e454da55" checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f"
dependencies = [ dependencies = [
"log", "log",
"plain", "plain",
@ -1232,9 +1232,9 @@ dependencies = [
[[package]] [[package]]
name = "hash32" name = "hash32"
version = "0.1.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
dependencies = [ dependencies = [
"byteorder 1.4.3", "byteorder 1.4.3",
] ]
@ -1920,7 +1920,7 @@ dependencies = [
"lazy_static", "lazy_static",
"percent-encoding", "percent-encoding",
"pin-project", "pin-project",
"rand 0.8.2", "rand 0.8.5",
"thiserror", "thiserror",
] ]
@ -2179,7 +2179,7 @@ checksum = "d2b1562bf4998b0c6d1841a4742b7103bb82cdde61374833de826bab9e8ad498"
dependencies = [ dependencies = [
"bytes 1.1.0", "bytes 1.1.0",
"fxhash", "fxhash",
"rand 0.8.2", "rand 0.8.5",
"ring", "ring",
"rustls", "rustls",
"rustls-native-certs", "rustls-native-certs",
@ -2234,20 +2234,18 @@ dependencies = [
"libc", "libc",
"rand_chacha 0.2.2", "rand_chacha 0.2.2",
"rand_core 0.5.1", "rand_core 0.5.1",
"rand_hc 0.2.0", "rand_hc",
"rand_pcg",
] ]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.8.2" version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [ dependencies = [
"libc", "libc",
"rand_chacha 0.3.0", "rand_chacha 0.3.0",
"rand_core 0.6.3", "rand_core 0.6.3",
"rand_hc 0.3.0",
] ]
[[package]] [[package]]
@ -2297,24 +2295,6 @@ dependencies = [
"rand_core 0.5.1", "rand_core 0.5.1",
] ]
[[package]]
name = "rand_hc"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
dependencies = [
"rand_core 0.6.3",
]
[[package]]
name = "rand_pcg"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
"rand_core 0.5.1",
]
[[package]] [[package]]
name = "rand_xoshiro" name = "rand_xoshiro"
version = "0.4.0" version = "0.4.0"
@ -2588,18 +2568,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]] [[package]]
name = "scroll" name = "scroll"
version = "0.10.1" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
dependencies = [ dependencies = [
"scroll_derive", "scroll_derive",
] ]
[[package]] [[package]]
name = "scroll_derive" name = "scroll_derive"
version = "0.10.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.6", "quote 1.0.6",
@ -4027,9 +4007,9 @@ dependencies = [
[[package]] [[package]]
name = "solana_rbpf" name = "solana_rbpf"
version = "0.2.24" version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" checksum = "ccd266a6c58aa37380b52e6ee627762d794840116d796879867e7419445e6fe5"
dependencies = [ dependencies = [
"byteorder 1.4.3", "byteorder 1.4.3",
"combine", "combine",
@ -4037,11 +4017,10 @@ dependencies = [
"hash32", "hash32",
"libc", "libc",
"log", "log",
"rand 0.7.3", "rand 0.8.5",
"rustc-demangle", "rustc-demangle",
"scroll", "scroll",
"thiserror", "thiserror",
"time 0.1.43",
] ]
[[package]] [[package]]
@ -4186,7 +4165,7 @@ dependencies = [
"humantime", "humantime",
"opentelemetry", "opentelemetry",
"pin-project", "pin-project",
"rand 0.8.2", "rand 0.8.5",
"serde", "serde",
"static_assertions", "static_assertions",
"tarpc-plugins", "tarpc-plugins",
@ -4529,7 +4508,7 @@ dependencies = [
"http", "http",
"httparse", "httparse",
"log", "log",
"rand 0.8.2", "rand 0.8.5",
"rustls", "rustls",
"sha-1", "sha-1",
"thiserror", "thiserror",

2
programs/bpf/Cargo.toml
View File

@ -33,7 +33,7 @@ solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.1
solana-cli-output = { path = "../../cli-output", version = "=1.11.0" } solana-cli-output = { path = "../../cli-output", version = "=1.11.0" }
solana-logger = { path = "../../logger", version = "=1.11.0" } solana-logger = { path = "../../logger", version = "=1.11.0" }
solana-measure = { path = "../../measure", version = "=1.11.0" } solana-measure = { path = "../../measure", version = "=1.11.0" }
solana_rbpf = "=0.2.24" solana_rbpf = "=0.2.25"
solana-runtime = { path = "../../runtime", version = "=1.11.0" } solana-runtime = { path = "../../runtime", version = "=1.11.0" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" } solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
solana-sdk = { path = "../../sdk", version = "=1.11.0" } solana-sdk = { path = "../../sdk", version = "=1.11.0" }

2
programs/bpf_loader/Cargo.toml
View File

@ -19,7 +19,7 @@ solana-metrics = { path = "../../metrics", version = "=1.11.0" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" } solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
solana-sdk = { path = "../../sdk", version = "=1.11.0" } solana-sdk = { path = "../../sdk", version = "=1.11.0" }
solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.11.0" } solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.11.0" }
solana_rbpf = "=0.2.24" solana_rbpf = "=0.2.25"
thiserror = "1.0" thiserror = "1.0"
[dev-dependencies] [dev-dependencies]

16
programs/bpf_loader/src/lib.rs
View File

@ -1341,14 +1341,22 @@ mod tests {
0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // exit 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // exit
]; ];
let input = &mut [0x00]; let input = &mut [0x00];
let config = Config::default();
let syscall_registry = SyscallRegistry::default();
let mut bpf_functions = std::collections::BTreeMap::<u32, (usize, String)>::new(); let mut bpf_functions = std::collections::BTreeMap::<u32, (usize, String)>::new();
solana_rbpf::elf::register_bpf_function(&mut bpf_functions, 0, "entrypoint", false) solana_rbpf::elf::register_bpf_function(
.unwrap(); &config,
&mut bpf_functions,
&syscall_registry,
0,
"entrypoint",
)
.unwrap();
let program = Executable::<BpfError, TestInstructionMeter>::from_text_bytes( let program = Executable::<BpfError, TestInstructionMeter>::from_text_bytes(
program, program,
None, None,
Config::default(), config,
SyscallRegistry::default(), syscall_registry,
bpf_functions, bpf_functions,
) )
.unwrap(); .unwrap();

2
rbpf-cli/Cargo.toml
View File

@ -17,4 +17,4 @@ solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.
solana-logger = { path = "../logger", version = "=1.11.0" } solana-logger = { path = "../logger", version = "=1.11.0" }
solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" } solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" } solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana_rbpf = "=0.2.24" solana_rbpf = "=0.2.25"