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

Commit

Permalink
Upgrade dependencies whenever “easy” (#3556)
Browse files Browse the repository at this point in the history
* Update all dependencies

* Upgrade dependencies whenever “easy”

“easy” means that there are no major changes required.

* Fix build and bump paste dependency to 0.1.6

* Remove dead code

* Re-add = dependency for futures-preview

* Add missing std features for runtime-io

* Remove git dependencies

as updated versions have been published to crates.io

* try to debug bug

* For sr-io, "std" should imply "no_oom" and "no_panic_handler".

Otherwise, rustc complains (correctly) about duplicate lang items.

* Add missing "runtime-io/std" features

* Fix compilation errors

* Prevent duplicate lang items

Rust does not allow duplicate lang items.  When compiled without the
`std` feature, `sr-io` defines two lang items.  Therefore, `sr-io`
compiled without `feature = "std"` must not be linked with `std`.

However, `pwasm-utils` and `wasmi-validation` both bring in `std` unless
compiled with `default-features = "false"`.  This caused a duplicate
lang item error.  Building both with `default-features = "false"`
prevents this error.  When building with `feature = "std"`, they should
both be built with the `std` feature, so this feature needs to be
explicitly depended on.

* Bump `impl_version`

* Make tests pass

Three tests used 1 less gas than they had previously.

* Try to un-break build

* Add a Cargo.lock file

* Revert offchain code

* Revert "Revert offchain code"

This reverts commit d216d08.

* Don’t try to send a body with a GET request

without adding a Transfer-Encoding or Content-Length header.

This has always been wrong, but hyperium/hyper#1925 hid the bug until
hyper was upgraded to 0.12.35.

* Change some more GET requests to POST requests

* Fix excess line width and remove an `extern crate`

* Delete commented-out extern crate

Co-Authored-By: Sergei Pepyakin <sergei@parity.io>

* Fix regression in Cargo.toml files

dev-dependencies need `default-features = false`, too.

* Bump parity-wasm dependency

* Bump `futures-preview`

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update Cargo.lock files

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update core/service/src/chain_ops.rs

Co-Authored-By: Sergei Pepyakin <sergei@parity.io>
  • Loading branch information
Demi-Marie and pepyakin committed Oct 2, 2019
1 parent d7be290 commit 0cfe743
Show file tree
Hide file tree
Showing 121 changed files with 1,306 additions and 6,561 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.adoc
Expand Up @@ -47,7 +47,7 @@ When reviewing a pull request, the end-goal is to suggest useful changes to the

=== Updating Polkadot as well

If your PR changes the external APIs or interfaces used by Polkadot, **a corresponding PR on Polkadot must** be submitted as well. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1.
If your PR changes the external APIs or interfaces used by Polkadot, **a corresponding PR on Polkadot must** be submitted as well. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1.

To update a corresponding Polkadot PR:

Expand Down
1,783 changes: 865 additions & 918 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Expand Up @@ -11,11 +11,11 @@ edition = "2018"

[dependencies]
cli = { package = "node-cli", path = "node/cli" }
futures = "0.1"
ctrlc = { version = "3.0", features = ["termination"] }
futures = "0.1.29"
ctrlc = { version = "3.1.3", features = ["termination"] }

[build-dependencies]
vergen = "3"
vergen = "3.0.4"

[workspace]
members = [
Expand Down
6 changes: 3 additions & 3 deletions SECURITY.md
Expand Up @@ -4,7 +4,7 @@ Parity Technologies is committed to resolving security vulnerabilities in our so

## Reporting a Vulnerability

Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io.
Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io.

Your report should include the following:

Expand All @@ -19,7 +19,7 @@ Try to include as much information in your report as you can, including a descri

You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.

After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days.
After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days.

Thank you for taking the time to responsibly disclose any vulnerabilities you find.

Expand All @@ -36,7 +36,7 @@ Responsible investigation and reporting includes, but isn't limited to, the foll

## Bug Bounty Program

Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html).
Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html).



Expand Down
2 changes: 1 addition & 1 deletion core/application-crypto/Cargo.toml
Expand Up @@ -8,7 +8,7 @@ description = "Provides facilities for generating application specific crypto wr
[dependencies]
primitives = { package = "substrate-primitives", path = "../primitives", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
runtime-io = { package = "sr-io", path = "../sr-io", default-features = false }

Expand Down
20 changes: 10 additions & 10 deletions core/authority-discovery/Cargo.toml
Expand Up @@ -6,26 +6,26 @@ edition = "2018"
build = "build.rs"

[build-dependencies]
prost-build = "0.5"
prost-build = "0.5.0"

[dependencies]
authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "./primitives" }
bytes = "0.4"
bytes = "0.4.12"
client = { package = "substrate-client", path = "../../core/client" }
codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
derive_more = "0.14.0"
futures = "0.1"
derive_more = "0.15.0"
futures = "0.1.29"
libp2p = { version = "0.12.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] }
log = "0.4"
log = "0.4.8"
network = { package = "substrate-network", path = "../../core/network" }
primitives = { package = "substrate-primitives", path = "../primitives" }
prost = "0.5"
serde_json = "1.0"
prost = "0.5.0"
serde_json = "1.0.40"
sr-primitives = { path = "../../core/sr-primitives" }
tokio-timer = "0.2"
tokio-timer = "0.2.11"

[dev-dependencies]
parking_lot = { version = "0.9.0" }
parking_lot = "0.9.0"
peerset = { package = "substrate-peerset", path = "../../core/peerset" }
test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
tokio = { version = "0.1"}
tokio = "0.1.22"
4 changes: 2 additions & 2 deletions core/basic-authorship/Cargo.toml
Expand Up @@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
log = "0.4"
futures-preview = "0.3.0-alpha.18"
log = "0.4.8"
futures-preview = "0.3.0-alpha.19"
codec = { package = "parity-scale-codec", version = "1.0.0" }
sr-primitives = { path = "../../core/sr-primitives" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
Expand Down
2 changes: 1 addition & 1 deletion core/chain-spec/Cargo.toml
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
chain-spec-derive = { package = "substrate-chain-spec-derive", path = "./derive" }
impl-trait-for-tuples = "0.1.1"
impl-trait-for-tuples = "0.1.2"
network = { package = "substrate-network", path = "../../core/network" }
primitives = { package = "substrate-primitives", path = "../primitives" }
serde = { version = "1.0.101", features = ["derive"] }
Expand Down
5 changes: 2 additions & 3 deletions core/chain-spec/derive/Cargo.toml
Expand Up @@ -8,10 +8,9 @@ edition = "2018"
proc-macro = true

[dependencies]
proc-macro-crate = "0.1.3"
proc-macro2 = "1.0.1"
proc-macro-crate = "0.1.4"
proc-macro2 = "1.0.4"
quote = "1.0.2"
syn = "1.0.5"

[dev-dependencies]

1 change: 0 additions & 1 deletion core/chain-spec/derive/src/impls.rs
Expand Up @@ -188,4 +188,3 @@ fn generate_fork_to_base(
})
}
}

1 change: 0 additions & 1 deletion core/chain-spec/src/lib.rs
Expand Up @@ -121,4 +121,3 @@ use sr_primitives::BuildStorage;
/// A set of traits for the runtime genesis config.
pub trait RuntimeGenesis: Serialize + DeserializeOwned + BuildStorage {}
impl<T: Serialize + DeserializeOwned + BuildStorage> RuntimeGenesis for T {}

38 changes: 19 additions & 19 deletions core/cli/Cargo.toml
Expand Up @@ -6,22 +6,22 @@ description = "Substrate CLI interface."
edition = "2018"

[dependencies]
clap = "~2.32"
derive_more = "0.14.0"
env_logger = "0.6"
log = "0.4"
atty = "0.2"
regex = "1"
time = "0.1"
ansi_term = "0.11"
lazy_static = "1.3"
app_dirs = "1.2"
tokio = "0.1.7"
futures = "0.1.17"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
fdlimit = "0.1"
exit-future = "0.1"
serde_json = "1.0"
clap = "~2.32.0"
derive_more = "0.15.0"
env_logger = "0.6.2"
log = "0.4.8"
atty = "0.2.13"
regex = "1.3.1"
time = "0.1.42"
ansi_term = "0.12.1"
lazy_static = "1.4.0"
app_dirs = "1.2.1"
tokio = "0.1.22"
futures = "0.1.29"
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features = ["compat"] }
fdlimit = "0.1.1"
exit-future = "0.1.4"
serde_json = "1.0.40"
panic-handler = { package = "substrate-panic-handler", path = "../../core/panic-handler" }
client = { package = "substrate-client", path = "../../core/client" }
header-metadata = { package = "substrate-header-metadata", path = "../../core/client/header-metadata" }
Expand All @@ -33,8 +33,8 @@ state-machine = { package = "substrate-state-machine", path = "../../core/state-
substrate-telemetry = { path = "../../core/telemetry" }
keyring = { package = "substrate-keyring", path = "../keyring" }
names = "0.11.0"
structopt = "0.2"
rpassword = "3.0"
structopt = "0.2.0"
rpassword = "4.0.1"

[dev-dependencies]
tempdir = "0.3"
tempdir = "0.3.7"
2 changes: 1 addition & 1 deletion core/cli/src/params.rs
Expand Up @@ -17,7 +17,7 @@
use crate::traits::{AugmentClap, GetLogFilter};

use std::path::PathBuf;
use structopt::{StructOpt, clap::{arg_enum, _clap_count_exprs, App, AppSettings, SubCommand, Arg}};
use structopt::{StructOpt, clap::{arg_enum, App, AppSettings, _clap_count_exprs, SubCommand, Arg}};
use client;

pub use crate::execution_strategy::ExecutionStrategy;
Expand Down
18 changes: 9 additions & 9 deletions core/client/Cargo.toml
Expand Up @@ -5,13 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
derive_more = { version = "0.14.0", optional = true }
fnv = { version = "1.0", optional = true }
log = { version = "0.4", optional = true }
derive_more = { version = "0.15.0", optional = true }
fnv = { version = "1.0.6", optional = true }
log = { version = "0.4.8", optional = true }
parking_lot = { version = "0.9.0", optional = true }
hex = { package = "hex-literal", version = "0.2", optional = true }
futures = { version = "0.1", optional = true }
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"], optional = true }
hex-literal = { version = "0.2.1", optional = true }
futures = { version = "0.1.29", optional = true }
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"], optional = true }
consensus = { package = "substrate-consensus-common", path = "../consensus/common", optional = true }
executor = { package = "substrate-executor", path = "../executor", optional = true }
state-machine = { package = "substrate-state-machine", path = "../state-machine", optional = true }
Expand All @@ -30,8 +30,8 @@ sr-api-macros = { path = "../sr-api-macros" }
header-metadata = { package = "substrate-header-metadata", path = "header-metadata", optional = true }

[dev-dependencies]
env_logger = "0.6"
tempfile = "3.1"
env_logger = "0.6.2"
tempfile = "3.1.0"
test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }
Expand All @@ -52,7 +52,7 @@ std = [
"derive_more",
"fnv",
"log",
"hex",
"hex-literal",
"futures",
"futures03",
"executor",
Expand Down
8 changes: 4 additions & 4 deletions core/client/db/Cargo.toml
Expand Up @@ -6,13 +6,13 @@ edition = "2018"

[dependencies]
parking_lot = "0.9.0"
log = "0.4"
log = "0.4.8"
kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
# FIXME replace with release as soon as our rocksdb changes are released upstream https://github.com/paritytech/parity-common/issues/88
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d", optional = true }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
linked-hash-map = "0.5"
hash-db = { version = "0.15.2" }
linked-hash-map = "0.5.2"
hash-db = "0.15.2"
primitives = { package = "substrate-primitives", path = "../../primitives" }
sr-primitives = { path = "../../sr-primitives" }
client = { package = "substrate-client", path = "../../client" }
Expand All @@ -27,7 +27,7 @@ header_metadata = { package = "substrate-header-metadata", path = "../header-met
[dev-dependencies]
substrate-keyring = { path = "../../keyring" }
test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" }
env_logger = { version = "0.6" }
env_logger = "0.6.2"

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/genesis.rs
Expand Up @@ -54,7 +54,7 @@ mod tests {
AccountKeyring, Sr25519Keyring,
};
use primitives::{Blake2Hasher, map, offchain::NeverOffchainExt};
use hex::*;
use hex_literal::*;

native_executor_instance!(
Executor,
Expand Down
12 changes: 6 additions & 6 deletions core/consensus/aura/Cargo.toml
Expand Up @@ -21,11 +21,11 @@ substrate-telemetry = { path = "../../telemetry" }
keystore = { package = "substrate-keystore", path = "../../keystore" }
consensus_common = { package = "substrate-consensus-common", path = "../common" }
sr-primitives = { path = "../../sr-primitives" }
futures-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }
futures01 = { package = "futures", version = "0.1" }
futures-timer = "0.3"
futures-timer = "0.4.0"
parking_lot = "0.9.0"
log = "0.4"
log = "0.4.8"
derive_more = "0.15.0"

[dev-dependencies]
Expand All @@ -34,6 +34,6 @@ substrate-executor = { path = "../../executor" }
network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]}
service = { package = "substrate-service", path = "../../service" }
test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" }
tokio = "0.1.7"
env_logger = "0.6"
tempfile = "3.1"
tokio = "0.1.22"
env_logger = "0.6.2"
tempfile = "3.1.0"
24 changes: 12 additions & 12 deletions core/consensus/babe/Cargo.toml
Expand Up @@ -10,9 +10,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive
babe_primitives = { package = "substrate-consensus-babe-primitives", path = "primitives" }
primitives = { package = "substrate-primitives", path = "../../primitives" }
app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto" }
num-bigint = "0.2"
num-rational = "0.2"
num-traits = "0.2"
num-bigint = "0.2.3"
num-rational = "0.2.2"
num-traits = "0.2.8"
runtime-support = { package = "srml-support", path = "../../../srml/support" }
runtime-version = { package = "sr-version", path = "../../sr-version" }
runtime-io = { package = "sr-io", path = "../../sr-io" }
Expand All @@ -27,14 +27,14 @@ uncles = { package = "substrate-consensus-uncles", path = "../uncles" }
slots = { package = "substrate-consensus-slots", path = "../slots" }
sr-primitives = { path = "../../sr-primitives" }
fork-tree = { path = "../../utils/fork-tree" }
futures-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }
futures01 = { package = "futures", version = "0.1" }
futures-timer = "0.3"
futures-timer = "0.4.0"
parking_lot = "0.9.0"
log = "0.4.6"
schnorrkel = { version = "0.8.4", features = ["preaudit_deprecated"] }
rand = "0.6.5"
merlin = "1.0.3"
log = "0.4.8"
schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"] }
rand = "0.7.2"
merlin = "1.2.1"
pdqselect = "0.1.0"

[dev-dependencies]
Expand All @@ -43,9 +43,9 @@ substrate-executor = { path = "../../executor" }
network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]}
service = { package = "substrate-service", path = "../../service" }
test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" }
tokio = "0.1.18"
env_logger = "0.6.1"
tempfile = "3.1"
tokio = "0.1.22"
env_logger = "0.6.2"
tempfile = "3.1.0"

[features]
test-helpers = []
2 changes: 1 addition & 1 deletion core/consensus/babe/primitives/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ rstd = { package = "sr-std", path = "../../../sr-std", default-features = false
sr-primitives = { path = "../../../sr-primitives", default-features = false }
app-crypto = { package = "substrate-application-crypto", path = "../../../application-crypto", default-features = false }
slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true }
schnorrkel = { version = "0.8.4", features = ["preaudit_deprecated"], optional = true }
schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }

[features]
Expand Down
8 changes: 4 additions & 4 deletions core/consensus/common/Cargo.toml
Expand Up @@ -6,13 +6,13 @@ description = "Common utilities for substrate consensus"
edition = "2018"

[dependencies]
derive_more = "0.14.0"
derive_more = "0.15.0"
libp2p = { version = "0.12.0", default-features = false }
log = "0.4"
log = "0.4.8"
primitives = { package = "substrate-primitives", path= "../../primitives" }
inherents = { package = "substrate-inherents", path = "../../inherents" }
futures-preview = "0.3.0-alpha.18"
futures-timer = "0.3"
futures-preview = "0.3.0-alpha.19"
futures-timer = "0.4.0"
rstd = { package = "sr-std", path = "../../sr-std" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
sr-primitives = { path = "../../sr-primitives" }
Expand Down
4 changes: 2 additions & 2 deletions core/consensus/pow/Cargo.toml
Expand Up @@ -14,5 +14,5 @@ srml-timestamp = { path = "../../../srml/timestamp" }
inherents = { package = "substrate-inherents", path = "../../inherents" }
pow-primitives = { package = "substrate-consensus-pow-primitives", path = "primitives" }
consensus-common = { package = "substrate-consensus-common", path = "../common" }
log = "0.4"
futures-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
log = "0.4.8"
futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }

0 comments on commit 0cfe743

Please sign in to comment.