Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Upgrade kvdb-*, trie-db and memory-db #6584

Merged
gnunicorn merged 8 commits into from
Jul 8, 2020
Merged

Upgrade kvdb-*, trie-db and memory-db #6584

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31d1d3f
Upgrade `kvdb-*`, `trie-db` and `memory-db`
bkchr Jul 6, 2020
c2390b1
Change `trie-db` version
bkchr Jul 6, 2020
c6a5ddd
Update test-utils/runtime/Cargo.toml
bkchr Jul 6, 2020
eb51ec9
Update primitives/trie/Cargo.toml
bkchr Jul 6, 2020
15ba29b
Update `Cargo.lock` and `trie-bench`
bkchr Jul 6, 2020
4b169c1
Fix UI tests
bkchr Jul 6, 2020
d19ef02
Switch to fixed version of memory-db
bkchr Jul 7, 2020
d5892a4
Merge remote-tracking branch 'origin/master' into upgrade-kvdb-etc
bkchr Jul 7, 2020
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
219 changes: 144 additions & 75 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bin/node/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ serde = "1.0.101"
serde_json = "1.0.41"
structopt = "0.3"
derive_more = "0.99.2"
kvdb = "0.6"
kvdb-rocksdb = "0.8"
kvdb = "0.7"
kvdb-rocksdb = "0.9"
sp-trie = { version = "2.0.0-rc4", path = "../../../primitives/trie" }
sp-core = { version = "2.0.0-rc4", path = "../../../primitives/core" }
sp-consensus = { version = "0.8.0-rc4", path = "../../../primitives/consensus/common" }
Expand All @@ -37,6 +37,6 @@ fs_extra = "1"
hex = "0.4.0"
rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.1.2" }
futures = "0.3.1"
2 changes: 1 addition & 1 deletion client/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-blockchain = { version = "2.0.0-rc4", path = "../../primitives/blockchain" }
hex-literal = { version = "0.2.1" }
sp-inherents = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "2.0.0-rc4", path = "../../primitives/keyring" }
kvdb = "0.6.0"
kvdb = "0.7.0"
log = { version = "0.4.8" }
parking_lot = "0.10.0"
lazy_static = "1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ names = "0.11.0"
structopt = "0.3.8"
sc-tracing = { version = "2.0.0-rc4", path = "../tracing" }
chrono = "0.4.10"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
serde = "1.0.111"

[target.'cfg(not(target_os = "unknown"))'.dependencies]
Expand Down
10 changes: 5 additions & 5 deletions client/db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
parking_lot = "0.10.0"
log = "0.4.8"
kvdb = "0.6.0"
kvdb-rocksdb = { version = "0.8", optional = true }
kvdb-memorydb = "0.6.0"
kvdb = "0.7.0"
kvdb-rocksdb = { version = "0.9", optional = true }
kvdb-memorydb = "0.7.0"
linked-hash-map = "0.5.2"
hash-db = "0.15.2"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["std"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["std"] }
codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
blake2-rfc = "0.2.18"

Expand All @@ -41,7 +41,7 @@ sp-keyring = { version = "2.0.0-rc4", path = "../../primitives/keyring" }
substrate-test-runtime-client = { version = "2.0.0-rc4", path = "../../test-utils/runtime/client" }
env_logger = "0.7.0"
quickcheck = "0.9"
kvdb-rocksdb = "0.8"
kvdb-rocksdb = "0.9"
tempfile = "3"

[features]
Expand Down
2 changes: 1 addition & 1 deletion client/informant/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
ansi_term = "0.12.1"
futures = "0.3.4"
log = "0.4.8"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
wasm-timer = "0.2"
sc-client-api = { version = "2.0.0-rc4", path = "../api" }
sc-network = { version = "0.8.0-rc4", path = "../network" }
Expand Down
2 changes: 1 addition & 1 deletion client/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ parity-multiaddr = { package = "parity-multiaddr", version = "0.7.3" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" , version = "0.8.0-rc4"}
sc-tracing = { version = "2.0.0-rc4", path = "../tracing" }
tracing = "0.1.10"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }


[target.'cfg(all(any(unix, windows), not(target_os = "android")))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion client/state-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = "0.4.8"
sc-client-api = { version = "2.0.0-rc4", path = "../api" }
sp-core = { version = "2.0.0-rc4", path = "../../primitives/core" }
codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
parity-util-mem-derive = "0.1.0"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ futures = { version = "0.3.1", features = ["compat"] }
futures-diagnose = "1.0"
intervalier = "0.4.0"
log = "0.4.8"
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
parking_lot = "0.10.0"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0-rc4"}
sc-client-api = { version = "2.0.0-rc4", path = "../api" }
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/graph/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sp-utils = { version = "2.0.0-rc4", path = "../../../primitives/utils" }
sp-core = { version = "2.0.0-rc4", path = "../../../primitives/core" }
sp-runtime = { version = "2.0.0-rc4", path = "../../../primitives/runtime" }
sp-transaction-pool = { version = "2.0.0-rc4", path = "../../../primitives/transaction-pool" }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
linked-hash-map = "0.5.2"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions frame/support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ once_cell = { version = "1", default-features = false, optional = true }
sp-state-machine = { version = "0.8.0-rc4", optional = true, path = "../../primitives/state-machine" }
bitmask = { version = "0.5.0", default-features = false }
impl-trait-for-tuples = "0.1.3"
smallvec = "1.4.0"
smallvec = "1.4.1"

[dev-dependencies]
pretty_assertions = "0.6.1"
frame-system = { version = "2.0.0-rc4", path = "../system" }
parity-util-mem = { version = "0.6.1", features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", features = ["primitive-types"] }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/transaction-payment/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sp-runtime = { version = "2.0.0-rc4", default-features = false, path = "../../pr
frame-support = { version = "2.0.0-rc4", default-features = false, path = "../support" }
frame-system = { version = "2.0.0-rc4", default-features = false, path = "../system" }
pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc4", default-features = false, path = "./rpc/runtime-api" }
smallvec = "1.4.0"
smallvec = "1.4.1"

[dev-dependencies]
sp-io = { version = "2.0.0-rc4", path = "../../primitives/io" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ parking_lot = { version = "0.10.0", optional = true }
sp-debug-derive = { version = "2.0.0-rc4", path = "../debug-derive" }
sp-externalities = { version = "0.8.0-rc4", optional = true, path = "../externalities" }
sp-storage = { version = "2.0.0-rc4", default-features = false, path = "../storage" }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
futures = { version = "0.3.1", optional = true }

# full crypto
Expand Down
2 changes: 1 addition & 1 deletion primitives/database/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ documentation = "https://docs.rs/sp-database"

[dependencies]
parking_lot = "0.10.0"
kvdb = "0.6.0"
kvdb = "0.7.0"
2 changes: 1 addition & 1 deletion primitives/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ paste = "0.1.6"
rand = { version = "0.7.2", optional = true }
impl-trait-for-tuples = "0.1.3"
sp-inherents = { version = "2.0.0-rc4", default-features = false, path = "../inherents" }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
hash256-std-hasher = { version = "0.15.2", default-features = false }
either = { version = "1.5", default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions primitives/state-machine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
log = "0.4.8"
parking_lot = "0.10.0"
hash-db = "0.15.2"
trie-db = "0.21.0"
trie-db = "0.22.0"
trie-root = "0.16.0"
sp-trie = { version = "2.0.0-rc4", path = "../trie" }
sp-core = { version = "2.0.0-rc4", path = "../core" }
Expand All @@ -26,7 +26,7 @@ num-traits = "0.2.8"
rand = "0.7.2"
sp-externalities = { version = "0.8.0-rc4", path = "../externalities" }
itertools = "0.9"
smallvec = "1.4"
smallvec = "1.4.1"

[dev-dependencies]
hex-literal = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion primitives/test-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
sp-core = { version = "2.0.0-rc4", default-features = false, path = "../core" }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-runtime = { version = "2.0.0-rc4", default-features = false, path = "../runtime" }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }

[features]
default = [
Expand Down
6 changes: 3 additions & 3 deletions primitives/trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ harness = false
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
sp-std = { version = "2.0.0-rc4", default-features = false, path = "../std" }
hash-db = { version = "0.15.2", default-features = false }
trie-db = { version = "0.21.0", default-features = false }
trie-db = { version = "0.22.0", default-features = false }
trie-root = { version = "0.16.0", default-features = false }
memory-db = { version = "0.21.0", default-features = false }
memory-db = { version = "0.22.0", default-features = false }
sp-core = { version = "2.0.0-rc4", default-features = false, path = "../core" }

[dev-dependencies]
trie-bench = "0.22.0"
trie-bench = "0.23.0"
trie-standardmap = "0.15.2"
criterion = "0.2.11"
hex-literal = "0.2.1"
Expand Down
6 changes: 3 additions & 3 deletions test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
frame-executive = { version = "2.0.0-rc4", default-features = false, path = "../../frame/executive" }
sp-inherents = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "2.0.0-rc4", optional = true, path = "../../primitives/keyring" }
memory-db = { version = "0.21.0", default-features = false }
memory-db = { version = "0.22.0", default-features = false }
sp-offchain = { path = "../../primitives/offchain", default-features = false, version = "2.0.0-rc4"}
sp-core = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/core" }
sp-std = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/std" }
Expand All @@ -39,8 +39,8 @@ pallet-timestamp = { version = "2.0.0-rc4", default-features = false, path = "..
sp-finality-grandpa = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/finality-grandpa" }
sp-trie = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/trie" }
sp-transaction-pool = { version = "2.0.0-rc4", default-features = false, path = "../../primitives/transaction-pool" }
trie-db = { version = "0.21.0", default-features = false }
parity-util-mem = { version = "0.6.1", default-features = false, features = ["primitive-types"] }
trie-db = { version = "0.22.0", default-features = false }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
sc-service = { version = "0.8.0-rc4", default-features = false, optional = true, features = ["test-helpers"], path = "../../client/service" }

# 3rd party
Expand Down
2 changes: 1 addition & 1 deletion utils/browser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ console_log = "0.1.2"
js-sys = "0.3.34"
wasm-bindgen = "0.2.57"
wasm-bindgen-futures = "0.4.7"
kvdb-web = "0.6"
kvdb-web = "0.7"
sp-database = { version = "2.0.0-rc4", path = "../../primitives/database" }
sc-informant = { version = "0.8.0-rc4", path = "../../client/informant" }
sc-service = { version = "0.8.0-rc4", path = "../../client/service", default-features = false }
Expand Down