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

bump a bunch of deps in parity-common #3402

Merged
ordian merged 4 commits into from
Jul 5, 2021
Merged

bump a bunch of deps in parity-common #3402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d6f032
bump a bunch of deps in parity-common
ordian Jul 2, 2021
06aa080
Merge remote-tracking branch 'origin/master' into ao-bump-common
Jul 5, 2021
f8d708a
update Substrate
Jul 5, 2021
a62fcec
fix browser check
ordian Jul 5, 2021
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
538 changes: 264 additions & 274 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/browser-demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

// Build our client.
log('Starting client');
let client = await start_client(chain_spec_text, 'info');
let client = start_client(chain_spec_text, 'info');
log('Client started');

client.rpcSubscribe('{"method":"chain_subscribeNewHead","params":[],"id":1,"jsonrpc":"2.0"}',
Expand Down
8 changes: 4 additions & 4 deletions cli/src/browser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ use wasm_bindgen::prelude::*;

/// Starts the client.
#[wasm_bindgen]
pub async fn start_client(chain_spec: String, log_level: String) -> Result<Client, JsValue> {
start_inner(chain_spec, log_level).await.map_err(|err| JsValue::from_str(&err.to_string()))
pub fn start_client(chain_spec: String, log_level: String) -> Result<Client, JsValue> {
start_inner(chain_spec, log_level).map_err(|err| JsValue::from_str(&err.to_string()))
}

async fn start_inner(chain_spec: String, log_directives: String) -> Result<Client, Box<dyn std::error::Error>> {
fn start_inner(chain_spec: String, log_directives: String) -> Result<Client, Box<dyn std::error::Error>> {
set_console_error_panic_hook();
init_logging(&log_directives)?;

let chain_spec =
service::PolkadotChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec()).map_err(|e| format!("{:?}", e))?;
let config = browser_configuration(chain_spec).await?;
let config = browser_configuration(chain_spec)?;

info!("Polkadot browser node");
info!(" version {}", config.impl_version);
Expand Down
2 changes: 1 addition & 1 deletion core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master",
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
parity-util-mem = { version = "0.10.0", default-features = false, optional = true }

[features]
default = [ "std" ]
Expand Down
4 changes: 2 additions & 2 deletions node/core/approval-voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
lru = "0.6"
merlin = "2.0"
schnorrkel = "0.9.1"
kvdb = "0.9.0"
kvdb = "0.10.0"
derive_more = "0.99.14"

polkadot-node-subsystem = { path = "../../subsystem" }
Expand Down Expand Up @@ -41,4 +41,4 @@ sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch =
maplit = "1.0.2"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
kvdb-memorydb = "0.9.0"
kvdb-memorydb = "0.10.0"
4 changes: 2 additions & 2 deletions node/core/av-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
futures = "0.3.15"
futures-timer = "3.0.2"
kvdb = "0.9.0"
kvdb = "0.10.0"
thiserror = "1.0.23"
tracing = "0.1.26"
bitvec = "0.20.1"
Expand All @@ -24,7 +24,7 @@ polkadot-node-primitives = { path = "../../primitives" }
log = "0.4.13"
env_logger = "0.8.4"
assert_matches = "1.4.0"
kvdb-memorydb = "0.9.0"
kvdb-memorydb = "0.10.0"

sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand Down
2 changes: 1 addition & 1 deletion node/core/chain-selection/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
kvdb = "0.9.0"
kvdb = "0.10.0"
thiserror = "1.0.23"
parity-scale-codec = "2"

Expand Down
4 changes: 2 additions & 2 deletions node/core/dispute-coordinator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
futures = "0.3.12"
tracing = "0.1.26"
parity-scale-codec = "2"
kvdb = "0.9.0"
kvdb = "0.10.0"
derive_more = "0.99.14"
thiserror = "1.0.23"

Expand All @@ -21,7 +21,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }

[dev-dependencies]
kvdb-memorydb = "0.9.0"
kvdb-memorydb = "0.10.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers"}
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion node/core/runtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
futures = "0.3.15"
tracing = "0.1.26"
memory-lru = "0.1.0"
parity-util-mem = { version = "0.9.0", default-features = false }
parity-util-mem = { version = "0.10.0", default-features = false }

sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion node/malus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ polkadot-cli = { path = "../../cli", default-features = false, features = [ "cli
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-node-core-candidate-validation = { path = "../core/candidate-validation" }
parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
parity-util-mem = { version = "0.10.0", default-features = false, features = ["jemalloc-global"] }
color-eyre = { version = "0.5.11", default-features = false }
assert_matches = "1.5"
structopt = "0.3.21"
Expand Down
4 changes: 2 additions & 2 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ hex-literal = "0.3.1"
tracing = "0.1.26"
serde = { version = "1.0.123", features = ["derive"] }
thiserror = "1.0.23"
kvdb = "0.9.0"
kvdb-rocksdb = { version = "0.11.1", optional = true }
kvdb = "0.10.0"
kvdb-rocksdb = { version = "0.12.0", optional = true }
async-trait = "0.1.42"

# Polkadot
Expand Down
2 changes: 1 addition & 1 deletion parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"
# this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
# various unnecessary Substrate-specific endpoints.
parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] }
parity-util-mem = { version = "0.9.0", optional = true }
parity-util-mem = { version = "0.10.0", optional = true }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", b
bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
hex-literal = "0.3.1"
parity-util-mem = { version = "0.9.0", default-features = false, optional = true }
parity-util-mem = { version = "0.10.0", default-features = false, optional = true }
thiserror = "1.0.23"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion xcm/pallet-xcm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ std = [
"frame-system/std",
"xcm/std",
]
runtime-benchmarks = []
runtime-benchmarks = []