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

Upgrading parity-scale-codec to v3 #10825

Merged
merged 9 commits into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
333 changes: 206 additions & 127 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/node-template/pallets/template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ repository = "https://github.com/substrate-developer-hub/substrate-node-template
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
"derive",
] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
frame-support = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/support" }
frame-system = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/system" }
frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository = "https://github.com/substrate-developer-hub/substrate-node-template
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }

pallet-aura = { version = "4.0.0-dev", default-features = false, path = "../../../frame/aura" }
pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../frame/balances" }
Expand Down
6 changes: 3 additions & 3 deletions bin/node/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ sp-state-machine = { version = "0.11.0", path = "../../../primitives/state-machi
serde = "1.0.136"
serde_json = "1.0.74"
derive_more = "0.99.16"
kvdb = "0.10.0"
kvdb-rocksdb = "0.14.0"
kvdb = "0.11.0"
kvdb-rocksdb = "0.15.1"
sp-trie = { version = "5.0.0", path = "../../../primitives/trie" }
sp-core = { version = "5.0.0", path = "../../../primitives/core" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
Expand All @@ -35,7 +35,7 @@ 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.10.2", default-features = false, features = ["primitive-types"] }
parity-util-mem = { version = "0.11.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.3" }
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# third-party dependencies
clap = { version = "3.0", features = ["derive"], optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.136", features = ["derive"] }
futures = "0.3.16"
hex-literal = "0.3.4"
Expand Down
4 changes: 2 additions & 2 deletions bin/node/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
scale-info = { version = "1.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
scale-info = { version = "2.0.0", features = ["derive"] }
node-primitives = { version = "2.0.0", path = "../primitives" }
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/inspect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "3.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
thiserror = "1.0"
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
Expand Down
4 changes: 2 additions & 2 deletions bin/node/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
"derive",
] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
sp-application-crypto = { version = "5.0.0", default-features = false, path = "../../../primitives/application-crypto" }
sp-core = { version = "5.0.0", default-features = false, path = "../../../primitives/core" }
Expand Down
4 changes: 2 additions & 2 deletions bin/node/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]

# third-party dependencies
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
"derive",
"max-encoded-len",
] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
static_assertions = "1.1.0"
hex-literal = { version = "0.3.4", optional = true }
log = { version = "0.4.14", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sc-client-db = { version = "0.10.0-dev", path = "../../../client/db/", features
] }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sp-keyring = { version = "5.0.0", path = "../../../primitives/keyring" }
node-executor = { version = "3.0.0-dev", path = "../executor" }
node-primitives = { version = "2.0.0", path = "../primitives" }
Expand Down
4 changes: 2 additions & 2 deletions client/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
"derive",
] }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
Expand All @@ -25,7 +25,7 @@ futures = "0.3.1"
hash-db = { version = "0.15.2", default-features = false }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
log = "0.4.8"
parking_lot = "0.11.2"
parking_lot = "0.12.0"
sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
sp-core = { version = "5.0.0", default-features = false, path = "../../primitives/core" }
sp-keystore = { version = "0.11.0", default-features = false, path = "../../primitives/keystore" }
Expand Down
2 changes: 1 addition & 1 deletion client/authority-discovery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ prost-build = "0.9"

[dependencies]
async-trait = "0.1"
codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" }
codec = { package = "parity-scale-codec", default-features = false, version = "3.0.0" }
thiserror = "1.0"
futures = "0.3.9"
futures-timer = "3.0.1"
Expand Down
4 changes: 2 additions & 2 deletions client/basic-authorship/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
Expand All @@ -33,4 +33,4 @@ sc-proposer-metrics = { version = "0.10.0-dev", path = "../proposer-metrics" }
[dev-dependencies]
sc-transaction-pool = { version = "4.0.0-dev", path = "../transaction-pool" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
parking_lot = "0.11.2"
parking_lot = "0.12.0"
4 changes: 2 additions & 2 deletions client/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ description = "BEEFY Client gadget for substrate"
fnv = "1.0.6"
futures = "0.3"
log = "0.4"
parking_lot = "0.11"
parking_lot = "0.12.0"
thiserror = "1.0"
wasm-timer = "0.2.5"

codec = { version = "2.2.0", package = "parity-scale-codec", features = ["derive"] }
codec = { version = "3.0.0", package = "parity-scale-codec", features = ["derive"] }
prometheus = { version = "0.10.0-dev", package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }

sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
Expand Down
4 changes: 2 additions & 2 deletions client/beefy/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = "RPC for the BEEFY Client gadget for substrate"
[dependencies]
futures = "0.3.16"
log = "0.4"
parking_lot = "0.11"
parking_lot = "0.12.0"
thiserror = "1.0"
serde = { version = "1.0.136", features = ["derive"] }

Expand All @@ -19,7 +19,7 @@ jsonrpc-core-client = "18.0.0"
jsonrpc-derive = "18.0.0"
jsonrpc-pubsub = "18.0.0"

codec = { version = "2.2.0", package = "parity-scale-codec", features = ["derive"] }
codec = { version = "3.0.0", package = "parity-scale-codec", features = ["derive"] }

sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
sc-utils = { version = "4.0.0-dev", path = "../../utils" }
Expand Down
2 changes: 1 addition & 1 deletion client/block-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sp-core = { version = "5.0.0", path = "../../primitives/core" }
sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
codec = { package = "parity-scale-codec", version = "2.0.0", features = [
codec = { package = "parity-scale-codec", version = "3.0.0", features = [
"derive",
] }

Expand Down
2 changes: 1 addition & 1 deletion client/chain-spec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.74"
sp-runtime = { version = "5.0.0", path = "../../primitives/runtime" }
sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
memmap2 = "0.5.0"
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ thiserror = "1.0.30"
tiny-bip39 = "0.8.2"
tokio = { version = "1.15", features = ["signal", "rt-multi-thread", "parking_lot"] }

parity-scale-codec = "2.3.1"
parity-scale-codec = "3.0.0"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
sc-network = { version = "0.10.0-dev", path = "../network" }
Expand Down
4 changes: 2 additions & 2 deletions client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sp-consensus-aura = { version = "0.10.0-dev", path = "../../../primitives/consen
sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" }
Expand Down Expand Up @@ -48,4 +48,4 @@ sc-network = { version = "0.10.0-dev", path = "../../network" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
tempfile = "3.1.0"
parking_lot = "0.11.2"
parking_lot = "0.12.0"
4 changes: 2 additions & 2 deletions client/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = [
codec = { package = "parity-scale-codec", version = "3.0.0", features = [
"derive",
] }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
Expand Down Expand Up @@ -44,7 +44,7 @@ sp-runtime = { version = "5.0.0", path = "../../../primitives/runtime" }
fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
futures = "0.3.9"
parking_lot = "0.11.2"
parking_lot = "0.12.0"
log = "0.4.8"
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
rand = "0.7.2"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sp-state-machine = { version = "0.11.0", path = "../../../primitives/state-machi
sp-runtime = { version = "5.0.0", path = "../../../primitives/runtime" }
sc-utils = { version = "4.0.0-dev", path = "../../utils" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
parking_lot = "0.11.2"
parking_lot = "0.12.0"
serde = { version = "1.0", features = ["derive"] }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev" }
async-trait = "0.1.42"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/epochs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
sp-runtime = { version = "5.0.0", path = "../../../primitives/runtime" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/manual-seal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
jsonrpc-derive = "18.0.0"
log = "0.4.8"
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0", features = ["derive"] }
assert_matches = "1.3.0"
async-trait = "0.1.50"
Expand Down
4 changes: 2 additions & 2 deletions client/consensus/pow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
sp-core = { version = "5.0.0", path = "../../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-runtime = { version = "5.0.0", path = "../../../primitives/runtime" }
Expand All @@ -27,7 +27,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
log = "0.4.8"
futures = "0.3.16"
futures-timer = "3.0.1"
parking_lot = "0.11.2"
parking_lot = "0.12.0"
thiserror = "1.0"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.10.0-dev"}
async-trait = "0.1.50"
2 changes: 1 addition & 1 deletion client/consensus/slots/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
sp-core = { version = "5.0.0", path = "../../../primitives/core" }
sp-arithmetic = { version = "4.0.0", path = "../../../primitives/arithmetic" }
Expand Down
12 changes: 6 additions & 6 deletions client/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
parking_lot = "0.11.2"
parking_lot = "0.12.0"
log = "0.4.8"
kvdb = "0.10.0"
kvdb-rocksdb = { version = "0.14.0", optional = true }
kvdb-memorydb = "0.10.0"
kvdb = "0.11.0"
kvdb-rocksdb = { version = "0.15.1", optional = true }
kvdb-memorydb = "0.11.0"
linked-hash-map = "0.5.4"
hash-db = "0.15.2"
codec = { package = "parity-scale-codec", version = "2.0.0", features = [
codec = { package = "parity-scale-codec", version = "3.0.0", features = [
"derive",
] }

Expand All @@ -39,7 +39,7 @@ parity-db = { version = "0.3.5", optional = true }
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
quickcheck = "1.0.3"
kvdb-rocksdb = "0.14.0"
kvdb-rocksdb = "0.15.1"
tempfile = "3"

[features]
Expand Down
4 changes: 2 additions & 2 deletions client/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sp-io = { version = "5.0.0", path = "../../primitives/io" }
sp-core = { version = "5.0.0", path = "../../primitives/core" }
sp-tasks = { version = "4.0.0-dev", path = "../../primitives/tasks" }
Expand All @@ -30,7 +30,7 @@ sp-externalities = { version = "0.11.0", path = "../../primitives/externalities"
sc-executor-common = { version = "0.10.0-dev", path = "common" }
sc-executor-wasmi = { version = "0.10.0-dev", path = "wasmi" }
sc-executor-wasmtime = { version = "0.10.0-dev", path = "wasmtime", optional = true }
parking_lot = "0.11.2"
parking_lot = "0.12.0"
libsecp256k1 = "0.7"
sp-core-hashing-proc-macro = { version = "4.0.0-dev", path = "../../primitives/core/hashing/proc-macro" }
lru = "0.6.6"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
wasm-instrument = "0.1"
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
wasmi = "0.9.1"
sp-core = { version = "5.0.0", path = "../../../primitives/core" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = "0.4.8"
wasmi = "0.9.1"
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
sp-wasm-interface = { version = "5.0.0", path = "../../../primitives/wasm-interface" }
Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libc = "0.2.112"
cfg-if = "1.0"
log = "0.4.8"
parity-wasm = "0.42.0"
codec = { package = "parity-scale-codec", version = "2.0.0" }
codec = { package = "parity-scale-codec", version = "3.0.0" }
sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sp-wasm-interface = { version = "5.0.0", path = "../../../primitives/wasm-interface", features = ["wasmtime"] }
sp-runtime-interface = { version = "5.0.0", path = "../../../primitives/runtime-interface" }
Expand Down
8 changes: 4 additions & 4 deletions client/finality-grandpa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" }
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
parking_lot = "0.11.2"
parking_lot = "0.12.0"
rand = "0.8.4"
ahash = "0.7.6"
parity-scale-codec = { version = "2.3.1", features = ["derive"] }
parity-scale-codec = { version = "3.0.0", features = ["derive"] }
sp-application-crypto = { version = "5.0.0", path = "../../primitives/application-crypto" }
sp-arithmetic = { version = "4.0.0", path = "../../primitives/arithmetic" }
sp-runtime = { version = "5.0.0", path = "../../primitives/runtime" }
Expand All @@ -44,12 +44,12 @@ sc-network-gossip = { version = "0.10.0-dev", path = "../network-gossip" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev" }
sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
finality-grandpa = { version = "0.14.4", features = ["derive-codec"] }
finality-grandpa = { version = "0.15.0", features = ["derive-codec"] }
async-trait = "0.1.50"

[dev-dependencies]
assert_matches = "1.3.0"
finality-grandpa = { version = "0.14.1", features = [
finality-grandpa = { version = "0.15.0", features = [
"derive-codec",
"test-helpers",
] }
Expand Down
Loading