Skip to content

Commit 4ad1e7b

Browse files
vadorovskymergify[bot]
authored andcommitted
bump solana-stake-interface from 2.0.0 to 2.0.1 (#7919)
`StakeHistory::get` in solana-stake-interface was performing a binary search for every requested epoch, which was a visible performance bottleneck. solana-program/stake#81 fixed that by subtracting the indices. The fix was released in 2.0.1. (cherry picked from commit 8c21276) # Conflicts: # Cargo.toml # programs/sbf/Cargo.toml
1 parent bec0de9 commit 4ad1e7b

File tree

6 files changed

+34
-7
lines changed

6 files changed

+34
-7
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ solana-signer = "3.0.0"
514514
solana-slot-hashes = "3.0.0"
515515
solana-slot-history = "3.0.0"
516516
solana-stable-layout = "3.0.0"
517+
<<<<<<< HEAD
517518
solana-stake-interface = { version = "2.0.0" }
518519
solana-stake-program = { path = "programs/stake", version = "=3.0.2" }
519520
solana-storage-bigtable = { path = "storage-bigtable", version = "=3.0.2" }
@@ -527,6 +528,21 @@ solana-svm-measure = { path = "svm-measure", version = "=3.0.2" }
527528
solana-svm-timings = { path = "svm-timings", version = "=3.0.2" }
528529
solana-svm-transaction = { path = "svm-transaction", version = "=3.0.2" }
529530
solana-svm-type-overrides = { path = "svm-type-overrides", version = "=3.0.2" }
531+
=======
532+
solana-stake-interface = { version = "2.0.1" }
533+
solana-stake-program = { path = "programs/stake", version = "=3.1.0" }
534+
solana-storage-bigtable = { path = "storage-bigtable", version = "=3.1.0" }
535+
solana-storage-proto = { path = "storage-proto", version = "=3.1.0" }
536+
solana-streamer = { path = "streamer", version = "=3.1.0" }
537+
solana-svm = { path = "svm", version = "=3.1.0" }
538+
solana-svm-callback = { path = "svm-callback", version = "=3.1.0" }
539+
solana-svm-feature-set = { path = "svm-feature-set", version = "=3.1.0" }
540+
solana-svm-log-collector = { path = "svm-log-collector", version = "=3.1.0" }
541+
solana-svm-measure = { path = "svm-measure", version = "=3.1.0" }
542+
solana-svm-timings = { path = "svm-timings", version = "=3.1.0" }
543+
solana-svm-transaction = { path = "svm-transaction", version = "=3.1.0" }
544+
solana-svm-type-overrides = { path = "svm-type-overrides", version = "=3.1.0" }
545+
>>>>>>> 8c21276b8 (bump solana-stake-interface from 2.0.0 to 2.0.1 (#7919))
530546
solana-system-interface = "2.0"
531547
solana-system-program = { path = "programs/system", version = "=3.0.2" }
532548
solana-system-transaction = "3.0.0"

cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ solana-sdk-ids = "=3.0.0"
8181
solana-signature = { version = "=3.1.0", default-features = false }
8282
solana-signer = "=3.0.0"
8383
solana-slot-history = "=3.0.0"
84-
solana-stake-interface = "=2.0.0"
84+
solana-stake-interface = "=2.0.1"
8585
solana-streamer = { workspace = true }
8686
solana-system-interface = { version = "=2.0", features = ["bincode"] }
8787
solana-sysvar = "=3.0.0"

genesis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ solana-rpc-client-api = { workspace = true }
5454
solana-runtime = { workspace = true }
5555
solana-sdk-ids = "=3.0.0"
5656
solana-signer = "=3.0.0"
57-
solana-stake-interface = { version = "=2.0.0", features = ["borsh"] }
57+
solana-stake-interface = { version = "=2.0.1", features = ["borsh"] }
5858
solana-stake-program = { workspace = true }
5959
solana-time-utils = "3.0.0"
6060
solana-version = { workspace = true }

programs/sbf/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

programs/sbf/Cargo.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ solana-sbpf = "=0.12.2"
157157
solana-sdk-ids = "=3.0.0"
158158
solana-secp256k1-recover = "=3.0.0"
159159
solana-sha256-hasher = { version = "=3.0.0", features = ["sha2"] }
160+
<<<<<<< HEAD
160161
solana-stake-interface = { version = "=2.0.0", features = ["bincode"] }
161162
solana-svm = { path = "../../svm", version = "=3.0.2" }
162163
solana-svm-callback = { path = "../../svm-callback", version = "=3.0.2" }
@@ -165,6 +166,16 @@ solana-svm-log-collector = { path = "../../svm-log-collector", version = "=3.0.2
165166
solana-svm-timings = { path = "../../svm-timings", version = "=3.0.2" }
166167
solana-svm-transaction = { path = "../../svm-transaction", version = "=3.0.2" }
167168
solana-svm-type-overrides = { path = "../../svm-type-overrides", version = "=3.0.2" }
169+
=======
170+
solana-stake-interface = { version = "=2.0.1", features = ["bincode"] }
171+
solana-svm = { path = "../../svm", version = "=3.1.0" }
172+
solana-svm-callback = { path = "../../svm-callback", version = "=3.1.0" }
173+
solana-svm-feature-set = { path = "../../svm-feature-set", version = "=3.1.0" }
174+
solana-svm-log-collector = { path = "../../svm-log-collector", version = "=3.1.0" }
175+
solana-svm-timings = { path = "../../svm-timings", version = "=3.1.0" }
176+
solana-svm-transaction = { path = "../../svm-transaction", version = "=3.1.0" }
177+
solana-svm-type-overrides = { path = "../../svm-type-overrides", version = "=3.1.0" }
178+
>>>>>>> 8c21276b8 (bump solana-stake-interface from 2.0.0 to 2.0.1 (#7919))
168179
solana-system-interface = { version = "=2.0", features = ["bincode"] }
169180
solana-sysvar = "=3.0.0"
170181
solana-transaction-context = { path = "../../transaction-context", version = "=3.0.2" }
@@ -236,7 +247,7 @@ solana-sbf-rust-realloc-invoke-dep = { workspace = true }
236247
solana-sbpf = { workspace = true, features = ["jit"] }
237248
solana-sdk-ids = "3.0.0"
238249
solana-signer = "3.0.0"
239-
solana-stake-interface = "2.0.0"
250+
solana-stake-interface = "2.0.1"
240251
solana-svm = { workspace = true }
241252
solana-svm-callback = { workspace = true }
242253
solana-svm-feature-set = { workspace = true }

0 commit comments

Comments
 (0)