pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 15:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies whenever “easy” (#3556)

Browse Source 
* 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 d216d08cc6ca0344614669c1d24cde3aa5c0d4e2.

* 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>
This commit is contained in:
DemiMarie-parity
2019-10-02 15:23:59 -04:00
committed by GitHub
parent f6bd58ac1f
commit 62b97a090d
121 changed files with 1307 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/application-crypto/Cargo.toml
+1 -1
View File
@@ -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 }
substrate/core/authority-discovery/Cargo.toml
+10 -10
View File
@@ -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"
substrate/core/basic-authorship/Cargo.toml
+2 -2
View File
@@ -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" }
substrate/core/chain-spec/Cargo.toml
+1 -1
View File
@@ -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"] }
substrate/core/chain-spec/derive/Cargo.toml
+2 -3
View File
@@ -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]
substrate/core/chain-spec/derive/src/impls.rs
-1
View File
@@ -188,4 +188,3 @@ fn generate_fork_to_base(
})
}
}
substrate/core/chain-spec/src/lib.rs
-1
View File
@@ -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 {}
substrate/core/cli/Cargo.toml
+19 -19
View File
@@ -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" }
@@ -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"
substrate/core/cli/src/params.rs
+1 -1
View File
@@ -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;
substrate/core/client/Cargo.toml
+9 -9
View File
@@ -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 }
@@ -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" }
@@ -52,7 +52,7 @@ std = [
"derive_more",
"fnv",
"log",
"hex",
"hex-literal",
"futures",
"futures03",
"executor",
substrate/core/client/db/Cargo.toml
+4 -4
View File
@@ -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" }
@@ -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 = []
substrate/core/client/src/genesis.rs
+1 -1
View File
@@ -54,7 +54,7 @@ mod tests {
AccountKeyring, Sr25519Keyring,
};
use primitives::{Blake2Hasher, map, offchain::NeverOffchainExt};
use hex::*;
use hex_literal::*;
native_executor_instance!(
Executor,
substrate/core/consensus/aura/Cargo.toml
+6 -6
View File
@@ -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]
@@ -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"
substrate/core/consensus/babe/Cargo.toml
+12 -12
View File
@@ -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" }
@@ -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]
@@ -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 = []
substrate/core/consensus/babe/primitives/Cargo.toml
+1 -1
View File
@@ -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]
substrate/core/consensus/common/Cargo.toml
+4 -4
View File
@@ -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" }
substrate/core/consensus/pow/Cargo.toml
+2 -2
View File
@@ -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"] }
substrate/core/consensus/rhd/Cargo.toml
+5 -5
View File
@@ -6,8 +6,8 @@ description = "Rhododendron Round-Based consensus-algorithm for substrate"
edition = "2018"
[dependencies]
derive_more = "0.14.0"
futures = "0.1.17"
derive_more = "0.15.0"
futures = "0.1.29"
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../../primitives" }
consensus = { package = "substrate-consensus-common", path = "../common" }
@@ -18,11 +18,11 @@ srml-system = { path = "../../../srml/system" }
sr-primitives = { path = "../../sr-primitives" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
runtime_io = { package = "sr-io", path = "../../sr-io" }
tokio = "0.1.7"
tokio = "0.1.22"
parking_lot = "0.9.0"
log = "0.4"
log = "0.4.8"
rhododendron = { version = "0.7.0", features = ["codec"] }
exit-future = "0.1"
exit-future = "0.1.4"
[dev-dependencies]
keyring = { package = "substrate-keyring", path = "../../keyring" }
substrate/core/consensus/slots/Cargo.toml
+3 -3
View File
@@ -14,10 +14,10 @@ sr-primitives = { path = "../../sr-primitives" }
substrate-telemetry = { path = "../../telemetry" }
consensus_common = { package = "substrate-consensus-common", path = "../common" }
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"
parking_lot = "0.9.0"
log = "0.4"
log = "0.4.8"
[dev-dependencies]
test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" }
substrate/core/consensus/uncles/Cargo.toml
+1 -1
View File
@@ -12,4 +12,4 @@ sr-primitives = { path = "../../sr-primitives" }
srml-authorship = { path = "../../../srml/authorship" }
consensus_common = { package = "substrate-consensus-common", path = "../common" }
inherents = { package = "substrate-inherents", path = "../../inherents" }
log = "0.4"
log = "0.4.8"
substrate/core/executor/Cargo.toml
+10 -10
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
derive_more = "0.14.0"
derive_more = "0.15.0"
codec = { package = "parity-scale-codec", version = "1.0.0" }
runtime_io = { package = "sr-io", path = "../sr-io" }
primitives = { package = "substrate-primitives", path = "../primitives" }
@@ -13,19 +13,19 @@ trie = { package = "substrate-trie", path = "../trie" }
serializer = { package = "substrate-serializer", path = "../serializer" }
runtime_version = { package = "sr-version", path = "../sr-version" }
panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }
wasmi = "0.5.1"
parity-wasm = "0.40.3"
lazy_static = "1.4.0"
wasm-interface = { package = "substrate-wasm-interface", path = "../wasm-interface" }
wasmi = "0.5.0"
parity-wasm = "0.40.1"
lazy_static = "1.3"
parking_lot = "0.9.0"
log = "0.4"
libsecp256k1 = "0.3"
tiny-keccak = "1.4.2"
log = "0.4.8"
libsecp256k1 = "0.3.0"
tiny-keccak = "1.5.0"
[dev-dependencies]
assert_matches = "1.1"
wabt = "~0.7.4"
hex-literal = "0.2.0"
assert_matches = "1.3.0"
wabt = "0.9.2"
hex-literal = "0.2.1"
runtime-test = { package = "substrate-runtime-test", path = "runtime-test" }
substrate-client = { path = "../client" }
substrate-offchain = { path = "../offchain/" }
substrate/core/executor/runtime-test/Cargo.toml
+1 -1
View File
@@ -17,4 +17,4 @@ wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.
[features]
default = [ "std" ]
std = []
std = ["runtime_io/std", "sandbox/std", "rstd/std"]
substrate/core/executor/src/allocator.rs
+1 -1
View File
@@ -155,7 +155,7 @@ impl FreeingBumpHeapAllocator {
/// Deallocates the space which was allocated for a pointer.
///
/// # Arguments
/// # Arguments
///
/// - `mem` - a slice representing the linear memory on which this allocator operates.
/// - `ptr` - pointer to the allocated chunk
substrate/core/executor/src/wasm_executor.rs
+3 -4
View File
@@ -27,16 +27,15 @@ use wasmi::{
Module, ModuleInstance, MemoryInstance, MemoryRef, TableRef, ImportsBuilder, ModuleRef,
memory_units::Pages, RuntimeValue::{I32, I64, self},
};
use crate::error::{Error, Result};
use super::{sandbox, allocator, error::{Error, Result}};
use codec::{Encode, Decode};
use primitives::{
blake2_128, blake2_256, twox_64, twox_128, twox_256, ed25519, sr25519, Pair, crypto::KeyTypeId,
offchain, sandbox as sandbox_primitives, Blake2Hasher,
traits::Externalities,
};
use trie::{TrieConfiguration, trie_types::Layout};
use crate::sandbox;
use crate::allocator;
use trie::TrieConfiguration;
use trie::trie_types::Layout;
use log::trace;
use wasm_interface::{
FunctionContext, HostFunctions, Pointer, WordSize, Sandbox, MemoryId, PointerType,
substrate/core/finality-grandpa/Cargo.toml
+9 -9
View File
@@ -6,20 +6,20 @@ edition = "2018"
[dependencies]
fork-tree = { path = "../../core/utils/fork-tree" }
futures = "0.1"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
log = "0.4"
futures = "0.1.29"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
log = "0.4.8"
parking_lot = "0.9.0"
tokio-executor = "0.1.7"
tokio-executor = "0.1.8"
tokio-timer = "0.2.11"
rand = "0.6"
rand = "0.7.2"
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
sr-primitives = { path = "../sr-primitives" }
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" }
primitives = { package = "substrate-primitives", path = "../primitives" }
substrate-telemetry = { path = "../telemetry" }
keystore = { package = "substrate-keystore", path = "../keystore" }
serde_json = "1.0"
serde_json = "1.0.40"
client = { package = "substrate-client", path = "../client" }
header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" }
inherents = { package = "substrate-inherents", path = "../../core/inherents" }
@@ -34,6 +34,6 @@ network = { package = "substrate-network", path = "../network", features = ["tes
keyring = { package = "substrate-keyring", path = "../keyring" }
test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client"}
babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives" }
env_logger = "0.6"
tokio = "0.1.17"
tempfile = "3.1"
env_logger = "0.6.2"
tokio = "0.1.22"
tempfile = "3.1.0"
substrate/core/finality-grandpa/primitives/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ app-crypto = { package = "substrate-application-crypto", path = "../../applicati
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
sr-primitives = { path = "../../sr-primitives", default-features = false }
rstd = { package = "sr-std", path = "../../sr-std", default-features = false }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
[features]
default = ["std"]
substrate/core/keyring/Cargo.toml
+1 -1
View File
@@ -7,6 +7,6 @@ edition = "2018"
[dependencies]
primitives = { package = "substrate-primitives", path = "../primitives" }
sr-primitives = { path = "../sr-primitives" }
lazy_static = { version = "1.0" }
lazy_static = "1.4.0"
strum = "0.15.0"
strum_macros = "0.15.0"
substrate/core/keystore/Cargo.toml
+5 -5
View File
@@ -8,11 +8,11 @@ edition = "2018"
derive_more = "0.15.0"
primitives = { package = "substrate-primitives", path = "../primitives" }
app-crypto = { package = "substrate-application-crypto", path = "../application-crypto" }
hex = "0.3"
rand = "0.6"
serde_json = "1.0"
subtle = "2.0"
hex = "0.3.2"
rand = "0.7.2"
serde_json = "1.0.40"
subtle = "2.1.1"
parking_lot = "0.9.0"
[dev-dependencies]
tempdir = "0.3"
tempdir = "0.3.7"
substrate/core/network/Cargo.toml
+26 -26
View File
@@ -7,21 +7,21 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
bytes = "0.4"
derive_more = "0.14.0"
either = "1.5.2"
log = "0.4"
bytes = "0.4.12"
derive_more = "0.15.0"
either = "1.5.3"
log = "0.4.8"
parking_lot = "0.9.0"
bitflags = "1.0"
fnv = "1.0"
futures = "0.1.17"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
futures-timer = "0.3"
linked-hash-map = "0.5"
bitflags = "1.2.0"
fnv = "1.0.6"
futures = "0.1.29"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
futures-timer = "0.4.0"
linked-hash-map = "0.5.2"
linked_hash_set = "0.1.3"
lru-cache = "0.1.2"
rustc-hex = "2.0"
rand = "0.6"
rustc-hex = "2.0.1"
rand = "0.7.2"
libp2p = { version = "0.12.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] }
fork-tree = { path = "../../core/utils/fork-tree" }
consensus = { package = "substrate-consensus-common", path = "../../core/consensus/common" }
@@ -31,31 +31,31 @@ sr-primitives = { path = "../../core/sr-primitives" }
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
peerset = { package = "substrate-peerset", path = "../../core/peerset" }
serde = { version = "1.0.70", features = ["derive"] }
serde_json = "1.0.24"
slog = { version = "^2", features = ["nested-values"] }
serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.40"
slog = { version = "2.5.2", features = ["nested-values"] }
slog_derive = "0.1.1"
smallvec = "0.6"
tokio-io = "0.1"
tokio = { version = "0.1.11", optional = true }
unsigned-varint = { version = "0.2.1", features = ["codec"] }
smallvec = "0.6.10"
tokio-io = "0.1.12"
tokio = { version = "0.1.22", optional = true }
unsigned-varint = { version = "0.2.2", features = ["codec"] }
keyring = { package = "substrate-keyring", path = "../../core/keyring", optional = true }
test_client = { package = "substrate-test-client", path = "../../core/test-client", optional = true }
test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client", optional = true }
erased-serde = "0.3.9"
void = "1.0"
zeroize = "0.9.0"
void = "1.0.2"
zeroize = "0.10.1"
babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives" }
[dev-dependencies]
env_logger = { version = "0.6" }
env_logger = "0.6.2"
keyring = { package = "substrate-keyring", path = "../../core/keyring" }
quickcheck = "0.8.5"
rand = "0.6.5"
quickcheck = "0.9.0"
rand = "0.7.2"
test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
test_runtime = { package = "substrate-test-runtime", path = "../../core/test-runtime" }
tempdir = "0.3"
tokio = "0.1.11"
tempdir = "0.3.7"
tokio = "0.1.22"
[features]
default = []
substrate/core/network/src/protocol/sync.rs
-1
View File
@@ -1325,4 +1325,3 @@ fn explicit_sync_request<B: BlockT>(
}
None
}
substrate/core/network/src/test/sync.rs
-1
View File
@@ -581,4 +581,3 @@ fn can_sync_explicit_forks() {
Ok(Async::Ready(()))
})).unwrap();
}
substrate/core/offchain/Cargo.toml
+9 -9
View File
@@ -7,30 +7,30 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
bytes = "0.4"
bytes = "0.4.12"
client = { package = "substrate-client", path = "../../core/client" }
fnv = "1.0"
fnv = "1.0.6"
futures01 = { package = "futures", version = "0.1" }
futures-preview = "0.3.0-alpha.18"
futures-timer = "0.3"
hyper = "0.12.33"
futures-preview = "0.3.0-alpha.19"
futures-timer = "0.4.0"
hyper = "0.12.35"
hyper-tls = "0.3.2"
log = "0.4"
log = "0.4.8"
offchain-primitives = { package = "substrate-offchain-primitives", path = "./primitives" }
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
parking_lot = "0.9.0"
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
rand = "0.7"
rand = "0.7.2"
sr-primitives = { path = "../../core/sr-primitives" }
transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
network = { package = "substrate-network", path = "../../core/network" }
keystore = { package = "substrate-keystore", path = "../keystore" }
[dev-dependencies]
env_logger = "0.6"
env_logger = "0.6.2"
client-db = { package = "substrate-client-db", path = "../../core/client/db/", default-features = true }
test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
tokio = "0.1"
tokio = "0.1.22"
[features]
default = []
substrate/core/offchain/src/api/http.rs
+15 -15
View File
@@ -759,7 +759,7 @@ mod tests {
let (mut api, addr) = build_api_server!();
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[], Some(deadline)).unwrap();
match api.response_wait(&[id], Some(deadline))[0] {
@@ -805,13 +805,13 @@ mod tests {
Ok(_) => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
match api.request_add_header(id, "Foo", "\0") {
Err(()) => {}
Ok(_) => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_add_header(id, "Foo", "Bar").unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
match api.request_add_header(id, "Foo2", "Bar") {
@@ -848,7 +848,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[], None).unwrap();
@@ -857,7 +857,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.request_write_body(id, &[], None).unwrap();
@@ -866,7 +866,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.response_wait(&[id], None);
match api.request_write_body(id, &[], None) {
@@ -874,7 +874,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[1, 2, 3, 4], None).unwrap();
api.response_wait(&[id], None);
match api.request_write_body(id, &[1, 2, 3, 4], None) {
@@ -882,7 +882,7 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_headers(id);
match api.request_write_body(id, &[1, 2, 3, 4], None) {
Err(HttpError::Invalid) => {}
@@ -896,14 +896,14 @@ mod tests {
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_read_body(id, &mut [], None).unwrap();
match api.request_write_body(id, &[1, 2, 3, 4], None) {
Err(HttpError::Invalid) => {}
_ => panic!()
};
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.response_read_body(id, &mut [], None).unwrap();
match api.request_write_body(id, &[], None) {
Err(HttpError::Invalid) => {}
@@ -916,10 +916,10 @@ mod tests {
let (mut api, addr) = build_api_server!();
assert!(api.response_headers(HttpRequestId(0xdead)).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
assert!(api.response_headers(id).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_write_body(id, &[], None).unwrap();
while api.response_headers(id).is_empty() {
std::thread::sleep(std::time::Duration::from_millis(100));
@@ -939,10 +939,10 @@ mod tests {
fn response_header_invalid_call() {
let (mut api, addr) = build_api_server!();
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
assert!(api.response_headers(id).is_empty());
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
api.request_add_header(id, "Foo", "Bar").unwrap();
assert!(api.response_headers(id).is_empty());
@@ -983,7 +983,7 @@ mod tests {
let (mut api, addr) = build_api_server!();
for _ in 0..50 {
let id = api.request_start("GET", &format!("http://{}", addr)).unwrap();
let id = api.request_start("POST", &format!("http://{}", addr)).unwrap();
for _ in 0..250 {
match rand::random::<u8>() % 6 {
substrate/core/panic-handler/Cargo.toml
+2 -2
View File
@@ -6,5 +6,5 @@ description = "Substrate panic handler."
edition = "2018"
[dependencies]
backtrace = "0.3"
log = "0.4"
backtrace = "0.3.38"
log = "0.4.8"
substrate/core/peerset/Cargo.toml
+5 -5
View File
@@ -8,12 +8,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
futures-preview = "0.3.0-alpha.18"
futures-preview = "0.3.0-alpha.19"
libp2p = { version = "0.12.0", default-features = false }
linked-hash-map = "0.5"
log = "0.4"
linked-hash-map = "0.5.2"
log = "0.4.8"
lru-cache = "0.1.2"
serde_json = "1.0.24"
serde_json = "1.0.40"
[dev-dependencies]
rand = "0.6"
rand = "0.7.2"
substrate/core/phragmen/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ rstd = { package = "sr-std", path = "../sr-std", default-features = false }
[dev-dependencies]
runtime-io ={ package = "sr-io", path = "../sr-io" }
support = { package = "srml-support", path = "../../srml/support" }
rand = "0.7.0"
rand = "0.7.2"
[features]
default = ["std"]
substrate/core/primitives/Cargo.toml
+22 -23
View File
@@ -7,37 +7,37 @@ edition = "2018"
[dependencies]
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
rustc-hex = { version = "2.0", default-features = false }
serde = { version = "1.0", optional = true, features = ["derive"] }
twox-hash = { version = "1.2.0", optional = true }
byteorder = { version = "1.3.1", default-features = false }
rustc-hex = { version = "2.0.1", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
twox-hash = { version = "1.5.0", optional = true }
byteorder = { version = "1.3.2", default-features = false }
primitive-types = { version = "0.5.1", default-features = false, features = ["codec"] }
impl-serde = { version = "0.1", optional = true }
log = { version = "0.4", optional = true }
wasmi = { version = "0.5.0", optional = true }
impl-serde = { version = "0.2.1", optional = true }
log = { version = "0.4.8", optional = true }
wasmi = { version = "0.5.1", optional = true }
hash-db = { version = "0.15.2", default-features = false }
hash256-std-hasher = { version = "0.15.2", default-features = false }
ed25519-dalek = { version = "1.0.0-pre.1", optional = true }
base58 = { version = "0.1", optional = true }
ed25519-dalek = { version = "0.9.1", optional = true }
base58 = { version = "0.1.0", optional = true }
blake2-rfc = { version = "0.2.18", optional = true }
schnorrkel = { version = "0.8.4", features = ["preaudit_deprecated"], optional = true }
rand = { version = "0.6", optional = true }
sha2 = { version = "0.8", optional = true }
schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true }
rand = { version = "0.7.2", optional = true }
sha2 = { version = "0.8.0", optional = true }
substrate-bip39 = { version = "0.3.1", optional = true }
tiny-bip39 = { version = "0.6.1", optional = true }
hex = { version = "0.3", optional = true }
regex = { version = "1.1", optional = true }
num-traits = { version = "0.2", default-features = false }
zeroize = { version = "0.9.2", default-features = false }
lazy_static = { version = "1.3", optional = true }
tiny-bip39 = { version = "0.6.2", optional = true }
hex = { version = "0.3.2", optional = true }
regex = { version = "1.3.1", optional = true }
num-traits = { version = "0.2.8", default-features = false }
zeroize = "0.10.1"
lazy_static = { version = "1.4.0", optional = true }
parking_lot = { version = "0.9.0", optional = true }
[dev-dependencies]
substrate-serializer = { path = "../serializer" }
pretty_assertions = "0.6"
hex-literal = "0.2"
rand = "0.6"
criterion = "0.2"
pretty_assertions = "0.6.1"
hex-literal = "0.2.1"
rand = "0.7.2"
criterion = "0.2.11"
[[bench]]
name = "benches"
@@ -79,5 +79,4 @@ std = [
"schnorrkel",
"regex",
"num-traits/std",
"zeroize/std"
]
substrate/core/primitives/src/crypto.rs
+1 -2
View File
@@ -587,9 +587,8 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
/// This is only for ephemeral keys really, since you won't have access to the secret key
/// for storage. If you want a persistent key pair, use `generate_with_phrase` instead.
fn generate() -> (Self, Self::Seed) {
let mut csprng: OsRng = OsRng::new().expect("OS random generator works; qed");
let mut seed = Self::Seed::default();
csprng.fill_bytes(seed.as_mut());
OsRng.fill_bytes(seed.as_mut());
(Self::from_seed(&seed), seed)
}
substrate/core/primitives/src/ed25519.rs
+3 -3
View File
@@ -397,7 +397,7 @@ impl TraitPair for Pair {
fn from_seed_slice(seed_slice: &[u8]) -> Result<Pair, SecretStringError> {
let secret = ed25519_dalek::SecretKey::from_bytes(seed_slice)
.map_err(|_| SecretStringError::InvalidSeedLength)?;
let public = ed25519_dalek::PublicKey::from(&secret);
let public = ed25519_dalek::PublicKey::from(secret.expand::<sha2::Sha512>());
Ok(Pair(ed25519_dalek::Keypair { secret, public }))
}
@@ -434,7 +434,7 @@ impl TraitPair for Pair {
/// Sign a message.
fn sign(&self, message: &[u8]) -> Signature {
let r = self.0.sign(message).to_bytes();
let r = self.0.sign::<sha2::Sha512>(message).to_bytes();
Signature::from_raw(r)
}
@@ -458,7 +458,7 @@ impl TraitPair for Pair {
Err(_) => return false
};
match public_key.verify(message.as_ref(), &sig) {
match public_key.verify::<sha2::Sha512>(message.as_ref(), &sig) {
Ok(_) => true,
_ => false,
}
substrate/core/rpc-servers/Cargo.toml
+2 -2
View File
@@ -7,8 +7,8 @@ edition = "2018"
[dependencies]
jsonrpc-core = "13.2.0"
pubsub = { package = "jsonrpc-pubsub", version = "13.2.0" }
log = "0.4"
serde = "1.0"
log = "0.4.8"
serde = "1.0.101"
serde_json = "1.0"
sr-primitives = { path = "../sr-primitives" }
substrate/core/rpc/Cargo.toml
+8 -8
View File
@@ -8,13 +8,13 @@ edition = "2018"
api = { package = "substrate-rpc-api", path = "./api" }
client = { package = "substrate-client", path = "../client" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
jsonrpc-pubsub = "13.1.0"
log = "0.4"
log = "0.4.8"
primitives = { package = "substrate-primitives", path = "../primitives" }
rpc = { package = "jsonrpc-core", version = "13.0.0" }
runtime_version = { package = "sr-version", path = "../sr-version" }
serde_json = "1.0"
serde_json = "1.0.40"
session = { package = "substrate-session", path = "../session" }
sr-primitives = { path = "../sr-primitives" }
rpc-primitives = { package = "substrate-rpc-primitives", path = "primitives" }
@@ -22,13 +22,13 @@ state_machine = { package = "substrate-state-machine", path = "../state-machine"
substrate-executor = { path = "../executor" }
substrate-keystore = { path = "../keystore" }
transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" }
hash-db = { version = "0.15.0", default-features = false }
hash-db = { version = "0.15.2", default-features = false }
[dev-dependencies]
assert_matches = "1.1"
futures = "0.1.17"
assert_matches = "1.3.0"
futures = "0.1.29"
network = { package = "substrate-network", path = "../network" }
rustc-hex = "2.0"
rustc-hex = "2.0.1"
sr-io = { path = "../sr-io" }
test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" }
tokio = "0.1.17"
tokio = "0.1.22"
substrate/core/rpc/api/Cargo.toml
+5 -5
View File
@@ -6,17 +6,17 @@ edition = "2018"
[dependencies]
codec = { package = "parity-scale-codec", version = "1.0.0" }
derive_more = "0.14.0"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
derive_more = "0.15.0"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
jsonrpc-core = "13.2.0"
jsonrpc-core-client = "13.2.0"
jsonrpc-derive = "13.2.0"
jsonrpc-pubsub = "13.2.0"
log = "0.4"
log = "0.4.8"
parking_lot = "0.9.0"
primitives = { package = "substrate-primitives", path = "../../primitives" }
runtime_version = { package = "sr-version", path = "../../sr-version" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.40"
txpool = { package = "substrate-transaction-graph", path = "../../transaction-pool/graph" }
rpc-primitives = { package = "substrate-rpc-primitives", path = "../../rpc/primitives" }
substrate/core/rpc/primitives/Cargo.toml
+1 -1
View File
@@ -5,5 +5,5 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.101", features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../../primitives" }
substrate/core/serializer/Cargo.toml
+2 -2
View File
@@ -5,5 +5,5 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
serde = "1.0"
serde_json = "1.0"
serde = "1.0.101"
serde_json = "1.0.40"
substrate/core/service/Cargo.toml
+13 -13
View File
@@ -5,20 +5,20 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
derive_more = "0.14.0"
futures = "0.1.17"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
derive_more = "0.15.0"
futures = "0.1.29"
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
parking_lot = "0.9.0"
lazy_static = "1.0"
log = "0.4"
slog = {version = "^2", features = ["nested-values"]}
tokio-executor = "0.1.7"
tokio-timer = "0.2"
exit-future = "0.1"
serde = { version = "1.0" }
serde_json = "1.0"
sysinfo = "0.9.0"
target_info = "0.1"
lazy_static = "1.4.0"
log = "0.4.8"
slog = { version = "2.5.2", features = ["nested-values"] }
tokio-executor = "0.1.8"
tokio-timer = "0.2.11"
exit-future = "0.1.4"
serde = "1.0.101"
serde_json = "1.0.40"
sysinfo = "0.9.5"
target_info = "0.1.0"
keystore = { package = "substrate-keystore", path = "../../core/keystore" }
sr-io = { path = "../../core/sr-io" }
sr-primitives = { path = "../../core/sr-primitives" }
substrate/core/service/src/chain_ops.rs
+3 -1
View File
@@ -21,6 +21,7 @@ use chain_spec::{ChainSpec, RuntimeGenesis, Extension};
/// Defines the logic for an operation exporting blocks within a range.
#[macro_export]
/// Export blocks
macro_rules! export_blocks {
($client:ident, $exit:ident, $output:ident, $from:ident, $to:ident, $json:ident) => {{
let mut block = $from;
@@ -77,6 +78,7 @@ macro_rules! export_blocks {
/// Defines the logic for an operation importing blocks from some known import.
#[macro_export]
/// Import blocks
macro_rules! import_blocks {
($block:ty, $client:ident, $queue:ident, $exit:ident, $input:ident) => {{
use consensus_common::import_queue::{IncomingBlock, Link, BlockImportError, BlockImportResult};
@@ -120,7 +122,7 @@ macro_rules! import_blocks {
}
let (exit_send, exit_recv) = std::sync::mpsc::channel();
::std::thread::spawn(move || {
std::thread::spawn(move || {
let _ = $exit.wait();
let _ = exit_send.send(());
});
substrate/core/service/src/lib.rs
+1 -1
View File
@@ -629,7 +629,7 @@ impl<TBl, TCl, TSc, TNetStatus, TNet, TTxPool, TOc> Future for
// Polling all the `to_poll` futures.
while let Some(pos) = self.to_poll.iter_mut().position(|t| t.poll().map(|t| t.is_ready()).unwrap_or(true)) {
self.to_poll.remove(pos);
let _ = self.to_poll.remove(pos);
}
// The service future never ends.
substrate/core/service/test/Cargo.toml
+7 -7
View File
@@ -5,13 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
tempdir = "0.3"
tokio = "0.1.7"
futures = "0.1"
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.18", features = ["compat"] }
log = "0.4"
env_logger = "0.6"
fdlimit = "0.1"
tempdir = "0.3.7"
tokio = "0.1.22"
futures = "0.1.29"
log = "0.4.8"
env_logger = "0.6.2"
fdlimit = "0.1.1"
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features = ["compat"] }
service = { package = "substrate-service", path = "../../../core/service" }
network = { package = "substrate-network", path = "../../../core/network" }
consensus = { package = "substrate-consensus-common", path = "../../../core/consensus/common" }
substrate/core/sr-api-macros/Cargo.toml
+7 -7
View File
@@ -9,10 +9,10 @@ proc-macro = true
[dependencies]
quote = "0.6.12"
syn = { version = "^0.15.30", features = [ "full", "fold", "extra-traits", "visit" ] }
proc-macro2 = "0.4"
blake2-rfc = "0.2"
proc-macro-crate = "0.1.3"
syn = { version = "0.15.44", features = [ "full", "fold", "extra-traits", "visit" ] }
proc-macro2 = "0.4.27"
blake2-rfc = "0.2.18"
proc-macro-crate = "0.1.4"
[dev-dependencies]
client = { package = "substrate-client", path = "../client" }
@@ -21,11 +21,11 @@ state_machine = { package = "substrate-state-machine", path = "../state-machine"
sr-primitives = { path = "../sr-primitives" }
sr-version = { path = "../sr-version" }
primitives = { package = "substrate-primitives", path = "../primitives" }
criterion = "0.2"
criterion = "0.2.11"
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
trybuild = "1.0"
rustversion = "0.1"
trybuild = "1.0.14"
rustversion = "0.1.4"
[[bench]]
name = "bench"
substrate/core/sr-io/Cargo.toml
+5 -5
View File
@@ -6,16 +6,16 @@ build = "build.rs"
edition = "2018"
[build-dependencies]
rustc_version = "0.2"
rustc_version = "0.2.3"
[dependencies]
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
primitives = { package = "substrate-primitives", path = "../primitives", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
hash-db = { version = "0.15.2", default-features = false }
libsecp256k1 = { version = "0.3", optional = true }
tiny-keccak = { version = "1.4.2", optional = true }
environmental = { version = "1.0.1", optional = true }
libsecp256k1 = { version = "0.3.0", optional = true }
tiny-keccak = { version = "1.5.0", optional = true }
environmental = { version = "1.0.2", optional = true }
substrate-state-machine = { path = "../state-machine", optional = true }
trie = { package = "substrate-trie", path = "../trie", optional = true }
@@ -30,7 +30,7 @@ std = [
"environmental",
"substrate-state-machine",
"libsecp256k1",
"tiny-keccak"
"tiny-keccak",
]
nightly = []
strict = []
substrate/core/sr-io/without_std.rs
-1
View File
@@ -1191,4 +1191,3 @@ unsafe fn from_raw_parts(ptr: *mut u8, len: u32) -> Option<Vec<u8>> {
}
impl Api for () {}
substrate/core/sr-primitives/Cargo.toml
+8 -8
View File
@@ -5,23 +5,23 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
num-traits = { version = "0.2", default-features = false }
integer-sqrt = { version = "0.1.2" }
serde = { version = "1.0", optional = true, features = ["derive"] }
num-traits = { version = "0.2.8", default-features = false }
integer-sqrt = "0.1.2"
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../primitives", default-features = false }
app-crypto = { package = "substrate-application-crypto", path = "../application-crypto", default-features = false }
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
runtime_io = { package = "sr-io", path = "../sr-io", default-features = false }
log = { version = "0.4", optional = true }
paste = { version = "0.1"}
rand = { version = "0.7.0", optional = true }
impl-trait-for-tuples = "0.1.1"
log = { version = "0.4.8", optional = true }
paste = "0.1.6"
rand = { version = "0.7.2", optional = true }
impl-trait-for-tuples = "0.1.2"
[dev-dependencies]
serde_json = "1.0.40"
primitive-types = "0.5.1"
rand = "0.7.2"
serde_json = "1.0"
substrate-offchain = { path = "../offchain" }
[features]
substrate/core/sr-sandbox/Cargo.toml
+3 -3
View File
@@ -6,7 +6,7 @@ build = "build.rs"
edition = "2018"
[build-dependencies]
rustc_version = "0.2"
rustc_version = "0.2.3"
[dependencies]
wasmi = { version = "0.5.1", optional = true }
@@ -15,8 +15,8 @@ rstd = { package = "sr-std", path = "../sr-std", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
[dev-dependencies]
wabt = "~0.7.4"
assert_matches = "1.1"
wabt = "0.9.2"
assert_matches = "1.3.0"
[features]
default = ["std"]
substrate/core/sr-version/Cargo.toml
+3 -3
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
impl-serde = { version = "0.1", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
impl-serde = { version = "0.2.1", optional = true }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", path = "../sr-std", default-features = false }
sr-primitives = { path = "../sr-primitives", default-features = false }
substrate/core/sr-version/src/lib.rs
+3 -4
View File
@@ -188,10 +188,10 @@ mod apis_serialize {
seq.end()
}
pub fn serialize_bytesref<S>(apis: &&super::ApiId, ser: S) -> Result<S::Ok, S::Error> where
pub fn serialize_bytesref<S>(&apis: &&super::ApiId, ser: S) -> Result<S::Ok, S::Error> where
S: Serializer,
{
bytes::serialize(*apis, ser)
bytes::serialize(apis, ser)
}
#[derive(Deserialize)]
@@ -228,9 +228,8 @@ mod apis_serialize {
pub fn deserialize_bytes<'de, D>(d: D) -> Result<super::ApiId, D::Error> where
D: de::Deserializer<'de>
{
let bytes = bytes::deserialize_check_len(d, bytes::ExpectedLen::Exact(8))?;
let mut arr = [0; 8];
arr.copy_from_slice(&bytes);
bytes::deserialize_check_len(d, bytes::ExpectedLen::Exact(&mut arr[..]))?;
Ok(arr)
}
}
substrate/core/state-db/Cargo.toml
+2 -2
View File
@@ -6,9 +6,9 @@ edition = "2018"
[dependencies]
parking_lot = "0.9.0"
log = "0.4"
log = "0.4.8"
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
[dev-dependencies]
env_logger = "0.6"
env_logger = "0.6.2"
substrate/core/state-machine/Cargo.toml
+4 -4
View File
@@ -6,7 +6,7 @@ description = "Substrate State Machine"
edition = "2018"
[dependencies]
log = "0.4"
log = "0.4.8"
parking_lot = "0.9.0"
hash-db = "0.15.2"
trie-db = "0.15.2"
@@ -15,11 +15,11 @@ trie = { package = "substrate-trie", path = "../trie" }
primitives = { package = "substrate-primitives", path = "../primitives" }
panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
num-traits = "0.2"
rand = "0.7.1"
num-traits = "0.2.8"
rand = "0.7.2"
[dev-dependencies]
hex-literal = "0.2.0"
hex-literal = "0.2.1"
[features]
default = []
substrate/core/telemetry/Cargo.toml
+11 -11
View File
@@ -6,20 +6,20 @@ description = "Telemetry utils"
edition = "2018"
[dependencies]
bytes = "0.4"
bytes = "0.4.12"
parking_lot = "0.9.0"
futures01 = { package = "futures", version = "0.1" }
futures-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
futures-timer = "0.3"
futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }
futures-timer = "0.4.0"
libp2p = { version = "0.12.0", default-features = false, features = ["libp2p-websocket"] }
log = "0.4"
rand = "0.6"
serde = { version = "1.0.81", features = ["derive"] }
slog = { version = "^2", features = ["nested-values"] }
log = "0.4.8"
rand = "0.7.2"
serde = { version = "1.0.101", features = ["derive"] }
slog = { version = "2.5.2", features = ["nested-values"] }
# TODO: we're using slog-async just to be able to clone records; See https://github.com/slog-rs/slog/issues/221,
# https://github.com/paritytech/substrate/issues/2823 and https://github.com/paritytech/substrate/issues/3260
slog-async = { git = "https://github.com/paritytech/slog-async", features = ["nested-values"] }
slog-json = { version = "^2", features = ["nested-values"] }
slog-scope = "^4"
tokio-io = "0.1"
void = "1.0"
slog-json = { version = "2.3.0", features = ["nested-values"] }
slog-scope = "4.1.2"
tokio-io = "0.1.12"
void = "1.0.2"
substrate/core/test-client/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ client = { package = "substrate-client", path = "../client" }
client-db = { package = "substrate-client-db", path = "../client/db", features = ["test-helpers"] }
consensus = { package = "substrate-consensus-common", path = "../consensus/common" }
executor = { package = "substrate-executor", path = "../executor" }
futures-preview = "0.3.0-alpha.18"
futures-preview = "0.3.0-alpha.19"
hash-db = "0.15.2"
keyring = { package = "substrate-keyring", path = "../keyring" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
substrate/core/test-runtime/Cargo.toml
+3 -3
View File
@@ -6,8 +6,8 @@ edition = "2018"
build = "build.rs"
[dependencies]
log = { version = "0.4", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
log = { version = "0.4.8", optional = true }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
keyring = { package = "substrate-keyring", path = "../keyring", optional = true }
substrate-client = { path = "../client", default-features = false }
@@ -27,7 +27,7 @@ trie-db = { version = "0.15.2", default-features = false }
memory-db = { version = "0.15.2", default-features = false }
offchain-primitives = { package = "substrate-offchain-primitives", path = "../offchain/primitives", default-features = false}
executive = { package = "srml-executive", path = "../../srml/executive", default-features = false }
cfg-if = "0.1.6"
cfg-if = "0.1.10"
srml-babe = { path = "../../srml/babe", default-features = false }
srml-timestamp = { path = "../../srml/timestamp", default-features = false }
srml-system = { path = "../../srml/system", default-features = false }
substrate/core/transaction-pool/Cargo.toml
+3 -3
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
derive_more = "0.14.0"
futures-preview = "=0.3.0-alpha.18"
log = "0.4"
derive_more = "0.15.0"
log = "0.4.8"
futures-preview = "0.3.0-alpha.19"
codec = { package = "parity-scale-codec", version = "1.0.0" }
parking_lot = "0.9.0"
sr-primitives = { path = "../sr-primitives" }
substrate/core/transaction-pool/graph/Cargo.toml
+5 -5
View File
@@ -5,16 +5,16 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
derive_more = "0.14.0"
futures-preview = "0.3.0-alpha.18"
log = "0.4"
derive_more = "0.15.0"
futures-preview = "0.3.0-alpha.19"
log = "0.4.8"
parking_lot = "0.9.0"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.101", features = ["derive"] }
primitives = { package = "substrate-primitives", path = "../../primitives" }
sr-primitives = { path = "../../sr-primitives" }
[dev-dependencies]
assert_matches = "1.3.0"
env_logger = "0.6.1"
env_logger = "0.6.2"
codec = { package = "parity-scale-codec", version = "1.0.0" }
test_runtime = { package = "substrate-test-runtime", path = "../../test-runtime" }
substrate/core/trie/Cargo.toml
+6 -6
View File
@@ -3,7 +3,7 @@ name = "substrate-trie"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Patricia trie stuff using a parity-scale-codec node format"
repository = "https://github.com/paritytech/parity-common"
repository = "https://github.com/paritytech/substrate"
license = "GPL-3.0"
edition = "2018"
@@ -21,11 +21,11 @@ memory-db = { version = "0.15.2", default-features = false }
primitives = { package = "substrate-primitives", path = "../primitives", default-features = false }
[dev-dependencies]
trie-bench = { version = "0.16.2" }
trie-standardmap = { version = "0.15.2" }
keccak-hasher = { version = "0.15.2" }
criterion = "0.2"
hex-literal = "0.2.0"
trie-bench = "0.16.2"
trie-standardmap = "0.15.2"
keccak-hasher = "0.15.2"
criterion = "0.2.11"
hex-literal = "0.2.1"
[features]
default = ["std"]
substrate/core/utils/wasm-builder/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ license = "GPL-3.0"
[dependencies]
build-helper = "0.1.1"
cargo_metadata = "0.8"
cargo_metadata = "0.8.2"
tempfile = "3.1.0"
toml = "0.5.3"
walkdir = "2.2.9"
substrate/core/wasm-interface/Cargo.toml
+1 -1
View File
@@ -5,4 +5,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
wasmi = "0.5.0"
wasmi = "0.5.1"