pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-22 17:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

update most of the dependencies (#1946)

Browse Source 
* update tiny-keccak to 0.2

* update deps except bitvec and shared_memory

* fix some warning after futures upgrade

* remove useless package rename caused by bug in cargo-upgrade

* revert parity-util-mem *

* remove unused import

* cargo update

* remove all renames on parity-scale-codec

* remove the leftovers

* remove unused dep
This commit is contained in:
Andronik Ordian
2020-11-17 11:16:31 +01:00
committed by GitHub
parent 2a25eacb22
commit 0a8a607a58
91 changed files with 1413 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+1108 -1014
View File
File diff suppressed because it is too large Load Diff
polkadot/Cargo.toml
+5 -5
View File
@@ -13,15 +13,15 @@ readme = "README.md"
[dependencies] [dependencies]
cli = { package = "polkadot-cli", path = "cli" } cli = { package = "polkadot-cli", path = "cli" }
color-eyre = "0.5.6" color-eyre = "0.5.7"
thiserror = "1" thiserror = "1.0.22"
futures = "0.3.4" futures = "0.3.8"
service = { package = "polkadot-service", path = "node/service" } service = { package = "polkadot-service", path = "node/service" }
parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] } parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
[dev-dependencies] [dev-dependencies]
assert_cmd = "0.12" assert_cmd = "1.0.1"
nix = "0.17" nix = "0.19.0"
tempfile = "3.1.0" tempfile = "3.1.0"
[workspace] [workspace]
polkadot/cli/Cargo.toml
+4 -4
View File
@@ -15,10 +15,10 @@ crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
structopt = { version = "0.3.8", optional = true } structopt = { version = "0.3.20", optional = true }
wasm-bindgen = { version = "0.2.57", optional = true } wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true } wasm-bindgen-futures = { version = "0.4.18", optional = true }
service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true } service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
polkadot-parachain = { path = "../parachain", optional = true } polkadot-parachain = { path = "../parachain", optional = true }
polkadot/core-primitives/Cargo.toml
+2 -2
View File
@@ -8,7 +8,7 @@ edition = "2018"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } 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-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "1.3.5", default-features = false, features = [ "derive" ] }
[features] [features]
default = [ "std" ] default = [ "std" ]
@@ -16,5 +16,5 @@ std = [
"sp-core/std", "sp-core/std",
"sp-runtime/std", "sp-runtime/std",
"sp-std/std", "sp-std/std",
"codec/std", "parity-scale-codec/std",
] ]
polkadot/core-primitives/src/lib.rs
+5 -4
View File
@@ -21,6 +21,7 @@
//! These core Polkadot types are used by the relay chain and the Parachains. //! These core Polkadot types are used by the relay chain and the Parachains.
use sp_runtime::{generic, MultiSignature, traits::{Verify, BlakeTwo256, IdentifyAccount}}; use sp_runtime::{generic, MultiSignature, traits::{Verify, BlakeTwo256, IdentifyAccount}};
use parity_scale_codec::{Encode, Decode};
/// The block number type used by Polkadot. /// The block number type used by Polkadot.
/// 32-bits will allow for 136 years of blocks assuming 1 block per second. /// 32-bits will allow for 136 years of blocks assuming 1 block per second.
@@ -55,7 +56,7 @@ pub type Hash = sp_core::H256;
/// This type is produced by [`CandidateReceipt::hash`]. /// This type is produced by [`CandidateReceipt::hash`].
/// ///
/// This type makes it easy to enforce that a hash is a candidate hash on the type level. /// This type makes it easy to enforce that a hash is a candidate hash on the type level.
#[derive(Clone, Copy, codec::Encode, codec::Decode, Hash, Eq, PartialEq, Debug, Default)] #[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, Debug, Default)]
pub struct CandidateHash(pub Hash); pub struct CandidateHash(pub Hash);
/// Index of a transaction in the relay chain. 32-bit should be plenty. /// Index of a transaction in the relay chain. 32-bit should be plenty.
@@ -94,7 +95,7 @@ pub type DownwardMessage = sp_std::vec::Vec<u8>;
/// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number when /// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number when
/// the message was sent. /// the message was sent.
#[derive(codec::Encode, codec::Decode, Clone, sp_runtime::RuntimeDebug, PartialEq)] #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq)]
pub struct InboundDownwardMessage<BlockNumber = crate::BlockNumber> { pub struct InboundDownwardMessage<BlockNumber = crate::BlockNumber> {
/// The block number at which this messages was put into the downward message queue. /// The block number at which this messages was put into the downward message queue.
pub sent_at: BlockNumber, pub sent_at: BlockNumber,
@@ -103,7 +104,7 @@ pub struct InboundDownwardMessage<BlockNumber = crate::BlockNumber> {
} }
/// An HRMP message seen from the perspective of a recipient. /// An HRMP message seen from the perspective of a recipient.
#[derive(codec::Encode, codec::Decode, Clone, sp_runtime::RuntimeDebug, PartialEq)] #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq)]
pub struct InboundHrmpMessage<BlockNumber = crate::BlockNumber> { pub struct InboundHrmpMessage<BlockNumber = crate::BlockNumber> {
/// The block number at which this message was sent. /// The block number at which this message was sent.
/// Specifically, it is the block number at which the candidate that sends this message was /// Specifically, it is the block number at which the candidate that sends this message was
@@ -114,7 +115,7 @@ pub struct InboundHrmpMessage<BlockNumber = crate::BlockNumber> {
} }
/// An HRMP message seen from the perspective of a sender. /// An HRMP message seen from the perspective of a sender.
#[derive(codec::Encode, codec::Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq, Hash)] #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq, Hash)]
pub struct OutboundHrmpMessage<Id> { pub struct OutboundHrmpMessage<Id> {
/// The para that will get this message in its downward message queue. /// The para that will get this message in its downward message queue.
pub recipient: Id, pub recipient: Id,
polkadot/erasure-coding/Cargo.toml
+3 -3
View File
@@ -6,8 +6,8 @@ edition = "2018"
[dependencies] [dependencies]
primitives = { package = "polkadot-primitives", path = "../primitives" } primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"} reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21" thiserror = "1.0.22"
polkadot/erasure-coding/src/lib.rs
+4 -4
View File
@@ -24,7 +24,7 @@
//! f is the maximum number of faulty validators in the system. //! f is the maximum number of faulty validators in the system.
//! The data is coded so any f+1 chunks can be used to reconstruct the full data. //! The data is coded so any f+1 chunks can be used to reconstruct the full data.
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use reed_solomon::galois_16::{self, ReedSolomon}; use reed_solomon::galois_16::{self, ReedSolomon};
use primitives::v0::{self, Hash as H256, BlakeTwo256, HashT}; use primitives::v0::{self, Hash as H256, BlakeTwo256, HashT};
use primitives::v1; use primitives::v1;
@@ -352,12 +352,12 @@ struct ShardInput<'a, I> {
cur_shard: Option<(&'a [u8], usize)>, cur_shard: Option<(&'a [u8], usize)>,
} }
impl<'a, I: Iterator<Item=&'a [u8]>> codec::Input for ShardInput<'a, I> { impl<'a, I: Iterator<Item=&'a [u8]>> parity_scale_codec::Input for ShardInput<'a, I> {
fn remaining_len(&mut self) -> Result<Option<usize>, codec::Error> { fn remaining_len(&mut self) -> Result<Option<usize>, parity_scale_codec::Error> {
Ok(Some(self.remaining_len)) Ok(Some(self.remaining_len))
} }
fn read(&mut self, into: &mut [u8]) -> Result<(), codec::Error> { fn read(&mut self, into: &mut [u8]) -> Result<(), parity_scale_codec::Error> {
let mut read_bytes = 0; let mut read_bytes = 0;
loop { loop {
polkadot/node/collation-generation/Cargo.toml
+3 -3
View File
@@ -5,15 +5,15 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.8" log = "0.4.11"
polkadot-erasure-coding = { path = "../../erasure-coding" } polkadot-erasure-coding = { path = "../../erasure-coding" }
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" } polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" } polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" } polkadot-primitives = { path = "../../primitives" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21" thiserror = "1.0.22"
[dev-dependencies] [dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
polkadot/node/core/av-store/Cargo.toml
+5 -5
View File
@@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
kvdb = "0.7.0" kvdb = "0.7.0"
kvdb-rocksdb = "0.9.1" kvdb-rocksdb = "0.9.1"
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] } parity-scale-codec = { version = "1.3.5", features = ["derive"] }
erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -22,8 +22,8 @@ polkadot-primitives = { path = "../../../primitives" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
[dev-dependencies] [dev-dependencies]
env_logger = "0.7.1" env_logger = "0.8.1"
assert_matches = "1.3.0" assert_matches = "1.4.0"
smallvec = "1.4.2" smallvec = "1.4.2"
kvdb-memorydb = "0.7.0" kvdb-memorydb = "0.7.0"
polkadot/node/core/av-store/src/lib.rs
+3 -3
View File
@@ -26,7 +26,7 @@ use std::path::PathBuf;
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, SystemTime, SystemTimeError, UNIX_EPOCH}; use std::time::{Duration, SystemTime, SystemTimeError, UNIX_EPOCH};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use futures::{select, channel::oneshot, future::{self, Either}, Future, FutureExt}; use futures::{select, channel::oneshot, future::{self, Either}, Future, FutureExt};
use futures_timer::Delay; use futures_timer::Delay;
use kvdb_rocksdb::{Database, DatabaseConfig}; use kvdb_rocksdb::{Database, DatabaseConfig};
@@ -527,10 +527,10 @@ where
} }
} }
} }
pov_pruning_time = pov_pruning_time => { _ = pov_pruning_time => {
subsystem.prune_povs()?; subsystem.prune_povs()?;
} }
chunk_pruning_time = chunk_pruning_time => { _ = chunk_pruning_time => {
subsystem.prune_chunks()?; subsystem.prune_chunks()?;
} }
complete => return Ok(true), complete => return Ok(true),
polkadot/node/core/backing/Cargo.toml
+4 -4
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../../primitives" }
@@ -15,13 +15,13 @@ erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure
statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" } statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
[dev-dependencies] [dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
assert_matches = "1.3.0" assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot/node/core/bitfield-signing/Cargo.toml
+3 -3
View File
@@ -5,12 +5,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
wasm-timer = "0.2.4" wasm-timer = "0.2.5"
thiserror = "1.0.21" thiserror = "1.0.22"
derive_more = "0.99.11" derive_more = "0.99.11"
polkadot/node/core/candidate-selection/Cargo.toml
+2 -2
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot/node/core/candidate-validation/Cargo.toml
+4 -4
View File
@@ -5,11 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["bit-vec", "derive"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-parachain = { path = "../../../parachain" } polkadot-parachain = { path = "../../../parachain" }
@@ -19,6 +19,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
[dev-dependencies] [dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
assert_matches = "1.3.0" assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot/node/core/chain-api/Cargo.toml
+2 -2
View File
@@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = { version = "0.3.5" } futures = "0.3.8"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
[dev-dependencies] [dev-dependencies]
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
maplit = "1.0.2" maplit = "1.0.2"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/node/core/proposer/Cargo.toml
+2 -2
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.4" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.8" log = "0.4.11"
polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-overseer = { path = "../../overseer" } polkadot-overseer = { path = "../../overseer" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot/node/core/provisioner/Cargo.toml
+2 -2
View File
@@ -6,9 +6,9 @@ edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot/node/core/runtime-api/Cargo.toml
+2 -2
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
@@ -14,5 +14,5 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
[dev-dependencies] [dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot/node/network/availability-distribution/Cargo.toml
+6 -6
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
codec = { package="parity-scale-codec", version = "1.3.4", features = ["std"] } parity-scale-codec = { version = "1.3.5", features = ["std"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-erasure-coding = { path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -15,7 +15,7 @@ polkadot-node-network-protocol = { path = "../../network/protocol" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21" thiserror = "1.0.22"
[dev-dependencies] [dev-dependencies]
polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
@@ -24,6 +24,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures-timer = "3.0.2" futures-timer = "3.0.2"
env_logger = "0.7.1" env_logger = "0.8.1"
assert_matches = "1.3.0" assert_matches = "1.4.0"
smallvec = "1" smallvec = "1.4.2"
polkadot/node/network/availability-distribution/src/lib.rs
+1 -1
View File
@@ -24,7 +24,7 @@
#![deny(unused_crate_dependencies, unused_qualifications)] #![deny(unused_crate_dependencies, unused_qualifications)]
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use futures::{channel::oneshot, FutureExt, TryFutureExt}; use futures::{channel::oneshot, FutureExt, TryFutureExt};
use sp_core::crypto::Public; use sp_core::crypto::Public;
polkadot/node/network/bitfield-distribution/Cargo.toml
+4 -4
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
codec = { package="parity-scale-codec", version = "1.3.4" } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -21,6 +21,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
maplit = "1.0.2" maplit = "1.0.2"
env_logger = "0.7.1" env_logger = "0.8.1"
assert_matches = "1.3.0" assert_matches = "1.4.0"
tempfile = "3.1.0" tempfile = "3.1.0"
polkadot/node/network/bitfield-distribution/src/lib.rs
+1 -1
View File
@@ -22,7 +22,7 @@
#![deny(unused_crate_dependencies)] #![deny(unused_crate_dependencies)]
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use futures::{channel::oneshot, FutureExt}; use futures::{channel::oneshot, FutureExt};
use log::{debug, trace, warn}; use log::{debug, trace, warn};
polkadot/node/network/bridge/Cargo.toml
+5 -5
View File
@@ -5,11 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1.41"
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
parity-scale-codec = "1.3.4" parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -17,8 +17,8 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys
polkadot-node-network-protocol = { path = "../protocol" } polkadot-node-network-protocol = { path = "../protocol" }
[dev-dependencies] [dev-dependencies]
assert_matches = "1.3.0" assert_matches = "1.4.0"
parking_lot = "0.10.0" parking_lot = "0.11.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/node/network/collator-protocol/Cargo.toml
+4 -4
View File
@@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
@@ -16,8 +16,8 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
[dev-dependencies] [dev-dependencies]
env_logger = "0.7.1" env_logger = "0.8.1"
assert_matches = "1.3.0" assert_matches = "1.4.0"
smallvec = "1.4.2" smallvec = "1.4.2"
futures-timer = "3.0.2" futures-timer = "3.0.2"
polkadot/node/network/pov-distribution/Cargo.toml
+2 -2
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
@@ -13,6 +13,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-network-protocol = { path = "../../network/protocol" } polkadot-node-network-protocol = { path = "../../network/protocol" }
[dev-dependencies] [dev-dependencies]
assert_matches = "1.3.0" assert_matches = "1.4.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
polkadot/node/network/protocol/Cargo.toml
+1 -1
View File
@@ -8,5 +8,5 @@ description = "Primitives types for the Node-side"
[dependencies] [dependencies]
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" } polkadot-node-primitives = { path = "../../primitives" }
parity-scale-codec = { version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/node/network/statement-distribution/Cargo.toml
+4 -4
View File
@@ -6,7 +6,7 @@ description = "Statement Distribution Subsystem"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" } node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" }
@@ -14,12 +14,12 @@ sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-network-protocol = { path = "../../network/protocol" } polkadot-node-network-protocol = { path = "../../network/protocol" }
arrayvec = "0.5.1" arrayvec = "0.5.2"
indexmap = "1.4.0" indexmap = "1.6.0"
[dev-dependencies] [dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.3.0" assert_matches = "1.4.0"
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/node/overseer/Cargo.toml
+3 -3
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
log = "0.4.11" log = "0.4.11"
futures-timer = "3.0.2" futures-timer = "3.0.2"
streamunordered = "0.5.1" streamunordered = "0.5.1"
@@ -14,12 +14,12 @@ client = { package = "sc-client-api", git = "https://github.com/paritytech/subst
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" } polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../primitives" } polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../primitives" }
async-trait = "0.1" async-trait = "0.1.41"
[dev-dependencies] [dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-network-protocol = { path = "../network/protocol" } polkadot-node-network-protocol = { path = "../network/protocol" }
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
futures-timer = "3.0.2" futures-timer = "3.0.2"
femme = "2.1.1" femme = "2.1.1"
log = "0.4.11" log = "0.4.11"
polkadot/node/overseer/src/lib.rs
+3 -3
View File
@@ -1275,7 +1275,7 @@ where
loop { loop {
select! { select! {
x = self.running_subsystems.next() => { _ = self.running_subsystems.next() => {
if self.running_subsystems.is_empty() { if self.running_subsystems.is_empty() {
break; break;
} }
@@ -1765,7 +1765,7 @@ mod tests {
loop { loop {
select! { select! {
a = overseer_fut => break, _ = overseer_fut => break,
s1_next = s1_rx.next() => { s1_next = s1_rx.next() => {
match s1_next { match s1_next {
Some(msg) => { Some(msg) => {
@@ -1779,7 +1779,7 @@ mod tests {
}, },
s2_next = s2_rx.next() => { s2_next = s2_rx.next() => {
match s2_next { match s2_next {
Some(msg) => s2_results.push(s2_next), Some(_) => s2_results.push(s2_next),
None => break, None => break,
} }
}, },
polkadot/node/primitives/Cargo.toml
+2 -2
View File
@@ -6,9 +6,9 @@ edition = "2018"
description = "Primitives types for the Node-side" description = "Primitives types for the Node-side"
[dependencies] [dependencies]
futures = "0.3.5" futures = "0.3.8"
polkadot-primitives = { path = "../../primitives" } polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" } polkadot-statement-table = { path = "../../statement-table" }
parity-scale-codec = { version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/node/service/Cargo.toml
+5 -6
View File
@@ -52,13 +52,12 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
# External Crates # External Crates
codec = { package = "parity-scale-codec", version = "1.3.4" } futures = "0.3.8"
futures = "0.3.4" hex-literal = "0.3.1"
hex-literal = "0.2.1"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = "0.4.8" log = "0.4.11"
parking_lot = "0.9.0" parking_lot = "0.11.0"
serde = { version = "1.0.102", features = ["derive"] } serde = { version = "1.0.117", features = ["derive"] }
slog = "2.5.2" slog = "2.5.2"
# Polkadot # Polkadot
polkadot/node/subsystem-test-helpers/Cargo.toml
+7 -7
View File
@@ -6,20 +6,20 @@ edition = "2018"
description = "Subsystem traits and message definitions" description = "Subsystem traits and message definitions"
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1.41"
futures = "0.3.5" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.8" log = "0.4.11"
parity-scale-codec = "1.3.4" parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
parking_lot = "0.10.0" parking_lot = "0.11.0"
pin-project = "0.4.23" pin-project = "1.0.1"
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" } polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" } polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" } polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" } polkadot-statement-table = { path = "../../statement-table" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
smallvec = "1.4.1" smallvec = "1.4.2"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies] [dev-dependencies]
polkadot/node/subsystem-util/Cargo.toml
+11 -11
View File
@@ -6,14 +6,14 @@ edition = "2018"
description = "Subsystem traits and message definitions" description = "Subsystem traits and message definitions"
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1.41"
futures = "0.3.5" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.11" log = "0.4.11"
thiserror = "1.0.21" thiserror = "1.0.22"
parity-scale-codec = "1.3.4" parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
parking_lot = { version = "0.10.0", optional = true } parking_lot = { version = "0.11.0", optional = true }
pin-project = "0.4.22" pin-project = "1.0.1"
streamunordered = "0.5.1" streamunordered = "0.5.1"
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
@@ -27,9 +27,9 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
[dev-dependencies] [dev-dependencies]
assert_matches = "1.3.0" assert_matches = "1.4.0"
async-trait = "0.1" async-trait = "0.1.41"
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
parking_lot = "0.10.0" parking_lot = "0.11.0"
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
env_logger = "0.7.1" env_logger = "0.8.1"
polkadot/node/subsystem/Cargo.toml
+12 -12
View File
@@ -6,27 +6,27 @@ edition = "2018"
description = "Subsystem traits and message definitions" description = "Subsystem traits and message definitions"
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1.41"
derive_more = "0.99.11" derive_more = "0.99.11"
futures = "0.3.5" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.8" log = "0.4.11"
parity-scale-codec = "1.3.4" parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
parking_lot = { version = "0.10.0", optional = true } parking_lot = { version = "0.11.0", optional = true }
pin-project = "0.4.22" pin-project = "1.0.1"
polkadot-node-primitives = { path = "../primitives" } polkadot-node-primitives = { path = "../primitives" }
polkadot-node-network-protocol = { path = "../network/protocol" } polkadot-node-network-protocol = { path = "../network/protocol" }
polkadot-primitives = { path = "../../primitives" } polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" } polkadot-statement-table = { path = "../../statement-table" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
smallvec = "1.4.1" smallvec = "1.4.2"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21" thiserror = "1.0.22"
[dev-dependencies] [dev-dependencies]
assert_matches = "1.3.0" assert_matches = "1.4.0"
async-trait = "0.1" async-trait = "0.1.41"
futures = { version = "0.3.5", features = ["thread-pool"] } futures = { version = "0.3.8", features = ["thread-pool"] }
parking_lot = "0.10.0" parking_lot = "0.11.0"
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
polkadot/node/test/client/Cargo.toml
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
# Polkadot dependencies # Polkadot dependencies
polkadot-test-runtime = { path = "../../../runtime/test-runtime" } polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
polkadot/node/test/client/src/block_builder.rs
+1 -1
View File
@@ -21,7 +21,7 @@ use sp_runtime::generic::BlockId;
use sp_api::ProvideRuntimeApi; use sp_api::ProvideRuntimeApi;
use sc_block_builder::{BlockBuilderProvider, BlockBuilder}; use sc_block_builder::{BlockBuilderProvider, BlockBuilder};
use sp_state_machine::BasicExternalities; use sp_state_machine::BasicExternalities;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
/// An extension for the test client to init a Polkadot specific block builder. /// An extension for the test client to init a Polkadot specific block builder.
pub trait InitPolkadotBlockBuilder { pub trait InitPolkadotBlockBuilder {
polkadot/node/test/service/Cargo.toml
+4 -4
View File
@@ -5,10 +5,10 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
futures = "0.3.4" futures = "0.3.8"
futures01 = { package = "futures", version = "0.1.29" } futures01 = { package = "futures", version = "0.1.29" }
hex = "0.4" hex = "0.4.2"
log = "0.4.8" log = "0.4.11"
rand = "0.7.3" rand = "0.7.3"
tempfile = "3.1.0" tempfile = "3.1.0"
@@ -56,6 +56,6 @@ substrate-test-client = { git = "https://github.com/paritytech/substrate", branc
[dev-dependencies] [dev-dependencies]
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
serde_json = "1.0" serde_json = "1.0.59"
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
tokio = { version = "0.2", features = ["macros"] } tokio = { version = "0.2", features = ["macros"] }
polkadot/parachain/Cargo.toml
+8 -8
View File
@@ -9,23 +9,23 @@ edition = "2018"
# note: special care is taken to avoid inclusion of `sp-io` externals when compiling # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
# this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
# various unnecessary Substrate-specific endpoints. # various unnecessary Substrate-specific endpoints.
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "1.3.5", default-features = false, features = [ "derive" ] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } 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-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 } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
polkadot-core-primitives = { path = "../core-primitives", default-features = false } polkadot-core-primitives = { path = "../core-primitives", default-features = false }
derive_more = { version = "0.99.11" } derive_more = "0.99.11"
# all optional crates. # all optional crates.
thiserror = { version = "1.0.21", optional = true } thiserror = { version = "1.0.22", optional = true }
serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true } serde = { version = "1.0.117", default-features = false, features = [ "derive" ], optional = true }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
parking_lot = { version = "0.10.0", optional = true } parking_lot = { version = "0.11.0", optional = true }
log = { version = "0.4.8", optional = true } log = { version = "0.4.11", optional = true }
futures = { version = "0.3.4", optional = true } futures = { version = "0.3.8", optional = true }
[target.'cfg(not(any(target_os = "android", target_os = "unknown")))'.dependencies] [target.'cfg(not(any(target_os = "android", target_os = "unknown")))'.dependencies]
shared_memory = { version = "0.10.0", optional = true } shared_memory = { version = "0.10.0", optional = true }
@@ -34,7 +34,7 @@ shared_memory = { version = "0.10.0", optional = true }
default = ["std"] default = ["std"]
wasm-api = [] wasm-api = []
std = [ std = [
"codec/std", "parity-scale-codec/std",
"thiserror", "thiserror",
"serde/std", "serde/std",
"sp-std/std", "sp-std/std",
polkadot/parachain/src/primitives.rs
+4 -4
View File
@@ -19,7 +19,7 @@
use sp_std::vec::Vec; use sp_std::vec::Vec;
use codec::{Encode, Decode, CompactAs}; use parity_scale_codec::{Encode, Decode, CompactAs};
use sp_core::{RuntimeDebug, TypeId}; use sp_core::{RuntimeDebug, TypeId};
#[cfg(feature = "std")] #[cfg(feature = "std")]
@@ -147,12 +147,12 @@ pub trait AccountIdConversion<AccountId>: Sized {
// TODO: Remove all of this, move sp-runtime::AccountIdConversion to own crate and and use that. // TODO: Remove all of this, move sp-runtime::AccountIdConversion to own crate and and use that.
// #360 // #360
struct TrailingZeroInput<'a>(&'a [u8]); struct TrailingZeroInput<'a>(&'a [u8]);
impl<'a> codec::Input for TrailingZeroInput<'a> { impl<'a> parity_scale_codec::Input for TrailingZeroInput<'a> {
fn remaining_len(&mut self) -> Result<Option<usize>, codec::Error> { fn remaining_len(&mut self) -> Result<Option<usize>, parity_scale_codec::Error> {
Ok(None) Ok(None)
} }
fn read(&mut self, into: &mut [u8]) -> Result<(), codec::Error> { fn read(&mut self, into: &mut [u8]) -> Result<(), parity_scale_codec::Error> {
let len = into.len().min(self.0.len()); let len = into.len().min(self.0.len());
into[..len].copy_from_slice(&self.0[..len]); into[..len].copy_from_slice(&self.0[..len]);
for i in &mut into[len..] { for i in &mut into[len..] {
polkadot/parachain/src/wasm_api.rs
+1 -1
View File
@@ -26,7 +26,7 @@ pub unsafe fn load_params(params: *const u8, len: usize)
{ {
let mut slice = sp_std::slice::from_raw_parts(params, len); let mut slice = sp_std::slice::from_raw_parts(params, len);
codec::Decode::decode(&mut slice).expect("Invalid input data") parity_scale_codec::Decode::decode(&mut slice).expect("Invalid input data")
} }
/// Allocate the validation result in memory, getting the return-pointer back. /// Allocate the validation result in memory, getting the return-pointer back.
polkadot/parachain/src/wasm_executor/mod.rs
+1 -1
View File
@@ -22,7 +22,7 @@
use std::{any::{TypeId, Any}, path::PathBuf}; use std::{any::{TypeId, Any}, path::PathBuf};
use crate::primitives::{ValidationParams, ValidationResult}; use crate::primitives::{ValidationParams, ValidationResult};
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use sp_core::{storage::{ChildInfo, TrackedStorageKey}, traits::{CallInWasm, SpawnNamed}}; use sp_core::{storage::{ChildInfo, TrackedStorageKey}, traits::{CallInWasm, SpawnNamed}};
use sp_externalities::Extensions; use sp_externalities::Extensions;
use sp_wasm_interface::HostFunctions as _; use sp_wasm_interface::HostFunctions as _;
polkadot/parachain/src/wasm_executor/validation_host.rs
+1 -1
View File
@@ -17,7 +17,7 @@
#![cfg(not(any(target_os = "android", target_os = "unknown")))] #![cfg(not(any(target_os = "android", target_os = "unknown")))]
use std::{process, env, sync::Arc, sync::atomic, path::PathBuf}; use std::{process, env, sync::Arc, sync::atomic, path::PathBuf};
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use crate::primitives::{ValidationParams, ValidationResult}; use crate::primitives::{ValidationParams, ValidationResult};
use super::{ use super::{
validate_candidate_internal, ValidationError, InvalidCandidate, InternalError, validate_candidate_internal, ValidationError, InvalidCandidate, InternalError,
polkadot/parachain/test-parachains/Cargo.toml
+2 -2
View File
@@ -6,8 +6,8 @@ description = "Integration tests using the test-parachains"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
tiny-keccak = "1.5.0" tiny-keccak = "2.0.2"
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
parachain = { package = "polkadot-parachain", path = ".." } parachain = { package = "polkadot-parachain", path = ".." }
adder = { package = "test-parachain-adder", path = "adder" } adder = { package = "test-parachain-adder", path = "adder" }
polkadot/parachain/test-parachains/adder/Cargo.toml
+2 -2
View File
@@ -8,9 +8,9 @@ build = "build.rs"
[dependencies] [dependencies]
parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
tiny-keccak = "1.5.0" tiny-keccak = { version = "2.0.2", features = ["keccak"] }
dlmalloc = { version = "0.1.3", features = [ "global" ] } dlmalloc = { version = "0.1.3", features = [ "global" ] }
# We need to make sure the global allocator is disabled until we have support of full substrate externalities # We need to make sure the global allocator is disabled until we have support of full substrate externalities
polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+4 -4
View File
@@ -10,11 +10,11 @@ name = "adder-collator"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
futures = "0.3.4" futures = "0.3.8"
futures-timer = "3.0.2" futures-timer = "3.0.2"
log = "0.4.8" log = "0.4.11"
structopt = "0.3.8" structopt = "0.3.20"
test-parachain-adder = { path = ".." } test-parachain-adder = { path = ".." }
polkadot-primitives = { path = "../../../../primitives" } polkadot-primitives = { path = "../../../../primitives" }
polkadot/parachain/test-parachains/adder/collator/src/lib.rs
+2 -2
View File
@@ -21,7 +21,7 @@ use test_parachain_adder::{hash_state, BlockData, HeadData, execute};
use futures_timer::Delay; use futures_timer::Delay;
use polkadot_primitives::v1::{PoV, CollatorId, CollatorPair}; use polkadot_primitives::v1::{PoV, CollatorId, CollatorPair};
use polkadot_node_primitives::{Collation, CollatorFn}; use polkadot_node_primitives::{Collation, CollatorFn};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use sp_core::Pair; use sp_core::Pair;
/// The amount we add when producing a new block. /// The amount we add when producing a new block.
@@ -168,7 +168,7 @@ mod tests {
use futures::executor::block_on; use futures::executor::block_on;
use polkadot_parachain::{primitives::ValidationParams, wasm_executor::IsolationStrategy}; use polkadot_parachain::{primitives::ValidationParams, wasm_executor::IsolationStrategy};
use polkadot_primitives::v1::{ValidationData, PersistedValidationData}; use polkadot_primitives::v1::{ValidationData, PersistedValidationData};
use codec::Decode; use parity_scale_codec::Decode;
#[test] #[test]
fn collator_works() { fn collator_works() {
polkadot/parachain/test-parachains/adder/src/lib.rs
+12 -3
View File
@@ -20,7 +20,8 @@
#![cfg_attr(not(feature = "std"), feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))] #![cfg_attr(not(feature = "std"), feature(core_intrinsics, lang_items, core_panic_info, alloc_error_handler))]
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use tiny_keccak::{Hasher as _, Keccak};
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
mod wasm_validation; mod wasm_validation;
@@ -33,6 +34,14 @@ static ALLOC: dlmalloc::GlobalDlmalloc = dlmalloc::GlobalDlmalloc;
#[cfg(feature = "std")] #[cfg(feature = "std")]
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
fn keccak256(input: &[u8]) -> [u8; 32] {
let mut out = [0u8; 32];
let mut keccak256 = Keccak::v256();
keccak256.update(input);
keccak256.finalize(&mut out);
out
}
/// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics. /// Wasm binary unwrapped. If built with `BUILD_DUMMY_WASM_BINARY`, the function panics.
#[cfg(feature = "std")] #[cfg(feature = "std")]
pub fn wasm_binary_unwrap() -> &'static [u8] { pub fn wasm_binary_unwrap() -> &'static [u8] {
@@ -53,7 +62,7 @@ pub struct HeadData {
impl HeadData { impl HeadData {
pub fn hash(&self) -> [u8; 32] { pub fn hash(&self) -> [u8; 32] {
tiny_keccak::keccak256(&self.encode()) keccak256(&self.encode())
} }
} }
@@ -67,7 +76,7 @@ pub struct BlockData {
} }
pub fn hash_state(state: u64) -> [u8; 32] { pub fn hash_state(state: u64) -> [u8; 32] {
tiny_keccak::keccak256(state.encode().as_slice()) keccak256(state.encode().as_slice())
} }
/// Start state mismatched with parent header's state hash. /// Start state mismatched with parent header's state hash.
polkadot/parachain/test-parachains/adder/src/wasm_validation.rs
+2 -2
View File
@@ -20,7 +20,7 @@ use crate::{HeadData, BlockData};
use core::panic; use core::panic;
use sp_std::vec::Vec; use sp_std::vec::Vec;
use parachain::primitives::{ValidationResult, HeadData as GenericHeadData}; use parachain::primitives::{ValidationResult, HeadData as GenericHeadData};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
#[no_mangle] #[no_mangle]
pub extern "C" fn validate_block(params: *const u8, len: usize) -> u64 { pub extern "C" fn validate_block(params: *const u8, len: usize) -> u64 {
@@ -31,7 +31,7 @@ pub extern "C" fn validate_block(params: *const u8, len: usize) -> u64 {
let block_data = BlockData::decode(&mut &params.block_data.0[..]) let block_data = BlockData::decode(&mut &params.block_data.0[..])
.expect("invalid block data format."); .expect("invalid block data format.");
let parent_hash = tiny_keccak::keccak256(&params.parent_head.0[..]); let parent_hash = crate::keccak256(&params.parent_head.0[..]);
let new_head = crate::execute(parent_hash, parent_head, &block_data).expect("Executes block"); let new_head = crate::execute(parent_hash, parent_head, &block_data).expect("Executes block");
parachain::write_result( parachain::write_result(
polkadot/parachain/test-parachains/tests/adder/mod.rs
+1 -1
View File
@@ -27,7 +27,7 @@ use parachain::{
}, },
wasm_executor::{ValidationPool, IsolationStrategy} wasm_executor::{ValidationPool, IsolationStrategy}
}; };
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use adder::{HeadData, BlockData, hash_state}; use adder::{HeadData, BlockData, hash_state};
fn isolation_strategy() -> IsolationStrategy { fn isolation_strategy() -> IsolationStrategy {
polkadot/primitives/Cargo.toml
+3 -3
View File
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
serde = { version = "1.0.102", optional = true, features = ["derive"] } serde = { version = "1.0.117", optional = true, features = ["derive"] }
parity-scale-codec = { version = "1.3.4", default-features = false, features = ["bit-vec", "derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["bit-vec", "derive"] }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -26,7 +26,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "mast
[dev-dependencies] [dev-dependencies]
sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "master" }
pretty_assertions = "0.5.1" pretty_assertions = "0.6.1"
[features] [features]
default = ["std"] default = ["std"]
polkadot/rpc/Cargo.toml
+1 -1
View File
@@ -26,5 +26,5 @@ sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch =
txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" } txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" } frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false } parity-scale-codec = { version = "1.3.5", default-features = false }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/runtime/common/Cargo.toml
+11 -11
View File
@@ -6,11 +6,11 @@ edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true } log = { version = "0.4.11", optional = true }
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0" static_assertions = "1.1.0"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -36,11 +36,11 @@ pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "m
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } libsecp256k1 = { version = "0.3.5", default-features = false, optional = true }
runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false } runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parachains", default-features = false }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.2.1" hex-literal = "0.3.1"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -48,16 +48,16 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie-db = "0.22.0" trie-db = "0.22.1"
serde_json = "1.0.41" serde_json = "1.0.59"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
[features] [features]
default = ["std"] default = ["std"]
no_std = [] no_std = []
std = [ std = [
"bitvec/std", "bitvec/std",
"codec/std", "parity-scale-codec/std",
"log", "log",
"rustc-hex/std", "rustc-hex/std",
"serde_derive", "serde_derive",
polkadot/runtime/common/src/claims.rs
+2 -2
View File
@@ -23,7 +23,7 @@ use frame_support::{
traits::{Currency, Get, VestingSchedule, EnsureOrigin, IsSubType}, weights::{Pays, DispatchClass} traits::{Currency, Get, VestingSchedule, EnsureOrigin, IsSubType}, weights::{Pays, DispatchClass}
}; };
use frame_system::{ensure_signed, ensure_root, ensure_none}; use frame_system::{ensure_signed, ensure_root, ensure_none};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
#[cfg(feature = "std")] #[cfg(feature = "std")]
use serde::{self, Serialize, Deserialize, Serializer, Deserializer}; use serde::{self, Serialize, Deserialize, Serializer, Deserializer};
#[cfg(feature = "std")] #[cfg(feature = "std")]
@@ -633,7 +633,7 @@ mod tests {
use secp_utils::*; use secp_utils::*;
use sp_core::H256; use sp_core::H256;
use codec::Encode; use parity_scale_codec::Encode;
// The testing primitives are very useful for avoiding having to work with signatures // The testing primitives are very useful for avoiding having to work with signatures
// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, Identity}, testing::Header}; use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup, Identity}, testing::Header};
polkadot/runtime/common/src/crowdfund.rs
+1 -1
View File
@@ -77,7 +77,7 @@ use sp_runtime::{ModuleId,
traits::{AccountIdConversion, Hash, Saturating, Zero, CheckedAdd} traits::{AccountIdConversion, Hash, Saturating, Zero, CheckedAdd}
}; };
use crate::slots; use crate::slots;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use sp_std::vec::Vec; use sp_std::vec::Vec;
use primitives::v1::{Id as ParaId, HeadData}; use primitives::v1::{Id as ParaId, HeadData};
polkadot/runtime/common/src/purchase.rs
+1 -1
View File
@@ -16,7 +16,7 @@
//! Module to process purchase of DOTs. //! Module to process purchase of DOTs.
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use sp_runtime::{Permill, RuntimeDebug, DispatchResult, DispatchError, AnySignature}; use sp_runtime::{Permill, RuntimeDebug, DispatchResult, DispatchError, AnySignature};
use sp_runtime::traits::{Zero, CheckedAdd, Verify, Saturating}; use sp_runtime::traits::{Zero, CheckedAdd, Verify, Saturating};
use frame_support::{decl_event, decl_storage, decl_module, decl_error, ensure}; use frame_support::{decl_event, decl_storage, decl_module, decl_error, ensure};
polkadot/runtime/common/src/slot_range.rs
+1 -1
View File
@@ -19,7 +19,7 @@
use sp_std::{result, ops::Add, convert::{TryFrom, TryInto}}; use sp_std::{result, ops::Add, convert::{TryFrom, TryInto}};
use sp_runtime::traits::CheckedSub; use sp_runtime::traits::CheckedSub;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
/// Total number of possible sub ranges of slots. /// Total number of possible sub ranges of slots.
pub const SLOT_RANGE_COUNT: usize = 10; pub const SLOT_RANGE_COUNT: usize = 10;
polkadot/runtime/common/src/slots.rs
+1 -1
View File
@@ -22,7 +22,7 @@ use sp_std::{prelude::*, mem::swap, convert::TryInto};
use sp_runtime::traits::{ use sp_runtime::traits::{
CheckedSub, StaticLookup, Zero, One, CheckedConversion, Hash, AccountIdConversion, CheckedSub, StaticLookup, Zero, One, CheckedConversion, Hash, AccountIdConversion,
}; };
use codec::{Encode, Decode, Codec}; use parity_scale_codec::{Encode, Decode, Codec};
use frame_support::{ use frame_support::{
decl_module, decl_storage, decl_event, decl_error, ensure, dispatch::DispatchResult, decl_module, decl_storage, decl_event, decl_error, ensure, dispatch::DispatchResult,
traits::{Currency, ReservableCurrency, WithdrawReasons, ExistenceRequirement, Get, Randomness}, traits::{Currency, ReservableCurrency, WithdrawReasons, ExistenceRequirement, Get, Randomness},
polkadot/runtime/kusama/Cargo.toml
+12 -12
View File
@@ -7,13 +7,13 @@ build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true } log = { version = "0.4.11", optional = true }
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0" static_assertions = "1.1.0"
smallvec = "1.4.1" smallvec = "1.4.2"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -68,19 +68,19 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
hex-literal = { version = "0.2.1", optional = true } hex-literal = { version = "0.3.1", optional = true }
runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.2.1" hex-literal = "0.3.1"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
tiny-keccak = "1.5.0" tiny-keccak = "2.0.2"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
separator = "0.4.1" separator = "0.4.1"
serde_json = "1.0.41" serde_json = "1.0.59"
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
@@ -95,7 +95,7 @@ std = [
"bitvec/std", "bitvec/std",
"primitives/std", "primitives/std",
"rustc-hex/std", "rustc-hex/std",
"codec/std", "parity-scale-codec/std",
"inherents/std", "inherents/std",
"sp-core/std", "sp-core/std",
"sp-api/std", "sp-api/std",
polkadot/runtime/kusama/src/lib.rs
+4 -4
View File
@@ -24,7 +24,7 @@ use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_std::collections::btree_map::BTreeMap; use sp_std::collections::btree_map::BTreeMap;
use sp_core::u32_trait::{_1, _2, _3, _5}; use sp_core::u32_trait::{_1, _2, _3, _5};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use primitives::v1::{ use primitives::v1::{
AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt,
CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption, CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption,
@@ -1149,7 +1149,7 @@ sp_api::impl_runtime_apis! {
_set_id: fg_primitives::SetId, _set_id: fg_primitives::SetId,
authority_id: fg_primitives::AuthorityId, authority_id: fg_primitives::AuthorityId,
) -> Option<fg_primitives::OpaqueKeyOwnershipProof> { ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((fg_primitives::KEY_TYPE, authority_id)) Historical::prove((fg_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
@@ -1182,7 +1182,7 @@ sp_api::impl_runtime_apis! {
_slot_number: babe_primitives::SlotNumber, _slot_number: babe_primitives::SlotNumber,
authority_id: babe_primitives::AuthorityId, authority_id: babe_primitives::AuthorityId,
) -> Option<babe_primitives::OpaqueKeyOwnershipProof> { ) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((babe_primitives::KEY_TYPE, authority_id)) Historical::prove((babe_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
@@ -1304,7 +1304,7 @@ mod test_fees {
use frame_support::storage::StorageValue; use frame_support::storage::StorageValue;
use sp_runtime::FixedPointNumber; use sp_runtime::FixedPointNumber;
use frame_support::weights::GetDispatchInfo; use frame_support::weights::GetDispatchInfo;
use codec::Encode; use parity_scale_codec::Encode;
use pallet_transaction_payment::Multiplier; use pallet_transaction_payment::Multiplier;
use separator::Separatable; use separator::Separatable;
polkadot/runtime/parachains/Cargo.toml
+11 -11
View File
@@ -6,11 +6,11 @@ edition = "2018"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = "0.4.11" log = "0.4.11"
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", features = [ "derive" ], optional = true } serde = { version = "1.0.117", features = [ "derive" ], optional = true }
derive_more = { version = "0.99.11" } derive_more = "0.99.11"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -36,14 +36,14 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
xcm = { package = "xcm", path = "../../xcm", default-features = false } xcm = { package = "xcm", path = "../../xcm", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
libsecp256k1 = { version = "0.3.2", default-features = false, optional = true } libsecp256k1 = { version = "0.3.5", default-features = false, optional = true }
rand = { version = "0.7", default-features = false } rand = { version = "0.7.3", default-features = false }
rand_chacha = { version = "0.2.2", default-features = false } rand_chacha = { version = "0.2.2", default-features = false }
[dev-dependencies] [dev-dependencies]
futures = "0.3.4" futures = "0.3.8"
hex-literal = "0.2.1" hex-literal = "0.3.1"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -51,8 +51,8 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.41" serde_json = "1.0.59"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"} sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"}
@@ -62,7 +62,7 @@ default = ["std"]
no_std = [] no_std = []
std = [ std = [
"bitvec/std", "bitvec/std",
"codec/std", "parity-scale-codec/std",
"rustc-hex/std", "rustc-hex/std",
"serde", "serde",
"primitives/std", "primitives/std",
polkadot/runtime/parachains/src/configuration.rs
+1 -1
View File
@@ -25,7 +25,7 @@ use frame_support::{
dispatch::DispatchResult, dispatch::DispatchResult,
weights::{DispatchClass, Weight}, weights::{DispatchClass, Weight},
}; };
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use frame_system::ensure_root; use frame_system::ensure_root;
/// All configuration of the runtime with respect to parachains and parathreads. /// All configuration of the runtime with respect to parachains and parathreads.
polkadot/runtime/parachains/src/dmp.rs
+1 -1
View File
@@ -229,7 +229,7 @@ mod tests {
use primitives::v1::BlockNumber; use primitives::v1::BlockNumber;
use frame_support::StorageValue; use frame_support::StorageValue;
use frame_support::traits::{OnFinalize, OnInitialize}; use frame_support::traits::{OnFinalize, OnInitialize};
use codec::Encode; use parity_scale_codec::Encode;
use crate::mock::{Configuration, new_test_ext, System, Dmp, GenesisConfig as MockGenesisConfig}; use crate::mock::{Configuration, new_test_ext, System, Dmp, GenesisConfig as MockGenesisConfig};
pub(crate) fn run_to_block(to: BlockNumber, new_session: Option<Vec<BlockNumber>>) { pub(crate) fn run_to_block(to: BlockNumber, new_session: Option<Vec<BlockNumber>>) {
polkadot/runtime/parachains/src/hrmp.rs
+4 -4
View File
@@ -19,7 +19,7 @@ use crate::{
configuration::{self, HostConfiguration}, configuration::{self, HostConfiguration},
initializer, paras, dmp, initializer, paras, dmp,
}; };
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
use frame_support::{ use frame_support::{
decl_storage, decl_module, decl_error, ensure, traits::Get, weights::Weight, StorageMap, decl_storage, decl_module, decl_error, ensure, traits::Get, weights::Weight, StorageMap,
StorageValue, dispatch::DispatchResult, StorageValue, dispatch::DispatchResult,
@@ -882,7 +882,7 @@ impl<T: Trait> Module<T> {
let notification_bytes = { let notification_bytes = {
use xcm::v0::Xcm; use xcm::v0::Xcm;
use codec::Encode as _; use parity_scale_codec::Encode as _;
Xcm::HrmpNewChannelOpenRequest { Xcm::HrmpNewChannelOpenRequest {
sender: u32::from(origin), sender: u32::from(origin),
@@ -939,7 +939,7 @@ impl<T: Trait> Module<T> {
<Self as Store>::HrmpAcceptedChannelRequestCount::insert(&origin, accepted_cnt + 1); <Self as Store>::HrmpAcceptedChannelRequestCount::insert(&origin, accepted_cnt + 1);
let notification_bytes = { let notification_bytes = {
use codec::Encode as _; use parity_scale_codec::Encode as _;
use xcm::v0::Xcm; use xcm::v0::Xcm;
Xcm::HrmpChannelAccepted { Xcm::HrmpChannelAccepted {
@@ -982,7 +982,7 @@ impl<T: Trait> Module<T> {
let config = <configuration::Module<T>>::config(); let config = <configuration::Module<T>>::config();
let notification_bytes = { let notification_bytes = {
use codec::Encode as _; use parity_scale_codec::Encode as _;
use xcm::v0::Xcm; use xcm::v0::Xcm;
Xcm::HrmpChannelClosing { Xcm::HrmpChannelClosing {
polkadot/runtime/parachains/src/inclusion.rs
+1 -1
View File
@@ -31,7 +31,7 @@ use frame_support::{
decl_storage, decl_module, decl_error, decl_event, ensure, debug, decl_storage, decl_module, decl_error, decl_event, ensure, debug,
dispatch::DispatchResult, IterableStorageMap, weights::Weight, traits::Get, dispatch::DispatchResult, IterableStorageMap, weights::Weight, traits::Get,
}; };
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec}; use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
use sp_staking::SessionIndex; use sp_staking::SessionIndex;
use sp_runtime::{DispatchError, traits::{One, Saturating}}; use sp_runtime::{DispatchError, traits::{One, Saturating}};
polkadot/runtime/parachains/src/initializer.rs
+1 -1
View File
@@ -26,7 +26,7 @@ use frame_support::{
decl_storage, decl_module, decl_error, traits::Randomness, decl_storage, decl_module, decl_error, traits::Randomness,
}; };
use sp_runtime::traits::One; use sp_runtime::traits::One;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use crate::{ use crate::{
configuration::{self, HostConfiguration}, configuration::{self, HostConfiguration},
paras, scheduler, inclusion, dmp, ump, hrmp, paras, scheduler, inclusion, dmp, ump, hrmp,
polkadot/runtime/parachains/src/origin.rs
+1 -1
View File
@@ -19,7 +19,7 @@
use sp_std::result; use sp_std::result;
use sp_runtime::traits::BadOrigin; use sp_runtime::traits::BadOrigin;
use primitives::v1::Id as ParaId; use primitives::v1::Id as ParaId;
use codec::{Decode, Encode}; use parity_scale_codec::{Decode, Encode};
/// Origin for the parachains. /// Origin for the parachains.
#[derive(PartialEq, Eq, Clone, Encode, Decode, sp_core::RuntimeDebug)] #[derive(PartialEq, Eq, Clone, Encode, Decode, sp_core::RuntimeDebug)]
polkadot/runtime/parachains/src/paras.rs
+1 -1
View File
@@ -36,7 +36,7 @@ use frame_support::{
traits::Get, traits::Get,
weights::Weight, weights::Weight,
}; };
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use crate::{configuration, initializer::SessionChangeNotification}; use crate::{configuration, initializer::SessionChangeNotification};
use sp_core::RuntimeDebug; use sp_core::RuntimeDebug;
polkadot/runtime/parachains/src/scheduler.rs
+1 -1
View File
@@ -45,7 +45,7 @@ use frame_support::{
decl_storage, decl_module, decl_error, decl_storage, decl_module, decl_error,
weights::Weight, weights::Weight,
}; };
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use sp_runtime::traits::{Saturating, Zero}; use sp_runtime::traits::{Saturating, Zero};
use rand::{SeedableRng, seq::SliceRandom}; use rand::{SeedableRng, seq::SliceRandom};
polkadot/runtime/polkadot/Cargo.toml
+13 -13
View File
@@ -7,13 +7,13 @@ build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true } log = { version = "0.4.11", optional = true }
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0" static_assertions = "1.1.0"
smallvec = "1.4.1" smallvec = "1.4.2"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -66,19 +66,19 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
hex-literal = { version = "0.2.1", optional = true } hex-literal = { version = "0.3.1", optional = true }
runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.2.1" hex-literal = "0.3.1"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
tiny-keccak = "1.5.0" tiny-keccak = "2.0.2"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie-db = "0.22.0" trie-db = "0.22.1"
serde_json = "1.0.41" serde_json = "1.0.59"
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
@@ -93,7 +93,7 @@ std = [
"bitvec/std", "bitvec/std",
"primitives/std", "primitives/std",
"rustc-hex/std", "rustc-hex/std",
"codec/std", "parity-scale-codec/std",
"inherents/std", "inherents/std",
"sp-core/std", "sp-core/std",
"sp-api/std", "sp-api/std",
polkadot/runtime/polkadot/src/lib.rs
+3 -3
View File
@@ -32,7 +32,7 @@ use runtime_common::{
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_std::collections::btree_map::BTreeMap; use sp_std::collections::btree_map::BTreeMap;
use sp_core::u32_trait::{_1, _2, _3, _4, _5}; use sp_core::u32_trait::{_1, _2, _3, _4, _5};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use primitives::v1::{ use primitives::v1::{
AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt,
CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption, CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption,
@@ -1144,7 +1144,7 @@ sp_api::impl_runtime_apis! {
_set_id: fg_primitives::SetId, _set_id: fg_primitives::SetId,
authority_id: fg_primitives::AuthorityId, authority_id: fg_primitives::AuthorityId,
) -> Option<fg_primitives::OpaqueKeyOwnershipProof> { ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((fg_primitives::KEY_TYPE, authority_id)) Historical::prove((fg_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
@@ -1177,7 +1177,7 @@ sp_api::impl_runtime_apis! {
_slot_number: babe_primitives::SlotNumber, _slot_number: babe_primitives::SlotNumber,
authority_id: babe_primitives::AuthorityId, authority_id: babe_primitives::AuthorityId,
) -> Option<babe_primitives::OpaqueKeyOwnershipProof> { ) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((babe_primitives::KEY_TYPE, authority_id)) Historical::prove((babe_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
polkadot/runtime/rococo/Cargo.toml
+5 -5
View File
@@ -6,10 +6,10 @@ edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.4.1" smallvec = "1.4.2"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -66,7 +66,7 @@ std = [
"pallet-babe/std", "pallet-babe/std",
"babe-primitives/std", "babe-primitives/std",
"pallet-balances/std", "pallet-balances/std",
"codec/std", "parity-scale-codec/std",
"frame-executive/std", "frame-executive/std",
"pallet-grandpa/std", "pallet-grandpa/std",
"pallet-sudo/std", "pallet-sudo/std",
polkadot/runtime/rococo/src/lib.rs
+3 -3
View File
@@ -23,7 +23,7 @@
use pallet_transaction_payment::CurrencyAdapter; use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_std::collections::btree_map::BTreeMap; use sp_std::collections::btree_map::BTreeMap;
use codec::Encode; use parity_scale_codec::Encode;
use primitives::v1::{ use primitives::v1::{
AccountId, AccountIndex, Balance, BlockNumber, Hash, Nonce, Signature, Moment, AccountId, AccountIndex, Balance, BlockNumber, Hash, Nonce, Signature, Moment,
GroupRotationInfo, CoreState, Id, ValidationData, ValidationCode, CandidateEvent, GroupRotationInfo, CoreState, Id, ValidationData, ValidationCode, CandidateEvent,
@@ -727,7 +727,7 @@ sp_api::impl_runtime_apis! {
_set_id: fg_primitives::SetId, _set_id: fg_primitives::SetId,
authority_id: fg_primitives::AuthorityId, authority_id: fg_primitives::AuthorityId,
) -> Option<fg_primitives::OpaqueKeyOwnershipProof> { ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((fg_primitives::KEY_TYPE, authority_id)) Historical::prove((fg_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
@@ -760,7 +760,7 @@ sp_api::impl_runtime_apis! {
_slot_number: babe_primitives::SlotNumber, _slot_number: babe_primitives::SlotNumber,
authority_id: babe_primitives::AuthorityId, authority_id: babe_primitives::AuthorityId,
) -> Option<babe_primitives::OpaqueKeyOwnershipProof> { ) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((babe_primitives::KEY_TYPE, authority_id)) Historical::prove((babe_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
polkadot/runtime/test-runtime/Cargo.toml
+11 -11
View File
@@ -7,12 +7,12 @@ build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true } log = { version = "0.4.11", optional = true }
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.4.1" smallvec = "1.4.2"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -57,12 +57,12 @@ polkadot-parachain = { path = "../../parachain", default-features = false }
polkadot-runtime-parachains = { path = "../parachains", default-features = false } polkadot-runtime-parachains = { path = "../parachains", default-features = false }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.2.1" hex-literal = "0.3.1"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
tiny-keccak = "1.5.0" tiny-keccak = "2.0.2"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.41" serde_json = "1.0.59"
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
@@ -77,7 +77,7 @@ std = [
"bitvec/std", "bitvec/std",
"primitives/std", "primitives/std",
"rustc-hex/std", "rustc-hex/std",
"codec/std", "parity-scale-codec/std",
"inherents/std", "inherents/std",
"sp-core/std", "sp-core/std",
"polkadot-parachain/std", "polkadot-parachain/std",
polkadot/runtime/test-runtime/src/lib.rs
+1 -1
View File
@@ -23,7 +23,7 @@
use pallet_transaction_payment::CurrencyAdapter; use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_std::collections::btree_map::BTreeMap; use sp_std::collections::btree_map::BTreeMap;
use codec::Encode; use parity_scale_codec::Encode;
use polkadot_runtime_parachains::configuration as parachains_configuration; use polkadot_runtime_parachains::configuration as parachains_configuration;
use polkadot_runtime_parachains::inclusion as parachains_inclusion; use polkadot_runtime_parachains::inclusion as parachains_inclusion;
polkadot/runtime/westend/Cargo.toml
+12 -12
View File
@@ -7,12 +7,12 @@ build = "build.rs"
[dependencies] [dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] } bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
log = { version = "0.3.9", optional = true } log = { version = "0.4.11", optional = true }
rustc-hex = { version = "2.0.1", default-features = false } rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.102", default-features = false } serde = { version = "1.0.117", default-features = false }
serde_derive = { version = "1.0.102", optional = true } serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.4.1" smallvec = "1.4.2"
static_assertions = "1.1.0" static_assertions = "1.1.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -69,19 +69,19 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
hex-literal = { version = "0.2.1", optional = true } hex-literal = { version = "0.3.1", optional = true }
runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
polkadot-parachain = { path = "../../parachain", default-features = false } polkadot-parachain = { path = "../../parachain", default-features = false }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.2.1" hex-literal = "0.3.1"
libsecp256k1 = "0.3.2" libsecp256k1 = "0.3.5"
tiny-keccak = "1.5.0" tiny-keccak = "2.0.2"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
serde_json = "1.0.41" serde_json = "1.0.59"
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
@@ -96,7 +96,7 @@ std = [
"bitvec/std", "bitvec/std",
"primitives/std", "primitives/std",
"rustc-hex/std", "rustc-hex/std",
"codec/std", "parity-scale-codec/std",
"inherents/std", "inherents/std",
"sp-core/std", "sp-core/std",
"polkadot-parachain/std", "polkadot-parachain/std",
polkadot/runtime/westend/src/lib.rs
+3 -3
View File
@@ -23,7 +23,7 @@
use pallet_transaction_payment::CurrencyAdapter; use pallet_transaction_payment::CurrencyAdapter;
use sp_std::prelude::*; use sp_std::prelude::*;
use sp_std::collections::btree_map::BTreeMap; use sp_std::collections::btree_map::BTreeMap;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use primitives::v1::{ use primitives::v1::{
AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt,
CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption, CoreState, GroupRotationInfo, Hash, Id, Moment, Nonce, OccupiedCoreAssumption,
@@ -893,7 +893,7 @@ sp_api::impl_runtime_apis! {
_set_id: fg_primitives::SetId, _set_id: fg_primitives::SetId,
authority_id: fg_primitives::AuthorityId, authority_id: fg_primitives::AuthorityId,
) -> Option<fg_primitives::OpaqueKeyOwnershipProof> { ) -> Option<fg_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((fg_primitives::KEY_TYPE, authority_id)) Historical::prove((fg_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
@@ -926,7 +926,7 @@ sp_api::impl_runtime_apis! {
_slot_number: babe_primitives::SlotNumber, _slot_number: babe_primitives::SlotNumber,
authority_id: babe_primitives::AuthorityId, authority_id: babe_primitives::AuthorityId,
) -> Option<babe_primitives::OpaqueKeyOwnershipProof> { ) -> Option<babe_primitives::OpaqueKeyOwnershipProof> {
use codec::Encode; use parity_scale_codec::Encode;
Historical::prove((babe_primitives::KEY_TYPE, authority_id)) Historical::prove((babe_primitives::KEY_TYPE, authority_id))
.map(|p| p.encode()) .map(|p| p.encode())
polkadot/statement-table/Cargo.toml
+1 -1
View File
@@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
primitives = { package = "polkadot-primitives", path = "../primitives" } primitives = { package = "polkadot-primitives", path = "../primitives" }
polkadot/statement-table/src/generic.rs
+1 -1
View File
@@ -30,7 +30,7 @@ use std::fmt::Debug;
use primitives::v1::{ValidityAttestation as PrimitiveValidityAttestation, ValidatorSignature}; use primitives::v1::{ValidityAttestation as PrimitiveValidityAttestation, ValidatorSignature};
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
/// Context for the statement table. /// Context for the statement table.
pub trait Context { pub trait Context {
polkadot/validation/Cargo.toml
+4 -4
View File
@@ -13,9 +13,9 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" } runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master" }
futures = "0.3.4" futures = "0.3.8"
log = "0.4.8" log = "0.4.11"
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" } primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -25,7 +25,7 @@ block-builder = { package = "sc-block-builder", git = "https://github.com/parity
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" } babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" } prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21" thiserror = "1.0.22"
[dev-dependencies] [dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot/xcm/Cargo.toml
+2 -2
View File
@@ -6,11 +6,11 @@ description = "The basic XCM datastructures."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = [ "derive" ] } parity-scale-codec = { version = "1.3.5", default-features = false, features = [ "derive" ] }
[features] [features]
default = ["std"] default = ["std"]
wasm-api = [] wasm-api = []
std = [ std = [
"codec/std", "parity-scale-codec/std",
] ]
polkadot/xcm/src/lib.rs
+1 -1
View File
@@ -23,7 +23,7 @@
#![no_std] #![no_std]
extern crate alloc; extern crate alloc;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
pub mod v0; pub mod v0;
polkadot/xcm/src/v0/junction.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! Support datastructures for `MultiLocation`, primarily the `Junction` datatype. //! Support datastructures for `MultiLocation`, primarily the `Junction` datatype.
use alloc::vec::Vec; use alloc::vec::Vec;
use codec::{self, Encode, Decode}; use parity_scale_codec::{self, Encode, Decode};
/// A global identifier of an account-bearing consensus system. /// A global identifier of an account-bearing consensus system.
#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug)] #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug)]
polkadot/xcm/src/v0/mod.rs
+1 -1
View File
@@ -19,7 +19,7 @@
use core::{result, convert::TryFrom}; use core::{result, convert::TryFrom};
use alloc::{boxed::Box, vec::Vec}; use alloc::{boxed::Box, vec::Vec};
use codec::{self, Encode, Decode}; use parity_scale_codec::{self, Encode, Decode};
use super::{VersionedXcm, VersionedMultiAsset}; use super::{VersionedXcm, VersionedMultiAsset};
mod junction; mod junction;
polkadot/xcm/src/v0/multi_asset.rs
+1 -1
View File
@@ -19,7 +19,7 @@
use core::{result, convert::TryFrom}; use core::{result, convert::TryFrom};
use alloc::vec::Vec; use alloc::vec::Vec;
use codec::{self, Encode, Decode}; use parity_scale_codec::{self, Encode, Decode};
use super::{MultiLocation, VersionedMultiAsset}; use super::{MultiLocation, VersionedMultiAsset};
/// A general identifier for an instance of a non-fungible asset class. /// A general identifier for an instance of a non-fungible asset class.
polkadot/xcm/src/v0/multi_location.rs
+1 -1
View File
@@ -18,7 +18,7 @@
use core::{result, mem, convert::TryFrom}; use core::{result, mem, convert::TryFrom};
use codec::{self, Encode, Decode}; use parity_scale_codec::{self, Encode, Decode};
use super::Junction; use super::Junction;
use crate::VersionedMultiLocation; use crate::VersionedMultiLocation;
polkadot/xcm/src/v0/order.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! Version 0 of the Cross-Consensus Message format data structures. //! Version 0 of the Cross-Consensus Message format data structures.
use alloc::vec::Vec; use alloc::vec::Vec;
use codec::{self, Encode, Decode}; use parity_scale_codec::{self, Encode, Decode};
use super::{MultiAsset, MultiLocation}; use super::{MultiAsset, MultiLocation};
/// An instruction to be executed on some or all of the assets in holding, used by asset-related XCM messages. /// An instruction to be executed on some or all of the assets in holding, used by asset-related XCM messages.
polkadot/xcm/src/v0/traits.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! Cross-Consensus Message format data structures. //! Cross-Consensus Message format data structures.
use core::result; use core::result;
use codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use super::{MultiLocation, Xcm}; use super::{MultiLocation, Xcm};
polkadot/xcm/xcm-builder/Cargo.toml
+2 -2
View File
@@ -6,7 +6,7 @@ description = "Tools & types for building with XCM and its executor."
version = "0.8.22" version = "0.8.22"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
xcm = { path = "..", default-features = false } xcm = { path = "..", default-features = false }
xcm-executor = { path = "../xcm-executor", default-features = false } xcm-executor = { path = "../xcm-executor", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -21,7 +21,7 @@ polkadot-parachain = { path = "../../parachain", default-features = false }
[features] [features]
default = ["std"] default = ["std"]
std = [ std = [
"codec/std", "parity-scale-codec/std",
"xcm/std", "xcm/std",
"xcm-executor/std", "xcm-executor/std",
"sp-std/std", "sp-std/std",
polkadot/xcm/xcm-builder/src/location_conversion.rs
+1 -1
View File
@@ -18,7 +18,7 @@ use sp_std::marker::PhantomData;
use sp_io::hashing::blake2_256; use sp_io::hashing::blake2_256;
use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::AccountIdConversion;
use frame_support::traits::Get; use frame_support::traits::Get;
use codec::Encode; use parity_scale_codec::Encode;
use xcm::v0::{MultiLocation, NetworkId, Junction}; use xcm::v0::{MultiLocation, NetworkId, Junction};
use xcm_executor::traits::LocationConversion; use xcm_executor::traits::LocationConversion;
polkadot/xcm/xcm-executor/Cargo.toml
+3 -3
View File
@@ -6,8 +6,8 @@ description = "An abstract and configurable XCM message executor."
version = "0.8.22" version = "0.8.22"
[dependencies] [dependencies]
impl-trait-for-tuples = "0.1.3" impl-trait-for-tuples = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
xcm = { path = "..", default-features = false } xcm = { path = "..", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -19,7 +19,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "mas
[features] [features]
default = ["std"] default = ["std"]
std = [ std = [
"codec/std", "parity-scale-codec/std",
"xcm/std", "xcm/std",
"sp-std/std", "sp-std/std",
"sp-io/std", "sp-io/std",
polkadot/xcm/xcm-executor/src/lib.rs
+1 -1
View File
@@ -18,7 +18,7 @@
use sp_std::{prelude::*, marker::PhantomData, convert::TryInto}; use sp_std::{prelude::*, marker::PhantomData, convert::TryInto};
use frame_support::{ensure, dispatch::Dispatchable}; use frame_support::{ensure, dispatch::Dispatchable};
use codec::Decode; use parity_scale_codec::Decode;
use xcm::v0::{ use xcm::v0::{
Xcm, Order, ExecuteXcm, SendXcm, Error as XcmError, Result as XcmResult, Xcm, Order, ExecuteXcm, SendXcm, Error as XcmError, Result as XcmResult,
MultiLocation, MultiAsset, Junction, MultiLocation, MultiAsset, Junction,