Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade trie-db from 0.28.0 to 0.29.0 #3982

Merged
merged 11 commits into from
Apr 9, 2024
Merged

Upgrade trie-db from 0.28.0 to 0.29.0 #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1ff7d2
build: :arrow_up: Upgrade `trie-db` from `0.28.0` to `0.29.0`
ffarall Apr 4, 2024
ae0e38a
feat: :sparkles: Reexport DoubleEnded iterators
ffarall Apr 4, 2024
e1e134b
Merge branch 'paritytech:master' into master
ffarall Apr 4, 2024
eb9e7e3
Merge branch 'master' into master
ffarall Apr 4, 2024
6d0016a
build: :arrow_up: Upgrade `trie-bench` from `0.38.0` to `0.39.0`
ffarall Apr 5, 2024
dc85187
build: :arrow_up: Upgrade `criterion` from `0.4.0` to `0.5.1`
ffarall Apr 5, 2024
427dde6
Merge branch 'master' into master
ffarall Apr 5, 2024
eefdd18
Merge remote-tracking branch 'upstream/master'
ffarall Apr 5, 2024
b23edb2
Merge remote-tracking branch 'upstream/master'
ffarall Apr 5, 2024
9a85b9c
Merge remote-tracking branch 'upstream/master'
ffarall Apr 7, 2024
5ec0076
Merge branch 'master' into master
bkchr Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bridges/primitives/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false }
sp-std = { path = "../../../substrate/primitives/std", default-features = false }
sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
trie-db = { version = "0.29.0", default-features = false }

[dev-dependencies]
hex-literal = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
environmental = { version = "1.1.4", default-features = false }
impl-trait-for-tuples = "0.2.1"
log = { workspace = true }
trie-db = { version = "0.28.0", default-features = false }
trie-db = { version = "0.29.0", default-features = false }
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion substrate/primitives/state-machine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sp-core = { path = "../core", default-features = false }
sp-externalities = { path = "../externalities", default-features = false }
sp-panic-handler = { path = "../panic-handler", optional = true }
sp-trie = { path = "../trie", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
trie-db = { version = "0.29.0", default-features = false }

[dev-dependencies]
array-bytes = "6.1"
Expand Down
6 changes: 3 additions & 3 deletions substrate/primitives/trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ rand = { version = "0.8", optional = true }
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
thiserror = { optional = true, workspace = true }
tracing = { version = "0.1.29", optional = true }
trie-db = { version = "0.28.0", default-features = false }
trie-db = { version = "0.29.0", default-features = false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this file trie-bench need to be upgraded to 0.39 (forgot to tell you :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Solved here: build: ⬆️ Upgrade trie-bench from 0.38.0 to 0.39.0

trie-root = { version = "0.18.0", default-features = false }
sp-core = { path = "../core", default-features = false }
sp-externalities = { path = "../externalities", default-features = false }
schnellru = { version = "0.2.1", optional = true }

[dev-dependencies]
array-bytes = "6.1"
criterion = "0.4.0"
trie-bench = "0.38.0"
criterion = "0.5.1"
trie-bench = "0.39.0"
trie-standardmap = "0.16.0"
sp-runtime = { path = "../runtime" }

Expand Down
4 changes: 3 additions & 1 deletion substrate/primitives/trie/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ use trie_db::proof::{generate_proof, verify_proof};
pub use trie_db::{
nibble_ops,
node::{NodePlan, ValuePlan},
triedb::{TrieDBDoubleEndedIterator, TrieDBKeyDoubleEndedIterator},
CError, DBValue, Query, Recorder, Trie, TrieCache, TrieConfiguration, TrieDBIterator,
TrieDBKeyIterator, TrieDBRawIterator, TrieLayout, TrieMut, TrieRecorder,
TrieDBKeyIterator, TrieDBNodeDoubleEndedIterator, TrieDBRawIterator, TrieLayout, TrieMut,
TrieRecorder,
};
pub use trie_db::{proof::VerifyError, MerkleValue};
/// The Substrate format implementation of `TrieStream`.
Expand Down
2 changes: 1 addition & 1 deletion substrate/test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pallet-timestamp = { path = "../../frame/timestamp", default-features = false }
sp-consensus-grandpa = { path = "../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
sp-trie = { path = "../../primitives/trie", default-features = false }
sp-transaction-pool = { path = "../../primitives/transaction-pool", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
trie-db = { version = "0.29.0", default-features = false }
sc-service = { path = "../../client/service", default-features = false, features = ["test-helpers"], optional = true }
sp-state-machine = { path = "../../primitives/state-machine", default-features = false }
sp-externalities = { path = "../../primitives/externalities", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { features = ["derive"], workspace = true, default-features = true }
sp-core = { path = "../../../../primitives/core" }
sp-state-machine = { path = "../../../../primitives/state-machine" }
sp-trie = { path = "../../../../primitives/trie" }
trie-db = "0.28.0"
trie-db = "0.29.0"

jsonrpsee = { version = "0.22", features = ["client-core", "macros", "server"] }

Expand Down
Loading