From fa071ff191bfd15979cc7714920cad67729b5a2c Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 14:29:40 +0100 Subject: [PATCH 01/61] Adding first rough ouline of the repository structure --- docs/Structure.adoc | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 docs/Structure.adoc diff --git a/docs/Structure.adoc b/docs/Structure.adoc new file mode 100644 index 0000000000000..502c19c8362b9 --- /dev/null +++ b/docs/Structure.adoc @@ -0,0 +1,78 @@ += Structure +:Author: Substrate developers +:Revision: 0.3.0 +:toc: +:sectnums: + + +== + +Substrate is split into multiple levels with increasing opinion and decreasing flexibility: + +- runtime +- client +- PAINT (formerly `srml`) +- node + +=== Runtime + + - _found in_: `/runtime` + - _crates prefix_: `sr-` + - _constrains_: + - must be `[no_std]` + - crates may not (dev-)depend on crates in other subfolders of this repo + - excluding `test`-crates, which **must not** to be published to crates.io + + +In the lowest level, substrate defines primitives, interfaces and traits to implement any on-chain substrate transition system and its interactions with the outside world. This is the lowest level of abstraction and opinion everything else builds upon. + +=== Client + + - _found in_: `/client` + - _crates prefix_: `substrate-` + - _constrains_: + - crates may not (dev-)depend on any `paint-`-crates + - excluding `test`-crates, which **must not** to be published to crates.io + +In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full- and light-client support. + +=== PAINT (formerly `srml`) + + - _found in_: `/paint` + - _crates prefix_: `paint-` + - _constrains_: + - must be `[no_std]` + +PAINT, the Parity Application Interface for Networked Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. + +=== the final Node + + - _found in_: `/examples` + +The node pulls it all together, constructs the (upgradable) runtime and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being build and run if you do `cargo run`. + + +== Internal Dependency Tree + +[ditaa] +... ++---------------+ +----------------+ +| | | | +| runtime +<------+ paint | +| | | | ++------+-----+--+ +-------------+--+ + ^ ^ ^ + | +----------------+ | + | | | ++------+--------+ | | +| | | | +| client | +--+-------+--------+ +| +<---------+ | ++---------------+ | | + | Node | + | | + | | + +-------------------+ + +.... + From b2b48ede709f4d946c4d32ad2f56e86376b386e3 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 14:30:35 +0100 Subject: [PATCH 02/61] Remove old CI stuff --- .travis.yml | 28 ---------------------------- ci/check_for_exit.sh | 16 ---------------- ci/script.sh | 31 ------------------------------- 3 files changed, 75 deletions(-) delete mode 100644 .travis.yml delete mode 100755 ci/check_for_exit.sh delete mode 100755 ci/script.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4180defedfd6a..0000000000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Request an environment that provides sudo (that goes with larger containers) -# and a minimal language environment. -sudo: true -language: minimal - -cache: cargo - -branches: - only: - - master - -env: - global: - - RUST_BACKTRACE=1 - matrix: - - RUST_TOOLCHAIN=nightly TARGET=wasm - - RUST_TOOLCHAIN=stable TARGET=native - -before_install: - # Check how much space we've got on this machine. - - df -h - -script: - - ./ci/script.sh - -after_script: - # Check how much free disk space left after the build - - df -h diff --git a/ci/check_for_exit.sh b/ci/check_for_exit.sh deleted file mode 100755 index c5a54eb83b800..0000000000000 --- a/ci/check_for_exit.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Script that checks that a node exits after `SIGINT` was send. - -set -e - -cargo build --release -./target/release/substrate --dev & -PID=$! - -# Let the chain running for 60 seconds -sleep 60 - -# Send `SIGINT` and give the process 30 seconds to end -kill -INT $PID -timeout 30 tail --pid=$PID -f /dev/null diff --git a/ci/script.sh b/ci/script.sh deleted file mode 100755 index b1b7dd3edf356..0000000000000 --- a/ci/script.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# Enable warnings about unused extern crates -export RUSTFLAGS=" -W unused-extern-crates" - -# Install rustup and the specified rust toolchain. -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=$RUST_TOOLCHAIN -y - -# Load cargo environment. Specifically, put cargo into PATH. -source ~/.cargo/env - -rustc --version -rustup --version -cargo --version - -case $TARGET in - "native") - sudo apt-get -y update - sudo apt-get install -y cmake pkg-config libssl-dev - - cargo test --all --release --locked "$@" - ;; - - "wasm") - # Install prerequisites and build all wasm projects - ./scripts/init.sh - ./scripts/build.sh "$@" - ;; -esac From c0556eaefff2dd41c0ab8d5e21f65360bcd0d00a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 14:31:41 +0100 Subject: [PATCH 03/61] add title --- docs/Structure.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Structure.adoc b/docs/Structure.adoc index 502c19c8362b9..b3c41f99ff902 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -5,7 +5,7 @@ :sectnums: -== +== Overview Substrate is split into multiple levels with increasing opinion and decreasing flexibility: From 425814dba6f6c02128b156a02c3fba62012d946e Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 14:34:18 +0100 Subject: [PATCH 04/61] formatting fixes --- docs/Structure.adoc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/Structure.adoc b/docs/Structure.adoc index b3c41f99ff902..0e187d0991ae2 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -9,45 +9,45 @@ Substrate is split into multiple levels with increasing opinion and decreasing flexibility: -- runtime -- client -- PAINT (formerly `srml`) -- node +* runtime +* client +* PAINT (formerly `srml`) +* node === Runtime - - _found in_: `/runtime` - - _crates prefix_: `sr-` - - _constrains_: - - must be `[no_std]` - - crates may not (dev-)depend on crates in other subfolders of this repo - - excluding `test`-crates, which **must not** to be published to crates.io +* _found in_: `/runtime` +* _crates prefix_: `sr-` +* _constrains_: +** must be `[no_std]` +** crates may not (dev-)depend on crates in other subfolders of this repo +** excluding `test`-crates, which **must not** to be published to crates.io In the lowest level, substrate defines primitives, interfaces and traits to implement any on-chain substrate transition system and its interactions with the outside world. This is the lowest level of abstraction and opinion everything else builds upon. === Client - - _found in_: `/client` - - _crates prefix_: `substrate-` - - _constrains_: - - crates may not (dev-)depend on any `paint-`-crates - - excluding `test`-crates, which **must not** to be published to crates.io +* _found in_: `/client` +* _crates prefix_: `substrate-` +* _constrains_: +** crates may not (dev-)depend on any `paint-`-crates +** excluding `test`-crates, which **must not** to be published to crates.io -In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full- and light-client support. +In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full* and light-client support. === PAINT (formerly `srml`) - - _found in_: `/paint` - - _crates prefix_: `paint-` - - _constrains_: - - must be `[no_std]` +* _found in_: `/paint` +* _crates prefix_: `paint-` +* _constrains_: +** must be `[no_std]` PAINT, the Parity Application Interface for Networked Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. === the final Node - - _found in_: `/examples` +* _found in_: `/examples` The node pulls it all together, constructs the (upgradable) runtime and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being build and run if you do `cargo run`. @@ -55,7 +55,7 @@ The node pulls it all together, constructs the (upgradable) runtime and wires up == Internal Dependency Tree [ditaa] -... +.... +---------------+ +----------------+ | | | | | runtime +<------+ paint | From 4f7d22e452c7020f10fa0b5c043267541e72b2c1 Mon Sep 17 00:00:00 2001 From: Denis P Date: Sun, 10 Nov 2019 16:11:53 +0100 Subject: [PATCH 05/61] move node-exits job's script to scripts dir --- .gitlab-ci.yml | 2 +- scripts/check_for_exit.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 scripts/check_for_exit.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baf875fd0fb79..f93de0be69b57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ node-exits: except: - /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - ./ci/check_for_exit.sh + - ./scripts/check_for_exit.sh test-full-crypto-feature: &test-full-crypto-feature diff --git a/scripts/check_for_exit.sh b/scripts/check_for_exit.sh new file mode 100755 index 0000000000000..c5a54eb83b800 --- /dev/null +++ b/scripts/check_for_exit.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +# Script that checks that a node exits after `SIGINT` was send. + +set -e + +cargo build --release +./target/release/substrate --dev & +PID=$! + +# Let the chain running for 60 seconds +sleep 60 + +# Send `SIGINT` and give the process 30 seconds to end +kill -INT $PID +timeout 30 tail --pid=$PID -f /dev/null From b3c4d8b8ce6129b690ab53223275e0005a687d1f Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 17:08:45 +0100 Subject: [PATCH 06/61] Move docs into subdir --- README.adoc | 519 +---------------- CODEOWNERS => docs/CODEOWNERS | 0 .../CODE_OF_CONDUCT.adoc | 0 CONTRIBUTING.adoc => docs/CONTRIBUTING.adoc | 0 .../PULL_REQUEST_TEMPLATE.md | 0 docs/README.adoc | 528 ++++++++++++++++++ SECURITY.md => docs/SECURITY.md | 0 license_header.txt => docs/license_header.txt | 0 8 files changed, 535 insertions(+), 512 deletions(-) rename CODEOWNERS => docs/CODEOWNERS (100%) rename CODE_OF_CONDUCT.adoc => docs/CODE_OF_CONDUCT.adoc (100%) rename CONTRIBUTING.adoc => docs/CONTRIBUTING.adoc (100%) rename PULL_REQUEST_TEMPLATE.md => docs/PULL_REQUEST_TEMPLATE.md (100%) create mode 100644 docs/README.adoc rename SECURITY.md => docs/SECURITY.md (100%) rename license_header.txt => docs/license_header.txt (100%) diff --git a/README.adoc b/README.adoc index 5caa3f932b23e..62673f70e48c7 100644 --- a/README.adoc +++ b/README.adoc @@ -4,525 +4,20 @@ :toc: :sectnums: -== Intro in one sentence - Substrate is a next-generation framework for blockchain innovation. -== Description - -At its heart, Substrate is a combination of three technologies: https://webassembly.org/[WebAssembly], https://libp2p.io/[Libp2p] and GRANDPA Consensus. About GRANDPA, see this https://hackmd.io/Jd0byWX0RiqFiXUVC78Bdw?view#GRANDPA[definition], https://medium.com/polkadot-network/grandpa-block-finality-in-polkadot-an-introduction-part-1-d08a24a021b5[introduction] and https://github.com/w3f/consensus/blob/master/pdf/grandpa.pdf[formal specification]. It is both a library for building new blockchains and a "skeleton key" of a blockchain client, able to synchronize to any Substrate-based chain. - -Substrate chains have three distinct features that make them "next-generation": a dynamic, self-defining state-transition function; light-client functionality from day one; and a progressive consensus algorithm with fast block production and adaptive, definite finality. The STF, encoded in WebAssembly, is known as the "runtime". This defines the `execute_block` function, and can specify everything from the staking algorithm, transaction semantics, logging mechanisms and procedures for replacing any aspect of itself or of the blockchain's state ("governance"). Because the runtime is entirely dynamic all of these can be switched out or upgraded at any time. A Substrate chain is very much a "living organism". - -See also https://www.parity.io/what-is-substrate/. - -== Usage - -Substrate is still an early stage project, and while it has already been used as the basis of major projects like Polkadot, using it is still a significant undertaking. In particular, you should have a good knowledge of blockchain concepts and basic cryptography. Terminology like header, block, client, hash, transaction and signature should be familiar. At present you will need a working knowledge of Rust to be able to do anything interesting (though eventually, we aim for this not to be the case). - -Substrate is designed for use in one of three ways: - -**1. Trivial**: By running the Substrate binary `substrate` and configuring it with a genesis block that includes the current demonstration runtime. In this case, you just build Substrate, configure a JSON file, and launch your own blockchain. This affords you the least amount of customizability, primarily allowing you to change the genesis parameters of the various included runtime modules such as balances, staking, block-period, fees, and governance. - -**2. Modular**: By hacking together modules from the Substrate Runtime Module Library (SRML) into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change datatypes, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term. - -**3. Generic**: The entire SRML can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm. - -=== The Basics of Substrate - -Substrate is a blockchain platform with a completely generic state transition function. That said, it does come with both standards and conventions (particularly regarding the Runtime Module Library) regarding underlying data structures. Roughly speaking, these core datatypes correspond to +trait+s in terms of the actual non-negotiable standard and generic +struct+s in terms of the convention. - -``` -Header := Parent + ExtrinsicsRoot + StorageRoot + Digest -Block := Header + Extrinsics + Justifications -``` - -=== Extrinsics - -Extrinsics in Substrate are pieces of information from "the outside world" that are contained in the blocks of the chain. You might think "ahh, that means *transactions*": in fact, no. Extrinsics fall into two broad categories of which only one is *transactions*. The other is known as *inherents*. The difference between these two is that transactions are signed and gossiped on the network and can be deemed useful *per se*. This fits the mold of what you would call transactions in Bitcoin or Ethereum. - -Inherents, meanwhile, are not passed on the network and are not signed. They represent data which describes the environment but which cannot call upon anything to prove it such as a signature. Rather they are assumed to be "true" simply because a sufficiently large number of validators have agreed on them being reasonable. - -To give an example, there is the timestamp inherent, which sets the current timestamp of the block. This is not a fixed part of Substrate, but does come as part of the Substrate Runtime Module Library to be used as desired. No signature could fundamentally prove that a block were authored at a given time in quite the same way that a signature can "prove" the desire to spend some particular funds. Rather, it is the business of each validator to ensure that they believe the timestamp is set to something reasonable before they agree that the block candidate is valid. - -Other examples include the parachain-heads extrinsic in Polkadot and the "note-missed-proposal" extrinsic used in the Substrate Runtime Module Library to determine and punish or deactivate offline validators. - - -=== Runtime and API - -Substrate chains all have a runtime. The runtime is a WebAssembly "blob" that includes a number of entry-points. Some entry-points are required as part of the underlying Substrate specification. Others are merely convention and required for the default implementation of the Substrate client to be able to author blocks. - -If you want to develop a chain with Substrate, you will need to implement the `Core` trait. This `Core` trait generates an API with the minimum necessary functionality to interact with your runtime. A special macro is provided called `impl_runtime_apis!` that help you implement runtime API traits. All runtime API trait implementations need to be done in one call of the `impl_runtime_apis!` macro. All parameters and return values need to implement https://crates.io/crates/parity-codec[`parity-codec`] to be encodable and decodable. - -Here's a snippet of the Polkadot API implementation as of PoC-3: - -```rust -impl_runtime_apis! { - impl client_api::Core for Runtime { - fn version() -> RuntimeVersion { - VERSION - } - - fn execute_block(block: Block) { - Executive::execute_block(block) - } - - fn initialize_block(header: ::Header) { - Executive::initialize_block(&header) - } - } - // ---snip--- -} -``` - - -=== Inherent Extrinsics - -The Substrate Runtime Module Library includes functionality for timestamps and slashing. If used, these rely on "trusted" external information being passed in via inherent extrinsics. The Substrate reference block authoring client software will expect to be able to call into the runtime API with collated data (in the case of the reference Substrate authoring client, this is merely the current timestamp and which nodes were offline) in order to return the appropriate extrinsics ready for inclusion. If new inherent extrinsic types and data are to be used in a modified runtime, then it is this function (and its argument type) that would change. - -=== Block-authoring Logic - -In Substrate, there is a major distinction between blockchain *syncing* and block *authoring* ("authoring" is a more general term for what is called "mining" in Bitcoin). The first case might be referred to as a "full node" (or "light node" - Substrate supports both): authoring necessarily requires a synced node and, therefore, all authoring clients must necessarily be able to synchronize. However, the reverse is not true. The primary functionality that authoring nodes have which is not in "sync nodes" is threefold: transaction queue logic, inherent transaction knowledge and BFT consensus logic. BFT consensus logic is provided as a core element of Substrate and can be ignored since it is only exposed in the SDK under the `authorities()` API entry. - -Transaction queue logic in Substrate is designed to be as generic as possible, allowing a runtime to express which transactions are fit for inclusion in a block through the `initialize_block` and `apply_extrinsic` calls. However, more subtle aspects like prioritization and replacement policy must currently be expressed "hard coded" as part of the blockchain's authoring code. That said, Substrate's reference implementation for a transaction queue should be sufficient for an initial chain implementation. - -Inherent extrinsic knowledge is again somewhat generic, and the actual construction of the extrinsics is, by convention, delegated to the "soft code" in the runtime. If ever there needs to be additional extrinsic information in the chain, then both the block authoring logic will need to be altered to provide it into the runtime and the runtime's `inherent_extrinsics` call will need to use this extra information in order to construct any additional extrinsic transactions for inclusion in the block. - -== Roadmap - -=== So far - -- 0.1 "PoC-1": PBFT consensus, Wasm runtime engine, basic runtime modules. -- 0.2 "PoC-2": Libp2p - -=== In progress - -- AfG consensus -- Improved PoS -- Smart contract runtime module - -=== The future - -- Splitting out runtime modules into separate repo -- Introduce substrate executable (the skeleton-key runtime) -- Introduce basic but extensible transaction queue and block-builder and place them in the executable. -- DAO runtime module -- Audit - -== Trying out Substrate Node - -Substrate Node is Substrate's pre-baked blockchain client. You can run a development node locally or configure a new chain and launch your own global testnet. - -=== On Mac and Ubuntu - -To get going as fast as possible, there is a simple script that installs all required dependencies and installs Substrate into your path. Just open a terminal and run: - -[source, shell] ----- -curl https://getsubstrate.io -sSf | bash ----- - -You can start a local Substrate development chain with running `substrate --dev`. - -To create your own global network/cryptocurrency, you'll need to make a new Substrate Node chain specification file ("chainspec"). - -First let's get a template chainspec that you can edit. We'll use the "staging" chain, a sort of default chain that the node comes pre-configured with: - -[source, shell] ----- -substrate build-spec --chain=staging > ~/chainspec.json ----- - -Now, edit `~/chainspec.json` in your editor. There are a lot of individual fields for each module, and one very large one which contains the WebAssembly code blob for this chain. The easiest field to edit is the block `period`. Change it to 10 (seconds): - -[source, json] ----- - "timestamp": { - "minimumPeriod": 10 - }, ----- - -Now with this new chainspec file, you can build a "raw" chain definition for your new chain: - -[source, shell] ----- -substrate build-spec --chain ~/chainspec.json --raw > ~/mychain.json ----- - -This can be fed into Substrate: - -[source, shell] ----- -substrate --chain ~/mychain.json ----- - -It won't do much until you start producing blocks though, so to do that you'll need to use the `--validator` option together with passing the seed for the account(s) that is configured to be the initial authorities: - -[source, shell] ----- -substrate --chain ~/mychain.json --validator ----- - -You can distribute `mychain.json` so that everyone can synchronize and (depending on your authorities list) validate on your chain. - - -== Building - -=== Hacking on Substrate - -If you'd actually like to hack on Substrate, you can just grab the source code and -build it. Ensure you have Rust and the support software installed: - -==== Linux and Mac - -For Unix-based operating systems, you should run the following commands: - -[source, shell] ----- -curl https://sh.rustup.rs -sSf | sh - -rustup update nightly -rustup target add wasm32-unknown-unknown --toolchain nightly -rustup update stable ----- - -You will also need to install the following packages: - - - Linux: -[source, shell] -sudo apt install cmake pkg-config libssl-dev git clang libclang-dev - -- Linux on ARM: -`rust-lld` is required for linking wasm, but is missing on non Tier 1 platforms. -So, use this https://github.com/Plume-org/Plume/blob/master/script/wasm-deps.sh[script] -to build `lld` and create the symlink `/usr/bin/rust-lld` to the build binary. - - - Mac: -[source, shell] -brew install cmake pkg-config openssl git llvm - -To finish installation of Substrate, jump down to <>. - -==== Windows - -If you are trying to set up Substrate on Windows, you should do the following: - -1. First, you will need to download and install "Build Tools for Visual Studio:" - - * You can get it at this link: https://aka.ms/buildtools - * Run the installation file: `vs_buildtools.exe` - * Please ensure the Windows 10 SDK component is included when installing the Visual C++ Build Tools. - * image:https://i.imgur.com/zayVLmu.png[image] - * Restart your computer. - -2. Next, you need to install Rust: - - * Detailed instructions are provided by the https://doc.rust-lang.org/book/ch01-01-installation.html#installing-rustup-on-windows[Rust Book]. - * Download from: https://www.rust-lang.org/tools/install - * Run the installation file: `rustup-init.exe` - > Note that it should not prompt you to install vs_buildtools since you did it in step 1. - * Choose "Default Installation." - * To get started, you need Cargo's bin directory (%USERPROFILE%\.cargo\bin) in your PATH environment variable. Future applications will automatically have the correct environment, but you may need to restart your current shell. - -3. Then, you will need to run some commands in CMD to set up your Wasm Build Environment: - - rustup update nightly - rustup update stable - rustup target add wasm32-unknown-unknown --toolchain nightly - -4. Then, you need to install LLVM: https://releases.llvm.org/download.html - -5. Next, you need to install OpenSSL, which we will do with `vcpkg`: - - mkdir \Tools - cd \Tools - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - .\bootstrap-vcpkg.bat - .\vcpkg.exe install openssl:x64-windows-static - -6. After, you need to add OpenSSL to your System Variables. Note that in order for the following commands to work, you need to use Windows Powershell: - - $env:OPENSSL_DIR = 'C:\Tools\vcpkg\installed\x64-windows-static' - $env:OPENSSL_STATIC = 'Yes' - [System.Environment]::SetEnvironmentVariable('OPENSSL_DIR', $env:OPENSSL_DIR, [System.EnvironmentVariableTarget]::User) - [System.Environment]::SetEnvironmentVariable('OPENSSL_STATIC', $env:OPENSSL_STATIC, [System.EnvironmentVariableTarget]::User) - -7. Finally, you need to install `cmake`: https://cmake.org/download/ - -==== Shared Steps - -Then, grab the Substrate source code: - -[source, shell] ----- -git clone https://github.com/paritytech/substrate.git -cd substrate ----- - -Then build the code: - -[source, shell] ----- -cargo build # Builds all native code ----- - -You can run all the tests if you like: - -[source, shell] -cargo test --all - -Or just run the tests of a specific package (i.e. `cargo test -p srml-assets`) - -You can start a development chain with: - -[source, shell] -cargo run --release -- --dev - -Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run --release \-- --dev`. - -If you want to see the multi-node consensus algorithm in action locally, then you can create a local testnet with two validator nodes for Alice and Bob, who are the initial authorities of the genesis chain specification that have been endowed with a testnet DOTs. We'll give each node a name and expose them so they are listed on link:https://telemetry.polkadot.io/#/Local%20Testnet[Telemetry]. You'll need two terminal windows open. - -We'll start Alice's Substrate node first on default TCP port 30333 with her chain database stored locally at `/tmp/alice`. The Bootnode ID of her node is `QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR`, which is generated from the `--node-key` value that we specify below: - -[source, shell] -cargo run --release \-- \ - --base-path /tmp/alice \ - --chain=local \ - --alice \ - --node-key 0000000000000000000000000000000000000000000000000000000000000001 \ - --telemetry-url ws://telemetry.polkadot.io:1024 \ - --validator - -In the second terminal, we'll run the following to start Bob's Substrate node on a different TCP port of 30334, and with his chain database stored locally at `/tmp/bob`. We'll specify a value for the `--bootnodes` option that will connect his node to Alice's Bootnode ID on TCP port 30333: - -[source, shell] -cargo run --release \-- \ - --base-path /tmp/bob \ - --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR \ - --chain=local \ - --bob \ - --port 30334 \ - --telemetry-url ws://telemetry.polkadot.io:1024 \ - --validator - -Additional Substrate CLI usage options are available and may be shown by running `cargo run \-- --help`. - -=== WASM binaries - -The WASM binaries are built during the normal `cargo build` process. To control the WASM binary building, -we support multiple environment variables: - -* `SKIP_WASM_BUILD` - Skips building any WASM binary. This is useful when only native should be recompiled. -* `BUILD_DUMMY_WASM_BINARY` - Builds dummy WASM binaries. These dummy binaries are empty and useful - for `cargo check` runs. -* `WASM_BUILD_TYPE` - Sets the build type for building WASM binaries. Supported values are `release` or `debug`. - By default the build type is equal to the build type used by the main build. -* `TRIGGER_WASM_BUILD` - Can be set to trigger a WASM build. On subsequent calls the value of the variable - needs to change. As WASM builder instructs `cargo` to watch for file changes - this environment variable should only be required in certain circumstances. -* `WASM_TARGET_DIRECTORY` - Will copy any build WASM binary to the given directory. The path needs - to be absolute. -* `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary. -* `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build. - -Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`. -Where `PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will -be `NODE_RUNTIME`. - -[[flaming-fir]] -=== Joining the Flaming Fir Testnet - -Flaming Fir is the new testnet for Substrate master (2.0) to test the latest development features. Please note that master is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Emberic Elm testnets. Ensure you have the dependencies listed above before compiling. - -Since Flaming Fir is targeting the master branch we make absolutely no guarantees of stability and/or persistence of the network. We might reset the chain at any time if it is necessary to deploy new changes. Currently, the validators are running with a client built from `d013bd900`, if you build from this commit you should be able to successfully sync, later commits may not work as new breaking changes may be introduced in master. - -Latest known working version: `a2a0eb5398d6223e531455b4c155ef053a4a3a2b` - -[source, shell] ----- -git clone https://github.com/paritytech/substrate.git -cd substrate -git checkout -b flaming-fir a2a0eb5398d6223e531455b4c155ef053a4a3a2b ----- - -You can run the tests if you like: - -[source, shell] -cargo test --all - -Start your node: - -[source, shell] -cargo run --release \-- - -To see a list of command line options, enter: - -[source, shell] -cargo run --release \-- --help - -For example, you can choose a custom node name: - -[source, shell] -cargo run --release \-- --name my_custom_name - -If you are successful, you will see your node syncing at https://telemetry.polkadot.io/#/Flaming%20Fir - -=== Joining the Emberic Elm Testnet - -Emberic Elm is the testnet for Substrate 1.0. Please note that 1.0 is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Flaming Fir testnets. -In order to join the Emberic Elm testnet you should build from the `v1.0` branch. Ensure you have the dependencies listed above before compiling. - -[source, shell] ----- -git clone https://github.com/paritytech/substrate.git -cd substrate -git checkout -b v1.0 origin/v1.0 ----- - -You can then follow the same steps for building and running as described above in <>. - -== Key management - -Keys in Substrate are stored in the keystore in the file system. To store keys into this keystore, -you need to use one of the two provided RPC calls. If your keys are encrypted or should be encrypted -by the keystore, you need to provide the key using one of the cli arguments `--password`, -`--password-interactive` or `--password-filename`. - -=== Recommended RPC call - -For most users who want to run a validator node, the `author_rotateKeys` RPC call is sufficient. -The RPC call will generate `N` Session keys for you and return their public keys. `N` is the number -of session keys configured in the runtime. The output of the RPC call can be used as input for the -`session::set_keys` transaction. - -``` -curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_rotateKeys", "id":1 }' localhost:9933 -``` - -=== Advanced RPC call - -If the Session keys need to match a fixed seed, they can be set individually key by key. The RPC call -expects the key seed and the key type. The key types supported by default in Substrate are listed -https://github.com/paritytech/substrate/blob/master/core/primitives/src/crypto.rs#L767[here], but the -user can declare any key type. - -``` -curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["KEY_TYPE", "SEED", "PUBLIC"],"id":1 }' localhost:9933 -``` - -`KEY_TYPE` - needs to be replaced with the 4-character key type identifier. -`SEED` - is the seed of the key. -`PUBLIC` - public key for the given key. - -== Documentation - -=== Viewing documentation for Substrate packages - -You can generate documentation for a Substrate Rust package and have it automatically open in your web browser using https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo[rustdoc with Cargo], -(of the The Rustdoc Book), by running the following command: - -``` -cargo doc --package --open -``` - -Replacing `` with one of the following (i.e. `cargo doc --package substrate --open`): - -* All Substrate Packages -[source, shell] -substrate -* Substrate Core -[source, shell] -substrate, substrate-cli, substrate-client, substrate-client-db, -substrate-consensus-common, substrate-consensus-rhd, -substrate-executor, substrate-finality-grandpa, substrate-keyring, substrate-keystore, substrate-network, -substrate-network-libp2p, substrate-primitives, substrate-rpc, substrate-rpc-servers, -substrate-serializer, substrate-service, substrate-service-test, substrate-state-db, -substrate-state-machine, substrate-telemetry, substrate-test-client, -substrate-test-runtime, substrate-transaction-graph, substrate-transaction-pool, -substrate-trie -* Substrate Runtime -[source, shell] -sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version -* Substrate Runtime Module Library (SRML) -[source, shell] -srml-assets, srml-balances, srml-consensus, srml-contracts, srml-council, srml-democracy, srml-example, -srml-executive, srml-metadata, srml-session, srml-staking, srml-support, srml-system, srml-timestamp, -srml-treasury -* Node -[source, shell] -node-cli, node-consensus, node-executor, node-network, node-primitives, node-runtime -* Subkey -[source, shell] -subkey - -=== Contributing to documentation for Substrate packages - -https://doc.rust-lang.org/1.9.0/book/documentation.html[Document source code] for Substrate packages by annotating the source code with documentation comments. - -Example (generic): -```markdown -/// Summary -/// -/// Description -/// -/// # Panics -/// -/// # Errors -/// -/// # Safety -/// -/// # Examples -/// -/// Summary of Example 1 -/// -/// ```rust -/// // insert example 1 code here -/// ``` -/// -``` - -* Important notes: -** Documentation comments must use annotations with a triple slash `///` -** Modules are documented using `//!` -``` -//! Summary (of module) -//! -//! Description (of module) -``` -* Special section header is indicated with a hash `#`. -** `Panics` section requires an explanation if the function triggers a panic -** `Errors` section is for describing conditions under which a function of method returns `Err(E)` if it returns a `Result` -** `Safety` section requires an explanation if the function is `unsafe` -** `Examples` section includes examples of using the function or method -* Code block annotations for examples are included between triple graves, as shown above. -Instead of including the programming language to use for syntax highlighting as the annotation -after the triple graves, alternative annotations include the `ignore`, `text`, `should_panic`, or `no_run`. -* Summary sentence is a short high level single sentence of its functionality -* Description paragraph is for details additional to the summary sentence -* Missing documentation annotations may be used to identify where to generate warnings with `#![warn(missing_docs)]` -or errors `#![deny(missing_docs)]` -* Hide documentation for items with `#[doc(hidden)]` - -=== Contributing to documentation (tests, extended examples, macros) for Substrate packages - -The code block annotations in the `# Example` section may be used as https://doc.rust-lang.org/1.9.0/book/documentation.html#documentation-as-tests[documentation as tests and for extended examples]. - -* Important notes: -** Rustdoc will automatically add a `main()` wrapper around the code block to test it -** https://doc.rust-lang.org/1.9.0/book/documentation.html#documenting-macros[Documenting macros]. -** Documentation as tests examples are included when running `cargo test` +== Trying it out -== Contributing +Simply go to [substrate.dev](https://substrate.dev) and follow the instructions as listed. -=== Contributing Guidelines +== Contributions & Code of Conduct -include::CONTRIBUTING.adoc[] +Please follow the contributions guidelines as outlined in [`docs/CONTRIBUTING.adoc`](docs/CONTRIBUTING.adoc). In all communications and contributions, this project follows the [Contributor Covenant Code of Conduct](docs/CODE_OF_CONDUCT.adoc). -=== Contributor Code of Conduct +== Security -include::CODE_OF_CONDUCT.adoc[] +The security policy and procedures can be found in [`docs/SECURITY.md`](docs/SECURITY.md). == License -https://github.com/paritytech/substrate/blob/master/LICENSE[LICENSE] +GPL 3.0 see `LICENSE`-file in the repo root. \ No newline at end of file diff --git a/CODEOWNERS b/docs/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to docs/CODEOWNERS diff --git a/CODE_OF_CONDUCT.adoc b/docs/CODE_OF_CONDUCT.adoc similarity index 100% rename from CODE_OF_CONDUCT.adoc rename to docs/CODE_OF_CONDUCT.adoc diff --git a/CONTRIBUTING.adoc b/docs/CONTRIBUTING.adoc similarity index 100% rename from CONTRIBUTING.adoc rename to docs/CONTRIBUTING.adoc diff --git a/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from PULL_REQUEST_TEMPLATE.md rename to docs/PULL_REQUEST_TEMPLATE.md diff --git a/docs/README.adoc b/docs/README.adoc new file mode 100644 index 0000000000000..5caa3f932b23e --- /dev/null +++ b/docs/README.adoc @@ -0,0 +1,528 @@ += Substrate +:Author: Substrate developers +:Revision: 0.2.0 +:toc: +:sectnums: + +== Intro in one sentence + +Substrate is a next-generation framework for blockchain innovation. + +== Description + +At its heart, Substrate is a combination of three technologies: https://webassembly.org/[WebAssembly], https://libp2p.io/[Libp2p] and GRANDPA Consensus. About GRANDPA, see this https://hackmd.io/Jd0byWX0RiqFiXUVC78Bdw?view#GRANDPA[definition], https://medium.com/polkadot-network/grandpa-block-finality-in-polkadot-an-introduction-part-1-d08a24a021b5[introduction] and https://github.com/w3f/consensus/blob/master/pdf/grandpa.pdf[formal specification]. It is both a library for building new blockchains and a "skeleton key" of a blockchain client, able to synchronize to any Substrate-based chain. + +Substrate chains have three distinct features that make them "next-generation": a dynamic, self-defining state-transition function; light-client functionality from day one; and a progressive consensus algorithm with fast block production and adaptive, definite finality. The STF, encoded in WebAssembly, is known as the "runtime". This defines the `execute_block` function, and can specify everything from the staking algorithm, transaction semantics, logging mechanisms and procedures for replacing any aspect of itself or of the blockchain's state ("governance"). Because the runtime is entirely dynamic all of these can be switched out or upgraded at any time. A Substrate chain is very much a "living organism". + +See also https://www.parity.io/what-is-substrate/. + +== Usage + +Substrate is still an early stage project, and while it has already been used as the basis of major projects like Polkadot, using it is still a significant undertaking. In particular, you should have a good knowledge of blockchain concepts and basic cryptography. Terminology like header, block, client, hash, transaction and signature should be familiar. At present you will need a working knowledge of Rust to be able to do anything interesting (though eventually, we aim for this not to be the case). + +Substrate is designed for use in one of three ways: + +**1. Trivial**: By running the Substrate binary `substrate` and configuring it with a genesis block that includes the current demonstration runtime. In this case, you just build Substrate, configure a JSON file, and launch your own blockchain. This affords you the least amount of customizability, primarily allowing you to change the genesis parameters of the various included runtime modules such as balances, staking, block-period, fees, and governance. + +**2. Modular**: By hacking together modules from the Substrate Runtime Module Library (SRML) into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change datatypes, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term. + +**3. Generic**: The entire SRML can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm. + +=== The Basics of Substrate + +Substrate is a blockchain platform with a completely generic state transition function. That said, it does come with both standards and conventions (particularly regarding the Runtime Module Library) regarding underlying data structures. Roughly speaking, these core datatypes correspond to +trait+s in terms of the actual non-negotiable standard and generic +struct+s in terms of the convention. + +``` +Header := Parent + ExtrinsicsRoot + StorageRoot + Digest +Block := Header + Extrinsics + Justifications +``` + +=== Extrinsics + +Extrinsics in Substrate are pieces of information from "the outside world" that are contained in the blocks of the chain. You might think "ahh, that means *transactions*": in fact, no. Extrinsics fall into two broad categories of which only one is *transactions*. The other is known as *inherents*. The difference between these two is that transactions are signed and gossiped on the network and can be deemed useful *per se*. This fits the mold of what you would call transactions in Bitcoin or Ethereum. + +Inherents, meanwhile, are not passed on the network and are not signed. They represent data which describes the environment but which cannot call upon anything to prove it such as a signature. Rather they are assumed to be "true" simply because a sufficiently large number of validators have agreed on them being reasonable. + +To give an example, there is the timestamp inherent, which sets the current timestamp of the block. This is not a fixed part of Substrate, but does come as part of the Substrate Runtime Module Library to be used as desired. No signature could fundamentally prove that a block were authored at a given time in quite the same way that a signature can "prove" the desire to spend some particular funds. Rather, it is the business of each validator to ensure that they believe the timestamp is set to something reasonable before they agree that the block candidate is valid. + +Other examples include the parachain-heads extrinsic in Polkadot and the "note-missed-proposal" extrinsic used in the Substrate Runtime Module Library to determine and punish or deactivate offline validators. + + +=== Runtime and API + +Substrate chains all have a runtime. The runtime is a WebAssembly "blob" that includes a number of entry-points. Some entry-points are required as part of the underlying Substrate specification. Others are merely convention and required for the default implementation of the Substrate client to be able to author blocks. + +If you want to develop a chain with Substrate, you will need to implement the `Core` trait. This `Core` trait generates an API with the minimum necessary functionality to interact with your runtime. A special macro is provided called `impl_runtime_apis!` that help you implement runtime API traits. All runtime API trait implementations need to be done in one call of the `impl_runtime_apis!` macro. All parameters and return values need to implement https://crates.io/crates/parity-codec[`parity-codec`] to be encodable and decodable. + +Here's a snippet of the Polkadot API implementation as of PoC-3: + +```rust +impl_runtime_apis! { + impl client_api::Core for Runtime { + fn version() -> RuntimeVersion { + VERSION + } + + fn execute_block(block: Block) { + Executive::execute_block(block) + } + + fn initialize_block(header: ::Header) { + Executive::initialize_block(&header) + } + } + // ---snip--- +} +``` + + +=== Inherent Extrinsics + +The Substrate Runtime Module Library includes functionality for timestamps and slashing. If used, these rely on "trusted" external information being passed in via inherent extrinsics. The Substrate reference block authoring client software will expect to be able to call into the runtime API with collated data (in the case of the reference Substrate authoring client, this is merely the current timestamp and which nodes were offline) in order to return the appropriate extrinsics ready for inclusion. If new inherent extrinsic types and data are to be used in a modified runtime, then it is this function (and its argument type) that would change. + +=== Block-authoring Logic + +In Substrate, there is a major distinction between blockchain *syncing* and block *authoring* ("authoring" is a more general term for what is called "mining" in Bitcoin). The first case might be referred to as a "full node" (or "light node" - Substrate supports both): authoring necessarily requires a synced node and, therefore, all authoring clients must necessarily be able to synchronize. However, the reverse is not true. The primary functionality that authoring nodes have which is not in "sync nodes" is threefold: transaction queue logic, inherent transaction knowledge and BFT consensus logic. BFT consensus logic is provided as a core element of Substrate and can be ignored since it is only exposed in the SDK under the `authorities()` API entry. + +Transaction queue logic in Substrate is designed to be as generic as possible, allowing a runtime to express which transactions are fit for inclusion in a block through the `initialize_block` and `apply_extrinsic` calls. However, more subtle aspects like prioritization and replacement policy must currently be expressed "hard coded" as part of the blockchain's authoring code. That said, Substrate's reference implementation for a transaction queue should be sufficient for an initial chain implementation. + +Inherent extrinsic knowledge is again somewhat generic, and the actual construction of the extrinsics is, by convention, delegated to the "soft code" in the runtime. If ever there needs to be additional extrinsic information in the chain, then both the block authoring logic will need to be altered to provide it into the runtime and the runtime's `inherent_extrinsics` call will need to use this extra information in order to construct any additional extrinsic transactions for inclusion in the block. + +== Roadmap + +=== So far + +- 0.1 "PoC-1": PBFT consensus, Wasm runtime engine, basic runtime modules. +- 0.2 "PoC-2": Libp2p + +=== In progress + +- AfG consensus +- Improved PoS +- Smart contract runtime module + +=== The future + +- Splitting out runtime modules into separate repo +- Introduce substrate executable (the skeleton-key runtime) +- Introduce basic but extensible transaction queue and block-builder and place them in the executable. +- DAO runtime module +- Audit + +== Trying out Substrate Node + +Substrate Node is Substrate's pre-baked blockchain client. You can run a development node locally or configure a new chain and launch your own global testnet. + +=== On Mac and Ubuntu + +To get going as fast as possible, there is a simple script that installs all required dependencies and installs Substrate into your path. Just open a terminal and run: + +[source, shell] +---- +curl https://getsubstrate.io -sSf | bash +---- + +You can start a local Substrate development chain with running `substrate --dev`. + +To create your own global network/cryptocurrency, you'll need to make a new Substrate Node chain specification file ("chainspec"). + +First let's get a template chainspec that you can edit. We'll use the "staging" chain, a sort of default chain that the node comes pre-configured with: + +[source, shell] +---- +substrate build-spec --chain=staging > ~/chainspec.json +---- + +Now, edit `~/chainspec.json` in your editor. There are a lot of individual fields for each module, and one very large one which contains the WebAssembly code blob for this chain. The easiest field to edit is the block `period`. Change it to 10 (seconds): + +[source, json] +---- + "timestamp": { + "minimumPeriod": 10 + }, +---- + +Now with this new chainspec file, you can build a "raw" chain definition for your new chain: + +[source, shell] +---- +substrate build-spec --chain ~/chainspec.json --raw > ~/mychain.json +---- + +This can be fed into Substrate: + +[source, shell] +---- +substrate --chain ~/mychain.json +---- + +It won't do much until you start producing blocks though, so to do that you'll need to use the `--validator` option together with passing the seed for the account(s) that is configured to be the initial authorities: + +[source, shell] +---- +substrate --chain ~/mychain.json --validator +---- + +You can distribute `mychain.json` so that everyone can synchronize and (depending on your authorities list) validate on your chain. + + +== Building + +=== Hacking on Substrate + +If you'd actually like to hack on Substrate, you can just grab the source code and +build it. Ensure you have Rust and the support software installed: + +==== Linux and Mac + +For Unix-based operating systems, you should run the following commands: + +[source, shell] +---- +curl https://sh.rustup.rs -sSf | sh + +rustup update nightly +rustup target add wasm32-unknown-unknown --toolchain nightly +rustup update stable +---- + +You will also need to install the following packages: + + - Linux: +[source, shell] +sudo apt install cmake pkg-config libssl-dev git clang libclang-dev + +- Linux on ARM: +`rust-lld` is required for linking wasm, but is missing on non Tier 1 platforms. +So, use this https://github.com/Plume-org/Plume/blob/master/script/wasm-deps.sh[script] +to build `lld` and create the symlink `/usr/bin/rust-lld` to the build binary. + + - Mac: +[source, shell] +brew install cmake pkg-config openssl git llvm + +To finish installation of Substrate, jump down to <>. + +==== Windows + +If you are trying to set up Substrate on Windows, you should do the following: + +1. First, you will need to download and install "Build Tools for Visual Studio:" + + * You can get it at this link: https://aka.ms/buildtools + * Run the installation file: `vs_buildtools.exe` + * Please ensure the Windows 10 SDK component is included when installing the Visual C++ Build Tools. + * image:https://i.imgur.com/zayVLmu.png[image] + * Restart your computer. + +2. Next, you need to install Rust: + + * Detailed instructions are provided by the https://doc.rust-lang.org/book/ch01-01-installation.html#installing-rustup-on-windows[Rust Book]. + * Download from: https://www.rust-lang.org/tools/install + * Run the installation file: `rustup-init.exe` + > Note that it should not prompt you to install vs_buildtools since you did it in step 1. + * Choose "Default Installation." + * To get started, you need Cargo's bin directory (%USERPROFILE%\.cargo\bin) in your PATH environment variable. Future applications will automatically have the correct environment, but you may need to restart your current shell. + +3. Then, you will need to run some commands in CMD to set up your Wasm Build Environment: + + rustup update nightly + rustup update stable + rustup target add wasm32-unknown-unknown --toolchain nightly + +4. Then, you need to install LLVM: https://releases.llvm.org/download.html + +5. Next, you need to install OpenSSL, which we will do with `vcpkg`: + + mkdir \Tools + cd \Tools + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + .\bootstrap-vcpkg.bat + .\vcpkg.exe install openssl:x64-windows-static + +6. After, you need to add OpenSSL to your System Variables. Note that in order for the following commands to work, you need to use Windows Powershell: + + $env:OPENSSL_DIR = 'C:\Tools\vcpkg\installed\x64-windows-static' + $env:OPENSSL_STATIC = 'Yes' + [System.Environment]::SetEnvironmentVariable('OPENSSL_DIR', $env:OPENSSL_DIR, [System.EnvironmentVariableTarget]::User) + [System.Environment]::SetEnvironmentVariable('OPENSSL_STATIC', $env:OPENSSL_STATIC, [System.EnvironmentVariableTarget]::User) + +7. Finally, you need to install `cmake`: https://cmake.org/download/ + +==== Shared Steps + +Then, grab the Substrate source code: + +[source, shell] +---- +git clone https://github.com/paritytech/substrate.git +cd substrate +---- + +Then build the code: + +[source, shell] +---- +cargo build # Builds all native code +---- + +You can run all the tests if you like: + +[source, shell] +cargo test --all + +Or just run the tests of a specific package (i.e. `cargo test -p srml-assets`) + +You can start a development chain with: + +[source, shell] +cargo run --release -- --dev + +Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run --release \-- --dev`. + +If you want to see the multi-node consensus algorithm in action locally, then you can create a local testnet with two validator nodes for Alice and Bob, who are the initial authorities of the genesis chain specification that have been endowed with a testnet DOTs. We'll give each node a name and expose them so they are listed on link:https://telemetry.polkadot.io/#/Local%20Testnet[Telemetry]. You'll need two terminal windows open. + +We'll start Alice's Substrate node first on default TCP port 30333 with her chain database stored locally at `/tmp/alice`. The Bootnode ID of her node is `QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR`, which is generated from the `--node-key` value that we specify below: + +[source, shell] +cargo run --release \-- \ + --base-path /tmp/alice \ + --chain=local \ + --alice \ + --node-key 0000000000000000000000000000000000000000000000000000000000000001 \ + --telemetry-url ws://telemetry.polkadot.io:1024 \ + --validator + +In the second terminal, we'll run the following to start Bob's Substrate node on a different TCP port of 30334, and with his chain database stored locally at `/tmp/bob`. We'll specify a value for the `--bootnodes` option that will connect his node to Alice's Bootnode ID on TCP port 30333: + +[source, shell] +cargo run --release \-- \ + --base-path /tmp/bob \ + --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR \ + --chain=local \ + --bob \ + --port 30334 \ + --telemetry-url ws://telemetry.polkadot.io:1024 \ + --validator + +Additional Substrate CLI usage options are available and may be shown by running `cargo run \-- --help`. + +=== WASM binaries + +The WASM binaries are built during the normal `cargo build` process. To control the WASM binary building, +we support multiple environment variables: + +* `SKIP_WASM_BUILD` - Skips building any WASM binary. This is useful when only native should be recompiled. +* `BUILD_DUMMY_WASM_BINARY` - Builds dummy WASM binaries. These dummy binaries are empty and useful + for `cargo check` runs. +* `WASM_BUILD_TYPE` - Sets the build type for building WASM binaries. Supported values are `release` or `debug`. + By default the build type is equal to the build type used by the main build. +* `TRIGGER_WASM_BUILD` - Can be set to trigger a WASM build. On subsequent calls the value of the variable + needs to change. As WASM builder instructs `cargo` to watch for file changes + this environment variable should only be required in certain circumstances. +* `WASM_TARGET_DIRECTORY` - Will copy any build WASM binary to the given directory. The path needs + to be absolute. +* `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary. +* `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build. + +Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`. +Where `PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will +be `NODE_RUNTIME`. + +[[flaming-fir]] +=== Joining the Flaming Fir Testnet + +Flaming Fir is the new testnet for Substrate master (2.0) to test the latest development features. Please note that master is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Emberic Elm testnets. Ensure you have the dependencies listed above before compiling. + +Since Flaming Fir is targeting the master branch we make absolutely no guarantees of stability and/or persistence of the network. We might reset the chain at any time if it is necessary to deploy new changes. Currently, the validators are running with a client built from `d013bd900`, if you build from this commit you should be able to successfully sync, later commits may not work as new breaking changes may be introduced in master. + +Latest known working version: `a2a0eb5398d6223e531455b4c155ef053a4a3a2b` + +[source, shell] +---- +git clone https://github.com/paritytech/substrate.git +cd substrate +git checkout -b flaming-fir a2a0eb5398d6223e531455b4c155ef053a4a3a2b +---- + +You can run the tests if you like: + +[source, shell] +cargo test --all + +Start your node: + +[source, shell] +cargo run --release \-- + +To see a list of command line options, enter: + +[source, shell] +cargo run --release \-- --help + +For example, you can choose a custom node name: + +[source, shell] +cargo run --release \-- --name my_custom_name + +If you are successful, you will see your node syncing at https://telemetry.polkadot.io/#/Flaming%20Fir + +=== Joining the Emberic Elm Testnet + +Emberic Elm is the testnet for Substrate 1.0. Please note that 1.0 is not compatible with the BBQ Birch, Charred Cherry, Dried Danta or Flaming Fir testnets. +In order to join the Emberic Elm testnet you should build from the `v1.0` branch. Ensure you have the dependencies listed above before compiling. + +[source, shell] +---- +git clone https://github.com/paritytech/substrate.git +cd substrate +git checkout -b v1.0 origin/v1.0 +---- + +You can then follow the same steps for building and running as described above in <>. + +== Key management + +Keys in Substrate are stored in the keystore in the file system. To store keys into this keystore, +you need to use one of the two provided RPC calls. If your keys are encrypted or should be encrypted +by the keystore, you need to provide the key using one of the cli arguments `--password`, +`--password-interactive` or `--password-filename`. + +=== Recommended RPC call + +For most users who want to run a validator node, the `author_rotateKeys` RPC call is sufficient. +The RPC call will generate `N` Session keys for you and return their public keys. `N` is the number +of session keys configured in the runtime. The output of the RPC call can be used as input for the +`session::set_keys` transaction. + +``` +curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_rotateKeys", "id":1 }' localhost:9933 +``` + +=== Advanced RPC call + +If the Session keys need to match a fixed seed, they can be set individually key by key. The RPC call +expects the key seed and the key type. The key types supported by default in Substrate are listed +https://github.com/paritytech/substrate/blob/master/core/primitives/src/crypto.rs#L767[here], but the +user can declare any key type. + +``` +curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["KEY_TYPE", "SEED", "PUBLIC"],"id":1 }' localhost:9933 +``` + +`KEY_TYPE` - needs to be replaced with the 4-character key type identifier. +`SEED` - is the seed of the key. +`PUBLIC` - public key for the given key. + +== Documentation + +=== Viewing documentation for Substrate packages + +You can generate documentation for a Substrate Rust package and have it automatically open in your web browser using https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo[rustdoc with Cargo], +(of the The Rustdoc Book), by running the following command: + +``` +cargo doc --package --open +``` + +Replacing `` with one of the following (i.e. `cargo doc --package substrate --open`): + +* All Substrate Packages +[source, shell] +substrate +* Substrate Core +[source, shell] +substrate, substrate-cli, substrate-client, substrate-client-db, +substrate-consensus-common, substrate-consensus-rhd, +substrate-executor, substrate-finality-grandpa, substrate-keyring, substrate-keystore, substrate-network, +substrate-network-libp2p, substrate-primitives, substrate-rpc, substrate-rpc-servers, +substrate-serializer, substrate-service, substrate-service-test, substrate-state-db, +substrate-state-machine, substrate-telemetry, substrate-test-client, +substrate-test-runtime, substrate-transaction-graph, substrate-transaction-pool, +substrate-trie +* Substrate Runtime +[source, shell] +sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version +* Substrate Runtime Module Library (SRML) +[source, shell] +srml-assets, srml-balances, srml-consensus, srml-contracts, srml-council, srml-democracy, srml-example, +srml-executive, srml-metadata, srml-session, srml-staking, srml-support, srml-system, srml-timestamp, +srml-treasury +* Node +[source, shell] +node-cli, node-consensus, node-executor, node-network, node-primitives, node-runtime +* Subkey +[source, shell] +subkey + +=== Contributing to documentation for Substrate packages + +https://doc.rust-lang.org/1.9.0/book/documentation.html[Document source code] for Substrate packages by annotating the source code with documentation comments. + +Example (generic): +```markdown +/// Summary +/// +/// Description +/// +/// # Panics +/// +/// # Errors +/// +/// # Safety +/// +/// # Examples +/// +/// Summary of Example 1 +/// +/// ```rust +/// // insert example 1 code here +/// ``` +/// +``` + +* Important notes: +** Documentation comments must use annotations with a triple slash `///` +** Modules are documented using `//!` +``` +//! Summary (of module) +//! +//! Description (of module) +``` +* Special section header is indicated with a hash `#`. +** `Panics` section requires an explanation if the function triggers a panic +** `Errors` section is for describing conditions under which a function of method returns `Err(E)` if it returns a `Result` +** `Safety` section requires an explanation if the function is `unsafe` +** `Examples` section includes examples of using the function or method +* Code block annotations for examples are included between triple graves, as shown above. +Instead of including the programming language to use for syntax highlighting as the annotation +after the triple graves, alternative annotations include the `ignore`, `text`, `should_panic`, or `no_run`. +* Summary sentence is a short high level single sentence of its functionality +* Description paragraph is for details additional to the summary sentence +* Missing documentation annotations may be used to identify where to generate warnings with `#![warn(missing_docs)]` +or errors `#![deny(missing_docs)]` +* Hide documentation for items with `#[doc(hidden)]` + +=== Contributing to documentation (tests, extended examples, macros) for Substrate packages + +The code block annotations in the `# Example` section may be used as https://doc.rust-lang.org/1.9.0/book/documentation.html#documentation-as-tests[documentation as tests and for extended examples]. + +* Important notes: +** Rustdoc will automatically add a `main()` wrapper around the code block to test it +** https://doc.rust-lang.org/1.9.0/book/documentation.html#documenting-macros[Documenting macros]. +** Documentation as tests examples are included when running `cargo test` + +== Contributing + +=== Contributing Guidelines + +include::CONTRIBUTING.adoc[] + +=== Contributor Code of Conduct + +include::CODE_OF_CONDUCT.adoc[] + +== License + +https://github.com/paritytech/substrate/blob/master/LICENSE[LICENSE] diff --git a/SECURITY.md b/docs/SECURITY.md similarity index 100% rename from SECURITY.md rename to docs/SECURITY.md diff --git a/license_header.txt b/docs/license_header.txt similarity index 100% rename from license_header.txt rename to docs/license_header.txt From 7887f7b4417421f416552e0d563f0fad447bfeb9 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 21:05:14 +0100 Subject: [PATCH 07/61] move to bin --- Cargo.toml | 18 +-- bin/node-template/Cargo.toml | 41 +++++++ {node-template => bin/node-template}/LICENSE | 0 .../node-template}/README.md | 0 {node-template => bin/node-template}/build.rs | 0 bin/node-template/runtime/Cargo.toml | 61 ++++++++++ .../node-template}/runtime/build.rs | 0 .../node-template}/runtime/src/lib.rs | 0 .../node-template}/runtime/src/template.rs | 0 .../node-template}/scripts/init.sh | 0 .../node-template}/src/chain_spec.rs | 0 .../node-template}/src/cli.rs | 0 .../node-template}/src/main.rs | 0 .../node-template}/src/service.rs | 0 {node => bin/node}/cli/Cargo.toml | 72 +++++------ {node => bin/node}/cli/bin/main.rs | 0 .../node}/cli/browser-demo/.gitignore | 0 {node => bin/node}/cli/browser-demo/README.md | 0 {node => bin/node}/cli/browser-demo/build.sh | 0 .../node}/cli/browser-demo/favicon.png | Bin .../node}/cli/browser-demo/index.html | 0 {node => bin/node}/cli/browser-demo/ws.js | 0 {node => bin/node}/cli/build.rs | 0 .../node}/cli/doc/shell-completion.adoc | 0 {node => bin/node}/cli/res/flaming-fir.json | 0 {node => bin/node}/cli/src/browser.rs | 0 {node => bin/node}/cli/src/chain_spec.rs | 0 {node => bin/node}/cli/src/cli.rs | 0 {node => bin/node}/cli/src/factory_impl.rs | 0 {node => bin/node}/cli/src/lib.rs | 0 {node => bin/node}/cli/src/service.rs | 0 bin/node/executor/Cargo.toml | 45 +++++++ {node => bin/node}/executor/benches/bench.rs | 0 {node => bin/node}/executor/src/lib.rs | 0 {node => bin/node}/primitives/Cargo.toml | 6 +- {node => bin/node}/primitives/src/lib.rs | 0 {node => bin/node}/rpc-client/Cargo.toml | 2 +- {node => bin/node}/rpc-client/src/main.rs | 0 bin/node/rpc/Cargo.toml | 16 +++ {node => bin/node}/rpc/src/lib.rs | 0 bin/node/runtime/Cargo.toml | 114 ++++++++++++++++++ {node => bin/node}/runtime/build.rs | 2 +- {node => bin/node}/runtime/src/constants.rs | 0 {node => bin/node}/runtime/src/impls.rs | 0 {node => bin/node}/runtime/src/lib.rs | 0 bin/node/testing/Cargo.toml | 31 +++++ {node => bin/node}/testing/src/client.rs | 0 {node => bin/node}/testing/src/genesis.rs | 0 {node => bin/node}/testing/src/keyring.rs | 0 {node => bin/node}/testing/src/lib.rs | 0 {subkey => bin/subkey}/Cargo.toml | 10 +- {subkey => bin/subkey}/README.adoc | 0 {subkey => bin/subkey}/src/cli.yml | 0 {subkey => bin/subkey}/src/main.rs | 0 {subkey => bin/subkey}/src/vanity.rs | 0 core/service/Cargo.toml | 6 +- node-template/Cargo.toml | 41 ------- node-template/runtime/Cargo.toml | 61 ---------- node/executor/Cargo.toml | 45 ------- node/rpc/Cargo.toml | 16 --- node/runtime/Cargo.toml | 114 ------------------ node/testing/Cargo.toml | 31 ----- test-utils/chain-spec-builder/Cargo.toml | 2 +- 63 files changed, 367 insertions(+), 367 deletions(-) create mode 100644 bin/node-template/Cargo.toml rename {node-template => bin/node-template}/LICENSE (100%) rename {node-template => bin/node-template}/README.md (100%) rename {node-template => bin/node-template}/build.rs (100%) create mode 100644 bin/node-template/runtime/Cargo.toml rename {node-template => bin/node-template}/runtime/build.rs (100%) rename {node-template => bin/node-template}/runtime/src/lib.rs (100%) rename {node-template => bin/node-template}/runtime/src/template.rs (100%) rename {node-template => bin/node-template}/scripts/init.sh (100%) rename {node-template => bin/node-template}/src/chain_spec.rs (100%) rename {node-template => bin/node-template}/src/cli.rs (100%) rename {node-template => bin/node-template}/src/main.rs (100%) rename {node-template => bin/node-template}/src/service.rs (100%) rename {node => bin/node}/cli/Cargo.toml (57%) rename {node => bin/node}/cli/bin/main.rs (100%) rename {node => bin/node}/cli/browser-demo/.gitignore (100%) rename {node => bin/node}/cli/browser-demo/README.md (100%) rename {node => bin/node}/cli/browser-demo/build.sh (100%) rename {node => bin/node}/cli/browser-demo/favicon.png (100%) rename {node => bin/node}/cli/browser-demo/index.html (100%) rename {node => bin/node}/cli/browser-demo/ws.js (100%) rename {node => bin/node}/cli/build.rs (100%) rename {node => bin/node}/cli/doc/shell-completion.adoc (100%) rename {node => bin/node}/cli/res/flaming-fir.json (100%) rename {node => bin/node}/cli/src/browser.rs (100%) rename {node => bin/node}/cli/src/chain_spec.rs (100%) rename {node => bin/node}/cli/src/cli.rs (100%) rename {node => bin/node}/cli/src/factory_impl.rs (100%) rename {node => bin/node}/cli/src/lib.rs (100%) rename {node => bin/node}/cli/src/service.rs (100%) create mode 100644 bin/node/executor/Cargo.toml rename {node => bin/node}/executor/benches/bench.rs (100%) rename {node => bin/node}/executor/src/lib.rs (100%) rename {node => bin/node}/primitives/Cargo.toml (51%) rename {node => bin/node}/primitives/src/lib.rs (100%) rename {node => bin/node}/rpc-client/Cargo.toml (83%) rename {node => bin/node}/rpc-client/src/main.rs (100%) create mode 100644 bin/node/rpc/Cargo.toml rename {node => bin/node}/rpc/src/lib.rs (100%) create mode 100644 bin/node/runtime/Cargo.toml rename {node => bin/node}/runtime/build.rs (96%) rename {node => bin/node}/runtime/src/constants.rs (100%) rename {node => bin/node}/runtime/src/impls.rs (100%) rename {node => bin/node}/runtime/src/lib.rs (100%) create mode 100644 bin/node/testing/Cargo.toml rename {node => bin/node}/testing/src/client.rs (100%) rename {node => bin/node}/testing/src/genesis.rs (100%) rename {node => bin/node}/testing/src/keyring.rs (100%) rename {node => bin/node}/testing/src/lib.rs (100%) rename {subkey => bin/subkey}/Cargo.toml (69%) rename {subkey => bin/subkey}/README.adoc (100%) rename {subkey => bin/subkey}/src/cli.yml (100%) rename {subkey => bin/subkey}/src/main.rs (100%) rename {subkey => bin/subkey}/src/vanity.rs (100%) delete mode 100644 node-template/Cargo.toml delete mode 100644 node-template/runtime/Cargo.toml delete mode 100644 node/executor/Cargo.toml delete mode 100644 node/rpc/Cargo.toml delete mode 100644 node/runtime/Cargo.toml delete mode 100644 node/testing/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index bdc0d8737518c..d9bc55615530c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,15 +94,15 @@ members = [ "srml/transaction-payment/rpc", "srml/utility", "srml/evm", - "node/cli", - "node/executor", - "node/primitives", - "node/rpc", - "node/rpc-client", - "node/runtime", - "node/testing", - "node-template", - "subkey", + "bin/node/cli", + "bin/node/executor", + "bin/node/primitives", + "bin/node/rpc", + "bin/node/rpc-client", + "bin/node/runtime", + "bin/node/testing", + "bin/node-template", + "bin/subkey", "test-utils/chain-spec-builder", ] diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml new file mode 100644 index 0000000000000..6213e1f79a057 --- /dev/null +++ b/bin/node-template/Cargo.toml @@ -0,0 +1,41 @@ +[package] +name = "node-template" +version = "2.0.0" +authors = ["Anonymous"] +build = "build.rs" +edition = "2018" + +[[bin]] +name = "node-template" +path = "src/main.rs" + +[dependencies] +derive_more = "0.15.0" +futures = "0.1.29" +ctrlc = { version = "3.1.3", features = ["termination"] } +log = "0.4.8" +tokio = "0.1.22" +exit-future = "0.1.4" +parking_lot = "0.9.0" +codec = { package = "parity-scale-codec", version = "1.0.0" } +trie-root = "0.15.2" +sr-io = { path = "../../core/sr-io" } +substrate-cli = { path = "../../core/cli" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } +substrate-executor = { path = "../../core/executor" } +substrate-service = { path = "../../core/service" } +inherents = { package = "substrate-inherents", path = "../../core/inherents" } +transaction-pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } +network = { package = "substrate-network", path = "../../core/network" } +aura = { package = "substrate-consensus-aura", path = "../../core/consensus/aura" } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../core/consensus/aura/primitives" } +grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" } +grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" } +substrate-client = { path = "../../core/client" } +basic-authorship = { package = "substrate-basic-authorship", path = "../../core/basic-authorship" } +runtime = { package = "node-template-runtime", path = "runtime" } +sr-primitives = { path = "../../core/sr-primitives" } + +[build-dependencies] +vergen = "3.0.4" +build-script-utils = { package = "substrate-build-script-utils", path = "../../core/utils/build-script-utils" } diff --git a/node-template/LICENSE b/bin/node-template/LICENSE similarity index 100% rename from node-template/LICENSE rename to bin/node-template/LICENSE diff --git a/node-template/README.md b/bin/node-template/README.md similarity index 100% rename from node-template/README.md rename to bin/node-template/README.md diff --git a/node-template/build.rs b/bin/node-template/build.rs similarity index 100% rename from node-template/build.rs rename to bin/node-template/build.rs diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml new file mode 100644 index 0000000000000..975a8501409e0 --- /dev/null +++ b/bin/node-template/runtime/Cargo.toml @@ -0,0 +1,61 @@ +[package] +name = "node-template-runtime" +version = "2.0.0" +authors = ["Anonymous"] +edition = "2018" + +[dependencies] +serde = { version = "1.0.101", optional = true, features = ["derive"] } +safe-mix = { version = "1.0.0", default-features = false } +codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } +rstd = { package = "sr-std", path = "../../../core/sr-std", default_features = false } +runtime-io = { package = "sr-io", path = "../../../core/sr-io", default_features = false } +version = { package = "sr-version", path = "../../../core/sr-version", default_features = false } +support = { package = "srml-support", path = "../../../srml/support", default_features = false } +primitives = { package = "substrate-primitives", path = "../../../core/primitives", default_features = false } +substrate-session = { path = "../../../core/session", default-features = false } +balances = { package = "srml-balances", path = "../../../srml/balances", default_features = false } +aura = { package = "srml-aura", path = "../../../srml/aura", default_features = false } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../core/consensus/aura/primitives", default_features = false } +grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa", default_features = false } +executive = { package = "srml-executive", path = "../../../srml/executive", default_features = false } +indices = { package = "srml-indices", path = "../../../srml/indices", default_features = false } +randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../srml/randomness-collective-flip", default_features = false } +system = { package = "srml-system", path = "../../../srml/system", default_features = false } +timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default_features = false } +sudo = { package = "srml-sudo", path = "../../../srml/sudo", default_features = false } +transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment", default_features = false } +sr-primitives = { path = "../../../core/sr-primitives", default_features = false } +client = { package = "substrate-client", path = "../../../core/client", default_features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../core/offchain/primitives", default-features = false } + +[build-dependencies] +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" } + +[features] +default = ["std"] +std = [ + "codec/std", + "client/std", + "rstd/std", + "runtime-io/std", + "support/std", + "balances/std", + "aura/std", + "aura-primitives/std", + "grandpa/std", + "executive/std", + "indices/std", + "primitives/std", + "sr-primitives/std", + "randomness-collective-flip/std", + "system/std", + "timestamp/std", + "sudo/std", + "transaction-payment/std", + "version/std", + "serde", + "safe-mix/std", + "offchain-primitives/std", + "substrate-session/std", +] diff --git a/node-template/runtime/build.rs b/bin/node-template/runtime/build.rs similarity index 100% rename from node-template/runtime/build.rs rename to bin/node-template/runtime/build.rs diff --git a/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs similarity index 100% rename from node-template/runtime/src/lib.rs rename to bin/node-template/runtime/src/lib.rs diff --git a/node-template/runtime/src/template.rs b/bin/node-template/runtime/src/template.rs similarity index 100% rename from node-template/runtime/src/template.rs rename to bin/node-template/runtime/src/template.rs diff --git a/node-template/scripts/init.sh b/bin/node-template/scripts/init.sh similarity index 100% rename from node-template/scripts/init.sh rename to bin/node-template/scripts/init.sh diff --git a/node-template/src/chain_spec.rs b/bin/node-template/src/chain_spec.rs similarity index 100% rename from node-template/src/chain_spec.rs rename to bin/node-template/src/chain_spec.rs diff --git a/node-template/src/cli.rs b/bin/node-template/src/cli.rs similarity index 100% rename from node-template/src/cli.rs rename to bin/node-template/src/cli.rs diff --git a/node-template/src/main.rs b/bin/node-template/src/main.rs similarity index 100% rename from node-template/src/main.rs rename to bin/node-template/src/main.rs diff --git a/node-template/src/service.rs b/bin/node-template/src/service.rs similarity index 100% rename from node-template/src/service.rs rename to bin/node-template/src/service.rs diff --git a/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml similarity index 57% rename from node/cli/Cargo.toml rename to bin/node/cli/Cargo.toml index 931488d3bcaeb..0b61a124a19e3 100644 --- a/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -33,38 +33,38 @@ rand = "0.7.2" structopt = "0.3.3" # primitives -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -sr-primitives = { path = "../../core/sr-primitives" } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives" } -grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" } +primitives = { package = "substrate-primitives", path = "../../../core/primitives" } +sr-primitives = { path = "../../../core/sr-primitives" } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../core/consensus/babe/primitives" } +grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../../core/finality-grandpa/primitives" } # core dependencies -sr-io = { path = "../../core/sr-io" } -client = { package = "substrate-client", path = "../../core/client" } -inherents = { package = "substrate-inherents", path = "../../core/inherents" } -chain-spec = { package = "substrate-chain-spec", path = "../../core/chain-spec" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } -network = { package = "substrate-network", path = "../../core/network" } -babe = { package = "substrate-consensus-babe", path = "../../core/consensus/babe" } -grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" } -keyring = { package = "substrate-keyring", path = "../../core/keyring" } -client_db = { package = "substrate-client-db", path = "../../core/client/db", default-features = false } -offchain = { package = "substrate-offchain", path = "../../core/offchain" } -substrate-rpc = { package = "substrate-rpc", path = "../../core/rpc" } -substrate-basic-authorship = { path = "../../core/basic-authorship" } -substrate-service = { path = "../../core/service", default-features = false } -substrate-telemetry = { package = "substrate-telemetry", path = "../../core/telemetry" } +sr-io = { path = "../../../core/sr-io" } +client = { package = "substrate-client", path = "../../../core/client" } +inherents = { package = "substrate-inherents", path = "../../../core/inherents" } +chain-spec = { package = "substrate-chain-spec", path = "../../../core/chain-spec" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../../core/transaction-pool" } +network = { package = "substrate-network", path = "../../../core/network" } +babe = { package = "substrate-consensus-babe", path = "../../../core/consensus/babe" } +grandpa = { package = "substrate-finality-grandpa", path = "../../../core/finality-grandpa" } +keyring = { package = "substrate-keyring", path = "../../../core/keyring" } +client_db = { package = "substrate-client-db", path = "../../../core/client/db", default-features = false } +offchain = { package = "substrate-offchain", path = "../../../core/offchain" } +substrate-rpc = { package = "substrate-rpc", path = "../../../core/rpc" } +substrate-basic-authorship = { path = "../../../core/basic-authorship" } +substrate-service = { path = "../../../core/service", default-features = false } +substrate-telemetry = { package = "substrate-telemetry", path = "../../../core/telemetry" } # srml dependencies -indices = { package = "srml-indices", path = "../../srml/indices" } -timestamp = { package = "srml-timestamp", path = "../../srml/timestamp", default-features = false } -finality_tracker = { package = "srml-finality-tracker", path = "../../srml/finality-tracker", default-features = false } -contracts = { package = "srml-contracts", path = "../../srml/contracts" } -system = { package = "srml-system", path = "../../srml/system" } -balances = { package = "srml-balances", path = "../../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment" } -support = { package = "srml-support", path = "../../srml/support", default-features = false } -im_online = { package = "srml-im-online", path = "../../srml/im-online", default-features = false } +indices = { package = "srml-indices", path = "../../../srml/indices" } +timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default-features = false } +finality_tracker = { package = "srml-finality-tracker", path = "../../../srml/finality-tracker", default-features = false } +contracts = { package = "srml-contracts", path = "../../../srml/contracts" } +system = { package = "srml-system", path = "../../../srml/system" } +balances = { package = "srml-balances", path = "../../../srml/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } +support = { package = "srml-support", path = "../../../srml/support", default-features = false } +im_online = { package = "srml-im-online", path = "../../../srml/im-online", default-features = false } # node-specific dependencies node-runtime = { path = "../runtime" } @@ -75,8 +75,8 @@ node-executor = { path = "../executor" } # CLI-specific dependencies tokio = { version = "0.1.22", optional = true } exit-future = { version = "0.1.4", optional = true } -substrate-cli = { path = "../../core/cli", optional = true } -transaction-factory = { path = "../../test-utils/transaction-factory", optional = true } +substrate-cli = { path = "../../../core/cli", optional = true } +transaction-factory = { path = "../../../test-utils/transaction-factory", optional = true } ctrlc = { version = "3.1.3", features = ["termination"], optional = true } # WASM-specific dependencies @@ -91,16 +91,16 @@ kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b031 rand6 = { package = "rand", version = "0.6", features = ["wasm-bindgen"], optional = true } # Imported just for the `wasm-bindgen` feature [dev-dependencies] -keystore = { package = "substrate-keystore", path = "../../core/keystore" } -babe = { package = "substrate-consensus-babe", path = "../../core/consensus/babe", features = ["test-helpers"] } -consensus-common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } -service-test = { package = "substrate-service-test", path = "../../core/service/test" } +keystore = { package = "substrate-keystore", path = "../../../core/keystore" } +babe = { package = "substrate-consensus-babe", path = "../../../core/consensus/babe", features = ["test-helpers"] } +consensus-common = { package = "substrate-consensus-common", path = "../../../core/consensus/common" } +service-test = { package = "substrate-service-test", path = "../../../core/service/test" } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19" } tempfile = "3.1.0" [build-dependencies] -substrate-cli = { package = "substrate-cli", path = "../../core/cli" } -build-script-utils = { package = "substrate-build-script-utils", path = "../../core/utils/build-script-utils" } +substrate-cli = { package = "substrate-cli", path = "../../../core/cli" } +build-script-utils = { package = "substrate-build-script-utils", path = "../../../core/utils/build-script-utils" } structopt = "0.3.3" vergen = "3.0.4" diff --git a/node/cli/bin/main.rs b/bin/node/cli/bin/main.rs similarity index 100% rename from node/cli/bin/main.rs rename to bin/node/cli/bin/main.rs diff --git a/node/cli/browser-demo/.gitignore b/bin/node/cli/browser-demo/.gitignore similarity index 100% rename from node/cli/browser-demo/.gitignore rename to bin/node/cli/browser-demo/.gitignore diff --git a/node/cli/browser-demo/README.md b/bin/node/cli/browser-demo/README.md similarity index 100% rename from node/cli/browser-demo/README.md rename to bin/node/cli/browser-demo/README.md diff --git a/node/cli/browser-demo/build.sh b/bin/node/cli/browser-demo/build.sh similarity index 100% rename from node/cli/browser-demo/build.sh rename to bin/node/cli/browser-demo/build.sh diff --git a/node/cli/browser-demo/favicon.png b/bin/node/cli/browser-demo/favicon.png similarity index 100% rename from node/cli/browser-demo/favicon.png rename to bin/node/cli/browser-demo/favicon.png diff --git a/node/cli/browser-demo/index.html b/bin/node/cli/browser-demo/index.html similarity index 100% rename from node/cli/browser-demo/index.html rename to bin/node/cli/browser-demo/index.html diff --git a/node/cli/browser-demo/ws.js b/bin/node/cli/browser-demo/ws.js similarity index 100% rename from node/cli/browser-demo/ws.js rename to bin/node/cli/browser-demo/ws.js diff --git a/node/cli/build.rs b/bin/node/cli/build.rs similarity index 100% rename from node/cli/build.rs rename to bin/node/cli/build.rs diff --git a/node/cli/doc/shell-completion.adoc b/bin/node/cli/doc/shell-completion.adoc similarity index 100% rename from node/cli/doc/shell-completion.adoc rename to bin/node/cli/doc/shell-completion.adoc diff --git a/node/cli/res/flaming-fir.json b/bin/node/cli/res/flaming-fir.json similarity index 100% rename from node/cli/res/flaming-fir.json rename to bin/node/cli/res/flaming-fir.json diff --git a/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs similarity index 100% rename from node/cli/src/browser.rs rename to bin/node/cli/src/browser.rs diff --git a/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs similarity index 100% rename from node/cli/src/chain_spec.rs rename to bin/node/cli/src/chain_spec.rs diff --git a/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs similarity index 100% rename from node/cli/src/cli.rs rename to bin/node/cli/src/cli.rs diff --git a/node/cli/src/factory_impl.rs b/bin/node/cli/src/factory_impl.rs similarity index 100% rename from node/cli/src/factory_impl.rs rename to bin/node/cli/src/factory_impl.rs diff --git a/node/cli/src/lib.rs b/bin/node/cli/src/lib.rs similarity index 100% rename from node/cli/src/lib.rs rename to bin/node/cli/src/lib.rs diff --git a/node/cli/src/service.rs b/bin/node/cli/src/service.rs similarity index 100% rename from node/cli/src/service.rs rename to bin/node/cli/src/service.rs diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml new file mode 100644 index 0000000000000..e9a59d427fdbf --- /dev/null +++ b/bin/node/executor/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "node-executor" +version = "2.0.0" +authors = ["Parity Technologies "] +description = "Substrate node implementation in Rust." +edition = "2018" + +[dependencies] +trie-root = "0.15.2" +codec = { package = "parity-scale-codec", version = "1.0.0" } +runtime_io = { package = "sr-io", path = "../../../core/sr-io" } +state_machine = { package = "substrate-state-machine", path = "../../../core/state-machine" } +substrate-executor = { path = "../../../core/executor" } +primitives = { package = "substrate-primitives", path = "../../../core/primitives" } +trie = { package = "substrate-trie", path = "../../../core/trie" } +node-primitives = { path = "../primitives" } +node-runtime = { path = "../runtime" } + +[dev-dependencies] +node-testing = { path = "../testing" } +test-client = { package = "substrate-test-client", path = "../../../core/test-client" } +sr-primitives = { path = "../../../core/sr-primitives" } +runtime_support = { package = "srml-support", path = "../../../srml/support" } +balances = { package = "srml-balances", path = "../../../srml/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } +session = { package = "srml-session", path = "../../../srml/session" } +system = { package = "srml-system", path = "../../../srml/system" } +timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } +treasury = { package = "srml-treasury", path = "../../../srml/treasury" } +contracts = { package = "srml-contracts", path = "../../../srml/contracts" } +grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa" } +indices = { package = "srml-indices", path = "../../../srml/indices" } +wabt = "0.9.2" +criterion = "0.3.0" + +[features] +wasmtime = [ + "substrate-executor/wasmtime", +] +stress-test = [] + +[[bench]] +name = "bench" +harness = false + diff --git a/node/executor/benches/bench.rs b/bin/node/executor/benches/bench.rs similarity index 100% rename from node/executor/benches/bench.rs rename to bin/node/executor/benches/bench.rs diff --git a/node/executor/src/lib.rs b/bin/node/executor/src/lib.rs similarity index 100% rename from node/executor/src/lib.rs rename to bin/node/executor/src/lib.rs diff --git a/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml similarity index 51% rename from node/primitives/Cargo.toml rename to bin/node/primitives/Cargo.toml index 25725449a3a5a..736e4f574dffc 100644 --- a/node/primitives/Cargo.toml +++ b/bin/node/primitives/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false } +sr-primitives = { path = "../../../core/sr-primitives", default-features = false } [dev-dependencies] -substrate-serializer = { path = "../../core/serializer" } +substrate-serializer = { path = "../../../core/serializer" } pretty_assertions = "0.6.1" [features] diff --git a/node/primitives/src/lib.rs b/bin/node/primitives/src/lib.rs similarity index 100% rename from node/primitives/src/lib.rs rename to bin/node/primitives/src/lib.rs diff --git a/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml similarity index 83% rename from node/rpc-client/Cargo.toml rename to bin/node/rpc-client/Cargo.toml index bc30f598bbc22..76cb24ae00a95 100644 --- a/node/rpc-client/Cargo.toml +++ b/bin/node/rpc-client/Cargo.toml @@ -11,4 +11,4 @@ hyper = "0.12.35" jsonrpc-core-client = { version = "14.0.3", features = ["http", "ws"] } log = "0.4.8" node-primitives = { path = "../primitives" } -substrate-rpc = { path = "../../core/rpc", version = "2.0.0" } +substrate-rpc = { path = "../../../core/rpc", version = "2.0.0" } diff --git a/node/rpc-client/src/main.rs b/bin/node/rpc-client/src/main.rs similarity index 100% rename from node/rpc-client/src/main.rs rename to bin/node/rpc-client/src/main.rs diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml new file mode 100644 index 0000000000000..3f669f39aa6cd --- /dev/null +++ b/bin/node/rpc/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "node-rpc" +version = "2.0.0" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +client = { package = "substrate-client", path = "../../../core/client" } +jsonrpc-core = "14.0.3" +node-primitives = { path = "../primitives" } +node-runtime = { path = "../runtime" } +sr-primitives = { path = "../../../core/sr-primitives" } +srml-contracts-rpc = { path = "../../../srml/contracts/rpc/" } +srml-transaction-payment-rpc = { path = "../../../srml/transaction-payment/rpc/" } +srml-system-rpc = { path = "../../../srml/system/rpc/" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../../core/transaction-pool" } diff --git a/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs similarity index 100% rename from node/rpc/src/lib.rs rename to bin/node/rpc/src/lib.rs diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml new file mode 100644 index 0000000000000..9949fbc4b2132 --- /dev/null +++ b/bin/node/runtime/Cargo.toml @@ -0,0 +1,114 @@ +[package] +name = "node-runtime" +version = "2.0.0" +authors = ["Parity Technologies "] +edition = "2018" +build = "build.rs" + +[dependencies] +# third-party dependencies +codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } +integer-sqrt = { version = "0.1.2" } +safe-mix = { version = "1.0", default-features = false } +rustc-hex = { version = "2.0", optional = true } +serde = { version = "1.0.102", optional = true } + +# primitives +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../core/consensus/babe/primitives", default-features = false } +node-primitives = { path = "../primitives", default-features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../core/offchain/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false } +sr-primitives = { path = "../../../core/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../../core/sr-staking-primitives", default-features = false } + +# core dependencies +client = { package = "substrate-client", path = "../../../core/client", default-features = false } +rstd = { package = "sr-std", path = "../../../core/sr-std", default-features = false } +version = { package = "sr-version", path = "../../../core/sr-version", default-features = false } +substrate-session = { path = "../../../core/session", default-features = false } +substrate-keyring = { path = "../../../core/keyring", optional = true } + +# srml dependencies +authorship = { package = "srml-authorship", path = "../../../srml/authorship", default-features = false } +babe = { package = "srml-babe", path = "../../../srml/babe", default-features = false } +balances = { package = "srml-balances", path = "../../../srml/balances", default-features = false } +collective = { package = "srml-collective", path = "../../../srml/collective", default-features = false } +contracts = { package = "srml-contracts", path = "../../../srml/contracts", default-features = false } +contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../../srml/contracts/rpc/runtime-api/", default-features = false } +democracy = { package = "srml-democracy", path = "../../../srml/democracy", default-features = false } +elections-phragmen = { package = "srml-elections-phragmen", path = "../../../srml/elections-phragmen", default-features = false } +executive = { package = "srml-executive", path = "../../../srml/executive", default-features = false } +finality-tracker = { package = "srml-finality-tracker", path = "../../../srml/finality-tracker", default-features = false } +grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa", default-features = false } +im-online = { package = "srml-im-online", path = "../../../srml/im-online", default-features = false } +indices = { package = "srml-indices", path = "../../../srml/indices", default-features = false } +membership = { package = "srml-membership", path = "../../../srml/membership", default-features = false } +nicks = { package = "srml-nicks", path = "../../../srml/nicks", default-features = false } +offences = { package = "srml-offences", path = "../../../srml/offences", default-features = false } +randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../srml/randomness-collective-flip", default-features = false } +session = { package = "srml-session", path = "../../../srml/session", default-features = false, features = ["historical"] } +staking = { package = "srml-staking", path = "../../../srml/staking", default-features = false } +srml-staking-reward-curve = { path = "../../../srml/staking/reward-curve"} +sudo = { package = "srml-sudo", path = "../../../srml/sudo", default-features = false } +support = { package = "srml-support", path = "../../../srml/support", default-features = false } +system = { package = "srml-system", path = "../../../srml/system", default-features = false } +system-rpc-runtime-api = { package = "srml-system-rpc-runtime-api", path = "../../../srml/system/rpc/runtime-api/", default-features = false } +timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default-features = false } +treasury = { package = "srml-treasury", path = "../../../srml/treasury", default-features = false } +utility = { package = "srml-utility", path = "../../../srml/utility", default-features = false } +transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment", default-features = false } +transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../../srml/transaction-payment/rpc/runtime-api/", default-features = false } + +[build-dependencies] +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../core/utils/wasm-builder-runner" } + +[dev-dependencies] +runtime_io = { package = "sr-io", path = "../../../core/sr-io" } + +[features] +default = ["std"] +std = [ + "authorship/std", + "babe-primitives/std", + "babe/std", + "balances/std", + "client/std", + "codec/std", + "collective/std", + "contracts/std", + "contracts-rpc-runtime-api/std", + "democracy/std", + "elections-phragmen/std", + "executive/std", + "finality-tracker/std", + "grandpa/std", + "im-online/std", + "indices/std", + "membership/std", + "nicks/std", + "node-primitives/std", + "offchain-primitives/std", + "offences/std", + "primitives/std", + "randomness-collective-flip/std", + "rstd/std", + "rustc-hex", + "safe-mix/std", + "serde", + "session/std", + "sr-primitives/std", + "sr-staking-primitives/std", + "staking/std", + "substrate-keyring", + "substrate-session/std", + "sudo/std", + "support/std", + "system/std", + "system-rpc-runtime-api/std", + "timestamp/std", + "treasury/std", + "utility/std", + "transaction-payment/std", + "transaction-payment-rpc-runtime-api/std", + "version/std", +] diff --git a/node/runtime/build.rs b/bin/node/runtime/build.rs similarity index 96% rename from node/runtime/build.rs rename to bin/node/runtime/build.rs index f5c2f98a75c8a..144875df4b823 100644 --- a/node/runtime/build.rs +++ b/bin/node/runtime/build.rs @@ -20,7 +20,7 @@ fn main() { build_current_project_with_rustflags( "wasm_binary.rs", WasmBuilderSource::CratesOrPath { - path: "../../core/utils/wasm-builder", + path: "../../../core/utils/wasm-builder", version: "1.0.8", }, // This instructs LLD to export __heap_base as a global variable, which is used by the diff --git a/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs similarity index 100% rename from node/runtime/src/constants.rs rename to bin/node/runtime/src/constants.rs diff --git a/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs similarity index 100% rename from node/runtime/src/impls.rs rename to bin/node/runtime/src/impls.rs diff --git a/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs similarity index 100% rename from node/runtime/src/lib.rs rename to bin/node/runtime/src/lib.rs diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml new file mode 100644 index 0000000000000..9426122f687a9 --- /dev/null +++ b/bin/node/testing/Cargo.toml @@ -0,0 +1,31 @@ +[package] +name = "node-testing" +version = "2.0.0" +authors = ["Parity Technologies "] +description = "Test utilities for Substrate node." +edition = "2018" + +[dependencies] +balances = { package = "srml-balances", path = "../../../srml/balances" } +client = { package = "substrate-client", path = "../../../core/client" } +contracts = { package = "srml-contracts", path = "../../../srml/contracts" } +grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa" } +indices = { package = "srml-indices", path = "../../../srml/indices" } +keyring = { package = "substrate-keyring", path = "../../../core/keyring" } +node-executor = { path = "../executor" } +node-primitives = { path = "../primitives" } +node-runtime = { path = "../runtime" } +codec = { package = "parity-scale-codec", version = "1.0.0" } +primitives = { package = "substrate-primitives", path = "../../../core/primitives" } +sr-io = { path = "../../../core/sr-io" } +sr-primitives = { path = "../../../core/sr-primitives" } +runtime_support = { package = "srml-support", path = "../../../srml/support" } +session = { package = "srml-session", path = "../../../srml/session" } +staking = { package = "srml-staking", path = "../../../srml/staking" } +substrate-executor = { path = "../../../core/executor" } +system = { package = "srml-system", path = "../../../srml/system" } +test-client = { package = "substrate-test-client", path = "../../../core/test-client" } +timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } +treasury = { package = "srml-treasury", path = "../../../srml/treasury" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } +wabt = "0.9.2" diff --git a/node/testing/src/client.rs b/bin/node/testing/src/client.rs similarity index 100% rename from node/testing/src/client.rs rename to bin/node/testing/src/client.rs diff --git a/node/testing/src/genesis.rs b/bin/node/testing/src/genesis.rs similarity index 100% rename from node/testing/src/genesis.rs rename to bin/node/testing/src/genesis.rs diff --git a/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs similarity index 100% rename from node/testing/src/keyring.rs rename to bin/node/testing/src/keyring.rs diff --git a/node/testing/src/lib.rs b/bin/node/testing/src/lib.rs similarity index 100% rename from node/testing/src/lib.rs rename to bin/node/testing/src/lib.rs diff --git a/subkey/Cargo.toml b/bin/subkey/Cargo.toml similarity index 69% rename from subkey/Cargo.toml rename to bin/subkey/Cargo.toml index e1c3ef64d26d4..75939a2d2685f 100644 --- a/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", version = "*", path = "../core/primitives" } +primitives = { package = "substrate-primitives", version = "*", path = "../../core/primitives" } node-runtime = { version = "*", path = "../node/runtime" } node-primitives = { version = "*", path = "../node/primitives" } -sr-primitives = { version = "*", path = "../core/sr-primitives" } +sr-primitives = { version = "*", path = "../../core/sr-primitives" } rand = "0.7.2" clap = { version = "2.33.0", features = ["yaml"] } tiny-bip39 = "0.6.2" @@ -17,9 +17,9 @@ substrate-bip39 = "0.3.1" hex = "0.3.2" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0" } -system = { package = "srml-system", path = "../srml/system" } -balances = { package = "srml-balances", path = "../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../srml/transaction-payment" } +system = { package = "srml-system", path = "../../srml/system" } +balances = { package = "srml-balances", path = "../../srml/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment" } [features] bench = [] diff --git a/subkey/README.adoc b/bin/subkey/README.adoc similarity index 100% rename from subkey/README.adoc rename to bin/subkey/README.adoc diff --git a/subkey/src/cli.yml b/bin/subkey/src/cli.yml similarity index 100% rename from subkey/src/cli.yml rename to bin/subkey/src/cli.yml diff --git a/subkey/src/main.rs b/bin/subkey/src/main.rs similarity index 100% rename from subkey/src/main.rs rename to bin/subkey/src/main.rs diff --git a/subkey/src/vanity.rs b/bin/subkey/src/vanity.rs similarity index 100% rename from subkey/src/vanity.rs rename to bin/subkey/src/vanity.rs diff --git a/core/service/Cargo.toml b/core/service/Cargo.toml index 3d40550c8c5b5..9f587d34a2d83 100644 --- a/core/service/Cargo.toml +++ b/core/service/Cargo.toml @@ -50,9 +50,9 @@ parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" } [dev-dependencies] substrate-test-runtime-client = { path = "../test-runtime/client" } -node-executor = { path = "../../node/executor" } -node-primitives = { path = "../../node/primitives" } -node-runtime = { path = "../../node/runtime" } +node-executor = { path = "../../bin/node/executor" } +node-primitives = { path = "../../bin/node/primitives" } +node-runtime = { path = "../../bin/node/runtime" } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives" } grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" } grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" } diff --git a/node-template/Cargo.toml b/node-template/Cargo.toml deleted file mode 100644 index e68cbc189379b..0000000000000 --- a/node-template/Cargo.toml +++ /dev/null @@ -1,41 +0,0 @@ -[package] -name = "node-template" -version = "2.0.0" -authors = ["Anonymous"] -build = "build.rs" -edition = "2018" - -[[bin]] -name = "node-template" -path = "src/main.rs" - -[dependencies] -derive_more = "0.15.0" -futures = "0.1.29" -ctrlc = { version = "3.1.3", features = ["termination"] } -log = "0.4.8" -tokio = "0.1.22" -exit-future = "0.1.4" -parking_lot = "0.9.0" -codec = { package = "parity-scale-codec", version = "1.0.0" } -trie-root = "0.15.2" -sr-io = { path = "../core/sr-io" } -substrate-cli = { path = "../core/cli" } -primitives = { package = "substrate-primitives", path = "../core/primitives" } -substrate-executor = { path = "../core/executor" } -substrate-service = { path = "../core/service" } -inherents = { package = "substrate-inherents", path = "../core/inherents" } -transaction-pool = { package = "substrate-transaction-pool", path = "../core/transaction-pool" } -network = { package = "substrate-network", path = "../core/network" } -aura = { package = "substrate-consensus-aura", path = "../core/consensus/aura" } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../core/consensus/aura/primitives" } -grandpa = { package = "substrate-finality-grandpa", path = "../core/finality-grandpa" } -grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../core/finality-grandpa/primitives" } -substrate-client = { path = "../core/client" } -basic-authorship = { package = "substrate-basic-authorship", path = "../core/basic-authorship" } -runtime = { package = "node-template-runtime", path = "runtime" } -sr-primitives = { path = "../core/sr-primitives" } - -[build-dependencies] -vergen = "3.0.4" -build-script-utils = { package = "substrate-build-script-utils", path = "../core/utils/build-script-utils" } diff --git a/node-template/runtime/Cargo.toml b/node-template/runtime/Cargo.toml deleted file mode 100644 index ff2e3eb2b1676..0000000000000 --- a/node-template/runtime/Cargo.toml +++ /dev/null @@ -1,61 +0,0 @@ -[package] -name = "node-template-runtime" -version = "2.0.0" -authors = ["Anonymous"] -edition = "2018" - -[dependencies] -serde = { version = "1.0.101", optional = true, features = ["derive"] } -safe-mix = { version = "1.0.0", default-features = false } -codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false } -version = { package = "sr-version", path = "../../core/sr-version", default_features = false } -support = { package = "srml-support", path = "../../srml/support", default_features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false } -substrate-session = { path = "../../core/session", default-features = false } -balances = { package = "srml-balances", path = "../../srml/balances", default_features = false } -aura = { package = "srml-aura", path = "../../srml/aura", default_features = false } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../core/consensus/aura/primitives", default_features = false } -grandpa = { package = "srml-grandpa", path = "../../srml/grandpa", default_features = false } -executive = { package = "srml-executive", path = "../../srml/executive", default_features = false } -indices = { package = "srml-indices", path = "../../srml/indices", default_features = false } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../srml/randomness-collective-flip", default_features = false } -system = { package = "srml-system", path = "../../srml/system", default_features = false } -timestamp = { package = "srml-timestamp", path = "../../srml/timestamp", default_features = false } -sudo = { package = "srml-sudo", path = "../../srml/sudo", default_features = false } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment", default_features = false } -sr-primitives = { path = "../../core/sr-primitives", default_features = false } -client = { package = "substrate-client", path = "../../core/client", default_features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../core/offchain/primitives", default-features = false } - -[build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" } - -[features] -default = ["std"] -std = [ - "codec/std", - "client/std", - "rstd/std", - "runtime-io/std", - "support/std", - "balances/std", - "aura/std", - "aura-primitives/std", - "grandpa/std", - "executive/std", - "indices/std", - "primitives/std", - "sr-primitives/std", - "randomness-collective-flip/std", - "system/std", - "timestamp/std", - "sudo/std", - "transaction-payment/std", - "version/std", - "serde", - "safe-mix/std", - "offchain-primitives/std", - "substrate-session/std", -] diff --git a/node/executor/Cargo.toml b/node/executor/Cargo.toml deleted file mode 100644 index 93f29910edbe0..0000000000000 --- a/node/executor/Cargo.toml +++ /dev/null @@ -1,45 +0,0 @@ -[package] -name = "node-executor" -version = "2.0.0" -authors = ["Parity Technologies "] -description = "Substrate node implementation in Rust." -edition = "2018" - -[dependencies] -trie-root = "0.15.2" -codec = { package = "parity-scale-codec", version = "1.0.0" } -runtime_io = { package = "sr-io", path = "../../core/sr-io" } -state_machine = { package = "substrate-state-machine", path = "../../core/state-machine" } -substrate-executor = { path = "../../core/executor" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -trie = { package = "substrate-trie", path = "../../core/trie" } -node-primitives = { path = "../primitives" } -node-runtime = { path = "../runtime" } - -[dev-dependencies] -node-testing = { path = "../testing" } -test-client = { package = "substrate-test-client", path = "../../core/test-client" } -sr-primitives = { path = "../../core/sr-primitives" } -runtime_support = { package = "srml-support", path = "../../srml/support" } -balances = { package = "srml-balances", path = "../../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment" } -session = { package = "srml-session", path = "../../srml/session" } -system = { package = "srml-system", path = "../../srml/system" } -timestamp = { package = "srml-timestamp", path = "../../srml/timestamp" } -treasury = { package = "srml-treasury", path = "../../srml/treasury" } -contracts = { package = "srml-contracts", path = "../../srml/contracts" } -grandpa = { package = "srml-grandpa", path = "../../srml/grandpa" } -indices = { package = "srml-indices", path = "../../srml/indices" } -wabt = "0.9.2" -criterion = "0.3.0" - -[features] -wasmtime = [ - "substrate-executor/wasmtime", -] -stress-test = [] - -[[bench]] -name = "bench" -harness = false - diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml deleted file mode 100644 index 5d2b3ac85832d..0000000000000 --- a/node/rpc/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "node-rpc" -version = "2.0.0" -authors = ["Parity Technologies "] -edition = "2018" - -[dependencies] -client = { package = "substrate-client", path = "../../core/client" } -jsonrpc-core = "14.0.3" -node-primitives = { path = "../primitives" } -node-runtime = { path = "../runtime" } -sr-primitives = { path = "../../core/sr-primitives" } -srml-contracts-rpc = { path = "../../srml/contracts/rpc/" } -srml-transaction-payment-rpc = { path = "../../srml/transaction-payment/rpc/" } -srml-system-rpc = { path = "../../srml/system/rpc/" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } diff --git a/node/runtime/Cargo.toml b/node/runtime/Cargo.toml deleted file mode 100644 index 5f450601246e9..0000000000000 --- a/node/runtime/Cargo.toml +++ /dev/null @@ -1,114 +0,0 @@ -[package] -name = "node-runtime" -version = "2.0.0" -authors = ["Parity Technologies "] -edition = "2018" -build = "build.rs" - -[dependencies] -# third-party dependencies -codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } -integer-sqrt = { version = "0.1.2" } -safe-mix = { version = "1.0", default-features = false } -rustc-hex = { version = "2.0", optional = true } -serde = { version = "1.0.102", optional = true } - -# primitives -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives", default-features = false } -node-primitives = { path = "../primitives", default-features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../core/offchain/primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } - -# core dependencies -client = { package = "substrate-client", path = "../../core/client", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -version = { package = "sr-version", path = "../../core/sr-version", default-features = false } -substrate-session = { path = "../../core/session", default-features = false } -substrate-keyring = { path = "../../core/keyring", optional = true } - -# srml dependencies -authorship = { package = "srml-authorship", path = "../../srml/authorship", default-features = false } -babe = { package = "srml-babe", path = "../../srml/babe", default-features = false } -balances = { package = "srml-balances", path = "../../srml/balances", default-features = false } -collective = { package = "srml-collective", path = "../../srml/collective", default-features = false } -contracts = { package = "srml-contracts", path = "../../srml/contracts", default-features = false } -contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../srml/contracts/rpc/runtime-api/", default-features = false } -democracy = { package = "srml-democracy", path = "../../srml/democracy", default-features = false } -elections-phragmen = { package = "srml-elections-phragmen", path = "../../srml/elections-phragmen", default-features = false } -executive = { package = "srml-executive", path = "../../srml/executive", default-features = false } -finality-tracker = { package = "srml-finality-tracker", path = "../../srml/finality-tracker", default-features = false } -grandpa = { package = "srml-grandpa", path = "../../srml/grandpa", default-features = false } -im-online = { package = "srml-im-online", path = "../../srml/im-online", default-features = false } -indices = { package = "srml-indices", path = "../../srml/indices", default-features = false } -membership = { package = "srml-membership", path = "../../srml/membership", default-features = false } -nicks = { package = "srml-nicks", path = "../../srml/nicks", default-features = false } -offences = { package = "srml-offences", path = "../../srml/offences", default-features = false } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../srml/randomness-collective-flip", default-features = false } -session = { package = "srml-session", path = "../../srml/session", default-features = false, features = ["historical"] } -staking = { package = "srml-staking", path = "../../srml/staking", default-features = false } -srml-staking-reward-curve = { path = "../../srml/staking/reward-curve"} -sudo = { package = "srml-sudo", path = "../../srml/sudo", default-features = false } -support = { package = "srml-support", path = "../../srml/support", default-features = false } -system = { package = "srml-system", path = "../../srml/system", default-features = false } -system-rpc-runtime-api = { package = "srml-system-rpc-runtime-api", path = "../../srml/system/rpc/runtime-api/", default-features = false } -timestamp = { package = "srml-timestamp", path = "../../srml/timestamp", default-features = false } -treasury = { package = "srml-treasury", path = "../../srml/treasury", default-features = false } -utility = { package = "srml-utility", path = "../../srml/utility", default-features = false } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment", default-features = false } -transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../srml/transaction-payment/rpc/runtime-api/", default-features = false } - -[build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../core/utils/wasm-builder-runner" } - -[dev-dependencies] -runtime_io = { package = "sr-io", path = "../../core/sr-io" } - -[features] -default = ["std"] -std = [ - "authorship/std", - "babe-primitives/std", - "babe/std", - "balances/std", - "client/std", - "codec/std", - "collective/std", - "contracts/std", - "contracts-rpc-runtime-api/std", - "democracy/std", - "elections-phragmen/std", - "executive/std", - "finality-tracker/std", - "grandpa/std", - "im-online/std", - "indices/std", - "membership/std", - "nicks/std", - "node-primitives/std", - "offchain-primitives/std", - "offences/std", - "primitives/std", - "randomness-collective-flip/std", - "rstd/std", - "rustc-hex", - "safe-mix/std", - "serde", - "session/std", - "sr-primitives/std", - "sr-staking-primitives/std", - "staking/std", - "substrate-keyring", - "substrate-session/std", - "sudo/std", - "support/std", - "system/std", - "system-rpc-runtime-api/std", - "timestamp/std", - "treasury/std", - "utility/std", - "transaction-payment/std", - "transaction-payment-rpc-runtime-api/std", - "version/std", -] diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml deleted file mode 100644 index 8a4c08ed11bd2..0000000000000 --- a/node/testing/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] -name = "node-testing" -version = "2.0.0" -authors = ["Parity Technologies "] -description = "Test utilities for Substrate node." -edition = "2018" - -[dependencies] -balances = { package = "srml-balances", path = "../../srml/balances" } -client = { package = "substrate-client", path = "../../core/client" } -contracts = { package = "srml-contracts", path = "../../srml/contracts" } -grandpa = { package = "srml-grandpa", path = "../../srml/grandpa" } -indices = { package = "srml-indices", path = "../../srml/indices" } -keyring = { package = "substrate-keyring", path = "../../core/keyring" } -node-executor = { path = "../executor" } -node-primitives = { path = "../primitives" } -node-runtime = { path = "../runtime" } -codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -sr-io = { path = "../../core/sr-io" } -sr-primitives = { path = "../../core/sr-primitives" } -runtime_support = { package = "srml-support", path = "../../srml/support" } -session = { package = "srml-session", path = "../../srml/session" } -staking = { package = "srml-staking", path = "../../srml/staking" } -substrate-executor = { path = "../../core/executor" } -system = { package = "srml-system", path = "../../srml/system" } -test-client = { package = "substrate-test-client", path = "../../core/test-client" } -timestamp = { package = "srml-timestamp", path = "../../srml/timestamp" } -treasury = { package = "srml-treasury", path = "../../srml/treasury" } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment" } -wabt = "0.9.2" diff --git a/test-utils/chain-spec-builder/Cargo.toml b/test-utils/chain-spec-builder/Cargo.toml index e8ca8d354025a..a835c065ff1be 100644 --- a/test-utils/chain-spec-builder/Cargo.toml +++ b/test-utils/chain-spec-builder/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] ansi_term = "0.12.1" keystore = { package = "substrate-keystore", path = "../../core/keystore" } -node-cli = { path = "../../node/cli" } +node-cli = { path = "../../bin/node/cli" } primitives = { package = "substrate-primitives", path = "../../core/primitives" } rand = "0.7.2" structopt = "0.3.3" From 09000f3131f138860d32fd71310743b72a50ca72 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 21:52:47 +0100 Subject: [PATCH 08/61] move maintainence scripts, configs and helpers into its own dir --- .gitlab-ci.yml | 26 +++++++++---------- Dockerfile => .maintain/Dockerfile | 0 {scripts => .maintain}/build-only-wasm.sh | 0 {scripts => .maintain}/check_for_exit.sh | 0 {scripts => .maintain}/common.sh | 0 .../docker/subkey.Dockerfile | 2 +- .../docker/substrate.Dockerfile | 2 +- {scripts => .maintain}/flamingfir-deploy.sh | 0 {scripts => .maintain}/getgoing.sh | 0 .../gitlab/check_line_width.sh | 0 .../gitlab/check_runtime.sh | 0 {scripts => .maintain}/init.sh | 0 {scripts => .maintain}/kubernetes/Chart.yaml | 0 {scripts => .maintain}/kubernetes/README.md | 0 .../templates/poddisruptionbudget.yaml | 0 .../kubernetes/templates/secrets.yaml | 0 .../kubernetes/templates/service.yaml | 0 .../kubernetes/templates/serviceaccount.yaml | 0 .../kubernetes/templates/statefulset.yaml | 0 {scripts => .maintain}/kubernetes/values.yaml | 0 .../node-template-release.sh | 2 +- .../node-template-release/Cargo.toml | 0 .../node-template-release/src/main.rs | 0 {scripts => .maintain}/runtime-dep.py | 2 +- .../rustdoc-header.html | 0 .../sentry-node/docker-compose.yml | 2 +- {scripts => .maintain}/update-copyright.sh | 0 {scripts => .maintain}/update-deps.sh | 0 {scripts => .maintain}/update.sh | 0 29 files changed, 18 insertions(+), 18 deletions(-) rename Dockerfile => .maintain/Dockerfile (100%) rename {scripts => .maintain}/build-only-wasm.sh (100%) rename {scripts => .maintain}/check_for_exit.sh (100%) rename {scripts => .maintain}/common.sh (100%) rename {scripts => .maintain}/docker/subkey.Dockerfile (93%) rename {scripts => .maintain}/docker/substrate.Dockerfile (96%) rename {scripts => .maintain}/flamingfir-deploy.sh (100%) rename {scripts => .maintain}/getgoing.sh (100%) rename {scripts => .maintain}/gitlab/check_line_width.sh (100%) rename {scripts => .maintain}/gitlab/check_runtime.sh (100%) rename {scripts => .maintain}/init.sh (100%) rename {scripts => .maintain}/kubernetes/Chart.yaml (100%) rename {scripts => .maintain}/kubernetes/README.md (100%) rename {scripts => .maintain}/kubernetes/templates/poddisruptionbudget.yaml (100%) rename {scripts => .maintain}/kubernetes/templates/secrets.yaml (100%) rename {scripts => .maintain}/kubernetes/templates/service.yaml (100%) rename {scripts => .maintain}/kubernetes/templates/serviceaccount.yaml (100%) rename {scripts => .maintain}/kubernetes/templates/statefulset.yaml (100%) rename {scripts => .maintain}/kubernetes/values.yaml (100%) rename {scripts => .maintain}/node-template-release.sh (84%) rename {scripts => .maintain}/node-template-release/Cargo.toml (100%) rename {scripts => .maintain}/node-template-release/src/main.rs (100%) rename {scripts => .maintain}/runtime-dep.py (91%) rename rustdoc-header.html => .maintain/rustdoc-header.html (100%) rename {scripts => .maintain}/sentry-node/docker-compose.yml (97%) rename {scripts => .maintain}/update-copyright.sh (100%) rename {scripts => .maintain}/update-deps.sh (100%) rename {scripts => .maintain}/update.sh (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f93de0be69b57..d6ff46e3c23fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,7 @@ check-runtime: GITLAB_API: "https://gitlab.parity.io/api/v4" GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api" script: - - ./scripts/gitlab/check_runtime.sh + - ./.maintain/gitlab/check_runtime.sh allow_failure: true @@ -89,7 +89,7 @@ check-line-width: only: - /^[0-9]+$/ script: - - ./scripts/gitlab/check_line_width.sh + - ./.maintain/gitlab/check_line_width.sh allow_failure: true @@ -228,7 +228,7 @@ node-exits: except: - /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - ./scripts/check_for_exit.sh + - ./.maintain/check_for_exit.sh test-full-crypto-feature: &test-full-crypto-feature @@ -274,8 +274,8 @@ build-linux-substrate: fi - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256 - printf '\n# building node-template\n\n' - - ./scripts/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz - - cp -r scripts/docker/substrate.Dockerfile ./artifacts/substrate/ + - ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz + - cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/ - sccache -s build-linux-subkey: @@ -298,7 +298,7 @@ build-linux-subkey: sed -n -r 's/^subkey ([0-9.]+.*)/\1/p' | tee ./artifacts/subkey/VERSION; - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256 - - cp -r scripts/docker/subkey.Dockerfile ./artifacts/subkey/ + - cp -r .maintain/docker/subkey.Dockerfile ./artifacts/subkey/ - sccache -s build-rust-doc-release: @@ -314,7 +314,7 @@ build-rust-doc-release: <<: *build-only script: - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds - - BUILD_DUMMY_WASM_BINARY=1 RUSTDOCFLAGS="--html-in-header $(pwd)/rustdoc-header.html" time cargo +nightly doc --release --all --verbose + - BUILD_DUMMY_WASM_BINARY=1 RUSTDOCFLAGS="--html-in-header $(pwd).maintain/rustdoc-header.html" time cargo +nightly doc --release --all --verbose - cp -R ./target/doc ./crate-docs - echo "" > ./crate-docs/index.html - sccache -s @@ -520,10 +520,10 @@ publish-gh-doc: - echo "Substrate version = ${DEPLOY_TAG}" # or use helm to render the template - helm template - --values ./scripts/kubernetes/values.yaml + --values ./.maintain/kubernetes/values.yaml --set image.tag=${DEPLOY_TAG} --set validator.keys=${VALIDATOR_KEYS} - ./scripts/kubernetes | kubectl apply -f - --dry-run=false + ./.maintain/kubernetes | kubectl apply -f - --dry-run=false - echo "# substrate namespace ${KUBE_NAMESPACE}" - kubectl -n ${KUBE_NAMESPACE} get all - echo "# substrate's nodes' external ip addresses:" @@ -585,16 +585,16 @@ deploy-ue1-tag: validator 1 4: <<: *validator-deploy script: - - ./scripts/flamingfir-deploy.sh flamingfir-validator1 + - ./.maintain/flamingfir-deploy.sh flamingfir-validator1 validator 2 4: <<: *validator-deploy script: - - ./scripts/flamingfir-deploy.sh flamingfir-validator2 + - ./.maintain/flamingfir-deploy.sh flamingfir-validator2 validator 3 4: <<: *validator-deploy script: - - ./scripts/flamingfir-deploy.sh flamingfir-validator3 + - ./.maintain/flamingfir-deploy.sh flamingfir-validator3 validator 4 4: <<: *validator-deploy script: - - ./scripts/flamingfir-deploy.sh flamingfir-validator4 + - ./.maintain/flamingfir-deploy.sh flamingfir-validator4 diff --git a/Dockerfile b/.maintain/Dockerfile similarity index 100% rename from Dockerfile rename to .maintain/Dockerfile diff --git a/scripts/build-only-wasm.sh b/.maintain/build-only-wasm.sh similarity index 100% rename from scripts/build-only-wasm.sh rename to .maintain/build-only-wasm.sh diff --git a/scripts/check_for_exit.sh b/.maintain/check_for_exit.sh similarity index 100% rename from scripts/check_for_exit.sh rename to .maintain/check_for_exit.sh diff --git a/scripts/common.sh b/.maintain/common.sh similarity index 100% rename from scripts/common.sh rename to .maintain/common.sh diff --git a/scripts/docker/subkey.Dockerfile b/.maintain/docker/subkey.Dockerfile similarity index 93% rename from scripts/docker/subkey.Dockerfile rename to .maintain/docker/subkey.Dockerfile index 6d5c559ea03dd..9184cad5b4058 100644 --- a/scripts/docker/subkey.Dockerfile +++ b/.maintain/docker/subkey.Dockerfile @@ -8,7 +8,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.title="parity/subkey" \ io.parity.image.description="Subkey: key generating utility for Substrate." \ - io.parity.image.source="https://github.com/paritytech/substrate/blob/${VCS_REF}/scripts/docker/subkey.Dockerfile" \ + io.parity.image.source="https://github.com/paritytech/substrate/blob/${VCS_REF}/.maintain/docker/subkey.Dockerfile" \ io.parity.image.revision="${VCS_REF}" \ io.parity.image.created="${BUILD_DATE}" \ io.parity.image.documentation="https://github.com/paritytech/substrate/tree/${VCS_REF}/subkey" diff --git a/scripts/docker/substrate.Dockerfile b/.maintain/docker/substrate.Dockerfile similarity index 96% rename from scripts/docker/substrate.Dockerfile rename to .maintain/docker/substrate.Dockerfile index 2bdf49e2fcec2..7cd4576a9e89f 100644 --- a/scripts/docker/substrate.Dockerfile +++ b/.maintain/docker/substrate.Dockerfile @@ -8,7 +8,7 @@ LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.title="parity/substrate" \ io.parity.image.description="Substrate: The platform for blockchain innovators." \ - io.parity.image.source="https://github.com/paritytech/substrate/blob/${VCS_REF}/scripts/docker/Dockerfile" \ + io.parity.image.source="https://github.com/paritytech/substrate/blob/${VCS_REF}/.maintain/docker/Dockerfile" \ io.parity.image.revision="${VCS_REF}" \ io.parity.image.created="${BUILD_DATE}" \ io.parity.image.documentation="https://wiki.parity.io/Parity-Substrate" diff --git a/scripts/flamingfir-deploy.sh b/.maintain/flamingfir-deploy.sh similarity index 100% rename from scripts/flamingfir-deploy.sh rename to .maintain/flamingfir-deploy.sh diff --git a/scripts/getgoing.sh b/.maintain/getgoing.sh similarity index 100% rename from scripts/getgoing.sh rename to .maintain/getgoing.sh diff --git a/scripts/gitlab/check_line_width.sh b/.maintain/gitlab/check_line_width.sh similarity index 100% rename from scripts/gitlab/check_line_width.sh rename to .maintain/gitlab/check_line_width.sh diff --git a/scripts/gitlab/check_runtime.sh b/.maintain/gitlab/check_runtime.sh similarity index 100% rename from scripts/gitlab/check_runtime.sh rename to .maintain/gitlab/check_runtime.sh diff --git a/scripts/init.sh b/.maintain/init.sh similarity index 100% rename from scripts/init.sh rename to .maintain/init.sh diff --git a/scripts/kubernetes/Chart.yaml b/.maintain/kubernetes/Chart.yaml similarity index 100% rename from scripts/kubernetes/Chart.yaml rename to .maintain/kubernetes/Chart.yaml diff --git a/scripts/kubernetes/README.md b/.maintain/kubernetes/README.md similarity index 100% rename from scripts/kubernetes/README.md rename to .maintain/kubernetes/README.md diff --git a/scripts/kubernetes/templates/poddisruptionbudget.yaml b/.maintain/kubernetes/templates/poddisruptionbudget.yaml similarity index 100% rename from scripts/kubernetes/templates/poddisruptionbudget.yaml rename to .maintain/kubernetes/templates/poddisruptionbudget.yaml diff --git a/scripts/kubernetes/templates/secrets.yaml b/.maintain/kubernetes/templates/secrets.yaml similarity index 100% rename from scripts/kubernetes/templates/secrets.yaml rename to .maintain/kubernetes/templates/secrets.yaml diff --git a/scripts/kubernetes/templates/service.yaml b/.maintain/kubernetes/templates/service.yaml similarity index 100% rename from scripts/kubernetes/templates/service.yaml rename to .maintain/kubernetes/templates/service.yaml diff --git a/scripts/kubernetes/templates/serviceaccount.yaml b/.maintain/kubernetes/templates/serviceaccount.yaml similarity index 100% rename from scripts/kubernetes/templates/serviceaccount.yaml rename to .maintain/kubernetes/templates/serviceaccount.yaml diff --git a/scripts/kubernetes/templates/statefulset.yaml b/.maintain/kubernetes/templates/statefulset.yaml similarity index 100% rename from scripts/kubernetes/templates/statefulset.yaml rename to .maintain/kubernetes/templates/statefulset.yaml diff --git a/scripts/kubernetes/values.yaml b/.maintain/kubernetes/values.yaml similarity index 100% rename from scripts/kubernetes/values.yaml rename to .maintain/kubernetes/values.yaml diff --git a/scripts/node-template-release.sh b/.maintain/node-template-release.sh similarity index 84% rename from scripts/node-template-release.sh rename to .maintain/node-template-release.sh index 3b2c0d6f0f6b8..897677edc5c39 100755 --- a/scripts/node-template-release.sh +++ b/.maintain/node-template-release.sh @@ -11,6 +11,6 @@ if [ "$#" -ne 1 ]; then fi PATH_TO_ARCHIVE=$(pwd)/$1 -cd $PROJECT_ROOT/scripts/node-template-release +cd $PROJECT_ROOT/.maintain/node-template-release cargo run $PROJECT_ROOT/node-template $PATH_TO_ARCHIVE diff --git a/scripts/node-template-release/Cargo.toml b/.maintain/node-template-release/Cargo.toml similarity index 100% rename from scripts/node-template-release/Cargo.toml rename to .maintain/node-template-release/Cargo.toml diff --git a/scripts/node-template-release/src/main.rs b/.maintain/node-template-release/src/main.rs similarity index 100% rename from scripts/node-template-release/src/main.rs rename to .maintain/node-template-release/src/main.rs diff --git a/scripts/runtime-dep.py b/.maintain/runtime-dep.py similarity index 91% rename from scripts/runtime-dep.py rename to .maintain/runtime-dep.py index 1d0c42b2f57e8..3198bb3e2669e 100755 --- a/scripts/runtime-dep.py +++ b/.maintain/runtime-dep.py @@ -4,7 +4,7 @@ # pip install toml # sudo apt-get install graphviz # the first parameter is the runtime folder -# python ./scripts/runtime-dep.py ./substrate/runtime | dot -Tpng -o output.png +# python ./.maintain/runtime-dep.py ./substrate/runtime | dot -Tpng -o output.png import sys import os import toml diff --git a/rustdoc-header.html b/.maintain/rustdoc-header.html similarity index 100% rename from rustdoc-header.html rename to .maintain/rustdoc-header.html diff --git a/scripts/sentry-node/docker-compose.yml b/.maintain/sentry-node/docker-compose.yml similarity index 97% rename from scripts/sentry-node/docker-compose.yml rename to .maintain/sentry-node/docker-compose.yml index 78f8ba36b82ee..dd2aee6995473 100644 --- a/scripts/sentry-node/docker-compose.yml +++ b/.maintain/sentry-node/docker-compose.yml @@ -12,7 +12,7 @@ # # 1. Build `target/release/substrate` binary: `cargo build --release` # -# 2. Start networks and containers: `sudo docker-compose -f scripts/sentry-node/docker-compose.yml up` +# 2. Start networks and containers: `sudo docker-compose -f .maintain/sentry-node/docker-compose.yml up` # # 3. Reach: # - polkadot/apps on localhost:3000 diff --git a/scripts/update-copyright.sh b/.maintain/update-copyright.sh similarity index 100% rename from scripts/update-copyright.sh rename to .maintain/update-copyright.sh diff --git a/scripts/update-deps.sh b/.maintain/update-deps.sh similarity index 100% rename from scripts/update-deps.sh rename to .maintain/update-deps.sh diff --git a/scripts/update.sh b/.maintain/update.sh similarity index 100% rename from scripts/update.sh rename to .maintain/update.sh From eea9398161d9507029217c2ad8725c4b8e537923 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 21:57:32 +0100 Subject: [PATCH 09/61] add .local to ignore --- .dockerignore | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.dockerignore b/.dockerignore index 834924b9f79d8..39dbc05c97e16 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ doc .idea/ Dockerfile .dockerignore +.local diff --git a/.gitignore b/.gitignore index 28885a4830d9b..6c79bfaf62ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ rls*.log *.orig *.rej **/wip/*.stderr +.local From a4e451c6571a2c506fffd5be5b7d1b046c2df966 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Sun, 10 Nov 2019 22:33:29 +0100 Subject: [PATCH 10/61] move core->client --- Cargo.toml | 106 +++++++++--------- bin/node-template/Cargo.toml | 32 +++--- bin/node-template/runtime/Cargo.toml | 18 +-- bin/node/cli/Cargo.toml | 52 ++++----- bin/node/executor/Cargo.toml | 14 +-- bin/node/primitives/Cargo.toml | 6 +- bin/node/rpc-client/Cargo.toml | 2 +- bin/node/rpc/Cargo.toml | 6 +- bin/node/rpc/src/lib.rs | 2 +- bin/node/runtime/Cargo.toml | 24 ++-- bin/node/runtime/build.rs | 2 +- bin/node/testing/Cargo.toml | 14 +-- bin/subkey/Cargo.toml | 4 +- .../application-crypto/Cargo.toml | 0 .../application-crypto/src/ed25519.rs | 0 .../application-crypto/src/lib.rs | 0 .../application-crypto/src/sr25519.rs | 0 .../application-crypto/src/traits.rs | 0 .../authority-discovery/Cargo.toml | 10 +- {core => client}/authority-discovery/build.rs | 0 .../authority-discovery/primitives/Cargo.toml | 0 .../authority-discovery/primitives/src/lib.rs | 2 +- .../authority-discovery/src/error.rs | 0 .../authority-discovery/src/lib.rs | 0 .../authority-discovery/src/schema/dht.proto | 0 {core => client}/basic-authorship/Cargo.toml | 12 +- .../basic-authorship/src/basic_authorship.rs | 0 {core => client}/basic-authorship/src/lib.rs | 0 {core => client}/chain-spec/Cargo.toml | 6 +- {core => client}/chain-spec/derive/Cargo.toml | 0 .../chain-spec/derive/src/impls.rs | 0 {core => client}/chain-spec/derive/src/lib.rs | 0 .../chain-spec/res/chain_spec.json | 0 .../chain-spec/res/chain_spec2.json | 0 {core => client}/chain-spec/src/chain_spec.rs | 0 {core => client}/chain-spec/src/extension.rs | 0 {core => client}/chain-spec/src/lib.rs | 0 {core => client}/cli/Cargo.toml | 18 +-- {core => client}/cli/README.adoc | 0 {core => client}/cli/src/error.rs | 0 .../cli/src/execution_strategy.rs | 0 {core => client}/cli/src/informant.rs | 0 {core => client}/cli/src/informant/display.rs | 0 {core => client}/cli/src/lib.rs | 0 {core => client}/cli/src/params.rs | 0 {core => client}/cli/src/traits.rs | 0 {core => client}/client/Cargo.toml | 0 {core => client}/client/db/Cargo.toml | 0 .../client/db/src/cache/list_cache.rs | 0 .../client/db/src/cache/list_entry.rs | 0 .../client/db/src/cache/list_storage.rs | 0 {core => client}/client/db/src/cache/mod.rs | 0 {core => client}/client/db/src/lib.rs | 0 {core => client}/client/db/src/light.rs | 0 {core => client}/client/db/src/offchain.rs | 0 .../client/db/src/storage_cache.rs | 0 {core => client}/client/db/src/utils.rs | 0 .../client/header-metadata/Cargo.toml | 0 .../client/header-metadata/src/lib.rs | 0 {core => client}/client/src/backend.rs | 0 .../client/src/block_builder/api.rs | 0 .../client/src/block_builder/block_builder.rs | 0 .../client/src/block_builder/mod.rs | 0 {core => client}/client/src/blockchain.rs | 0 {core => client}/client/src/call_executor.rs | 0 {core => client}/client/src/children.rs | 0 {core => client}/client/src/cht.rs | 0 {core => client}/client/src/client.rs | 0 {core => client}/client/src/error.rs | 0 {core => client}/client/src/genesis.rs | 0 {core => client}/client/src/in_mem.rs | 0 {core => client}/client/src/leaves.rs | 0 {core => client}/client/src/lib.rs | 0 {core => client}/client/src/light/backend.rs | 0 .../client/src/light/blockchain.rs | 0 .../client/src/light/call_executor.rs | 0 {core => client}/client/src/light/fetcher.rs | 0 {core => client}/client/src/light/mod.rs | 0 {core => client}/client/src/notifications.rs | 0 {core => client}/client/src/runtime_api.rs | 0 {core => client}/consensus/aura/Cargo.toml | 0 .../consensus/aura/primitives/Cargo.toml | 0 .../consensus/aura/primitives/src/lib.rs | 0 {core => client}/consensus/aura/src/digest.rs | 0 {core => client}/consensus/aura/src/lib.rs | 0 {core => client}/consensus/babe/Cargo.toml | 0 .../consensus/babe/primitives/Cargo.toml | 0 .../consensus/babe/primitives/src/digest.rs | 0 .../consensus/babe/primitives/src/lib.rs | 0 .../consensus/babe/src/authorship.rs | 0 .../consensus/babe/src/aux_schema.rs | 0 .../consensus/babe/src/epoch_changes.rs | 0 {core => client}/consensus/babe/src/lib.rs | 0 {core => client}/consensus/babe/src/tests.rs | 0 .../consensus/babe/src/verification.rs | 0 {core => client}/consensus/common/Cargo.toml | 0 .../consensus/common/src/block_import.rs | 0 .../consensus/common/src/block_validation.rs | 0 .../consensus/common/src/error.rs | 0 .../consensus/common/src/evaluation.rs | 0 .../consensus/common/src/import_queue.rs | 0 .../common/src/import_queue/basic_queue.rs | 0 .../common/src/import_queue/buffered_link.rs | 0 {core => client}/consensus/common/src/lib.rs | 0 .../consensus/common/src/offline_tracker.rs | 0 .../consensus/common/src/select_chain.rs | 0 {core => client}/consensus/pow/Cargo.toml | 0 .../consensus/pow/primitives/Cargo.toml | 0 .../consensus/pow/primitives/src/lib.rs | 0 {core => client}/consensus/pow/src/lib.rs | 0 {core => client}/consensus/rhd/Cargo.toml | 0 {core => client}/consensus/rhd/src/error.rs | 0 {core => client}/consensus/rhd/src/lib.rs | 0 .../consensus/rhd/src/misbehaviour_check.rs | 0 {core => client}/consensus/rhd/src/service.rs | 0 {core => client}/consensus/slots/Cargo.toml | 0 {core => client}/consensus/slots/build.rs | 0 .../consensus/slots/src/aux_schema.rs | 0 {core => client}/consensus/slots/src/lib.rs | 0 {core => client}/consensus/slots/src/slots.rs | 0 {core => client}/consensus/uncles/Cargo.toml | 0 {core => client}/consensus/uncles/src/lib.rs | 0 {core => client}/executor/Cargo.toml | 0 .../executor/runtime-test/Cargo.toml | 0 .../executor/runtime-test/build.rs | 0 .../executor/runtime-test/src/lib.rs | 0 {core => client}/executor/src/allocator.rs | 0 {core => client}/executor/src/error.rs | 0 .../executor/src/host_interface.rs | 0 .../executor/src/integration_tests/mod.rs | 0 .../executor/src/integration_tests/sandbox.rs | 0 {core => client}/executor/src/lib.rs | 0 .../executor/src/native_executor.rs | 0 {core => client}/executor/src/sandbox.rs | 0 {core => client}/executor/src/wasm_runtime.rs | 0 {core => client}/executor/src/wasm_utils.rs | 0 .../executor/src/wasmi_execution.rs | 0 .../src/wasmtime/function_executor.rs | 0 {core => client}/executor/src/wasmtime/mod.rs | 0 .../executor/src/wasmtime/runtime.rs | 0 .../executor/src/wasmtime/trampoline.rs | 0 .../executor/src/wasmtime/util.rs | 0 {core => client}/externalities/Cargo.toml | 0 .../externalities/src/extensions.rs | 0 {core => client}/externalities/src/lib.rs | 0 .../externalities/src/scope_limited.rs | 0 {core => client}/finality-grandpa/Cargo.toml | 4 +- .../finality-grandpa/primitives/Cargo.toml | 0 .../finality-grandpa/primitives/src/lib.rs | 0 .../finality-grandpa/src/authorities.rs | 0 .../finality-grandpa/src/aux_schema.rs | 0 .../src/communication/gossip.rs | 0 .../finality-grandpa/src/communication/mod.rs | 0 .../src/communication/periodic.rs | 0 .../src/communication/tests.rs | 0 .../finality-grandpa/src/consensus_changes.rs | 0 .../finality-grandpa/src/environment.rs | 0 .../finality-grandpa/src/finality_proof.rs | 0 .../finality-grandpa/src/import.rs | 0 .../finality-grandpa/src/justification.rs | 0 {core => client}/finality-grandpa/src/lib.rs | 0 .../finality-grandpa/src/light_import.rs | 0 .../finality-grandpa/src/observer.rs | 0 .../finality-grandpa/src/tests.rs | 0 .../finality-grandpa/src/until_imported.rs | 0 .../finality-grandpa/src/voting_rule.rs | 0 {core => client}/inherents/Cargo.toml | 0 {core => client}/inherents/src/lib.rs | 0 {core => client}/keyring/Cargo.toml | 0 {core => client}/keyring/src/ed25519.rs | 0 {core => client}/keyring/src/lib.rs | 0 {core => client}/keyring/src/sr25519.rs | 0 {core => client}/keystore/Cargo.toml | 0 {core => client}/keystore/src/lib.rs | 0 {core => client}/network/Cargo.toml | 26 ++--- {core => client}/network/src/behaviour.rs | 0 {core => client}/network/src/chain.rs | 0 {core => client}/network/src/config.rs | 0 {core => client}/network/src/debug_info.rs | 0 {core => client}/network/src/discovery.rs | 0 {core => client}/network/src/error.rs | 0 .../network/src/legacy_proto/behaviour.rs | 0 .../network/src/legacy_proto/handler.rs | 0 .../network/src/legacy_proto/mod.rs | 0 .../network/src/legacy_proto/tests.rs | 0 .../network/src/legacy_proto/upgrade.rs | 0 {core => client}/network/src/lib.rs | 0 .../network/src/on_demand_layer.rs | 0 {core => client}/network/src/protocol.rs | 0 .../network/src/protocol/consensus_gossip.rs | 0 .../network/src/protocol/event.rs | 0 .../network/src/protocol/light_dispatch.rs | 0 .../network/src/protocol/message.rs | 0 .../network/src/protocol/specialization.rs | 0 {core => client}/network/src/protocol/sync.rs | 0 .../network/src/protocol/sync/blocks.rs | 0 .../src/protocol/sync/extra_requests.rs | 0 {core => client}/network/src/protocol/util.rs | 0 {core => client}/network/src/service.rs | 0 .../network/src/test/block_import.rs | 0 {core => client}/network/src/test/mod.rs | 0 {core => client}/network/src/test/sync.rs | 0 {core => client}/network/src/transport.rs | 0 {core => client}/offchain/Cargo.toml | 14 +-- .../offchain/primitives/Cargo.toml | 0 .../offchain/primitives/src/lib.rs | 0 {core => client}/offchain/src/api.rs | 0 {core => client}/offchain/src/api/http.rs | 0 .../offchain/src/api/http_dummy.rs | 0 .../offchain/src/api/timestamp.rs | 0 {core => client}/offchain/src/lib.rs | 0 {core => client}/offchain/src/testing.rs | 0 {core => client}/panic-handler/Cargo.toml | 0 {core => client}/panic-handler/src/lib.rs | 0 {core => client}/peerset/Cargo.toml | 0 {core => client}/peerset/src/lib.rs | 0 {core => client}/peerset/src/peersstate.rs | 0 {core => client}/peerset/tests/fuzz.rs | 0 {core => client}/phragmen/Cargo.toml | 0 {core => client}/phragmen/benches/phragmen.rs | 0 {core => client}/phragmen/src/lib.rs | 0 {core => client}/phragmen/src/mock.rs | 0 {core => client}/phragmen/src/tests.rs | 0 {core => client}/primitives/Cargo.toml | 0 {core => client}/primitives/benches/bench.rs | 0 .../primitives/debug-derive/Cargo.toml | 0 .../primitives/debug-derive/src/impls.rs | 0 .../primitives/debug-derive/src/lib.rs | 0 .../primitives/debug-derive/tests/tests.rs | 0 .../primitives/src/changes_trie.rs | 0 {core => client}/primitives/src/crypto.rs | 0 {core => client}/primitives/src/ecdsa.rs | 0 {core => client}/primitives/src/ed25519.rs | 0 {core => client}/primitives/src/hash.rs | 0 {core => client}/primitives/src/hasher.rs | 0 {core => client}/primitives/src/hashing.rs | 0 {core => client}/primitives/src/hexdisplay.rs | 0 {core => client}/primitives/src/lib.rs | 0 {core => client}/primitives/src/offchain.rs | 0 {core => client}/primitives/src/sandbox.rs | 0 {core => client}/primitives/src/sr25519.rs | 0 {core => client}/primitives/src/testing.rs | 0 {core => client}/primitives/src/tests.rs | 0 {core => client}/primitives/src/traits.rs | 0 {core => client}/primitives/src/u32_trait.rs | 0 {core => client}/primitives/src/uint.rs | 0 .../primitives/storage/Cargo.toml | 0 .../primitives/storage/src/lib.rs | 0 {core => client}/rpc-servers/Cargo.toml | 0 {core => client}/rpc-servers/src/lib.rs | 0 {core => client}/rpc/Cargo.toml | 0 {core => client}/rpc/api/Cargo.toml | 0 {core => client}/rpc/api/src/author/error.rs | 0 {core => client}/rpc/api/src/author/hash.rs | 0 {core => client}/rpc/api/src/author/mod.rs | 0 {core => client}/rpc/api/src/chain/error.rs | 0 {core => client}/rpc/api/src/chain/mod.rs | 0 {core => client}/rpc/api/src/errors.rs | 0 {core => client}/rpc/api/src/helpers.rs | 0 {core => client}/rpc/api/src/lib.rs | 0 {core => client}/rpc/api/src/state/error.rs | 0 {core => client}/rpc/api/src/state/mod.rs | 0 {core => client}/rpc/api/src/subscriptions.rs | 0 {core => client}/rpc/api/src/system/error.rs | 0 .../rpc/api/src/system/helpers.rs | 0 {core => client}/rpc/api/src/system/mod.rs | 0 {core => client}/rpc/primitives/Cargo.toml | 0 {core => client}/rpc/primitives/src/lib.rs | 0 {core => client}/rpc/primitives/src/number.rs | 0 {core => client}/rpc/src/author/mod.rs | 0 {core => client}/rpc/src/author/tests.rs | 0 {core => client}/rpc/src/chain/chain_full.rs | 0 {core => client}/rpc/src/chain/chain_light.rs | 0 {core => client}/rpc/src/chain/mod.rs | 0 {core => client}/rpc/src/chain/tests.rs | 0 {core => client}/rpc/src/lib.rs | 0 {core => client}/rpc/src/metadata.rs | 0 {core => client}/rpc/src/state/mod.rs | 0 {core => client}/rpc/src/state/state_full.rs | 0 {core => client}/rpc/src/state/state_light.rs | 0 {core => client}/rpc/src/state/tests.rs | 0 {core => client}/rpc/src/system/mod.rs | 0 {core => client}/rpc/src/system/tests.rs | 0 {core => client}/serializer/Cargo.toml | 0 {core => client}/serializer/src/lib.rs | 0 {core => client}/service/Cargo.toml | 32 +++--- {core => client}/service/src/builder.rs | 0 {core => client}/service/src/chain_ops.rs | 0 {core => client}/service/src/config.rs | 0 {core => client}/service/src/error.rs | 0 {core => client}/service/src/lib.rs | 2 +- {core => client}/service/src/status_sinks.rs | 0 {core => client}/service/test/Cargo.toml | 12 +- {core => client}/service/test/src/lib.rs | 0 {core => client}/session/Cargo.toml | 0 {core => client}/session/src/lib.rs | 0 {core => client}/sr-api-macros/Cargo.toml | 0 .../sr-api-macros/benches/bench.rs | 0 .../sr-api-macros/src/decl_runtime_apis.rs | 0 .../sr-api-macros/src/impl_runtime_apis.rs | 0 {core => client}/sr-api-macros/src/lib.rs | 0 {core => client}/sr-api-macros/src/utils.rs | 0 .../sr-api-macros/tests/decl_and_impl.rs | 0 .../sr-api-macros/tests/runtime_calls.rs | 0 .../sr-api-macros/tests/trybuild.rs | 0 .../tests/ui/adding_self_parameter.rs | 0 .../tests/ui/adding_self_parameter.stderr | 0 .../tests/ui/changed_in_unknown_version.rs | 0 .../ui/changed_in_unknown_version.stderr | 0 .../tests/ui/declaring_old_block.rs | 0 .../tests/ui/declaring_old_block.stderr | 0 ...declaring_own_block_with_different_name.rs | 0 ...aring_own_block_with_different_name.stderr | 0 .../tests/ui/empty_impl_runtime_apis_call.rs | 0 .../ui/empty_impl_runtime_apis_call.stderr | 0 .../ui/impl_incorrect_method_signature.rs | 0 .../ui/impl_incorrect_method_signature.stderr | 0 .../ui/impl_two_traits_with_same_name.rs | 0 .../ui/impl_two_traits_with_same_name.stderr | 0 .../tests/ui/invalid_api_version.rs | 0 .../tests/ui/invalid_api_version.stderr | 0 .../tests/ui/invalid_api_version_2.rs | 0 .../tests/ui/invalid_api_version_2.stderr | 0 .../tests/ui/invalid_api_version_3.rs | 0 .../tests/ui/invalid_api_version_3.stderr | 0 .../ui/missing_block_generic_parameter.rs | 0 .../ui/missing_block_generic_parameter.stderr | 0 .../tests/ui/missing_path_for_trait.rs | 0 .../tests/ui/missing_path_for_trait.stderr | 0 ...ype_reference_in_impl_runtime_apis_call.rs | 0 ...reference_in_impl_runtime_apis_call.stderr | 0 {core => client}/sr-arithmetic/Cargo.toml | 0 .../sr-arithmetic/benches/bench.rs | 0 .../sr-arithmetic/fuzzer/.gitignore | 0 .../sr-arithmetic/fuzzer/Cargo.lock | 0 .../sr-arithmetic/fuzzer/Cargo.toml | 0 .../sr-arithmetic/fuzzer/src/biguint.rs | 0 .../sr-arithmetic/fuzzer/src/rational128.rs | 0 {core => client}/sr-arithmetic/src/biguint.rs | 0 {core => client}/sr-arithmetic/src/fixed64.rs | 0 .../sr-arithmetic/src/helpers_128bit.rs | 0 {core => client}/sr-arithmetic/src/lib.rs | 0 .../sr-arithmetic/src/per_things.rs | 0 .../sr-arithmetic/src/rational128.rs | 0 {core => client}/sr-arithmetic/src/traits.rs | 0 {core => client}/sr-io/Cargo.toml | 0 {core => client}/sr-io/build.rs | 0 {core => client}/sr-io/src/lib.rs | 0 {core => client}/sr-io/with_std.rs | 0 {core => client}/sr-io/without_std.rs | 0 {core => client}/sr-primitives/Cargo.toml | 0 {core => client}/sr-primitives/src/curve.rs | 0 .../sr-primitives/src/generic/block.rs | 0 .../src/generic/checked_extrinsic.rs | 0 .../sr-primitives/src/generic/digest.rs | 0 .../sr-primitives/src/generic/era.rs | 0 .../sr-primitives/src/generic/header.rs | 0 .../sr-primitives/src/generic/mod.rs | 0 .../sr-primitives/src/generic/tests.rs | 0 .../src/generic/unchecked_extrinsic.rs | 0 {core => client}/sr-primitives/src/lib.rs | 0 .../sr-primitives/src/offchain/http.rs | 0 .../sr-primitives/src/offchain/mod.rs | 0 {core => client}/sr-primitives/src/testing.rs | 0 {core => client}/sr-primitives/src/traits.rs | 0 .../sr-primitives/src/transaction_validity.rs | 0 {core => client}/sr-primitives/src/weights.rs | 0 {core => client}/sr-sandbox/Cargo.toml | 0 {core => client}/sr-sandbox/build.rs | 0 {core => client}/sr-sandbox/src/lib.rs | 0 {core => client}/sr-sandbox/with_std.rs | 0 {core => client}/sr-sandbox/without_std.rs | 0 .../sr-staking-primitives/Cargo.toml | 0 .../sr-staking-primitives/src/lib.rs | 0 .../sr-staking-primitives/src/offence.rs | 0 {core => client}/sr-std/Cargo.toml | 0 {core => client}/sr-std/build.rs | 0 {core => client}/sr-std/src/lib.rs | 2 +- {core => client}/sr-std/with_std.rs | 0 {core => client}/sr-std/without_std.rs | 0 {core => client}/sr-version/Cargo.toml | 0 {core => client}/sr-version/src/lib.rs | 0 {core => client}/state-db/Cargo.toml | 2 +- {core => client}/state-db/src/lib.rs | 0 {core => client}/state-db/src/noncanonical.rs | 0 {core => client}/state-db/src/pruning.rs | 0 {core => client}/state-db/src/test.rs | 0 {core => client}/state-machine/Cargo.toml | 0 {core => client}/state-machine/src/backend.rs | 0 {core => client}/state-machine/src/basic.rs | 0 .../state-machine/src/changes_trie/build.rs | 0 .../src/changes_trie/build_cache.rs | 0 .../src/changes_trie/build_iterator.rs | 0 .../src/changes_trie/changes_iterator.rs | 0 .../state-machine/src/changes_trie/input.rs | 0 .../state-machine/src/changes_trie/mod.rs | 0 .../state-machine/src/changes_trie/prune.rs | 0 .../state-machine/src/changes_trie/storage.rs | 0 .../src/changes_trie/surface_iterator.rs | 0 {core => client}/state-machine/src/error.rs | 0 {core => client}/state-machine/src/ext.rs | 0 {core => client}/state-machine/src/lib.rs | 0 .../state-machine/src/overlayed_changes.rs | 0 .../state-machine/src/proving_backend.rs | 0 {core => client}/state-machine/src/testing.rs | 0 .../state-machine/src/trie_backend.rs | 0 .../state-machine/src/trie_backend_essence.rs | 0 {core => client}/telemetry/Cargo.toml | 0 {core => client}/telemetry/src/lib.rs | 0 {core => client}/telemetry/src/worker.rs | 0 {core => client}/telemetry/src/worker/node.rs | 0 {core => client}/test-client/Cargo.toml | 0 .../test-client/src/client_ext.rs | 0 {core => client}/test-client/src/lib.rs | 0 {core => client}/test-runtime/Cargo.toml | 0 {core => client}/test-runtime/build.rs | 0 .../test-runtime/client/Cargo.toml | 0 .../client/src/block_builder_ext.rs | 0 .../test-runtime/client/src/lib.rs | 0 .../test-runtime/client/src/trait_tests.rs | 0 .../test-runtime/src/genesismap.rs | 0 {core => client}/test-runtime/src/lib.rs | 0 {core => client}/test-runtime/src/system.rs | 0 {core => client}/transaction-pool/Cargo.toml | 4 +- .../transaction-pool/graph/Cargo.toml | 0 .../transaction-pool/graph/benches/basics.rs | 0 .../transaction-pool/graph/src/base_pool.rs | 0 .../transaction-pool/graph/src/error.rs | 0 .../transaction-pool/graph/src/future.rs | 0 .../transaction-pool/graph/src/lib.rs | 0 .../transaction-pool/graph/src/listener.rs | 0 .../transaction-pool/graph/src/pool.rs | 0 .../transaction-pool/graph/src/ready.rs | 0 .../transaction-pool/graph/src/rotator.rs | 0 .../graph/src/validated_pool.rs | 0 .../transaction-pool/graph/src/watcher.rs | 0 {core => client}/transaction-pool/src/api.rs | 0 .../transaction-pool/src/error.rs | 0 {core => client}/transaction-pool/src/lib.rs | 0 .../transaction-pool/src/tests.rs | 0 {core => client}/trie/Cargo.toml | 0 {core => client}/trie/benches/bench.rs | 0 {core => client}/trie/src/error.rs | 0 {core => client}/trie/src/lib.rs | 0 {core => client}/trie/src/node_codec.rs | 0 {core => client}/trie/src/node_header.rs | 0 {core => client}/trie/src/trie_stream.rs | 0 .../utils/build-script-utils/Cargo.toml | 0 .../utils/build-script-utils/src/lib.rs | 0 {core => client}/utils/fork-tree/Cargo.toml | 0 {core => client}/utils/fork-tree/src/lib.rs | 0 .../utils/wasm-builder-runner/Cargo.toml | 0 .../utils/wasm-builder-runner/README.md | 0 .../utils/wasm-builder-runner/src/lib.rs | 0 .../utils/wasm-builder/Cargo.toml | 0 {core => client}/utils/wasm-builder/README.md | 0 .../utils/wasm-builder/src/lib.rs | 0 .../utils/wasm-builder/src/prerequisites.rs | 0 .../utils/wasm-builder/src/wasm_project.rs | 0 {core => client}/wasm-interface/Cargo.toml | 0 {core => client}/wasm-interface/src/lib.rs | 0 .../wasm-interface/src/wasmi_impl.rs | 0 srml/assets/Cargo.toml | 8 +- srml/aura/Cargo.toml | 14 +-- srml/aura/src/lib.rs | 2 +- srml/authority-discovery/Cargo.toml | 14 +-- srml/authority-discovery/src/lib.rs | 2 +- srml/authorship/Cargo.toml | 10 +- srml/babe/Cargo.toml | 18 +-- srml/balances/Cargo.toml | 10 +- srml/collective/Cargo.toml | 8 +- srml/contracts/Cargo.toml | 10 +- srml/contracts/rpc/Cargo.toml | 8 +- srml/contracts/rpc/runtime-api/Cargo.toml | 6 +- srml/democracy/Cargo.toml | 8 +- srml/elections-phragmen/Cargo.toml | 10 +- srml/elections/Cargo.toml | 8 +- srml/evm/Cargo.toml | 8 +- srml/example/Cargo.toml | 8 +- srml/executive/Cargo.toml | 8 +- srml/finality-tracker/Cargo.toml | 10 +- srml/generic-asset/Cargo.toml | 8 +- srml/grandpa/Cargo.toml | 12 +- srml/im-online/Cargo.toml | 14 +-- srml/im-online/src/lib.rs | 2 +- srml/indices/Cargo.toml | 10 +- srml/membership/Cargo.toml | 8 +- srml/metadata/Cargo.toml | 4 +- srml/nicks/Cargo.toml | 8 +- srml/offences/Cargo.toml | 10 +- srml/randomness-collective-flip/Cargo.toml | 8 +- srml/scored-pool/Cargo.toml | 8 +- srml/session/Cargo.toml | 14 +-- srml/staking/Cargo.toml | 14 +-- srml/staking/reward-curve/Cargo.toml | 2 +- srml/sudo/Cargo.toml | 8 +- srml/support/Cargo.toml | 10 +- srml/support/procedural/Cargo.toml | 2 +- srml/support/test/Cargo.toml | 8 +- srml/system/Cargo.toml | 10 +- srml/system/rpc/Cargo.toml | 10 +- srml/system/rpc/runtime-api/Cargo.toml | 2 +- srml/timestamp/Cargo.toml | 10 +- srml/transaction-payment/Cargo.toml | 8 +- srml/transaction-payment/rpc/Cargo.toml | 8 +- .../rpc/runtime-api/Cargo.toml | 6 +- srml/treasury/Cargo.toml | 8 +- srml/utility/Cargo.toml | 8 +- test-utils/chain-spec-builder/Cargo.toml | 4 +- test-utils/transaction-factory/Cargo.toml | 12 +- 510 files changed, 417 insertions(+), 417 deletions(-) rename {core => client}/application-crypto/Cargo.toml (100%) rename {core => client}/application-crypto/src/ed25519.rs (100%) rename {core => client}/application-crypto/src/lib.rs (100%) rename {core => client}/application-crypto/src/sr25519.rs (100%) rename {core => client}/application-crypto/src/traits.rs (100%) rename {core => client}/authority-discovery/Cargo.toml (72%) rename {core => client}/authority-discovery/build.rs (100%) rename {core => client}/authority-discovery/primitives/Cargo.toml (100%) rename {core => client}/authority-discovery/primitives/src/lib.rs (96%) rename {core => client}/authority-discovery/src/error.rs (100%) rename {core => client}/authority-discovery/src/lib.rs (100%) rename {core => client}/authority-discovery/src/schema/dht.proto (100%) rename {core => client}/basic-authorship/Cargo.toml (71%) rename {core => client}/basic-authorship/src/basic_authorship.rs (100%) rename {core => client}/basic-authorship/src/lib.rs (100%) rename {core => client}/chain-spec/Cargo.toml (65%) rename {core => client}/chain-spec/derive/Cargo.toml (100%) rename {core => client}/chain-spec/derive/src/impls.rs (100%) rename {core => client}/chain-spec/derive/src/lib.rs (100%) rename {core => client}/chain-spec/res/chain_spec.json (100%) rename {core => client}/chain-spec/res/chain_spec2.json (100%) rename {core => client}/chain-spec/src/chain_spec.rs (100%) rename {core => client}/chain-spec/src/extension.rs (100%) rename {core => client}/chain-spec/src/lib.rs (100%) rename {core => client}/cli/Cargo.toml (67%) rename {core => client}/cli/README.adoc (100%) rename {core => client}/cli/src/error.rs (100%) rename {core => client}/cli/src/execution_strategy.rs (100%) rename {core => client}/cli/src/informant.rs (100%) rename {core => client}/cli/src/informant/display.rs (100%) rename {core => client}/cli/src/lib.rs (100%) rename {core => client}/cli/src/params.rs (100%) rename {core => client}/cli/src/traits.rs (100%) rename {core => client}/client/Cargo.toml (100%) rename {core => client}/client/db/Cargo.toml (100%) rename {core => client}/client/db/src/cache/list_cache.rs (100%) rename {core => client}/client/db/src/cache/list_entry.rs (100%) rename {core => client}/client/db/src/cache/list_storage.rs (100%) rename {core => client}/client/db/src/cache/mod.rs (100%) rename {core => client}/client/db/src/lib.rs (100%) rename {core => client}/client/db/src/light.rs (100%) rename {core => client}/client/db/src/offchain.rs (100%) rename {core => client}/client/db/src/storage_cache.rs (100%) rename {core => client}/client/db/src/utils.rs (100%) rename {core => client}/client/header-metadata/Cargo.toml (100%) rename {core => client}/client/header-metadata/src/lib.rs (100%) rename {core => client}/client/src/backend.rs (100%) rename {core => client}/client/src/block_builder/api.rs (100%) rename {core => client}/client/src/block_builder/block_builder.rs (100%) rename {core => client}/client/src/block_builder/mod.rs (100%) rename {core => client}/client/src/blockchain.rs (100%) rename {core => client}/client/src/call_executor.rs (100%) rename {core => client}/client/src/children.rs (100%) rename {core => client}/client/src/cht.rs (100%) rename {core => client}/client/src/client.rs (100%) rename {core => client}/client/src/error.rs (100%) rename {core => client}/client/src/genesis.rs (100%) rename {core => client}/client/src/in_mem.rs (100%) rename {core => client}/client/src/leaves.rs (100%) rename {core => client}/client/src/lib.rs (100%) rename {core => client}/client/src/light/backend.rs (100%) rename {core => client}/client/src/light/blockchain.rs (100%) rename {core => client}/client/src/light/call_executor.rs (100%) rename {core => client}/client/src/light/fetcher.rs (100%) rename {core => client}/client/src/light/mod.rs (100%) rename {core => client}/client/src/notifications.rs (100%) rename {core => client}/client/src/runtime_api.rs (100%) rename {core => client}/consensus/aura/Cargo.toml (100%) rename {core => client}/consensus/aura/primitives/Cargo.toml (100%) rename {core => client}/consensus/aura/primitives/src/lib.rs (100%) rename {core => client}/consensus/aura/src/digest.rs (100%) rename {core => client}/consensus/aura/src/lib.rs (100%) rename {core => client}/consensus/babe/Cargo.toml (100%) rename {core => client}/consensus/babe/primitives/Cargo.toml (100%) rename {core => client}/consensus/babe/primitives/src/digest.rs (100%) rename {core => client}/consensus/babe/primitives/src/lib.rs (100%) rename {core => client}/consensus/babe/src/authorship.rs (100%) rename {core => client}/consensus/babe/src/aux_schema.rs (100%) rename {core => client}/consensus/babe/src/epoch_changes.rs (100%) rename {core => client}/consensus/babe/src/lib.rs (100%) rename {core => client}/consensus/babe/src/tests.rs (100%) rename {core => client}/consensus/babe/src/verification.rs (100%) rename {core => client}/consensus/common/Cargo.toml (100%) rename {core => client}/consensus/common/src/block_import.rs (100%) rename {core => client}/consensus/common/src/block_validation.rs (100%) rename {core => client}/consensus/common/src/error.rs (100%) rename {core => client}/consensus/common/src/evaluation.rs (100%) rename {core => client}/consensus/common/src/import_queue.rs (100%) rename {core => client}/consensus/common/src/import_queue/basic_queue.rs (100%) rename {core => client}/consensus/common/src/import_queue/buffered_link.rs (100%) rename {core => client}/consensus/common/src/lib.rs (100%) rename {core => client}/consensus/common/src/offline_tracker.rs (100%) rename {core => client}/consensus/common/src/select_chain.rs (100%) rename {core => client}/consensus/pow/Cargo.toml (100%) rename {core => client}/consensus/pow/primitives/Cargo.toml (100%) rename {core => client}/consensus/pow/primitives/src/lib.rs (100%) rename {core => client}/consensus/pow/src/lib.rs (100%) rename {core => client}/consensus/rhd/Cargo.toml (100%) rename {core => client}/consensus/rhd/src/error.rs (100%) rename {core => client}/consensus/rhd/src/lib.rs (100%) rename {core => client}/consensus/rhd/src/misbehaviour_check.rs (100%) rename {core => client}/consensus/rhd/src/service.rs (100%) rename {core => client}/consensus/slots/Cargo.toml (100%) rename {core => client}/consensus/slots/build.rs (100%) rename {core => client}/consensus/slots/src/aux_schema.rs (100%) rename {core => client}/consensus/slots/src/lib.rs (100%) rename {core => client}/consensus/slots/src/slots.rs (100%) rename {core => client}/consensus/uncles/Cargo.toml (100%) rename {core => client}/consensus/uncles/src/lib.rs (100%) rename {core => client}/executor/Cargo.toml (100%) rename {core => client}/executor/runtime-test/Cargo.toml (100%) rename {core => client}/executor/runtime-test/build.rs (100%) rename {core => client}/executor/runtime-test/src/lib.rs (100%) rename {core => client}/executor/src/allocator.rs (100%) rename {core => client}/executor/src/error.rs (100%) rename {core => client}/executor/src/host_interface.rs (100%) rename {core => client}/executor/src/integration_tests/mod.rs (100%) rename {core => client}/executor/src/integration_tests/sandbox.rs (100%) rename {core => client}/executor/src/lib.rs (100%) rename {core => client}/executor/src/native_executor.rs (100%) rename {core => client}/executor/src/sandbox.rs (100%) rename {core => client}/executor/src/wasm_runtime.rs (100%) rename {core => client}/executor/src/wasm_utils.rs (100%) rename {core => client}/executor/src/wasmi_execution.rs (100%) rename {core => client}/executor/src/wasmtime/function_executor.rs (100%) rename {core => client}/executor/src/wasmtime/mod.rs (100%) rename {core => client}/executor/src/wasmtime/runtime.rs (100%) rename {core => client}/executor/src/wasmtime/trampoline.rs (100%) rename {core => client}/executor/src/wasmtime/util.rs (100%) rename {core => client}/externalities/Cargo.toml (100%) rename {core => client}/externalities/src/extensions.rs (100%) rename {core => client}/externalities/src/lib.rs (100%) rename {core => client}/externalities/src/scope_limited.rs (100%) rename {core => client}/finality-grandpa/Cargo.toml (93%) rename {core => client}/finality-grandpa/primitives/Cargo.toml (100%) rename {core => client}/finality-grandpa/primitives/src/lib.rs (100%) rename {core => client}/finality-grandpa/src/authorities.rs (100%) rename {core => client}/finality-grandpa/src/aux_schema.rs (100%) rename {core => client}/finality-grandpa/src/communication/gossip.rs (100%) rename {core => client}/finality-grandpa/src/communication/mod.rs (100%) rename {core => client}/finality-grandpa/src/communication/periodic.rs (100%) rename {core => client}/finality-grandpa/src/communication/tests.rs (100%) rename {core => client}/finality-grandpa/src/consensus_changes.rs (100%) rename {core => client}/finality-grandpa/src/environment.rs (100%) rename {core => client}/finality-grandpa/src/finality_proof.rs (100%) rename {core => client}/finality-grandpa/src/import.rs (100%) rename {core => client}/finality-grandpa/src/justification.rs (100%) rename {core => client}/finality-grandpa/src/lib.rs (100%) rename {core => client}/finality-grandpa/src/light_import.rs (100%) rename {core => client}/finality-grandpa/src/observer.rs (100%) rename {core => client}/finality-grandpa/src/tests.rs (100%) rename {core => client}/finality-grandpa/src/until_imported.rs (100%) rename {core => client}/finality-grandpa/src/voting_rule.rs (100%) rename {core => client}/inherents/Cargo.toml (100%) rename {core => client}/inherents/src/lib.rs (100%) rename {core => client}/keyring/Cargo.toml (100%) rename {core => client}/keyring/src/ed25519.rs (100%) rename {core => client}/keyring/src/lib.rs (100%) rename {core => client}/keyring/src/sr25519.rs (100%) rename {core => client}/keystore/Cargo.toml (100%) rename {core => client}/keystore/src/lib.rs (100%) rename {core => client}/network/Cargo.toml (73%) rename {core => client}/network/src/behaviour.rs (100%) rename {core => client}/network/src/chain.rs (100%) rename {core => client}/network/src/config.rs (100%) rename {core => client}/network/src/debug_info.rs (100%) rename {core => client}/network/src/discovery.rs (100%) rename {core => client}/network/src/error.rs (100%) rename {core => client}/network/src/legacy_proto/behaviour.rs (100%) rename {core => client}/network/src/legacy_proto/handler.rs (100%) rename {core => client}/network/src/legacy_proto/mod.rs (100%) rename {core => client}/network/src/legacy_proto/tests.rs (100%) rename {core => client}/network/src/legacy_proto/upgrade.rs (100%) rename {core => client}/network/src/lib.rs (100%) rename {core => client}/network/src/on_demand_layer.rs (100%) rename {core => client}/network/src/protocol.rs (100%) rename {core => client}/network/src/protocol/consensus_gossip.rs (100%) rename {core => client}/network/src/protocol/event.rs (100%) rename {core => client}/network/src/protocol/light_dispatch.rs (100%) rename {core => client}/network/src/protocol/message.rs (100%) rename {core => client}/network/src/protocol/specialization.rs (100%) rename {core => client}/network/src/protocol/sync.rs (100%) rename {core => client}/network/src/protocol/sync/blocks.rs (100%) rename {core => client}/network/src/protocol/sync/extra_requests.rs (100%) rename {core => client}/network/src/protocol/util.rs (100%) rename {core => client}/network/src/service.rs (100%) rename {core => client}/network/src/test/block_import.rs (100%) rename {core => client}/network/src/test/mod.rs (100%) rename {core => client}/network/src/test/sync.rs (100%) rename {core => client}/network/src/transport.rs (100%) rename {core => client}/offchain/Cargo.toml (72%) rename {core => client}/offchain/primitives/Cargo.toml (100%) rename {core => client}/offchain/primitives/src/lib.rs (100%) rename {core => client}/offchain/src/api.rs (100%) rename {core => client}/offchain/src/api/http.rs (100%) rename {core => client}/offchain/src/api/http_dummy.rs (100%) rename {core => client}/offchain/src/api/timestamp.rs (100%) rename {core => client}/offchain/src/lib.rs (100%) rename {core => client}/offchain/src/testing.rs (100%) rename {core => client}/panic-handler/Cargo.toml (100%) rename {core => client}/panic-handler/src/lib.rs (100%) rename {core => client}/peerset/Cargo.toml (100%) rename {core => client}/peerset/src/lib.rs (100%) rename {core => client}/peerset/src/peersstate.rs (100%) rename {core => client}/peerset/tests/fuzz.rs (100%) rename {core => client}/phragmen/Cargo.toml (100%) rename {core => client}/phragmen/benches/phragmen.rs (100%) rename {core => client}/phragmen/src/lib.rs (100%) rename {core => client}/phragmen/src/mock.rs (100%) rename {core => client}/phragmen/src/tests.rs (100%) rename {core => client}/primitives/Cargo.toml (100%) rename {core => client}/primitives/benches/bench.rs (100%) rename {core => client}/primitives/debug-derive/Cargo.toml (100%) rename {core => client}/primitives/debug-derive/src/impls.rs (100%) rename {core => client}/primitives/debug-derive/src/lib.rs (100%) rename {core => client}/primitives/debug-derive/tests/tests.rs (100%) rename {core => client}/primitives/src/changes_trie.rs (100%) rename {core => client}/primitives/src/crypto.rs (100%) rename {core => client}/primitives/src/ecdsa.rs (100%) rename {core => client}/primitives/src/ed25519.rs (100%) rename {core => client}/primitives/src/hash.rs (100%) rename {core => client}/primitives/src/hasher.rs (100%) rename {core => client}/primitives/src/hashing.rs (100%) rename {core => client}/primitives/src/hexdisplay.rs (100%) rename {core => client}/primitives/src/lib.rs (100%) rename {core => client}/primitives/src/offchain.rs (100%) rename {core => client}/primitives/src/sandbox.rs (100%) rename {core => client}/primitives/src/sr25519.rs (100%) rename {core => client}/primitives/src/testing.rs (100%) rename {core => client}/primitives/src/tests.rs (100%) rename {core => client}/primitives/src/traits.rs (100%) rename {core => client}/primitives/src/u32_trait.rs (100%) rename {core => client}/primitives/src/uint.rs (100%) rename {core => client}/primitives/storage/Cargo.toml (100%) rename {core => client}/primitives/storage/src/lib.rs (100%) rename {core => client}/rpc-servers/Cargo.toml (100%) rename {core => client}/rpc-servers/src/lib.rs (100%) rename {core => client}/rpc/Cargo.toml (100%) rename {core => client}/rpc/api/Cargo.toml (100%) rename {core => client}/rpc/api/src/author/error.rs (100%) rename {core => client}/rpc/api/src/author/hash.rs (100%) rename {core => client}/rpc/api/src/author/mod.rs (100%) rename {core => client}/rpc/api/src/chain/error.rs (100%) rename {core => client}/rpc/api/src/chain/mod.rs (100%) rename {core => client}/rpc/api/src/errors.rs (100%) rename {core => client}/rpc/api/src/helpers.rs (100%) rename {core => client}/rpc/api/src/lib.rs (100%) rename {core => client}/rpc/api/src/state/error.rs (100%) rename {core => client}/rpc/api/src/state/mod.rs (100%) rename {core => client}/rpc/api/src/subscriptions.rs (100%) rename {core => client}/rpc/api/src/system/error.rs (100%) rename {core => client}/rpc/api/src/system/helpers.rs (100%) rename {core => client}/rpc/api/src/system/mod.rs (100%) rename {core => client}/rpc/primitives/Cargo.toml (100%) rename {core => client}/rpc/primitives/src/lib.rs (100%) rename {core => client}/rpc/primitives/src/number.rs (100%) rename {core => client}/rpc/src/author/mod.rs (100%) rename {core => client}/rpc/src/author/tests.rs (100%) rename {core => client}/rpc/src/chain/chain_full.rs (100%) rename {core => client}/rpc/src/chain/chain_light.rs (100%) rename {core => client}/rpc/src/chain/mod.rs (100%) rename {core => client}/rpc/src/chain/tests.rs (100%) rename {core => client}/rpc/src/lib.rs (100%) rename {core => client}/rpc/src/metadata.rs (100%) rename {core => client}/rpc/src/state/mod.rs (100%) rename {core => client}/rpc/src/state/state_full.rs (100%) rename {core => client}/rpc/src/state/state_light.rs (100%) rename {core => client}/rpc/src/state/tests.rs (100%) rename {core => client}/rpc/src/system/mod.rs (100%) rename {core => client}/rpc/src/system/tests.rs (100%) rename {core => client}/serializer/Cargo.toml (100%) rename {core => client}/serializer/src/lib.rs (100%) rename {core => client}/service/Cargo.toml (67%) rename {core => client}/service/src/builder.rs (100%) rename {core => client}/service/src/chain_ops.rs (100%) rename {core => client}/service/src/config.rs (100%) rename {core => client}/service/src/error.rs (100%) rename {core => client}/service/src/lib.rs (99%) rename {core => client}/service/src/status_sinks.rs (100%) rename {core => client}/service/test/Cargo.toml (56%) rename {core => client}/service/test/src/lib.rs (100%) rename {core => client}/session/Cargo.toml (100%) rename {core => client}/session/src/lib.rs (100%) rename {core => client}/sr-api-macros/Cargo.toml (100%) rename {core => client}/sr-api-macros/benches/bench.rs (100%) rename {core => client}/sr-api-macros/src/decl_runtime_apis.rs (100%) rename {core => client}/sr-api-macros/src/impl_runtime_apis.rs (100%) rename {core => client}/sr-api-macros/src/lib.rs (100%) rename {core => client}/sr-api-macros/src/utils.rs (100%) rename {core => client}/sr-api-macros/tests/decl_and_impl.rs (100%) rename {core => client}/sr-api-macros/tests/runtime_calls.rs (100%) rename {core => client}/sr-api-macros/tests/trybuild.rs (100%) rename {core => client}/sr-api-macros/tests/ui/adding_self_parameter.rs (100%) rename {core => client}/sr-api-macros/tests/ui/adding_self_parameter.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/changed_in_unknown_version.rs (100%) rename {core => client}/sr-api-macros/tests/ui/changed_in_unknown_version.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/declaring_old_block.rs (100%) rename {core => client}/sr-api-macros/tests/ui/declaring_old_block.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs (100%) rename {core => client}/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs (100%) rename {core => client}/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs (100%) rename {core => client}/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs (100%) rename {core => client}/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version.rs (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version_2.rs (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version_2.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version_3.rs (100%) rename {core => client}/sr-api-macros/tests/ui/invalid_api_version_3.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/missing_block_generic_parameter.rs (100%) rename {core => client}/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/missing_path_for_trait.rs (100%) rename {core => client}/sr-api-macros/tests/ui/missing_path_for_trait.stderr (100%) rename {core => client}/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs (100%) rename {core => client}/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr (100%) rename {core => client}/sr-arithmetic/Cargo.toml (100%) rename {core => client}/sr-arithmetic/benches/bench.rs (100%) rename {core => client}/sr-arithmetic/fuzzer/.gitignore (100%) rename {core => client}/sr-arithmetic/fuzzer/Cargo.lock (100%) rename {core => client}/sr-arithmetic/fuzzer/Cargo.toml (100%) rename {core => client}/sr-arithmetic/fuzzer/src/biguint.rs (100%) rename {core => client}/sr-arithmetic/fuzzer/src/rational128.rs (100%) rename {core => client}/sr-arithmetic/src/biguint.rs (100%) rename {core => client}/sr-arithmetic/src/fixed64.rs (100%) rename {core => client}/sr-arithmetic/src/helpers_128bit.rs (100%) rename {core => client}/sr-arithmetic/src/lib.rs (100%) rename {core => client}/sr-arithmetic/src/per_things.rs (100%) rename {core => client}/sr-arithmetic/src/rational128.rs (100%) rename {core => client}/sr-arithmetic/src/traits.rs (100%) rename {core => client}/sr-io/Cargo.toml (100%) rename {core => client}/sr-io/build.rs (100%) rename {core => client}/sr-io/src/lib.rs (100%) rename {core => client}/sr-io/with_std.rs (100%) rename {core => client}/sr-io/without_std.rs (100%) rename {core => client}/sr-primitives/Cargo.toml (100%) rename {core => client}/sr-primitives/src/curve.rs (100%) rename {core => client}/sr-primitives/src/generic/block.rs (100%) rename {core => client}/sr-primitives/src/generic/checked_extrinsic.rs (100%) rename {core => client}/sr-primitives/src/generic/digest.rs (100%) rename {core => client}/sr-primitives/src/generic/era.rs (100%) rename {core => client}/sr-primitives/src/generic/header.rs (100%) rename {core => client}/sr-primitives/src/generic/mod.rs (100%) rename {core => client}/sr-primitives/src/generic/tests.rs (100%) rename {core => client}/sr-primitives/src/generic/unchecked_extrinsic.rs (100%) rename {core => client}/sr-primitives/src/lib.rs (100%) rename {core => client}/sr-primitives/src/offchain/http.rs (100%) rename {core => client}/sr-primitives/src/offchain/mod.rs (100%) rename {core => client}/sr-primitives/src/testing.rs (100%) rename {core => client}/sr-primitives/src/traits.rs (100%) rename {core => client}/sr-primitives/src/transaction_validity.rs (100%) rename {core => client}/sr-primitives/src/weights.rs (100%) rename {core => client}/sr-sandbox/Cargo.toml (100%) rename {core => client}/sr-sandbox/build.rs (100%) rename {core => client}/sr-sandbox/src/lib.rs (100%) rename {core => client}/sr-sandbox/with_std.rs (100%) rename {core => client}/sr-sandbox/without_std.rs (100%) rename {core => client}/sr-staking-primitives/Cargo.toml (100%) rename {core => client}/sr-staking-primitives/src/lib.rs (100%) rename {core => client}/sr-staking-primitives/src/offence.rs (100%) rename {core => client}/sr-std/Cargo.toml (100%) rename {core => client}/sr-std/build.rs (100%) rename {core => client}/sr-std/src/lib.rs (96%) rename {core => client}/sr-std/with_std.rs (100%) rename {core => client}/sr-std/without_std.rs (100%) rename {core => client}/sr-version/Cargo.toml (100%) rename {core => client}/sr-version/src/lib.rs (100%) rename {core => client}/state-db/Cargo.toml (94%) rename {core => client}/state-db/src/lib.rs (100%) rename {core => client}/state-db/src/noncanonical.rs (100%) rename {core => client}/state-db/src/pruning.rs (100%) rename {core => client}/state-db/src/test.rs (100%) rename {core => client}/state-machine/Cargo.toml (100%) rename {core => client}/state-machine/src/backend.rs (100%) rename {core => client}/state-machine/src/basic.rs (100%) rename {core => client}/state-machine/src/changes_trie/build.rs (100%) rename {core => client}/state-machine/src/changes_trie/build_cache.rs (100%) rename {core => client}/state-machine/src/changes_trie/build_iterator.rs (100%) rename {core => client}/state-machine/src/changes_trie/changes_iterator.rs (100%) rename {core => client}/state-machine/src/changes_trie/input.rs (100%) rename {core => client}/state-machine/src/changes_trie/mod.rs (100%) rename {core => client}/state-machine/src/changes_trie/prune.rs (100%) rename {core => client}/state-machine/src/changes_trie/storage.rs (100%) rename {core => client}/state-machine/src/changes_trie/surface_iterator.rs (100%) rename {core => client}/state-machine/src/error.rs (100%) rename {core => client}/state-machine/src/ext.rs (100%) rename {core => client}/state-machine/src/lib.rs (100%) rename {core => client}/state-machine/src/overlayed_changes.rs (100%) rename {core => client}/state-machine/src/proving_backend.rs (100%) rename {core => client}/state-machine/src/testing.rs (100%) rename {core => client}/state-machine/src/trie_backend.rs (100%) rename {core => client}/state-machine/src/trie_backend_essence.rs (100%) rename {core => client}/telemetry/Cargo.toml (100%) rename {core => client}/telemetry/src/lib.rs (100%) rename {core => client}/telemetry/src/worker.rs (100%) rename {core => client}/telemetry/src/worker/node.rs (100%) rename {core => client}/test-client/Cargo.toml (100%) rename {core => client}/test-client/src/client_ext.rs (100%) rename {core => client}/test-client/src/lib.rs (100%) rename {core => client}/test-runtime/Cargo.toml (100%) rename {core => client}/test-runtime/build.rs (100%) rename {core => client}/test-runtime/client/Cargo.toml (100%) rename {core => client}/test-runtime/client/src/block_builder_ext.rs (100%) rename {core => client}/test-runtime/client/src/lib.rs (100%) rename {core => client}/test-runtime/client/src/trait_tests.rs (100%) rename {core => client}/test-runtime/src/genesismap.rs (100%) rename {core => client}/test-runtime/src/lib.rs (100%) rename {core => client}/test-runtime/src/system.rs (100%) rename {core => client}/transaction-pool/Cargo.toml (85%) rename {core => client}/transaction-pool/graph/Cargo.toml (100%) rename {core => client}/transaction-pool/graph/benches/basics.rs (100%) rename {core => client}/transaction-pool/graph/src/base_pool.rs (100%) rename {core => client}/transaction-pool/graph/src/error.rs (100%) rename {core => client}/transaction-pool/graph/src/future.rs (100%) rename {core => client}/transaction-pool/graph/src/lib.rs (100%) rename {core => client}/transaction-pool/graph/src/listener.rs (100%) rename {core => client}/transaction-pool/graph/src/pool.rs (100%) rename {core => client}/transaction-pool/graph/src/ready.rs (100%) rename {core => client}/transaction-pool/graph/src/rotator.rs (100%) rename {core => client}/transaction-pool/graph/src/validated_pool.rs (100%) rename {core => client}/transaction-pool/graph/src/watcher.rs (100%) rename {core => client}/transaction-pool/src/api.rs (100%) rename {core => client}/transaction-pool/src/error.rs (100%) rename {core => client}/transaction-pool/src/lib.rs (100%) rename {core => client}/transaction-pool/src/tests.rs (100%) rename {core => client}/trie/Cargo.toml (100%) rename {core => client}/trie/benches/bench.rs (100%) rename {core => client}/trie/src/error.rs (100%) rename {core => client}/trie/src/lib.rs (100%) rename {core => client}/trie/src/node_codec.rs (100%) rename {core => client}/trie/src/node_header.rs (100%) rename {core => client}/trie/src/trie_stream.rs (100%) rename {core => client}/utils/build-script-utils/Cargo.toml (100%) rename {core => client}/utils/build-script-utils/src/lib.rs (100%) rename {core => client}/utils/fork-tree/Cargo.toml (100%) rename {core => client}/utils/fork-tree/src/lib.rs (100%) rename {core => client}/utils/wasm-builder-runner/Cargo.toml (100%) rename {core => client}/utils/wasm-builder-runner/README.md (100%) rename {core => client}/utils/wasm-builder-runner/src/lib.rs (100%) rename {core => client}/utils/wasm-builder/Cargo.toml (100%) rename {core => client}/utils/wasm-builder/README.md (100%) rename {core => client}/utils/wasm-builder/src/lib.rs (100%) rename {core => client}/utils/wasm-builder/src/prerequisites.rs (100%) rename {core => client}/utils/wasm-builder/src/wasm_project.rs (100%) rename {core => client}/wasm-interface/Cargo.toml (100%) rename {core => client}/wasm-interface/src/lib.rs (100%) rename {core => client}/wasm-interface/src/wasmi_impl.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index d9bc55615530c..272946fb5b9d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,58 +1,58 @@ [workspace] members = [ - "core/authority-discovery", - "core/application-crypto", - "core/chain-spec", - "core/chain-spec/derive", - "core/cli", - "core/client", - "core/client/db", - "core/client/header-metadata", - "core/consensus/aura", - "core/consensus/babe", - "core/consensus/common", - "core/consensus/rhd", - "core/consensus/slots", - "core/consensus/uncles", - "core/consensus/pow", - "core/executor", - "core/executor/runtime-test", - "core/externalities", - "core/finality-grandpa", - "core/finality-grandpa/primitives", - "core/inherents", - "core/keyring", - "core/keystore", - "core/network", - "core/panic-handler", - "core/primitives", - "core/rpc", - "core/rpc/primitives", - "core/rpc-servers", - "core/serializer", - "core/service", - "core/service/test", - "core/session", - "core/sr-api-macros", - "core/sr-arithmetic", - "core/sr-io", - "core/sr-primitives", - "core/sr-staking-primitives", - "core/sr-sandbox", - "core/sr-std", - "core/sr-version", - "core/state-machine", - "core/telemetry", - "core/test-client", - "core/test-runtime", - "core/test-runtime/client", - "core/transaction-pool", - "core/transaction-pool/graph", - "core/trie", - "core/utils/fork-tree", - "core/utils/wasm-builder", - "core/utils/wasm-builder-runner", - "core/wasm-interface", + "client/authority-discovery", + "client/application-crypto", + "client/chain-spec", + "client/chain-spec/derive", + "client/cli", + "client/client", + "client/client/db", + "client/client/header-metadata", + "client/consensus/aura", + "client/consensus/babe", + "client/consensus/common", + "client/consensus/rhd", + "client/consensus/slots", + "client/consensus/uncles", + "client/consensus/pow", + "client/executor", + "client/executor/runtime-test", + "client/externalities", + "client/finality-grandpa", + "client/finality-grandpa/primitives", + "client/inherents", + "client/keyring", + "client/keystore", + "client/network", + "client/panic-handler", + "client/primitives", + "client/rpc", + "client/rpc/primitives", + "client/rpc-servers", + "client/serializer", + "client/service", + "client/service/test", + "client/session", + "client/sr-api-macros", + "client/sr-arithmetic", + "client/sr-io", + "client/sr-primitives", + "client/sr-staking-primitives", + "client/sr-sandbox", + "client/sr-std", + "client/sr-version", + "client/state-machine", + "client/telemetry", + "client/test-client", + "client/test-runtime", + "client/test-runtime/client", + "client/transaction-pool", + "client/transaction-pool/graph", + "client/trie", + "client/utils/fork-tree", + "client/utils/wasm-builder", + "client/utils/wasm-builder-runner", + "client/wasm-interface", "srml/support", "srml/support/procedural", "srml/support/procedural/tools", diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml index 6213e1f79a057..34df9f7ff6238 100644 --- a/bin/node-template/Cargo.toml +++ b/bin/node-template/Cargo.toml @@ -19,23 +19,23 @@ exit-future = "0.1.4" parking_lot = "0.9.0" codec = { package = "parity-scale-codec", version = "1.0.0" } trie-root = "0.15.2" -sr-io = { path = "../../core/sr-io" } -substrate-cli = { path = "../../core/cli" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -substrate-executor = { path = "../../core/executor" } -substrate-service = { path = "../../core/service" } -inherents = { package = "substrate-inherents", path = "../../core/inherents" } -transaction-pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } -network = { package = "substrate-network", path = "../../core/network" } -aura = { package = "substrate-consensus-aura", path = "../../core/consensus/aura" } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../core/consensus/aura/primitives" } -grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" } -grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" } -substrate-client = { path = "../../core/client" } -basic-authorship = { package = "substrate-basic-authorship", path = "../../core/basic-authorship" } +sr-io = { path = "../../client/sr-io" } +substrate-cli = { path = "../../client/cli" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +substrate-executor = { path = "../../client/executor" } +substrate-service = { path = "../../client/service" } +inherents = { package = "substrate-inherents", path = "../../client/inherents" } +transaction-pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } +network = { package = "substrate-network", path = "../../client/network" } +aura = { package = "substrate-consensus-aura", path = "../../client/consensus/aura" } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../client/consensus/aura/primitives" } +grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" } +grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../client/finality-grandpa/primitives" } +substrate-client = { path = "../../client/client" } +basic-authorship = { package = "substrate-basic-authorship", path = "../../client/basic-authorship" } runtime = { package = "node-template-runtime", path = "runtime" } -sr-primitives = { path = "../../core/sr-primitives" } +sr-primitives = { path = "../../client/sr-primitives" } [build-dependencies] vergen = "3.0.4" -build-script-utils = { package = "substrate-build-script-utils", path = "../../core/utils/build-script-utils" } +build-script-utils = { package = "substrate-build-script-utils", path = "../../client/utils/build-script-utils" } diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml index 975a8501409e0..a44674373073a 100644 --- a/bin/node-template/runtime/Cargo.toml +++ b/bin/node-template/runtime/Cargo.toml @@ -8,15 +8,15 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../core/sr-std", default_features = false } -runtime-io = { package = "sr-io", path = "../../../core/sr-io", default_features = false } -version = { package = "sr-version", path = "../../../core/sr-version", default_features = false } +rstd = { package = "sr-std", path = "../../../client/sr-std", default_features = false } +runtime-io = { package = "sr-io", path = "../../../client/sr-io", default_features = false } +version = { package = "sr-version", path = "../../../client/sr-version", default_features = false } support = { package = "srml-support", path = "../../../srml/support", default_features = false } -primitives = { package = "substrate-primitives", path = "../../../core/primitives", default_features = false } -substrate-session = { path = "../../../core/session", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default_features = false } +substrate-session = { path = "../../../client/session", default-features = false } balances = { package = "srml-balances", path = "../../../srml/balances", default_features = false } aura = { package = "srml-aura", path = "../../../srml/aura", default_features = false } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../core/consensus/aura/primitives", default_features = false } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../client/consensus/aura/primitives", default_features = false } grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa", default_features = false } executive = { package = "srml-executive", path = "../../../srml/executive", default_features = false } indices = { package = "srml-indices", path = "../../../srml/indices", default_features = false } @@ -25,9 +25,9 @@ system = { package = "srml-system", path = "../../../srml/system", default_featu timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default_features = false } sudo = { package = "srml-sudo", path = "../../../srml/sudo", default_features = false } transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment", default_features = false } -sr-primitives = { path = "../../../core/sr-primitives", default_features = false } -client = { package = "substrate-client", path = "../../../core/client", default_features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../core/offchain/primitives", default-features = false } +sr-primitives = { path = "../../../client/sr-primitives", default_features = false } +client = { package = "substrate-client", path = "../../../client/client", default_features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" } diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 0b61a124a19e3..9fd06dfcdfe5e 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -33,27 +33,27 @@ rand = "0.7.2" structopt = "0.3.3" # primitives -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } -sr-primitives = { path = "../../../core/sr-primitives" } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../core/consensus/babe/primitives" } -grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../../core/finality-grandpa/primitives" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives" } +grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../../client/finality-grandpa/primitives" } # core dependencies -sr-io = { path = "../../../core/sr-io" } -client = { package = "substrate-client", path = "../../../core/client" } -inherents = { package = "substrate-inherents", path = "../../../core/inherents" } -chain-spec = { package = "substrate-chain-spec", path = "../../../core/chain-spec" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../../core/transaction-pool" } -network = { package = "substrate-network", path = "../../../core/network" } -babe = { package = "substrate-consensus-babe", path = "../../../core/consensus/babe" } -grandpa = { package = "substrate-finality-grandpa", path = "../../../core/finality-grandpa" } -keyring = { package = "substrate-keyring", path = "../../../core/keyring" } -client_db = { package = "substrate-client-db", path = "../../../core/client/db", default-features = false } -offchain = { package = "substrate-offchain", path = "../../../core/offchain" } -substrate-rpc = { package = "substrate-rpc", path = "../../../core/rpc" } -substrate-basic-authorship = { path = "../../../core/basic-authorship" } -substrate-service = { path = "../../../core/service", default-features = false } -substrate-telemetry = { package = "substrate-telemetry", path = "../../../core/telemetry" } +sr-io = { path = "../../../client/sr-io" } +client = { package = "substrate-client", path = "../../../client/client" } +inherents = { package = "substrate-inherents", path = "../../../client/inherents" } +chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } +network = { package = "substrate-network", path = "../../../client/network" } +babe = { package = "substrate-consensus-babe", path = "../../../client/consensus/babe" } +grandpa = { package = "substrate-finality-grandpa", path = "../../../client/finality-grandpa" } +keyring = { package = "substrate-keyring", path = "../../../client/keyring" } +client_db = { package = "substrate-client-db", path = "../../../client/client/db", default-features = false } +offchain = { package = "substrate-offchain", path = "../../../client/offchain" } +substrate-rpc = { package = "substrate-rpc", path = "../../../client/rpc" } +substrate-basic-authorship = { path = "../../../client/basic-authorship" } +substrate-service = { path = "../../../client/service", default-features = false } +substrate-telemetry = { package = "substrate-telemetry", path = "../../../client/telemetry" } # srml dependencies indices = { package = "srml-indices", path = "../../../srml/indices" } @@ -75,7 +75,7 @@ node-executor = { path = "../executor" } # CLI-specific dependencies tokio = { version = "0.1.22", optional = true } exit-future = { version = "0.1.4", optional = true } -substrate-cli = { path = "../../../core/cli", optional = true } +substrate-cli = { path = "../../../client/cli", optional = true } transaction-factory = { path = "../../../test-utils/transaction-factory", optional = true } ctrlc = { version = "3.1.3", features = ["termination"], optional = true } @@ -91,16 +91,16 @@ kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b031 rand6 = { package = "rand", version = "0.6", features = ["wasm-bindgen"], optional = true } # Imported just for the `wasm-bindgen` feature [dev-dependencies] -keystore = { package = "substrate-keystore", path = "../../../core/keystore" } -babe = { package = "substrate-consensus-babe", path = "../../../core/consensus/babe", features = ["test-helpers"] } -consensus-common = { package = "substrate-consensus-common", path = "../../../core/consensus/common" } -service-test = { package = "substrate-service-test", path = "../../../core/service/test" } +keystore = { package = "substrate-keystore", path = "../../../client/keystore" } +babe = { package = "substrate-consensus-babe", path = "../../../client/consensus/babe", features = ["test-helpers"] } +consensus-common = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } +service-test = { package = "substrate-service-test", path = "../../../client/service/test" } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19" } tempfile = "3.1.0" [build-dependencies] -substrate-cli = { package = "substrate-cli", path = "../../../core/cli" } -build-script-utils = { package = "substrate-build-script-utils", path = "../../../core/utils/build-script-utils" } +substrate-cli = { package = "substrate-cli", path = "../../../client/cli" } +build-script-utils = { package = "substrate-build-script-utils", path = "../../../client/utils/build-script-utils" } structopt = "0.3.3" vergen = "3.0.4" diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index e9a59d427fdbf..b3107cb2bae93 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -8,18 +8,18 @@ edition = "2018" [dependencies] trie-root = "0.15.2" codec = { package = "parity-scale-codec", version = "1.0.0" } -runtime_io = { package = "sr-io", path = "../../../core/sr-io" } -state_machine = { package = "substrate-state-machine", path = "../../../core/state-machine" } -substrate-executor = { path = "../../../core/executor" } -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } -trie = { package = "substrate-trie", path = "../../../core/trie" } +runtime_io = { package = "sr-io", path = "../../../client/sr-io" } +state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } +substrate-executor = { path = "../../../client/executor" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +trie = { package = "substrate-trie", path = "../../../client/trie" } node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } [dev-dependencies] node-testing = { path = "../testing" } -test-client = { package = "substrate-test-client", path = "../../../core/test-client" } -sr-primitives = { path = "../../../core/sr-primitives" } +test-client = { package = "substrate-test-client", path = "../../../client/test-client" } +sr-primitives = { path = "../../../client/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../srml/support" } balances = { package = "srml-balances", path = "../../../srml/balances" } transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml index 736e4f574dffc..ebcde46b22d99 100644 --- a/bin/node/primitives/Cargo.toml +++ b/bin/node/primitives/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false } -sr-primitives = { path = "../../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +sr-primitives = { path = "../../../client/sr-primitives", default-features = false } [dev-dependencies] -substrate-serializer = { path = "../../../core/serializer" } +substrate-serializer = { path = "../../../client/serializer" } pretty_assertions = "0.6.1" [features] diff --git a/bin/node/rpc-client/Cargo.toml b/bin/node/rpc-client/Cargo.toml index 76cb24ae00a95..882dd7ee2b629 100644 --- a/bin/node/rpc-client/Cargo.toml +++ b/bin/node/rpc-client/Cargo.toml @@ -11,4 +11,4 @@ hyper = "0.12.35" jsonrpc-core-client = { version = "14.0.3", features = ["http", "ws"] } log = "0.4.8" node-primitives = { path = "../primitives" } -substrate-rpc = { path = "../../../core/rpc", version = "2.0.0" } +substrate-rpc = { path = "../../../client/rpc", version = "2.0.0" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 3f669f39aa6cd..ae13f97497a4a 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -5,12 +5,12 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../core/client" } +client = { package = "substrate-client", path = "../../../client/client" } jsonrpc-core = "14.0.3" node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } -sr-primitives = { path = "../../../core/sr-primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } srml-contracts-rpc = { path = "../../../srml/contracts/rpc/" } srml-transaction-payment-rpc = { path = "../../../srml/transaction-payment/rpc/" } srml-system-rpc = { path = "../../../srml/system/rpc/" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../../core/transaction-pool" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs index 99321373f8f8c..59b3933d16679 100644 --- a/bin/node/rpc/src/lib.rs +++ b/bin/node/rpc/src/lib.rs @@ -19,7 +19,7 @@ //! Since `substrate` core functionality makes no assumptions //! about the modules used inside the runtime, so do //! RPC methods defined in `substrate-rpc` crate. -//! It means that `core/rpc` can't have any methods that +//! It means that `client/rpc` can't have any methods that //! need some strong assumptions about the particular runtime. //! //! The RPCs available in this crate however can make some assumptions diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 9949fbc4b2132..6128258840fc4 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -14,19 +14,19 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # primitives -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../core/consensus/babe/primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives", default-features = false } node-primitives = { path = "../primitives", default-features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../core/offchain/primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false } -sr-primitives = { path = "../../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../../core/sr-staking-primitives", default-features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../../client/sr-staking-primitives", default-features = false } # core dependencies -client = { package = "substrate-client", path = "../../../core/client", default-features = false } -rstd = { package = "sr-std", path = "../../../core/sr-std", default-features = false } -version = { package = "sr-version", path = "../../../core/sr-version", default-features = false } -substrate-session = { path = "../../../core/session", default-features = false } -substrate-keyring = { path = "../../../core/keyring", optional = true } +client = { package = "substrate-client", path = "../../../client/client", default-features = false } +rstd = { package = "sr-std", path = "../../../client/sr-std", default-features = false } +version = { package = "sr-version", path = "../../../client/sr-version", default-features = false } +substrate-session = { path = "../../../client/session", default-features = false } +substrate-keyring = { path = "../../../client/keyring", optional = true } # srml dependencies authorship = { package = "srml-authorship", path = "../../../srml/authorship", default-features = false } @@ -60,10 +60,10 @@ transaction-payment = { package = "srml-transaction-payment", path = "../../../s transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../../srml/transaction-payment/rpc/runtime-api/", default-features = false } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../core/utils/wasm-builder-runner" } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } [dev-dependencies] -runtime_io = { package = "sr-io", path = "../../../core/sr-io" } +runtime_io = { package = "sr-io", path = "../../../client/sr-io" } [features] default = ["std"] diff --git a/bin/node/runtime/build.rs b/bin/node/runtime/build.rs index 144875df4b823..c86d3a1eee517 100644 --- a/bin/node/runtime/build.rs +++ b/bin/node/runtime/build.rs @@ -20,7 +20,7 @@ fn main() { build_current_project_with_rustflags( "wasm_binary.rs", WasmBuilderSource::CratesOrPath { - path: "../../../core/utils/wasm-builder", + path: "../../../client/utils/wasm-builder", version: "1.0.8", }, // This instructs LLD to export __heap_base as a global variable, which is used by the diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index 9426122f687a9..2553d2d5a6c90 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -7,24 +7,24 @@ edition = "2018" [dependencies] balances = { package = "srml-balances", path = "../../../srml/balances" } -client = { package = "substrate-client", path = "../../../core/client" } +client = { package = "substrate-client", path = "../../../client/client" } contracts = { package = "srml-contracts", path = "../../../srml/contracts" } grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa" } indices = { package = "srml-indices", path = "../../../srml/indices" } -keyring = { package = "substrate-keyring", path = "../../../core/keyring" } +keyring = { package = "substrate-keyring", path = "../../../client/keyring" } node-executor = { path = "../executor" } node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } -sr-io = { path = "../../../core/sr-io" } -sr-primitives = { path = "../../../core/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +sr-io = { path = "../../../client/sr-io" } +sr-primitives = { path = "../../../client/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../srml/support" } session = { package = "srml-session", path = "../../../srml/session" } staking = { package = "srml-staking", path = "../../../srml/staking" } -substrate-executor = { path = "../../../core/executor" } +substrate-executor = { path = "../../../client/executor" } system = { package = "srml-system", path = "../../../srml/system" } -test-client = { package = "substrate-test-client", path = "../../../core/test-client" } +test-client = { package = "substrate-test-client", path = "../../../client/test-client" } timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } treasury = { package = "srml-treasury", path = "../../../srml/treasury" } transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } diff --git a/bin/subkey/Cargo.toml b/bin/subkey/Cargo.toml index 75939a2d2685f..0d227dadddafa 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", version = "*", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", version = "*", path = "../../client/primitives" } node-runtime = { version = "*", path = "../node/runtime" } node-primitives = { version = "*", path = "../node/primitives" } -sr-primitives = { version = "*", path = "../../core/sr-primitives" } +sr-primitives = { version = "*", path = "../../client/sr-primitives" } rand = "0.7.2" clap = { version = "2.33.0", features = ["yaml"] } tiny-bip39 = "0.6.2" diff --git a/core/application-crypto/Cargo.toml b/client/application-crypto/Cargo.toml similarity index 100% rename from core/application-crypto/Cargo.toml rename to client/application-crypto/Cargo.toml diff --git a/core/application-crypto/src/ed25519.rs b/client/application-crypto/src/ed25519.rs similarity index 100% rename from core/application-crypto/src/ed25519.rs rename to client/application-crypto/src/ed25519.rs diff --git a/core/application-crypto/src/lib.rs b/client/application-crypto/src/lib.rs similarity index 100% rename from core/application-crypto/src/lib.rs rename to client/application-crypto/src/lib.rs diff --git a/core/application-crypto/src/sr25519.rs b/client/application-crypto/src/sr25519.rs similarity index 100% rename from core/application-crypto/src/sr25519.rs rename to client/application-crypto/src/sr25519.rs diff --git a/core/application-crypto/src/traits.rs b/client/application-crypto/src/traits.rs similarity index 100% rename from core/application-crypto/src/traits.rs rename to client/application-crypto/src/traits.rs diff --git a/core/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml similarity index 72% rename from core/authority-discovery/Cargo.toml rename to client/authority-discovery/Cargo.toml index 823977668a0e5..8628e5d162286 100644 --- a/core/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -11,20 +11,20 @@ prost-build = "0.5.0" [dependencies] authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "./primitives" } bytes = "0.4.12" -client = { package = "substrate-client", path = "../../core/client" } +client = { package = "substrate-client", path = "../../client/client" } codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } derive_more = "0.15.0" futures-preview = "0.3.0-alpha.19" libp2p = { version = "0.13.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] } log = "0.4.8" -network = { package = "substrate-network", path = "../../core/network" } +network = { package = "substrate-network", path = "../../client/network" } primitives = { package = "substrate-primitives", path = "../primitives" } prost = "0.5.0" serde_json = "1.0.41" -sr-primitives = { path = "../../core/sr-primitives" } +sr-primitives = { path = "../../client/sr-primitives" } futures-timer = "0.4" [dev-dependencies] parking_lot = "0.9.0" -peerset = { package = "substrate-peerset", path = "../../core/peerset" } -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" } +peerset = { package = "substrate-peerset", path = "../../client/peerset" } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } diff --git a/core/authority-discovery/build.rs b/client/authority-discovery/build.rs similarity index 100% rename from core/authority-discovery/build.rs rename to client/authority-discovery/build.rs diff --git a/core/authority-discovery/primitives/Cargo.toml b/client/authority-discovery/primitives/Cargo.toml similarity index 100% rename from core/authority-discovery/primitives/Cargo.toml rename to client/authority-discovery/primitives/Cargo.toml diff --git a/core/authority-discovery/primitives/src/lib.rs b/client/authority-discovery/primitives/src/lib.rs similarity index 96% rename from core/authority-discovery/primitives/src/lib.rs rename to client/authority-discovery/primitives/src/lib.rs index 7c56dc6ca4ca6..7661ae86ff745 100644 --- a/core/authority-discovery/primitives/src/lib.rs +++ b/client/authority-discovery/primitives/src/lib.rs @@ -32,7 +32,7 @@ pub struct AuthorityId(pub Vec); decl_runtime_apis! { /// The authority discovery api. /// - /// This api is used by the `core/authority-discovery` module to retrieve our + /// This api is used by the `client/authority-discovery` module to retrieve our /// own authority identifier, to retrieve identifiers of the current authority /// set, as well as sign and verify Kademlia Dht external address payloads /// from and to other authorities. diff --git a/core/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs similarity index 100% rename from core/authority-discovery/src/error.rs rename to client/authority-discovery/src/error.rs diff --git a/core/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs similarity index 100% rename from core/authority-discovery/src/lib.rs rename to client/authority-discovery/src/lib.rs diff --git a/core/authority-discovery/src/schema/dht.proto b/client/authority-discovery/src/schema/dht.proto similarity index 100% rename from core/authority-discovery/src/schema/dht.proto rename to client/authority-discovery/src/schema/dht.proto diff --git a/core/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml similarity index 71% rename from core/basic-authorship/Cargo.toml rename to client/basic-authorship/Cargo.toml index 0a98c151d6eaf..6e646538ce2ab 100644 --- a/core/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" log = "0.4.8" futures-preview = "0.3.0-alpha.19" codec = { package = "parity-scale-codec", version = "1.0.0" } -sr-primitives = { path = "../../core/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -client = { package = "substrate-client", path = "../../core/client" } -consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } +sr-primitives = { path = "../../client/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +client = { package = "substrate-client", path = "../../client/client" } +consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } inherents = { package = "substrate-inherents", path = "../inherents" } substrate-telemetry = { path = "../telemetry" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } diff --git a/core/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs similarity index 100% rename from core/basic-authorship/src/basic_authorship.rs rename to client/basic-authorship/src/basic_authorship.rs diff --git a/core/basic-authorship/src/lib.rs b/client/basic-authorship/src/lib.rs similarity index 100% rename from core/basic-authorship/src/lib.rs rename to client/basic-authorship/src/lib.rs diff --git a/core/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml similarity index 65% rename from core/chain-spec/Cargo.toml rename to client/chain-spec/Cargo.toml index 1ab78a18dd13c..74474acadc2ac 100644 --- a/core/chain-spec/Cargo.toml +++ b/client/chain-spec/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] substrate-chain-spec-derive = { path = "./derive" } impl-trait-for-tuples = "0.1.3" -network = { package = "substrate-network", path = "../../core/network" } +network = { package = "substrate-network", path = "../../client/network" } primitives = { package = "substrate-primitives", path = "../primitives" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" -sr-primitives = { path = "../../core/sr-primitives" } -tel = { package = "substrate-telemetry", path = "../../core/telemetry" } +sr-primitives = { path = "../../client/sr-primitives" } +tel = { package = "substrate-telemetry", path = "../../client/telemetry" } [dev-dependencies] diff --git a/core/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml similarity index 100% rename from core/chain-spec/derive/Cargo.toml rename to client/chain-spec/derive/Cargo.toml diff --git a/core/chain-spec/derive/src/impls.rs b/client/chain-spec/derive/src/impls.rs similarity index 100% rename from core/chain-spec/derive/src/impls.rs rename to client/chain-spec/derive/src/impls.rs diff --git a/core/chain-spec/derive/src/lib.rs b/client/chain-spec/derive/src/lib.rs similarity index 100% rename from core/chain-spec/derive/src/lib.rs rename to client/chain-spec/derive/src/lib.rs diff --git a/core/chain-spec/res/chain_spec.json b/client/chain-spec/res/chain_spec.json similarity index 100% rename from core/chain-spec/res/chain_spec.json rename to client/chain-spec/res/chain_spec.json diff --git a/core/chain-spec/res/chain_spec2.json b/client/chain-spec/res/chain_spec2.json similarity index 100% rename from core/chain-spec/res/chain_spec2.json rename to client/chain-spec/res/chain_spec2.json diff --git a/core/chain-spec/src/chain_spec.rs b/client/chain-spec/src/chain_spec.rs similarity index 100% rename from core/chain-spec/src/chain_spec.rs rename to client/chain-spec/src/chain_spec.rs diff --git a/core/chain-spec/src/extension.rs b/client/chain-spec/src/extension.rs similarity index 100% rename from core/chain-spec/src/extension.rs rename to client/chain-spec/src/extension.rs diff --git a/core/chain-spec/src/lib.rs b/client/chain-spec/src/lib.rs similarity index 100% rename from core/chain-spec/src/lib.rs rename to client/chain-spec/src/lib.rs diff --git a/core/cli/Cargo.toml b/client/cli/Cargo.toml similarity index 67% rename from core/cli/Cargo.toml rename to client/cli/Cargo.toml index 9fb528e66cf56..b2bfa331512ee 100644 --- a/core/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -22,15 +22,15 @@ futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features fdlimit = "0.1.1" exit-future = "0.1.4" serde_json = "1.0.41" -panic-handler = { package = "substrate-panic-handler", path = "../../core/panic-handler" } -client = { package = "substrate-client", path = "../../core/client" } -header-metadata = { package = "substrate-header-metadata", path = "../../core/client/header-metadata" } -network = { package = "substrate-network", path = "../../core/network" } -sr-primitives = { path = "../../core/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -service = { package = "substrate-service", path = "../../core/service", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../../core/state-machine" } -substrate-telemetry = { path = "../../core/telemetry" } +panic-handler = { package = "substrate-panic-handler", path = "../../client/panic-handler" } +client = { package = "substrate-client", path = "../../client/client" } +header-metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } +network = { package = "substrate-network", path = "../../client/network" } +sr-primitives = { path = "../../client/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +service = { package = "substrate-service", path = "../../client/service", default-features = false } +state-machine = { package = "substrate-state-machine", path = "../../client/state-machine" } +substrate-telemetry = { path = "../../client/telemetry" } keyring = { package = "substrate-keyring", path = "../keyring" } names = "0.11.0" structopt = "0.3.3" diff --git a/core/cli/README.adoc b/client/cli/README.adoc similarity index 100% rename from core/cli/README.adoc rename to client/cli/README.adoc diff --git a/core/cli/src/error.rs b/client/cli/src/error.rs similarity index 100% rename from core/cli/src/error.rs rename to client/cli/src/error.rs diff --git a/core/cli/src/execution_strategy.rs b/client/cli/src/execution_strategy.rs similarity index 100% rename from core/cli/src/execution_strategy.rs rename to client/cli/src/execution_strategy.rs diff --git a/core/cli/src/informant.rs b/client/cli/src/informant.rs similarity index 100% rename from core/cli/src/informant.rs rename to client/cli/src/informant.rs diff --git a/core/cli/src/informant/display.rs b/client/cli/src/informant/display.rs similarity index 100% rename from core/cli/src/informant/display.rs rename to client/cli/src/informant/display.rs diff --git a/core/cli/src/lib.rs b/client/cli/src/lib.rs similarity index 100% rename from core/cli/src/lib.rs rename to client/cli/src/lib.rs diff --git a/core/cli/src/params.rs b/client/cli/src/params.rs similarity index 100% rename from core/cli/src/params.rs rename to client/cli/src/params.rs diff --git a/core/cli/src/traits.rs b/client/cli/src/traits.rs similarity index 100% rename from core/cli/src/traits.rs rename to client/cli/src/traits.rs diff --git a/core/client/Cargo.toml b/client/client/Cargo.toml similarity index 100% rename from core/client/Cargo.toml rename to client/client/Cargo.toml diff --git a/core/client/db/Cargo.toml b/client/client/db/Cargo.toml similarity index 100% rename from core/client/db/Cargo.toml rename to client/client/db/Cargo.toml diff --git a/core/client/db/src/cache/list_cache.rs b/client/client/db/src/cache/list_cache.rs similarity index 100% rename from core/client/db/src/cache/list_cache.rs rename to client/client/db/src/cache/list_cache.rs diff --git a/core/client/db/src/cache/list_entry.rs b/client/client/db/src/cache/list_entry.rs similarity index 100% rename from core/client/db/src/cache/list_entry.rs rename to client/client/db/src/cache/list_entry.rs diff --git a/core/client/db/src/cache/list_storage.rs b/client/client/db/src/cache/list_storage.rs similarity index 100% rename from core/client/db/src/cache/list_storage.rs rename to client/client/db/src/cache/list_storage.rs diff --git a/core/client/db/src/cache/mod.rs b/client/client/db/src/cache/mod.rs similarity index 100% rename from core/client/db/src/cache/mod.rs rename to client/client/db/src/cache/mod.rs diff --git a/core/client/db/src/lib.rs b/client/client/db/src/lib.rs similarity index 100% rename from core/client/db/src/lib.rs rename to client/client/db/src/lib.rs diff --git a/core/client/db/src/light.rs b/client/client/db/src/light.rs similarity index 100% rename from core/client/db/src/light.rs rename to client/client/db/src/light.rs diff --git a/core/client/db/src/offchain.rs b/client/client/db/src/offchain.rs similarity index 100% rename from core/client/db/src/offchain.rs rename to client/client/db/src/offchain.rs diff --git a/core/client/db/src/storage_cache.rs b/client/client/db/src/storage_cache.rs similarity index 100% rename from core/client/db/src/storage_cache.rs rename to client/client/db/src/storage_cache.rs diff --git a/core/client/db/src/utils.rs b/client/client/db/src/utils.rs similarity index 100% rename from core/client/db/src/utils.rs rename to client/client/db/src/utils.rs diff --git a/core/client/header-metadata/Cargo.toml b/client/client/header-metadata/Cargo.toml similarity index 100% rename from core/client/header-metadata/Cargo.toml rename to client/client/header-metadata/Cargo.toml diff --git a/core/client/header-metadata/src/lib.rs b/client/client/header-metadata/src/lib.rs similarity index 100% rename from core/client/header-metadata/src/lib.rs rename to client/client/header-metadata/src/lib.rs diff --git a/core/client/src/backend.rs b/client/client/src/backend.rs similarity index 100% rename from core/client/src/backend.rs rename to client/client/src/backend.rs diff --git a/core/client/src/block_builder/api.rs b/client/client/src/block_builder/api.rs similarity index 100% rename from core/client/src/block_builder/api.rs rename to client/client/src/block_builder/api.rs diff --git a/core/client/src/block_builder/block_builder.rs b/client/client/src/block_builder/block_builder.rs similarity index 100% rename from core/client/src/block_builder/block_builder.rs rename to client/client/src/block_builder/block_builder.rs diff --git a/core/client/src/block_builder/mod.rs b/client/client/src/block_builder/mod.rs similarity index 100% rename from core/client/src/block_builder/mod.rs rename to client/client/src/block_builder/mod.rs diff --git a/core/client/src/blockchain.rs b/client/client/src/blockchain.rs similarity index 100% rename from core/client/src/blockchain.rs rename to client/client/src/blockchain.rs diff --git a/core/client/src/call_executor.rs b/client/client/src/call_executor.rs similarity index 100% rename from core/client/src/call_executor.rs rename to client/client/src/call_executor.rs diff --git a/core/client/src/children.rs b/client/client/src/children.rs similarity index 100% rename from core/client/src/children.rs rename to client/client/src/children.rs diff --git a/core/client/src/cht.rs b/client/client/src/cht.rs similarity index 100% rename from core/client/src/cht.rs rename to client/client/src/cht.rs diff --git a/core/client/src/client.rs b/client/client/src/client.rs similarity index 100% rename from core/client/src/client.rs rename to client/client/src/client.rs diff --git a/core/client/src/error.rs b/client/client/src/error.rs similarity index 100% rename from core/client/src/error.rs rename to client/client/src/error.rs diff --git a/core/client/src/genesis.rs b/client/client/src/genesis.rs similarity index 100% rename from core/client/src/genesis.rs rename to client/client/src/genesis.rs diff --git a/core/client/src/in_mem.rs b/client/client/src/in_mem.rs similarity index 100% rename from core/client/src/in_mem.rs rename to client/client/src/in_mem.rs diff --git a/core/client/src/leaves.rs b/client/client/src/leaves.rs similarity index 100% rename from core/client/src/leaves.rs rename to client/client/src/leaves.rs diff --git a/core/client/src/lib.rs b/client/client/src/lib.rs similarity index 100% rename from core/client/src/lib.rs rename to client/client/src/lib.rs diff --git a/core/client/src/light/backend.rs b/client/client/src/light/backend.rs similarity index 100% rename from core/client/src/light/backend.rs rename to client/client/src/light/backend.rs diff --git a/core/client/src/light/blockchain.rs b/client/client/src/light/blockchain.rs similarity index 100% rename from core/client/src/light/blockchain.rs rename to client/client/src/light/blockchain.rs diff --git a/core/client/src/light/call_executor.rs b/client/client/src/light/call_executor.rs similarity index 100% rename from core/client/src/light/call_executor.rs rename to client/client/src/light/call_executor.rs diff --git a/core/client/src/light/fetcher.rs b/client/client/src/light/fetcher.rs similarity index 100% rename from core/client/src/light/fetcher.rs rename to client/client/src/light/fetcher.rs diff --git a/core/client/src/light/mod.rs b/client/client/src/light/mod.rs similarity index 100% rename from core/client/src/light/mod.rs rename to client/client/src/light/mod.rs diff --git a/core/client/src/notifications.rs b/client/client/src/notifications.rs similarity index 100% rename from core/client/src/notifications.rs rename to client/client/src/notifications.rs diff --git a/core/client/src/runtime_api.rs b/client/client/src/runtime_api.rs similarity index 100% rename from core/client/src/runtime_api.rs rename to client/client/src/runtime_api.rs diff --git a/core/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml similarity index 100% rename from core/consensus/aura/Cargo.toml rename to client/consensus/aura/Cargo.toml diff --git a/core/consensus/aura/primitives/Cargo.toml b/client/consensus/aura/primitives/Cargo.toml similarity index 100% rename from core/consensus/aura/primitives/Cargo.toml rename to client/consensus/aura/primitives/Cargo.toml diff --git a/core/consensus/aura/primitives/src/lib.rs b/client/consensus/aura/primitives/src/lib.rs similarity index 100% rename from core/consensus/aura/primitives/src/lib.rs rename to client/consensus/aura/primitives/src/lib.rs diff --git a/core/consensus/aura/src/digest.rs b/client/consensus/aura/src/digest.rs similarity index 100% rename from core/consensus/aura/src/digest.rs rename to client/consensus/aura/src/digest.rs diff --git a/core/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs similarity index 100% rename from core/consensus/aura/src/lib.rs rename to client/consensus/aura/src/lib.rs diff --git a/core/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml similarity index 100% rename from core/consensus/babe/Cargo.toml rename to client/consensus/babe/Cargo.toml diff --git a/core/consensus/babe/primitives/Cargo.toml b/client/consensus/babe/primitives/Cargo.toml similarity index 100% rename from core/consensus/babe/primitives/Cargo.toml rename to client/consensus/babe/primitives/Cargo.toml diff --git a/core/consensus/babe/primitives/src/digest.rs b/client/consensus/babe/primitives/src/digest.rs similarity index 100% rename from core/consensus/babe/primitives/src/digest.rs rename to client/consensus/babe/primitives/src/digest.rs diff --git a/core/consensus/babe/primitives/src/lib.rs b/client/consensus/babe/primitives/src/lib.rs similarity index 100% rename from core/consensus/babe/primitives/src/lib.rs rename to client/consensus/babe/primitives/src/lib.rs diff --git a/core/consensus/babe/src/authorship.rs b/client/consensus/babe/src/authorship.rs similarity index 100% rename from core/consensus/babe/src/authorship.rs rename to client/consensus/babe/src/authorship.rs diff --git a/core/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs similarity index 100% rename from core/consensus/babe/src/aux_schema.rs rename to client/consensus/babe/src/aux_schema.rs diff --git a/core/consensus/babe/src/epoch_changes.rs b/client/consensus/babe/src/epoch_changes.rs similarity index 100% rename from core/consensus/babe/src/epoch_changes.rs rename to client/consensus/babe/src/epoch_changes.rs diff --git a/core/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs similarity index 100% rename from core/consensus/babe/src/lib.rs rename to client/consensus/babe/src/lib.rs diff --git a/core/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs similarity index 100% rename from core/consensus/babe/src/tests.rs rename to client/consensus/babe/src/tests.rs diff --git a/core/consensus/babe/src/verification.rs b/client/consensus/babe/src/verification.rs similarity index 100% rename from core/consensus/babe/src/verification.rs rename to client/consensus/babe/src/verification.rs diff --git a/core/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml similarity index 100% rename from core/consensus/common/Cargo.toml rename to client/consensus/common/Cargo.toml diff --git a/core/consensus/common/src/block_import.rs b/client/consensus/common/src/block_import.rs similarity index 100% rename from core/consensus/common/src/block_import.rs rename to client/consensus/common/src/block_import.rs diff --git a/core/consensus/common/src/block_validation.rs b/client/consensus/common/src/block_validation.rs similarity index 100% rename from core/consensus/common/src/block_validation.rs rename to client/consensus/common/src/block_validation.rs diff --git a/core/consensus/common/src/error.rs b/client/consensus/common/src/error.rs similarity index 100% rename from core/consensus/common/src/error.rs rename to client/consensus/common/src/error.rs diff --git a/core/consensus/common/src/evaluation.rs b/client/consensus/common/src/evaluation.rs similarity index 100% rename from core/consensus/common/src/evaluation.rs rename to client/consensus/common/src/evaluation.rs diff --git a/core/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs similarity index 100% rename from core/consensus/common/src/import_queue.rs rename to client/consensus/common/src/import_queue.rs diff --git a/core/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs similarity index 100% rename from core/consensus/common/src/import_queue/basic_queue.rs rename to client/consensus/common/src/import_queue/basic_queue.rs diff --git a/core/consensus/common/src/import_queue/buffered_link.rs b/client/consensus/common/src/import_queue/buffered_link.rs similarity index 100% rename from core/consensus/common/src/import_queue/buffered_link.rs rename to client/consensus/common/src/import_queue/buffered_link.rs diff --git a/core/consensus/common/src/lib.rs b/client/consensus/common/src/lib.rs similarity index 100% rename from core/consensus/common/src/lib.rs rename to client/consensus/common/src/lib.rs diff --git a/core/consensus/common/src/offline_tracker.rs b/client/consensus/common/src/offline_tracker.rs similarity index 100% rename from core/consensus/common/src/offline_tracker.rs rename to client/consensus/common/src/offline_tracker.rs diff --git a/core/consensus/common/src/select_chain.rs b/client/consensus/common/src/select_chain.rs similarity index 100% rename from core/consensus/common/src/select_chain.rs rename to client/consensus/common/src/select_chain.rs diff --git a/core/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml similarity index 100% rename from core/consensus/pow/Cargo.toml rename to client/consensus/pow/Cargo.toml diff --git a/core/consensus/pow/primitives/Cargo.toml b/client/consensus/pow/primitives/Cargo.toml similarity index 100% rename from core/consensus/pow/primitives/Cargo.toml rename to client/consensus/pow/primitives/Cargo.toml diff --git a/core/consensus/pow/primitives/src/lib.rs b/client/consensus/pow/primitives/src/lib.rs similarity index 100% rename from core/consensus/pow/primitives/src/lib.rs rename to client/consensus/pow/primitives/src/lib.rs diff --git a/core/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs similarity index 100% rename from core/consensus/pow/src/lib.rs rename to client/consensus/pow/src/lib.rs diff --git a/core/consensus/rhd/Cargo.toml b/client/consensus/rhd/Cargo.toml similarity index 100% rename from core/consensus/rhd/Cargo.toml rename to client/consensus/rhd/Cargo.toml diff --git a/core/consensus/rhd/src/error.rs b/client/consensus/rhd/src/error.rs similarity index 100% rename from core/consensus/rhd/src/error.rs rename to client/consensus/rhd/src/error.rs diff --git a/core/consensus/rhd/src/lib.rs b/client/consensus/rhd/src/lib.rs similarity index 100% rename from core/consensus/rhd/src/lib.rs rename to client/consensus/rhd/src/lib.rs diff --git a/core/consensus/rhd/src/misbehaviour_check.rs b/client/consensus/rhd/src/misbehaviour_check.rs similarity index 100% rename from core/consensus/rhd/src/misbehaviour_check.rs rename to client/consensus/rhd/src/misbehaviour_check.rs diff --git a/core/consensus/rhd/src/service.rs b/client/consensus/rhd/src/service.rs similarity index 100% rename from core/consensus/rhd/src/service.rs rename to client/consensus/rhd/src/service.rs diff --git a/core/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml similarity index 100% rename from core/consensus/slots/Cargo.toml rename to client/consensus/slots/Cargo.toml diff --git a/core/consensus/slots/build.rs b/client/consensus/slots/build.rs similarity index 100% rename from core/consensus/slots/build.rs rename to client/consensus/slots/build.rs diff --git a/core/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs similarity index 100% rename from core/consensus/slots/src/aux_schema.rs rename to client/consensus/slots/src/aux_schema.rs diff --git a/core/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs similarity index 100% rename from core/consensus/slots/src/lib.rs rename to client/consensus/slots/src/lib.rs diff --git a/core/consensus/slots/src/slots.rs b/client/consensus/slots/src/slots.rs similarity index 100% rename from core/consensus/slots/src/slots.rs rename to client/consensus/slots/src/slots.rs diff --git a/core/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml similarity index 100% rename from core/consensus/uncles/Cargo.toml rename to client/consensus/uncles/Cargo.toml diff --git a/core/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs similarity index 100% rename from core/consensus/uncles/src/lib.rs rename to client/consensus/uncles/src/lib.rs diff --git a/core/executor/Cargo.toml b/client/executor/Cargo.toml similarity index 100% rename from core/executor/Cargo.toml rename to client/executor/Cargo.toml diff --git a/core/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml similarity index 100% rename from core/executor/runtime-test/Cargo.toml rename to client/executor/runtime-test/Cargo.toml diff --git a/core/executor/runtime-test/build.rs b/client/executor/runtime-test/build.rs similarity index 100% rename from core/executor/runtime-test/build.rs rename to client/executor/runtime-test/build.rs diff --git a/core/executor/runtime-test/src/lib.rs b/client/executor/runtime-test/src/lib.rs similarity index 100% rename from core/executor/runtime-test/src/lib.rs rename to client/executor/runtime-test/src/lib.rs diff --git a/core/executor/src/allocator.rs b/client/executor/src/allocator.rs similarity index 100% rename from core/executor/src/allocator.rs rename to client/executor/src/allocator.rs diff --git a/core/executor/src/error.rs b/client/executor/src/error.rs similarity index 100% rename from core/executor/src/error.rs rename to client/executor/src/error.rs diff --git a/core/executor/src/host_interface.rs b/client/executor/src/host_interface.rs similarity index 100% rename from core/executor/src/host_interface.rs rename to client/executor/src/host_interface.rs diff --git a/core/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs similarity index 100% rename from core/executor/src/integration_tests/mod.rs rename to client/executor/src/integration_tests/mod.rs diff --git a/core/executor/src/integration_tests/sandbox.rs b/client/executor/src/integration_tests/sandbox.rs similarity index 100% rename from core/executor/src/integration_tests/sandbox.rs rename to client/executor/src/integration_tests/sandbox.rs diff --git a/core/executor/src/lib.rs b/client/executor/src/lib.rs similarity index 100% rename from core/executor/src/lib.rs rename to client/executor/src/lib.rs diff --git a/core/executor/src/native_executor.rs b/client/executor/src/native_executor.rs similarity index 100% rename from core/executor/src/native_executor.rs rename to client/executor/src/native_executor.rs diff --git a/core/executor/src/sandbox.rs b/client/executor/src/sandbox.rs similarity index 100% rename from core/executor/src/sandbox.rs rename to client/executor/src/sandbox.rs diff --git a/core/executor/src/wasm_runtime.rs b/client/executor/src/wasm_runtime.rs similarity index 100% rename from core/executor/src/wasm_runtime.rs rename to client/executor/src/wasm_runtime.rs diff --git a/core/executor/src/wasm_utils.rs b/client/executor/src/wasm_utils.rs similarity index 100% rename from core/executor/src/wasm_utils.rs rename to client/executor/src/wasm_utils.rs diff --git a/core/executor/src/wasmi_execution.rs b/client/executor/src/wasmi_execution.rs similarity index 100% rename from core/executor/src/wasmi_execution.rs rename to client/executor/src/wasmi_execution.rs diff --git a/core/executor/src/wasmtime/function_executor.rs b/client/executor/src/wasmtime/function_executor.rs similarity index 100% rename from core/executor/src/wasmtime/function_executor.rs rename to client/executor/src/wasmtime/function_executor.rs diff --git a/core/executor/src/wasmtime/mod.rs b/client/executor/src/wasmtime/mod.rs similarity index 100% rename from core/executor/src/wasmtime/mod.rs rename to client/executor/src/wasmtime/mod.rs diff --git a/core/executor/src/wasmtime/runtime.rs b/client/executor/src/wasmtime/runtime.rs similarity index 100% rename from core/executor/src/wasmtime/runtime.rs rename to client/executor/src/wasmtime/runtime.rs diff --git a/core/executor/src/wasmtime/trampoline.rs b/client/executor/src/wasmtime/trampoline.rs similarity index 100% rename from core/executor/src/wasmtime/trampoline.rs rename to client/executor/src/wasmtime/trampoline.rs diff --git a/core/executor/src/wasmtime/util.rs b/client/executor/src/wasmtime/util.rs similarity index 100% rename from core/executor/src/wasmtime/util.rs rename to client/executor/src/wasmtime/util.rs diff --git a/core/externalities/Cargo.toml b/client/externalities/Cargo.toml similarity index 100% rename from core/externalities/Cargo.toml rename to client/externalities/Cargo.toml diff --git a/core/externalities/src/extensions.rs b/client/externalities/src/extensions.rs similarity index 100% rename from core/externalities/src/extensions.rs rename to client/externalities/src/extensions.rs diff --git a/core/externalities/src/lib.rs b/client/externalities/src/lib.rs similarity index 100% rename from core/externalities/src/lib.rs rename to client/externalities/src/lib.rs diff --git a/core/externalities/src/scope_limited.rs b/client/externalities/src/scope_limited.rs similarity index 100% rename from core/externalities/src/scope_limited.rs rename to client/externalities/src/scope_limited.rs diff --git a/core/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml similarity index 93% rename from core/finality-grandpa/Cargo.toml rename to client/finality-grandpa/Cargo.toml index a4c6a0278a445..305539c273faa 100644 --- a/core/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -fork-tree = { path = "../../core/utils/fork-tree" } +fork-tree = { path = "../../client/utils/fork-tree" } futures = "0.1.29" futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } log = "0.4.8" @@ -22,7 +22,7 @@ keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" client = { package = "substrate-client", path = "../client" } header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } -inherents = { package = "substrate-inherents", path = "../../core/inherents" } +inherents = { package = "substrate-inherents", path = "../../client/inherents" } network = { package = "substrate-network", path = "../network" } srml-finality-tracker = { path = "../../srml/finality-tracker" } fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "primitives" } diff --git a/core/finality-grandpa/primitives/Cargo.toml b/client/finality-grandpa/primitives/Cargo.toml similarity index 100% rename from core/finality-grandpa/primitives/Cargo.toml rename to client/finality-grandpa/primitives/Cargo.toml diff --git a/core/finality-grandpa/primitives/src/lib.rs b/client/finality-grandpa/primitives/src/lib.rs similarity index 100% rename from core/finality-grandpa/primitives/src/lib.rs rename to client/finality-grandpa/primitives/src/lib.rs diff --git a/core/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs similarity index 100% rename from core/finality-grandpa/src/authorities.rs rename to client/finality-grandpa/src/authorities.rs diff --git a/core/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs similarity index 100% rename from core/finality-grandpa/src/aux_schema.rs rename to client/finality-grandpa/src/aux_schema.rs diff --git a/core/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs similarity index 100% rename from core/finality-grandpa/src/communication/gossip.rs rename to client/finality-grandpa/src/communication/gossip.rs diff --git a/core/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs similarity index 100% rename from core/finality-grandpa/src/communication/mod.rs rename to client/finality-grandpa/src/communication/mod.rs diff --git a/core/finality-grandpa/src/communication/periodic.rs b/client/finality-grandpa/src/communication/periodic.rs similarity index 100% rename from core/finality-grandpa/src/communication/periodic.rs rename to client/finality-grandpa/src/communication/periodic.rs diff --git a/core/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs similarity index 100% rename from core/finality-grandpa/src/communication/tests.rs rename to client/finality-grandpa/src/communication/tests.rs diff --git a/core/finality-grandpa/src/consensus_changes.rs b/client/finality-grandpa/src/consensus_changes.rs similarity index 100% rename from core/finality-grandpa/src/consensus_changes.rs rename to client/finality-grandpa/src/consensus_changes.rs diff --git a/core/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs similarity index 100% rename from core/finality-grandpa/src/environment.rs rename to client/finality-grandpa/src/environment.rs diff --git a/core/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs similarity index 100% rename from core/finality-grandpa/src/finality_proof.rs rename to client/finality-grandpa/src/finality_proof.rs diff --git a/core/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs similarity index 100% rename from core/finality-grandpa/src/import.rs rename to client/finality-grandpa/src/import.rs diff --git a/core/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs similarity index 100% rename from core/finality-grandpa/src/justification.rs rename to client/finality-grandpa/src/justification.rs diff --git a/core/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs similarity index 100% rename from core/finality-grandpa/src/lib.rs rename to client/finality-grandpa/src/lib.rs diff --git a/core/finality-grandpa/src/light_import.rs b/client/finality-grandpa/src/light_import.rs similarity index 100% rename from core/finality-grandpa/src/light_import.rs rename to client/finality-grandpa/src/light_import.rs diff --git a/core/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs similarity index 100% rename from core/finality-grandpa/src/observer.rs rename to client/finality-grandpa/src/observer.rs diff --git a/core/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs similarity index 100% rename from core/finality-grandpa/src/tests.rs rename to client/finality-grandpa/src/tests.rs diff --git a/core/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs similarity index 100% rename from core/finality-grandpa/src/until_imported.rs rename to client/finality-grandpa/src/until_imported.rs diff --git a/core/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs similarity index 100% rename from core/finality-grandpa/src/voting_rule.rs rename to client/finality-grandpa/src/voting_rule.rs diff --git a/core/inherents/Cargo.toml b/client/inherents/Cargo.toml similarity index 100% rename from core/inherents/Cargo.toml rename to client/inherents/Cargo.toml diff --git a/core/inherents/src/lib.rs b/client/inherents/src/lib.rs similarity index 100% rename from core/inherents/src/lib.rs rename to client/inherents/src/lib.rs diff --git a/core/keyring/Cargo.toml b/client/keyring/Cargo.toml similarity index 100% rename from core/keyring/Cargo.toml rename to client/keyring/Cargo.toml diff --git a/core/keyring/src/ed25519.rs b/client/keyring/src/ed25519.rs similarity index 100% rename from core/keyring/src/ed25519.rs rename to client/keyring/src/ed25519.rs diff --git a/core/keyring/src/lib.rs b/client/keyring/src/lib.rs similarity index 100% rename from core/keyring/src/lib.rs rename to client/keyring/src/lib.rs diff --git a/core/keyring/src/sr25519.rs b/client/keyring/src/sr25519.rs similarity index 100% rename from core/keyring/src/sr25519.rs rename to client/keyring/src/sr25519.rs diff --git a/core/keystore/Cargo.toml b/client/keystore/Cargo.toml similarity index 100% rename from core/keystore/Cargo.toml rename to client/keystore/Cargo.toml diff --git a/core/keystore/src/lib.rs b/client/keystore/src/lib.rs similarity index 100% rename from core/keystore/src/lib.rs rename to client/keystore/src/lib.rs diff --git a/core/network/Cargo.toml b/client/network/Cargo.toml similarity index 73% rename from core/network/Cargo.toml rename to client/network/Cargo.toml index 216b898277b4b..e590a0584d3bf 100644 --- a/core/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -23,14 +23,14 @@ lru-cache = "0.1.2" rustc-hex = "2.0.1" rand = "0.7.2" libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-websocket"] } -fork-tree = { path = "../../core/utils/fork-tree" } -consensus = { package = "substrate-consensus-common", path = "../../core/consensus/common" } -client = { package = "substrate-client", path = "../../core/client" } -header_metadata = { package = "substrate-header-metadata", path = "../../core/client/header-metadata" } -sr-primitives = { path = "../../core/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +fork-tree = { path = "../../client/utils/fork-tree" } +consensus = { package = "substrate-consensus-common", path = "../../client/consensus/common" } +client = { package = "substrate-client", path = "../../client/client" } +header_metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } +sr-primitives = { path = "../../client/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -peerset = { package = "substrate-peerset", path = "../../core/peerset" } +peerset = { package = "substrate-peerset", path = "../../client/peerset" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" slog = { version = "2.5.2", features = ["nested-values"] } @@ -39,9 +39,9 @@ smallvec = "0.6.10" tokio-io = "0.1.12" tokio = { version = "0.1.22", optional = true } unsigned-varint = { version = "0.2.2", features = ["codec"] } -keyring = { package = "substrate-keyring", path = "../../core/keyring", optional = true } -test_client = { package = "substrate-test-client", path = "../../core/test-client", optional = true } -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client", optional = true } +keyring = { package = "substrate-keyring", path = "../../client/keyring", optional = true } +test_client = { package = "substrate-test-client", path = "../../client/test-client", optional = true } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client", optional = true } erased-serde = "0.3.9" void = "1.0.2" zeroize = "0.10.1" @@ -49,11 +49,11 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../ [dev-dependencies] env_logger = "0.7.0" -keyring = { package = "substrate-keyring", path = "../../core/keyring" } +keyring = { package = "substrate-keyring", path = "../../client/keyring" } quickcheck = "0.9.0" rand = "0.7.2" -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" } -test_runtime = { package = "substrate-test-runtime", path = "../../core/test-runtime" } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } +test_runtime = { package = "substrate-test-runtime", path = "../../client/test-runtime" } tempdir = "0.3.7" tokio = "0.1.22" diff --git a/core/network/src/behaviour.rs b/client/network/src/behaviour.rs similarity index 100% rename from core/network/src/behaviour.rs rename to client/network/src/behaviour.rs diff --git a/core/network/src/chain.rs b/client/network/src/chain.rs similarity index 100% rename from core/network/src/chain.rs rename to client/network/src/chain.rs diff --git a/core/network/src/config.rs b/client/network/src/config.rs similarity index 100% rename from core/network/src/config.rs rename to client/network/src/config.rs diff --git a/core/network/src/debug_info.rs b/client/network/src/debug_info.rs similarity index 100% rename from core/network/src/debug_info.rs rename to client/network/src/debug_info.rs diff --git a/core/network/src/discovery.rs b/client/network/src/discovery.rs similarity index 100% rename from core/network/src/discovery.rs rename to client/network/src/discovery.rs diff --git a/core/network/src/error.rs b/client/network/src/error.rs similarity index 100% rename from core/network/src/error.rs rename to client/network/src/error.rs diff --git a/core/network/src/legacy_proto/behaviour.rs b/client/network/src/legacy_proto/behaviour.rs similarity index 100% rename from core/network/src/legacy_proto/behaviour.rs rename to client/network/src/legacy_proto/behaviour.rs diff --git a/core/network/src/legacy_proto/handler.rs b/client/network/src/legacy_proto/handler.rs similarity index 100% rename from core/network/src/legacy_proto/handler.rs rename to client/network/src/legacy_proto/handler.rs diff --git a/core/network/src/legacy_proto/mod.rs b/client/network/src/legacy_proto/mod.rs similarity index 100% rename from core/network/src/legacy_proto/mod.rs rename to client/network/src/legacy_proto/mod.rs diff --git a/core/network/src/legacy_proto/tests.rs b/client/network/src/legacy_proto/tests.rs similarity index 100% rename from core/network/src/legacy_proto/tests.rs rename to client/network/src/legacy_proto/tests.rs diff --git a/core/network/src/legacy_proto/upgrade.rs b/client/network/src/legacy_proto/upgrade.rs similarity index 100% rename from core/network/src/legacy_proto/upgrade.rs rename to client/network/src/legacy_proto/upgrade.rs diff --git a/core/network/src/lib.rs b/client/network/src/lib.rs similarity index 100% rename from core/network/src/lib.rs rename to client/network/src/lib.rs diff --git a/core/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs similarity index 100% rename from core/network/src/on_demand_layer.rs rename to client/network/src/on_demand_layer.rs diff --git a/core/network/src/protocol.rs b/client/network/src/protocol.rs similarity index 100% rename from core/network/src/protocol.rs rename to client/network/src/protocol.rs diff --git a/core/network/src/protocol/consensus_gossip.rs b/client/network/src/protocol/consensus_gossip.rs similarity index 100% rename from core/network/src/protocol/consensus_gossip.rs rename to client/network/src/protocol/consensus_gossip.rs diff --git a/core/network/src/protocol/event.rs b/client/network/src/protocol/event.rs similarity index 100% rename from core/network/src/protocol/event.rs rename to client/network/src/protocol/event.rs diff --git a/core/network/src/protocol/light_dispatch.rs b/client/network/src/protocol/light_dispatch.rs similarity index 100% rename from core/network/src/protocol/light_dispatch.rs rename to client/network/src/protocol/light_dispatch.rs diff --git a/core/network/src/protocol/message.rs b/client/network/src/protocol/message.rs similarity index 100% rename from core/network/src/protocol/message.rs rename to client/network/src/protocol/message.rs diff --git a/core/network/src/protocol/specialization.rs b/client/network/src/protocol/specialization.rs similarity index 100% rename from core/network/src/protocol/specialization.rs rename to client/network/src/protocol/specialization.rs diff --git a/core/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs similarity index 100% rename from core/network/src/protocol/sync.rs rename to client/network/src/protocol/sync.rs diff --git a/core/network/src/protocol/sync/blocks.rs b/client/network/src/protocol/sync/blocks.rs similarity index 100% rename from core/network/src/protocol/sync/blocks.rs rename to client/network/src/protocol/sync/blocks.rs diff --git a/core/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs similarity index 100% rename from core/network/src/protocol/sync/extra_requests.rs rename to client/network/src/protocol/sync/extra_requests.rs diff --git a/core/network/src/protocol/util.rs b/client/network/src/protocol/util.rs similarity index 100% rename from core/network/src/protocol/util.rs rename to client/network/src/protocol/util.rs diff --git a/core/network/src/service.rs b/client/network/src/service.rs similarity index 100% rename from core/network/src/service.rs rename to client/network/src/service.rs diff --git a/core/network/src/test/block_import.rs b/client/network/src/test/block_import.rs similarity index 100% rename from core/network/src/test/block_import.rs rename to client/network/src/test/block_import.rs diff --git a/core/network/src/test/mod.rs b/client/network/src/test/mod.rs similarity index 100% rename from core/network/src/test/mod.rs rename to client/network/src/test/mod.rs diff --git a/core/network/src/test/sync.rs b/client/network/src/test/sync.rs similarity index 100% rename from core/network/src/test/sync.rs rename to client/network/src/test/sync.rs diff --git a/core/network/src/transport.rs b/client/network/src/transport.rs similarity index 100% rename from core/network/src/transport.rs rename to client/network/src/transport.rs diff --git a/core/offchain/Cargo.toml b/client/offchain/Cargo.toml similarity index 72% rename from core/offchain/Cargo.toml rename to client/offchain/Cargo.toml index 9e16150938f1e..0940eaea14a8c 100644 --- a/core/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] bytes = "0.4.12" -client = { package = "substrate-client", path = "../../core/client" } +client = { package = "substrate-client", path = "../../client/client" } fnv = "1.0.6" futures01 = { package = "futures", version = "0.1" } futures-preview = "0.3.0-alpha.19" @@ -19,11 +19,11 @@ num_cpus = "1.10" offchain-primitives = { package = "substrate-offchain-primitives", path = "./primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } parking_lot = "0.9.0" -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } rand = "0.7.2" -sr-primitives = { path = "../../core/sr-primitives" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } -network = { package = "substrate-network", path = "../../core/network" } +sr-primitives = { path = "../../client/sr-primitives" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } +network = { package = "substrate-network", path = "../../client/network" } keystore = { package = "substrate-keystore", path = "../keystore" } [target.'cfg(not(target_os = "unknown"))'.dependencies] @@ -32,8 +32,8 @@ hyper-rustls = "0.17.1" [dev-dependencies] env_logger = "0.7.0" -client-db = { package = "substrate-client-db", path = "../../core/client/db/", default-features = true } -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" } +client-db = { package = "substrate-client-db", path = "../../client/client/db/", default-features = true } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } tokio = "0.1.22" [features] diff --git a/core/offchain/primitives/Cargo.toml b/client/offchain/primitives/Cargo.toml similarity index 100% rename from core/offchain/primitives/Cargo.toml rename to client/offchain/primitives/Cargo.toml diff --git a/core/offchain/primitives/src/lib.rs b/client/offchain/primitives/src/lib.rs similarity index 100% rename from core/offchain/primitives/src/lib.rs rename to client/offchain/primitives/src/lib.rs diff --git a/core/offchain/src/api.rs b/client/offchain/src/api.rs similarity index 100% rename from core/offchain/src/api.rs rename to client/offchain/src/api.rs diff --git a/core/offchain/src/api/http.rs b/client/offchain/src/api/http.rs similarity index 100% rename from core/offchain/src/api/http.rs rename to client/offchain/src/api/http.rs diff --git a/core/offchain/src/api/http_dummy.rs b/client/offchain/src/api/http_dummy.rs similarity index 100% rename from core/offchain/src/api/http_dummy.rs rename to client/offchain/src/api/http_dummy.rs diff --git a/core/offchain/src/api/timestamp.rs b/client/offchain/src/api/timestamp.rs similarity index 100% rename from core/offchain/src/api/timestamp.rs rename to client/offchain/src/api/timestamp.rs diff --git a/core/offchain/src/lib.rs b/client/offchain/src/lib.rs similarity index 100% rename from core/offchain/src/lib.rs rename to client/offchain/src/lib.rs diff --git a/core/offchain/src/testing.rs b/client/offchain/src/testing.rs similarity index 100% rename from core/offchain/src/testing.rs rename to client/offchain/src/testing.rs diff --git a/core/panic-handler/Cargo.toml b/client/panic-handler/Cargo.toml similarity index 100% rename from core/panic-handler/Cargo.toml rename to client/panic-handler/Cargo.toml diff --git a/core/panic-handler/src/lib.rs b/client/panic-handler/src/lib.rs similarity index 100% rename from core/panic-handler/src/lib.rs rename to client/panic-handler/src/lib.rs diff --git a/core/peerset/Cargo.toml b/client/peerset/Cargo.toml similarity index 100% rename from core/peerset/Cargo.toml rename to client/peerset/Cargo.toml diff --git a/core/peerset/src/lib.rs b/client/peerset/src/lib.rs similarity index 100% rename from core/peerset/src/lib.rs rename to client/peerset/src/lib.rs diff --git a/core/peerset/src/peersstate.rs b/client/peerset/src/peersstate.rs similarity index 100% rename from core/peerset/src/peersstate.rs rename to client/peerset/src/peersstate.rs diff --git a/core/peerset/tests/fuzz.rs b/client/peerset/tests/fuzz.rs similarity index 100% rename from core/peerset/tests/fuzz.rs rename to client/peerset/tests/fuzz.rs diff --git a/core/phragmen/Cargo.toml b/client/phragmen/Cargo.toml similarity index 100% rename from core/phragmen/Cargo.toml rename to client/phragmen/Cargo.toml diff --git a/core/phragmen/benches/phragmen.rs b/client/phragmen/benches/phragmen.rs similarity index 100% rename from core/phragmen/benches/phragmen.rs rename to client/phragmen/benches/phragmen.rs diff --git a/core/phragmen/src/lib.rs b/client/phragmen/src/lib.rs similarity index 100% rename from core/phragmen/src/lib.rs rename to client/phragmen/src/lib.rs diff --git a/core/phragmen/src/mock.rs b/client/phragmen/src/mock.rs similarity index 100% rename from core/phragmen/src/mock.rs rename to client/phragmen/src/mock.rs diff --git a/core/phragmen/src/tests.rs b/client/phragmen/src/tests.rs similarity index 100% rename from core/phragmen/src/tests.rs rename to client/phragmen/src/tests.rs diff --git a/core/primitives/Cargo.toml b/client/primitives/Cargo.toml similarity index 100% rename from core/primitives/Cargo.toml rename to client/primitives/Cargo.toml diff --git a/core/primitives/benches/bench.rs b/client/primitives/benches/bench.rs similarity index 100% rename from core/primitives/benches/bench.rs rename to client/primitives/benches/bench.rs diff --git a/core/primitives/debug-derive/Cargo.toml b/client/primitives/debug-derive/Cargo.toml similarity index 100% rename from core/primitives/debug-derive/Cargo.toml rename to client/primitives/debug-derive/Cargo.toml diff --git a/core/primitives/debug-derive/src/impls.rs b/client/primitives/debug-derive/src/impls.rs similarity index 100% rename from core/primitives/debug-derive/src/impls.rs rename to client/primitives/debug-derive/src/impls.rs diff --git a/core/primitives/debug-derive/src/lib.rs b/client/primitives/debug-derive/src/lib.rs similarity index 100% rename from core/primitives/debug-derive/src/lib.rs rename to client/primitives/debug-derive/src/lib.rs diff --git a/core/primitives/debug-derive/tests/tests.rs b/client/primitives/debug-derive/tests/tests.rs similarity index 100% rename from core/primitives/debug-derive/tests/tests.rs rename to client/primitives/debug-derive/tests/tests.rs diff --git a/core/primitives/src/changes_trie.rs b/client/primitives/src/changes_trie.rs similarity index 100% rename from core/primitives/src/changes_trie.rs rename to client/primitives/src/changes_trie.rs diff --git a/core/primitives/src/crypto.rs b/client/primitives/src/crypto.rs similarity index 100% rename from core/primitives/src/crypto.rs rename to client/primitives/src/crypto.rs diff --git a/core/primitives/src/ecdsa.rs b/client/primitives/src/ecdsa.rs similarity index 100% rename from core/primitives/src/ecdsa.rs rename to client/primitives/src/ecdsa.rs diff --git a/core/primitives/src/ed25519.rs b/client/primitives/src/ed25519.rs similarity index 100% rename from core/primitives/src/ed25519.rs rename to client/primitives/src/ed25519.rs diff --git a/core/primitives/src/hash.rs b/client/primitives/src/hash.rs similarity index 100% rename from core/primitives/src/hash.rs rename to client/primitives/src/hash.rs diff --git a/core/primitives/src/hasher.rs b/client/primitives/src/hasher.rs similarity index 100% rename from core/primitives/src/hasher.rs rename to client/primitives/src/hasher.rs diff --git a/core/primitives/src/hashing.rs b/client/primitives/src/hashing.rs similarity index 100% rename from core/primitives/src/hashing.rs rename to client/primitives/src/hashing.rs diff --git a/core/primitives/src/hexdisplay.rs b/client/primitives/src/hexdisplay.rs similarity index 100% rename from core/primitives/src/hexdisplay.rs rename to client/primitives/src/hexdisplay.rs diff --git a/core/primitives/src/lib.rs b/client/primitives/src/lib.rs similarity index 100% rename from core/primitives/src/lib.rs rename to client/primitives/src/lib.rs diff --git a/core/primitives/src/offchain.rs b/client/primitives/src/offchain.rs similarity index 100% rename from core/primitives/src/offchain.rs rename to client/primitives/src/offchain.rs diff --git a/core/primitives/src/sandbox.rs b/client/primitives/src/sandbox.rs similarity index 100% rename from core/primitives/src/sandbox.rs rename to client/primitives/src/sandbox.rs diff --git a/core/primitives/src/sr25519.rs b/client/primitives/src/sr25519.rs similarity index 100% rename from core/primitives/src/sr25519.rs rename to client/primitives/src/sr25519.rs diff --git a/core/primitives/src/testing.rs b/client/primitives/src/testing.rs similarity index 100% rename from core/primitives/src/testing.rs rename to client/primitives/src/testing.rs diff --git a/core/primitives/src/tests.rs b/client/primitives/src/tests.rs similarity index 100% rename from core/primitives/src/tests.rs rename to client/primitives/src/tests.rs diff --git a/core/primitives/src/traits.rs b/client/primitives/src/traits.rs similarity index 100% rename from core/primitives/src/traits.rs rename to client/primitives/src/traits.rs diff --git a/core/primitives/src/u32_trait.rs b/client/primitives/src/u32_trait.rs similarity index 100% rename from core/primitives/src/u32_trait.rs rename to client/primitives/src/u32_trait.rs diff --git a/core/primitives/src/uint.rs b/client/primitives/src/uint.rs similarity index 100% rename from core/primitives/src/uint.rs rename to client/primitives/src/uint.rs diff --git a/core/primitives/storage/Cargo.toml b/client/primitives/storage/Cargo.toml similarity index 100% rename from core/primitives/storage/Cargo.toml rename to client/primitives/storage/Cargo.toml diff --git a/core/primitives/storage/src/lib.rs b/client/primitives/storage/src/lib.rs similarity index 100% rename from core/primitives/storage/src/lib.rs rename to client/primitives/storage/src/lib.rs diff --git a/core/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml similarity index 100% rename from core/rpc-servers/Cargo.toml rename to client/rpc-servers/Cargo.toml diff --git a/core/rpc-servers/src/lib.rs b/client/rpc-servers/src/lib.rs similarity index 100% rename from core/rpc-servers/src/lib.rs rename to client/rpc-servers/src/lib.rs diff --git a/core/rpc/Cargo.toml b/client/rpc/Cargo.toml similarity index 100% rename from core/rpc/Cargo.toml rename to client/rpc/Cargo.toml diff --git a/core/rpc/api/Cargo.toml b/client/rpc/api/Cargo.toml similarity index 100% rename from core/rpc/api/Cargo.toml rename to client/rpc/api/Cargo.toml diff --git a/core/rpc/api/src/author/error.rs b/client/rpc/api/src/author/error.rs similarity index 100% rename from core/rpc/api/src/author/error.rs rename to client/rpc/api/src/author/error.rs diff --git a/core/rpc/api/src/author/hash.rs b/client/rpc/api/src/author/hash.rs similarity index 100% rename from core/rpc/api/src/author/hash.rs rename to client/rpc/api/src/author/hash.rs diff --git a/core/rpc/api/src/author/mod.rs b/client/rpc/api/src/author/mod.rs similarity index 100% rename from core/rpc/api/src/author/mod.rs rename to client/rpc/api/src/author/mod.rs diff --git a/core/rpc/api/src/chain/error.rs b/client/rpc/api/src/chain/error.rs similarity index 100% rename from core/rpc/api/src/chain/error.rs rename to client/rpc/api/src/chain/error.rs diff --git a/core/rpc/api/src/chain/mod.rs b/client/rpc/api/src/chain/mod.rs similarity index 100% rename from core/rpc/api/src/chain/mod.rs rename to client/rpc/api/src/chain/mod.rs diff --git a/core/rpc/api/src/errors.rs b/client/rpc/api/src/errors.rs similarity index 100% rename from core/rpc/api/src/errors.rs rename to client/rpc/api/src/errors.rs diff --git a/core/rpc/api/src/helpers.rs b/client/rpc/api/src/helpers.rs similarity index 100% rename from core/rpc/api/src/helpers.rs rename to client/rpc/api/src/helpers.rs diff --git a/core/rpc/api/src/lib.rs b/client/rpc/api/src/lib.rs similarity index 100% rename from core/rpc/api/src/lib.rs rename to client/rpc/api/src/lib.rs diff --git a/core/rpc/api/src/state/error.rs b/client/rpc/api/src/state/error.rs similarity index 100% rename from core/rpc/api/src/state/error.rs rename to client/rpc/api/src/state/error.rs diff --git a/core/rpc/api/src/state/mod.rs b/client/rpc/api/src/state/mod.rs similarity index 100% rename from core/rpc/api/src/state/mod.rs rename to client/rpc/api/src/state/mod.rs diff --git a/core/rpc/api/src/subscriptions.rs b/client/rpc/api/src/subscriptions.rs similarity index 100% rename from core/rpc/api/src/subscriptions.rs rename to client/rpc/api/src/subscriptions.rs diff --git a/core/rpc/api/src/system/error.rs b/client/rpc/api/src/system/error.rs similarity index 100% rename from core/rpc/api/src/system/error.rs rename to client/rpc/api/src/system/error.rs diff --git a/core/rpc/api/src/system/helpers.rs b/client/rpc/api/src/system/helpers.rs similarity index 100% rename from core/rpc/api/src/system/helpers.rs rename to client/rpc/api/src/system/helpers.rs diff --git a/core/rpc/api/src/system/mod.rs b/client/rpc/api/src/system/mod.rs similarity index 100% rename from core/rpc/api/src/system/mod.rs rename to client/rpc/api/src/system/mod.rs diff --git a/core/rpc/primitives/Cargo.toml b/client/rpc/primitives/Cargo.toml similarity index 100% rename from core/rpc/primitives/Cargo.toml rename to client/rpc/primitives/Cargo.toml diff --git a/core/rpc/primitives/src/lib.rs b/client/rpc/primitives/src/lib.rs similarity index 100% rename from core/rpc/primitives/src/lib.rs rename to client/rpc/primitives/src/lib.rs diff --git a/core/rpc/primitives/src/number.rs b/client/rpc/primitives/src/number.rs similarity index 100% rename from core/rpc/primitives/src/number.rs rename to client/rpc/primitives/src/number.rs diff --git a/core/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs similarity index 100% rename from core/rpc/src/author/mod.rs rename to client/rpc/src/author/mod.rs diff --git a/core/rpc/src/author/tests.rs b/client/rpc/src/author/tests.rs similarity index 100% rename from core/rpc/src/author/tests.rs rename to client/rpc/src/author/tests.rs diff --git a/core/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs similarity index 100% rename from core/rpc/src/chain/chain_full.rs rename to client/rpc/src/chain/chain_full.rs diff --git a/core/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs similarity index 100% rename from core/rpc/src/chain/chain_light.rs rename to client/rpc/src/chain/chain_light.rs diff --git a/core/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs similarity index 100% rename from core/rpc/src/chain/mod.rs rename to client/rpc/src/chain/mod.rs diff --git a/core/rpc/src/chain/tests.rs b/client/rpc/src/chain/tests.rs similarity index 100% rename from core/rpc/src/chain/tests.rs rename to client/rpc/src/chain/tests.rs diff --git a/core/rpc/src/lib.rs b/client/rpc/src/lib.rs similarity index 100% rename from core/rpc/src/lib.rs rename to client/rpc/src/lib.rs diff --git a/core/rpc/src/metadata.rs b/client/rpc/src/metadata.rs similarity index 100% rename from core/rpc/src/metadata.rs rename to client/rpc/src/metadata.rs diff --git a/core/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs similarity index 100% rename from core/rpc/src/state/mod.rs rename to client/rpc/src/state/mod.rs diff --git a/core/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs similarity index 100% rename from core/rpc/src/state/state_full.rs rename to client/rpc/src/state/state_full.rs diff --git a/core/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs similarity index 100% rename from core/rpc/src/state/state_light.rs rename to client/rpc/src/state/state_light.rs diff --git a/core/rpc/src/state/tests.rs b/client/rpc/src/state/tests.rs similarity index 100% rename from core/rpc/src/state/tests.rs rename to client/rpc/src/state/tests.rs diff --git a/core/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs similarity index 100% rename from core/rpc/src/system/mod.rs rename to client/rpc/src/system/mod.rs diff --git a/core/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs similarity index 100% rename from core/rpc/src/system/tests.rs rename to client/rpc/src/system/tests.rs diff --git a/core/serializer/Cargo.toml b/client/serializer/Cargo.toml similarity index 100% rename from core/serializer/Cargo.toml rename to client/serializer/Cargo.toml diff --git a/core/serializer/src/lib.rs b/client/serializer/src/lib.rs similarity index 100% rename from core/serializer/src/lib.rs rename to client/serializer/src/lib.rs diff --git a/core/service/Cargo.toml b/client/service/Cargo.toml similarity index 67% rename from core/service/Cargo.toml rename to client/service/Cargo.toml index 9f587d34a2d83..0da6f4e293c15 100644 --- a/core/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -28,24 +28,24 @@ serde = "1.0.101" serde_json = "1.0.41" sysinfo = "0.9.5" target_info = "0.1.0" -keystore = { package = "substrate-keystore", path = "../../core/keystore" } -sr-io = { path = "../../core/sr-io" } -sr-primitives = { path = "../../core/sr-primitives" } +keystore = { package = "substrate-keystore", path = "../../client/keystore" } +sr-io = { path = "../../client/sr-io" } +sr-primitives = { path = "../../client/sr-primitives" } primitives = { package = "substrate-primitives", path = "../primitives" } session = { package = "substrate-session", path = "../session" } app-crypto = { package = "substrate-application-crypto", path = "../application-crypto" } -consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } -network = { package = "substrate-network", path = "../../core/network" } +consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } +network = { package = "substrate-network", path = "../../client/network" } chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" } -client = { package = "substrate-client", path = "../../core/client" } -client_db = { package = "substrate-client-db", path = "../../core/client/db" } +client = { package = "substrate-client", path = "../../client/client" } +client_db = { package = "substrate-client-db", path = "../../client/client/db" } codec = { package = "parity-scale-codec", version = "1.0.0" } -substrate-executor = { path = "../../core/executor" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } -rpc-servers = { package = "substrate-rpc-servers", path = "../../core/rpc-servers" } -rpc = { package = "substrate-rpc", path = "../../core/rpc" } -tel = { package = "substrate-telemetry", path = "../../core/telemetry" } -offchain = { package = "substrate-offchain", path = "../../core/offchain" } +substrate-executor = { path = "../../client/executor" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } +rpc-servers = { package = "substrate-rpc-servers", path = "../../client/rpc-servers" } +rpc = { package = "substrate-rpc", path = "../../client/rpc" } +tel = { package = "substrate-telemetry", path = "../../client/telemetry" } +offchain = { package = "substrate-offchain", path = "../../client/offchain" } parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" } [dev-dependencies] @@ -53,7 +53,7 @@ substrate-test-runtime-client = { path = "../test-runtime/client" } node-executor = { path = "../../bin/node/executor" } node-primitives = { path = "../../bin/node/primitives" } node-runtime = { path = "../../bin/node/runtime" } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives" } -grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" } -grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives" } +grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" } +grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../client/finality-grandpa/primitives" } tokio = "0.1" diff --git a/core/service/src/builder.rs b/client/service/src/builder.rs similarity index 100% rename from core/service/src/builder.rs rename to client/service/src/builder.rs diff --git a/core/service/src/chain_ops.rs b/client/service/src/chain_ops.rs similarity index 100% rename from core/service/src/chain_ops.rs rename to client/service/src/chain_ops.rs diff --git a/core/service/src/config.rs b/client/service/src/config.rs similarity index 100% rename from core/service/src/config.rs rename to client/service/src/config.rs diff --git a/core/service/src/error.rs b/client/service/src/error.rs similarity index 100% rename from core/service/src/error.rs rename to client/service/src/error.rs diff --git a/core/service/src/lib.rs b/client/service/src/lib.rs similarity index 99% rename from core/service/src/lib.rs rename to client/service/src/lib.rs index b267e0a635b23..b8ee3c3e4ad50 100644 --- a/core/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -442,7 +442,7 @@ fn build_network_future< while let Ok(Async::Ready(Some(Event::Dht(event)))) = network.poll().map_err(|err| { warn!(target: "service", "Error in network: {:?}", err); }) { - // Given that core/authority-discovery is the only upper stack consumer of Dht events at the moment, all Dht + // Given that client/authority-discovery is the only upper stack consumer of Dht events at the moment, all Dht // events are being passed on to the authority-discovery module. In the future there might be multiple // consumers of these events. In that case this would need to be refactored to properly dispatch the events, // e.g. via a subscriber model. diff --git a/core/service/src/status_sinks.rs b/client/service/src/status_sinks.rs similarity index 100% rename from core/service/src/status_sinks.rs rename to client/service/src/status_sinks.rs diff --git a/core/service/test/Cargo.toml b/client/service/test/Cargo.toml similarity index 56% rename from core/service/test/Cargo.toml rename to client/service/test/Cargo.toml index 4415369a6a1d3..781379626eb20 100644 --- a/core/service/test/Cargo.toml +++ b/client/service/test/Cargo.toml @@ -12,9 +12,9 @@ log = "0.4.8" env_logger = "0.7.0" fdlimit = "0.1.1" futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features = ["compat"] } -service = { package = "substrate-service", path = "../../../core/service", default-features = false } -network = { package = "substrate-network", path = "../../../core/network" } -consensus = { package = "substrate-consensus-common", path = "../../../core/consensus/common" } -client = { package = "substrate-client", path = "../../../core/client" } -sr-primitives = { path = "../../../core/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } +service = { package = "substrate-service", path = "../../../client/service", default-features = false } +network = { package = "substrate-network", path = "../../../client/network" } +consensus = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } +client = { package = "substrate-client", path = "../../../client/client" } +sr-primitives = { path = "../../../client/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } diff --git a/core/service/test/src/lib.rs b/client/service/test/src/lib.rs similarity index 100% rename from core/service/test/src/lib.rs rename to client/service/test/src/lib.rs diff --git a/core/session/Cargo.toml b/client/session/Cargo.toml similarity index 100% rename from core/session/Cargo.toml rename to client/session/Cargo.toml diff --git a/core/session/src/lib.rs b/client/session/src/lib.rs similarity index 100% rename from core/session/src/lib.rs rename to client/session/src/lib.rs diff --git a/core/sr-api-macros/Cargo.toml b/client/sr-api-macros/Cargo.toml similarity index 100% rename from core/sr-api-macros/Cargo.toml rename to client/sr-api-macros/Cargo.toml diff --git a/core/sr-api-macros/benches/bench.rs b/client/sr-api-macros/benches/bench.rs similarity index 100% rename from core/sr-api-macros/benches/bench.rs rename to client/sr-api-macros/benches/bench.rs diff --git a/core/sr-api-macros/src/decl_runtime_apis.rs b/client/sr-api-macros/src/decl_runtime_apis.rs similarity index 100% rename from core/sr-api-macros/src/decl_runtime_apis.rs rename to client/sr-api-macros/src/decl_runtime_apis.rs diff --git a/core/sr-api-macros/src/impl_runtime_apis.rs b/client/sr-api-macros/src/impl_runtime_apis.rs similarity index 100% rename from core/sr-api-macros/src/impl_runtime_apis.rs rename to client/sr-api-macros/src/impl_runtime_apis.rs diff --git a/core/sr-api-macros/src/lib.rs b/client/sr-api-macros/src/lib.rs similarity index 100% rename from core/sr-api-macros/src/lib.rs rename to client/sr-api-macros/src/lib.rs diff --git a/core/sr-api-macros/src/utils.rs b/client/sr-api-macros/src/utils.rs similarity index 100% rename from core/sr-api-macros/src/utils.rs rename to client/sr-api-macros/src/utils.rs diff --git a/core/sr-api-macros/tests/decl_and_impl.rs b/client/sr-api-macros/tests/decl_and_impl.rs similarity index 100% rename from core/sr-api-macros/tests/decl_and_impl.rs rename to client/sr-api-macros/tests/decl_and_impl.rs diff --git a/core/sr-api-macros/tests/runtime_calls.rs b/client/sr-api-macros/tests/runtime_calls.rs similarity index 100% rename from core/sr-api-macros/tests/runtime_calls.rs rename to client/sr-api-macros/tests/runtime_calls.rs diff --git a/core/sr-api-macros/tests/trybuild.rs b/client/sr-api-macros/tests/trybuild.rs similarity index 100% rename from core/sr-api-macros/tests/trybuild.rs rename to client/sr-api-macros/tests/trybuild.rs diff --git a/core/sr-api-macros/tests/ui/adding_self_parameter.rs b/client/sr-api-macros/tests/ui/adding_self_parameter.rs similarity index 100% rename from core/sr-api-macros/tests/ui/adding_self_parameter.rs rename to client/sr-api-macros/tests/ui/adding_self_parameter.rs diff --git a/core/sr-api-macros/tests/ui/adding_self_parameter.stderr b/client/sr-api-macros/tests/ui/adding_self_parameter.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/adding_self_parameter.stderr rename to client/sr-api-macros/tests/ui/adding_self_parameter.stderr diff --git a/core/sr-api-macros/tests/ui/changed_in_unknown_version.rs b/client/sr-api-macros/tests/ui/changed_in_unknown_version.rs similarity index 100% rename from core/sr-api-macros/tests/ui/changed_in_unknown_version.rs rename to client/sr-api-macros/tests/ui/changed_in_unknown_version.rs diff --git a/core/sr-api-macros/tests/ui/changed_in_unknown_version.stderr b/client/sr-api-macros/tests/ui/changed_in_unknown_version.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/changed_in_unknown_version.stderr rename to client/sr-api-macros/tests/ui/changed_in_unknown_version.stderr diff --git a/core/sr-api-macros/tests/ui/declaring_old_block.rs b/client/sr-api-macros/tests/ui/declaring_old_block.rs similarity index 100% rename from core/sr-api-macros/tests/ui/declaring_old_block.rs rename to client/sr-api-macros/tests/ui/declaring_old_block.rs diff --git a/core/sr-api-macros/tests/ui/declaring_old_block.stderr b/client/sr-api-macros/tests/ui/declaring_old_block.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/declaring_old_block.stderr rename to client/sr-api-macros/tests/ui/declaring_old_block.stderr diff --git a/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs b/client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs similarity index 100% rename from core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs rename to client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs diff --git a/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr b/client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr rename to client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr diff --git a/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs b/client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs similarity index 100% rename from core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs rename to client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs diff --git a/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr b/client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr rename to client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr diff --git a/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs b/client/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs similarity index 100% rename from core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs rename to client/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs diff --git a/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr b/client/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr rename to client/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr diff --git a/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs b/client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs similarity index 100% rename from core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs rename to client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs diff --git a/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr b/client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr rename to client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr diff --git a/core/sr-api-macros/tests/ui/invalid_api_version.rs b/client/sr-api-macros/tests/ui/invalid_api_version.rs similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version.rs rename to client/sr-api-macros/tests/ui/invalid_api_version.rs diff --git a/core/sr-api-macros/tests/ui/invalid_api_version.stderr b/client/sr-api-macros/tests/ui/invalid_api_version.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version.stderr rename to client/sr-api-macros/tests/ui/invalid_api_version.stderr diff --git a/core/sr-api-macros/tests/ui/invalid_api_version_2.rs b/client/sr-api-macros/tests/ui/invalid_api_version_2.rs similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version_2.rs rename to client/sr-api-macros/tests/ui/invalid_api_version_2.rs diff --git a/core/sr-api-macros/tests/ui/invalid_api_version_2.stderr b/client/sr-api-macros/tests/ui/invalid_api_version_2.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version_2.stderr rename to client/sr-api-macros/tests/ui/invalid_api_version_2.stderr diff --git a/core/sr-api-macros/tests/ui/invalid_api_version_3.rs b/client/sr-api-macros/tests/ui/invalid_api_version_3.rs similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version_3.rs rename to client/sr-api-macros/tests/ui/invalid_api_version_3.rs diff --git a/core/sr-api-macros/tests/ui/invalid_api_version_3.stderr b/client/sr-api-macros/tests/ui/invalid_api_version_3.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/invalid_api_version_3.stderr rename to client/sr-api-macros/tests/ui/invalid_api_version_3.stderr diff --git a/core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs b/client/sr-api-macros/tests/ui/missing_block_generic_parameter.rs similarity index 100% rename from core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs rename to client/sr-api-macros/tests/ui/missing_block_generic_parameter.rs diff --git a/core/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr b/client/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr rename to client/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr diff --git a/core/sr-api-macros/tests/ui/missing_path_for_trait.rs b/client/sr-api-macros/tests/ui/missing_path_for_trait.rs similarity index 100% rename from core/sr-api-macros/tests/ui/missing_path_for_trait.rs rename to client/sr-api-macros/tests/ui/missing_path_for_trait.rs diff --git a/core/sr-api-macros/tests/ui/missing_path_for_trait.stderr b/client/sr-api-macros/tests/ui/missing_path_for_trait.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/missing_path_for_trait.stderr rename to client/sr-api-macros/tests/ui/missing_path_for_trait.stderr diff --git a/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs similarity index 100% rename from core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs rename to client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs diff --git a/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr similarity index 100% rename from core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr rename to client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr diff --git a/core/sr-arithmetic/Cargo.toml b/client/sr-arithmetic/Cargo.toml similarity index 100% rename from core/sr-arithmetic/Cargo.toml rename to client/sr-arithmetic/Cargo.toml diff --git a/core/sr-arithmetic/benches/bench.rs b/client/sr-arithmetic/benches/bench.rs similarity index 100% rename from core/sr-arithmetic/benches/bench.rs rename to client/sr-arithmetic/benches/bench.rs diff --git a/core/sr-arithmetic/fuzzer/.gitignore b/client/sr-arithmetic/fuzzer/.gitignore similarity index 100% rename from core/sr-arithmetic/fuzzer/.gitignore rename to client/sr-arithmetic/fuzzer/.gitignore diff --git a/core/sr-arithmetic/fuzzer/Cargo.lock b/client/sr-arithmetic/fuzzer/Cargo.lock similarity index 100% rename from core/sr-arithmetic/fuzzer/Cargo.lock rename to client/sr-arithmetic/fuzzer/Cargo.lock diff --git a/core/sr-arithmetic/fuzzer/Cargo.toml b/client/sr-arithmetic/fuzzer/Cargo.toml similarity index 100% rename from core/sr-arithmetic/fuzzer/Cargo.toml rename to client/sr-arithmetic/fuzzer/Cargo.toml diff --git a/core/sr-arithmetic/fuzzer/src/biguint.rs b/client/sr-arithmetic/fuzzer/src/biguint.rs similarity index 100% rename from core/sr-arithmetic/fuzzer/src/biguint.rs rename to client/sr-arithmetic/fuzzer/src/biguint.rs diff --git a/core/sr-arithmetic/fuzzer/src/rational128.rs b/client/sr-arithmetic/fuzzer/src/rational128.rs similarity index 100% rename from core/sr-arithmetic/fuzzer/src/rational128.rs rename to client/sr-arithmetic/fuzzer/src/rational128.rs diff --git a/core/sr-arithmetic/src/biguint.rs b/client/sr-arithmetic/src/biguint.rs similarity index 100% rename from core/sr-arithmetic/src/biguint.rs rename to client/sr-arithmetic/src/biguint.rs diff --git a/core/sr-arithmetic/src/fixed64.rs b/client/sr-arithmetic/src/fixed64.rs similarity index 100% rename from core/sr-arithmetic/src/fixed64.rs rename to client/sr-arithmetic/src/fixed64.rs diff --git a/core/sr-arithmetic/src/helpers_128bit.rs b/client/sr-arithmetic/src/helpers_128bit.rs similarity index 100% rename from core/sr-arithmetic/src/helpers_128bit.rs rename to client/sr-arithmetic/src/helpers_128bit.rs diff --git a/core/sr-arithmetic/src/lib.rs b/client/sr-arithmetic/src/lib.rs similarity index 100% rename from core/sr-arithmetic/src/lib.rs rename to client/sr-arithmetic/src/lib.rs diff --git a/core/sr-arithmetic/src/per_things.rs b/client/sr-arithmetic/src/per_things.rs similarity index 100% rename from core/sr-arithmetic/src/per_things.rs rename to client/sr-arithmetic/src/per_things.rs diff --git a/core/sr-arithmetic/src/rational128.rs b/client/sr-arithmetic/src/rational128.rs similarity index 100% rename from core/sr-arithmetic/src/rational128.rs rename to client/sr-arithmetic/src/rational128.rs diff --git a/core/sr-arithmetic/src/traits.rs b/client/sr-arithmetic/src/traits.rs similarity index 100% rename from core/sr-arithmetic/src/traits.rs rename to client/sr-arithmetic/src/traits.rs diff --git a/core/sr-io/Cargo.toml b/client/sr-io/Cargo.toml similarity index 100% rename from core/sr-io/Cargo.toml rename to client/sr-io/Cargo.toml diff --git a/core/sr-io/build.rs b/client/sr-io/build.rs similarity index 100% rename from core/sr-io/build.rs rename to client/sr-io/build.rs diff --git a/core/sr-io/src/lib.rs b/client/sr-io/src/lib.rs similarity index 100% rename from core/sr-io/src/lib.rs rename to client/sr-io/src/lib.rs diff --git a/core/sr-io/with_std.rs b/client/sr-io/with_std.rs similarity index 100% rename from core/sr-io/with_std.rs rename to client/sr-io/with_std.rs diff --git a/core/sr-io/without_std.rs b/client/sr-io/without_std.rs similarity index 100% rename from core/sr-io/without_std.rs rename to client/sr-io/without_std.rs diff --git a/core/sr-primitives/Cargo.toml b/client/sr-primitives/Cargo.toml similarity index 100% rename from core/sr-primitives/Cargo.toml rename to client/sr-primitives/Cargo.toml diff --git a/core/sr-primitives/src/curve.rs b/client/sr-primitives/src/curve.rs similarity index 100% rename from core/sr-primitives/src/curve.rs rename to client/sr-primitives/src/curve.rs diff --git a/core/sr-primitives/src/generic/block.rs b/client/sr-primitives/src/generic/block.rs similarity index 100% rename from core/sr-primitives/src/generic/block.rs rename to client/sr-primitives/src/generic/block.rs diff --git a/core/sr-primitives/src/generic/checked_extrinsic.rs b/client/sr-primitives/src/generic/checked_extrinsic.rs similarity index 100% rename from core/sr-primitives/src/generic/checked_extrinsic.rs rename to client/sr-primitives/src/generic/checked_extrinsic.rs diff --git a/core/sr-primitives/src/generic/digest.rs b/client/sr-primitives/src/generic/digest.rs similarity index 100% rename from core/sr-primitives/src/generic/digest.rs rename to client/sr-primitives/src/generic/digest.rs diff --git a/core/sr-primitives/src/generic/era.rs b/client/sr-primitives/src/generic/era.rs similarity index 100% rename from core/sr-primitives/src/generic/era.rs rename to client/sr-primitives/src/generic/era.rs diff --git a/core/sr-primitives/src/generic/header.rs b/client/sr-primitives/src/generic/header.rs similarity index 100% rename from core/sr-primitives/src/generic/header.rs rename to client/sr-primitives/src/generic/header.rs diff --git a/core/sr-primitives/src/generic/mod.rs b/client/sr-primitives/src/generic/mod.rs similarity index 100% rename from core/sr-primitives/src/generic/mod.rs rename to client/sr-primitives/src/generic/mod.rs diff --git a/core/sr-primitives/src/generic/tests.rs b/client/sr-primitives/src/generic/tests.rs similarity index 100% rename from core/sr-primitives/src/generic/tests.rs rename to client/sr-primitives/src/generic/tests.rs diff --git a/core/sr-primitives/src/generic/unchecked_extrinsic.rs b/client/sr-primitives/src/generic/unchecked_extrinsic.rs similarity index 100% rename from core/sr-primitives/src/generic/unchecked_extrinsic.rs rename to client/sr-primitives/src/generic/unchecked_extrinsic.rs diff --git a/core/sr-primitives/src/lib.rs b/client/sr-primitives/src/lib.rs similarity index 100% rename from core/sr-primitives/src/lib.rs rename to client/sr-primitives/src/lib.rs diff --git a/core/sr-primitives/src/offchain/http.rs b/client/sr-primitives/src/offchain/http.rs similarity index 100% rename from core/sr-primitives/src/offchain/http.rs rename to client/sr-primitives/src/offchain/http.rs diff --git a/core/sr-primitives/src/offchain/mod.rs b/client/sr-primitives/src/offchain/mod.rs similarity index 100% rename from core/sr-primitives/src/offchain/mod.rs rename to client/sr-primitives/src/offchain/mod.rs diff --git a/core/sr-primitives/src/testing.rs b/client/sr-primitives/src/testing.rs similarity index 100% rename from core/sr-primitives/src/testing.rs rename to client/sr-primitives/src/testing.rs diff --git a/core/sr-primitives/src/traits.rs b/client/sr-primitives/src/traits.rs similarity index 100% rename from core/sr-primitives/src/traits.rs rename to client/sr-primitives/src/traits.rs diff --git a/core/sr-primitives/src/transaction_validity.rs b/client/sr-primitives/src/transaction_validity.rs similarity index 100% rename from core/sr-primitives/src/transaction_validity.rs rename to client/sr-primitives/src/transaction_validity.rs diff --git a/core/sr-primitives/src/weights.rs b/client/sr-primitives/src/weights.rs similarity index 100% rename from core/sr-primitives/src/weights.rs rename to client/sr-primitives/src/weights.rs diff --git a/core/sr-sandbox/Cargo.toml b/client/sr-sandbox/Cargo.toml similarity index 100% rename from core/sr-sandbox/Cargo.toml rename to client/sr-sandbox/Cargo.toml diff --git a/core/sr-sandbox/build.rs b/client/sr-sandbox/build.rs similarity index 100% rename from core/sr-sandbox/build.rs rename to client/sr-sandbox/build.rs diff --git a/core/sr-sandbox/src/lib.rs b/client/sr-sandbox/src/lib.rs similarity index 100% rename from core/sr-sandbox/src/lib.rs rename to client/sr-sandbox/src/lib.rs diff --git a/core/sr-sandbox/with_std.rs b/client/sr-sandbox/with_std.rs similarity index 100% rename from core/sr-sandbox/with_std.rs rename to client/sr-sandbox/with_std.rs diff --git a/core/sr-sandbox/without_std.rs b/client/sr-sandbox/without_std.rs similarity index 100% rename from core/sr-sandbox/without_std.rs rename to client/sr-sandbox/without_std.rs diff --git a/core/sr-staking-primitives/Cargo.toml b/client/sr-staking-primitives/Cargo.toml similarity index 100% rename from core/sr-staking-primitives/Cargo.toml rename to client/sr-staking-primitives/Cargo.toml diff --git a/core/sr-staking-primitives/src/lib.rs b/client/sr-staking-primitives/src/lib.rs similarity index 100% rename from core/sr-staking-primitives/src/lib.rs rename to client/sr-staking-primitives/src/lib.rs diff --git a/core/sr-staking-primitives/src/offence.rs b/client/sr-staking-primitives/src/offence.rs similarity index 100% rename from core/sr-staking-primitives/src/offence.rs rename to client/sr-staking-primitives/src/offence.rs diff --git a/core/sr-std/Cargo.toml b/client/sr-std/Cargo.toml similarity index 100% rename from core/sr-std/Cargo.toml rename to client/sr-std/Cargo.toml diff --git a/core/sr-std/build.rs b/client/sr-std/build.rs similarity index 100% rename from core/sr-std/build.rs rename to client/sr-std/build.rs diff --git a/core/sr-std/src/lib.rs b/client/sr-std/src/lib.rs similarity index 96% rename from core/sr-std/src/lib.rs rename to client/sr-std/src/lib.rs index f369d3908ba83..db628ded01f8b 100644 --- a/core/sr-std/src/lib.rs +++ b/client/sr-std/src/lib.rs @@ -15,7 +15,7 @@ // along with Substrate. If not, see . //! Lowest-abstraction level for the Substrate runtime: just exports useful primitives from std -//! or core/alloc to be used with any code that depends on the runtime. +//! or client/alloc to be used with any code that depends on the runtime. #![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), feature(core_intrinsics))] diff --git a/core/sr-std/with_std.rs b/client/sr-std/with_std.rs similarity index 100% rename from core/sr-std/with_std.rs rename to client/sr-std/with_std.rs diff --git a/core/sr-std/without_std.rs b/client/sr-std/without_std.rs similarity index 100% rename from core/sr-std/without_std.rs rename to client/sr-std/without_std.rs diff --git a/core/sr-version/Cargo.toml b/client/sr-version/Cargo.toml similarity index 100% rename from core/sr-version/Cargo.toml rename to client/sr-version/Cargo.toml diff --git a/core/sr-version/src/lib.rs b/client/sr-version/src/lib.rs similarity index 100% rename from core/sr-version/src/lib.rs rename to client/sr-version/src/lib.rs diff --git a/core/state-db/Cargo.toml b/client/state-db/Cargo.toml similarity index 94% rename from core/state-db/Cargo.toml rename to client/state-db/Cargo.toml index d271a0e179d6d..8ecf1c2f10d3b 100644 --- a/core/state-db/Cargo.toml +++ b/client/state-db/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] parking_lot = "0.9.0" log = "0.4.8" -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } [dev-dependencies] diff --git a/core/state-db/src/lib.rs b/client/state-db/src/lib.rs similarity index 100% rename from core/state-db/src/lib.rs rename to client/state-db/src/lib.rs diff --git a/core/state-db/src/noncanonical.rs b/client/state-db/src/noncanonical.rs similarity index 100% rename from core/state-db/src/noncanonical.rs rename to client/state-db/src/noncanonical.rs diff --git a/core/state-db/src/pruning.rs b/client/state-db/src/pruning.rs similarity index 100% rename from core/state-db/src/pruning.rs rename to client/state-db/src/pruning.rs diff --git a/core/state-db/src/test.rs b/client/state-db/src/test.rs similarity index 100% rename from core/state-db/src/test.rs rename to client/state-db/src/test.rs diff --git a/core/state-machine/Cargo.toml b/client/state-machine/Cargo.toml similarity index 100% rename from core/state-machine/Cargo.toml rename to client/state-machine/Cargo.toml diff --git a/core/state-machine/src/backend.rs b/client/state-machine/src/backend.rs similarity index 100% rename from core/state-machine/src/backend.rs rename to client/state-machine/src/backend.rs diff --git a/core/state-machine/src/basic.rs b/client/state-machine/src/basic.rs similarity index 100% rename from core/state-machine/src/basic.rs rename to client/state-machine/src/basic.rs diff --git a/core/state-machine/src/changes_trie/build.rs b/client/state-machine/src/changes_trie/build.rs similarity index 100% rename from core/state-machine/src/changes_trie/build.rs rename to client/state-machine/src/changes_trie/build.rs diff --git a/core/state-machine/src/changes_trie/build_cache.rs b/client/state-machine/src/changes_trie/build_cache.rs similarity index 100% rename from core/state-machine/src/changes_trie/build_cache.rs rename to client/state-machine/src/changes_trie/build_cache.rs diff --git a/core/state-machine/src/changes_trie/build_iterator.rs b/client/state-machine/src/changes_trie/build_iterator.rs similarity index 100% rename from core/state-machine/src/changes_trie/build_iterator.rs rename to client/state-machine/src/changes_trie/build_iterator.rs diff --git a/core/state-machine/src/changes_trie/changes_iterator.rs b/client/state-machine/src/changes_trie/changes_iterator.rs similarity index 100% rename from core/state-machine/src/changes_trie/changes_iterator.rs rename to client/state-machine/src/changes_trie/changes_iterator.rs diff --git a/core/state-machine/src/changes_trie/input.rs b/client/state-machine/src/changes_trie/input.rs similarity index 100% rename from core/state-machine/src/changes_trie/input.rs rename to client/state-machine/src/changes_trie/input.rs diff --git a/core/state-machine/src/changes_trie/mod.rs b/client/state-machine/src/changes_trie/mod.rs similarity index 100% rename from core/state-machine/src/changes_trie/mod.rs rename to client/state-machine/src/changes_trie/mod.rs diff --git a/core/state-machine/src/changes_trie/prune.rs b/client/state-machine/src/changes_trie/prune.rs similarity index 100% rename from core/state-machine/src/changes_trie/prune.rs rename to client/state-machine/src/changes_trie/prune.rs diff --git a/core/state-machine/src/changes_trie/storage.rs b/client/state-machine/src/changes_trie/storage.rs similarity index 100% rename from core/state-machine/src/changes_trie/storage.rs rename to client/state-machine/src/changes_trie/storage.rs diff --git a/core/state-machine/src/changes_trie/surface_iterator.rs b/client/state-machine/src/changes_trie/surface_iterator.rs similarity index 100% rename from core/state-machine/src/changes_trie/surface_iterator.rs rename to client/state-machine/src/changes_trie/surface_iterator.rs diff --git a/core/state-machine/src/error.rs b/client/state-machine/src/error.rs similarity index 100% rename from core/state-machine/src/error.rs rename to client/state-machine/src/error.rs diff --git a/core/state-machine/src/ext.rs b/client/state-machine/src/ext.rs similarity index 100% rename from core/state-machine/src/ext.rs rename to client/state-machine/src/ext.rs diff --git a/core/state-machine/src/lib.rs b/client/state-machine/src/lib.rs similarity index 100% rename from core/state-machine/src/lib.rs rename to client/state-machine/src/lib.rs diff --git a/core/state-machine/src/overlayed_changes.rs b/client/state-machine/src/overlayed_changes.rs similarity index 100% rename from core/state-machine/src/overlayed_changes.rs rename to client/state-machine/src/overlayed_changes.rs diff --git a/core/state-machine/src/proving_backend.rs b/client/state-machine/src/proving_backend.rs similarity index 100% rename from core/state-machine/src/proving_backend.rs rename to client/state-machine/src/proving_backend.rs diff --git a/core/state-machine/src/testing.rs b/client/state-machine/src/testing.rs similarity index 100% rename from core/state-machine/src/testing.rs rename to client/state-machine/src/testing.rs diff --git a/core/state-machine/src/trie_backend.rs b/client/state-machine/src/trie_backend.rs similarity index 100% rename from core/state-machine/src/trie_backend.rs rename to client/state-machine/src/trie_backend.rs diff --git a/core/state-machine/src/trie_backend_essence.rs b/client/state-machine/src/trie_backend_essence.rs similarity index 100% rename from core/state-machine/src/trie_backend_essence.rs rename to client/state-machine/src/trie_backend_essence.rs diff --git a/core/telemetry/Cargo.toml b/client/telemetry/Cargo.toml similarity index 100% rename from core/telemetry/Cargo.toml rename to client/telemetry/Cargo.toml diff --git a/core/telemetry/src/lib.rs b/client/telemetry/src/lib.rs similarity index 100% rename from core/telemetry/src/lib.rs rename to client/telemetry/src/lib.rs diff --git a/core/telemetry/src/worker.rs b/client/telemetry/src/worker.rs similarity index 100% rename from core/telemetry/src/worker.rs rename to client/telemetry/src/worker.rs diff --git a/core/telemetry/src/worker/node.rs b/client/telemetry/src/worker/node.rs similarity index 100% rename from core/telemetry/src/worker/node.rs rename to client/telemetry/src/worker/node.rs diff --git a/core/test-client/Cargo.toml b/client/test-client/Cargo.toml similarity index 100% rename from core/test-client/Cargo.toml rename to client/test-client/Cargo.toml diff --git a/core/test-client/src/client_ext.rs b/client/test-client/src/client_ext.rs similarity index 100% rename from core/test-client/src/client_ext.rs rename to client/test-client/src/client_ext.rs diff --git a/core/test-client/src/lib.rs b/client/test-client/src/lib.rs similarity index 100% rename from core/test-client/src/lib.rs rename to client/test-client/src/lib.rs diff --git a/core/test-runtime/Cargo.toml b/client/test-runtime/Cargo.toml similarity index 100% rename from core/test-runtime/Cargo.toml rename to client/test-runtime/Cargo.toml diff --git a/core/test-runtime/build.rs b/client/test-runtime/build.rs similarity index 100% rename from core/test-runtime/build.rs rename to client/test-runtime/build.rs diff --git a/core/test-runtime/client/Cargo.toml b/client/test-runtime/client/Cargo.toml similarity index 100% rename from core/test-runtime/client/Cargo.toml rename to client/test-runtime/client/Cargo.toml diff --git a/core/test-runtime/client/src/block_builder_ext.rs b/client/test-runtime/client/src/block_builder_ext.rs similarity index 100% rename from core/test-runtime/client/src/block_builder_ext.rs rename to client/test-runtime/client/src/block_builder_ext.rs diff --git a/core/test-runtime/client/src/lib.rs b/client/test-runtime/client/src/lib.rs similarity index 100% rename from core/test-runtime/client/src/lib.rs rename to client/test-runtime/client/src/lib.rs diff --git a/core/test-runtime/client/src/trait_tests.rs b/client/test-runtime/client/src/trait_tests.rs similarity index 100% rename from core/test-runtime/client/src/trait_tests.rs rename to client/test-runtime/client/src/trait_tests.rs diff --git a/core/test-runtime/src/genesismap.rs b/client/test-runtime/src/genesismap.rs similarity index 100% rename from core/test-runtime/src/genesismap.rs rename to client/test-runtime/src/genesismap.rs diff --git a/core/test-runtime/src/lib.rs b/client/test-runtime/src/lib.rs similarity index 100% rename from core/test-runtime/src/lib.rs rename to client/test-runtime/src/lib.rs diff --git a/core/test-runtime/src/system.rs b/client/test-runtime/src/system.rs similarity index 100% rename from core/test-runtime/src/system.rs rename to client/test-runtime/src/system.rs diff --git a/core/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml similarity index 85% rename from core/transaction-pool/Cargo.toml rename to client/transaction-pool/Cargo.toml index 60803fd42a9c3..aa9f1ee12624f 100644 --- a/core/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -16,5 +16,5 @@ primitives = { package = "substrate-primitives", path = "../primitives" } txpool = { package = "substrate-transaction-graph", path = "./graph" } [dev-dependencies] -keyring = { package = "substrate-keyring", path = "../../core/keyring" } -test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" } +keyring = { package = "substrate-keyring", path = "../../client/keyring" } +test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } diff --git a/core/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml similarity index 100% rename from core/transaction-pool/graph/Cargo.toml rename to client/transaction-pool/graph/Cargo.toml diff --git a/core/transaction-pool/graph/benches/basics.rs b/client/transaction-pool/graph/benches/basics.rs similarity index 100% rename from core/transaction-pool/graph/benches/basics.rs rename to client/transaction-pool/graph/benches/basics.rs diff --git a/core/transaction-pool/graph/src/base_pool.rs b/client/transaction-pool/graph/src/base_pool.rs similarity index 100% rename from core/transaction-pool/graph/src/base_pool.rs rename to client/transaction-pool/graph/src/base_pool.rs diff --git a/core/transaction-pool/graph/src/error.rs b/client/transaction-pool/graph/src/error.rs similarity index 100% rename from core/transaction-pool/graph/src/error.rs rename to client/transaction-pool/graph/src/error.rs diff --git a/core/transaction-pool/graph/src/future.rs b/client/transaction-pool/graph/src/future.rs similarity index 100% rename from core/transaction-pool/graph/src/future.rs rename to client/transaction-pool/graph/src/future.rs diff --git a/core/transaction-pool/graph/src/lib.rs b/client/transaction-pool/graph/src/lib.rs similarity index 100% rename from core/transaction-pool/graph/src/lib.rs rename to client/transaction-pool/graph/src/lib.rs diff --git a/core/transaction-pool/graph/src/listener.rs b/client/transaction-pool/graph/src/listener.rs similarity index 100% rename from core/transaction-pool/graph/src/listener.rs rename to client/transaction-pool/graph/src/listener.rs diff --git a/core/transaction-pool/graph/src/pool.rs b/client/transaction-pool/graph/src/pool.rs similarity index 100% rename from core/transaction-pool/graph/src/pool.rs rename to client/transaction-pool/graph/src/pool.rs diff --git a/core/transaction-pool/graph/src/ready.rs b/client/transaction-pool/graph/src/ready.rs similarity index 100% rename from core/transaction-pool/graph/src/ready.rs rename to client/transaction-pool/graph/src/ready.rs diff --git a/core/transaction-pool/graph/src/rotator.rs b/client/transaction-pool/graph/src/rotator.rs similarity index 100% rename from core/transaction-pool/graph/src/rotator.rs rename to client/transaction-pool/graph/src/rotator.rs diff --git a/core/transaction-pool/graph/src/validated_pool.rs b/client/transaction-pool/graph/src/validated_pool.rs similarity index 100% rename from core/transaction-pool/graph/src/validated_pool.rs rename to client/transaction-pool/graph/src/validated_pool.rs diff --git a/core/transaction-pool/graph/src/watcher.rs b/client/transaction-pool/graph/src/watcher.rs similarity index 100% rename from core/transaction-pool/graph/src/watcher.rs rename to client/transaction-pool/graph/src/watcher.rs diff --git a/core/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs similarity index 100% rename from core/transaction-pool/src/api.rs rename to client/transaction-pool/src/api.rs diff --git a/core/transaction-pool/src/error.rs b/client/transaction-pool/src/error.rs similarity index 100% rename from core/transaction-pool/src/error.rs rename to client/transaction-pool/src/error.rs diff --git a/core/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs similarity index 100% rename from core/transaction-pool/src/lib.rs rename to client/transaction-pool/src/lib.rs diff --git a/core/transaction-pool/src/tests.rs b/client/transaction-pool/src/tests.rs similarity index 100% rename from core/transaction-pool/src/tests.rs rename to client/transaction-pool/src/tests.rs diff --git a/core/trie/Cargo.toml b/client/trie/Cargo.toml similarity index 100% rename from core/trie/Cargo.toml rename to client/trie/Cargo.toml diff --git a/core/trie/benches/bench.rs b/client/trie/benches/bench.rs similarity index 100% rename from core/trie/benches/bench.rs rename to client/trie/benches/bench.rs diff --git a/core/trie/src/error.rs b/client/trie/src/error.rs similarity index 100% rename from core/trie/src/error.rs rename to client/trie/src/error.rs diff --git a/core/trie/src/lib.rs b/client/trie/src/lib.rs similarity index 100% rename from core/trie/src/lib.rs rename to client/trie/src/lib.rs diff --git a/core/trie/src/node_codec.rs b/client/trie/src/node_codec.rs similarity index 100% rename from core/trie/src/node_codec.rs rename to client/trie/src/node_codec.rs diff --git a/core/trie/src/node_header.rs b/client/trie/src/node_header.rs similarity index 100% rename from core/trie/src/node_header.rs rename to client/trie/src/node_header.rs diff --git a/core/trie/src/trie_stream.rs b/client/trie/src/trie_stream.rs similarity index 100% rename from core/trie/src/trie_stream.rs rename to client/trie/src/trie_stream.rs diff --git a/core/utils/build-script-utils/Cargo.toml b/client/utils/build-script-utils/Cargo.toml similarity index 100% rename from core/utils/build-script-utils/Cargo.toml rename to client/utils/build-script-utils/Cargo.toml diff --git a/core/utils/build-script-utils/src/lib.rs b/client/utils/build-script-utils/src/lib.rs similarity index 100% rename from core/utils/build-script-utils/src/lib.rs rename to client/utils/build-script-utils/src/lib.rs diff --git a/core/utils/fork-tree/Cargo.toml b/client/utils/fork-tree/Cargo.toml similarity index 100% rename from core/utils/fork-tree/Cargo.toml rename to client/utils/fork-tree/Cargo.toml diff --git a/core/utils/fork-tree/src/lib.rs b/client/utils/fork-tree/src/lib.rs similarity index 100% rename from core/utils/fork-tree/src/lib.rs rename to client/utils/fork-tree/src/lib.rs diff --git a/core/utils/wasm-builder-runner/Cargo.toml b/client/utils/wasm-builder-runner/Cargo.toml similarity index 100% rename from core/utils/wasm-builder-runner/Cargo.toml rename to client/utils/wasm-builder-runner/Cargo.toml diff --git a/core/utils/wasm-builder-runner/README.md b/client/utils/wasm-builder-runner/README.md similarity index 100% rename from core/utils/wasm-builder-runner/README.md rename to client/utils/wasm-builder-runner/README.md diff --git a/core/utils/wasm-builder-runner/src/lib.rs b/client/utils/wasm-builder-runner/src/lib.rs similarity index 100% rename from core/utils/wasm-builder-runner/src/lib.rs rename to client/utils/wasm-builder-runner/src/lib.rs diff --git a/core/utils/wasm-builder/Cargo.toml b/client/utils/wasm-builder/Cargo.toml similarity index 100% rename from core/utils/wasm-builder/Cargo.toml rename to client/utils/wasm-builder/Cargo.toml diff --git a/core/utils/wasm-builder/README.md b/client/utils/wasm-builder/README.md similarity index 100% rename from core/utils/wasm-builder/README.md rename to client/utils/wasm-builder/README.md diff --git a/core/utils/wasm-builder/src/lib.rs b/client/utils/wasm-builder/src/lib.rs similarity index 100% rename from core/utils/wasm-builder/src/lib.rs rename to client/utils/wasm-builder/src/lib.rs diff --git a/core/utils/wasm-builder/src/prerequisites.rs b/client/utils/wasm-builder/src/prerequisites.rs similarity index 100% rename from core/utils/wasm-builder/src/prerequisites.rs rename to client/utils/wasm-builder/src/prerequisites.rs diff --git a/core/utils/wasm-builder/src/wasm_project.rs b/client/utils/wasm-builder/src/wasm_project.rs similarity index 100% rename from core/utils/wasm-builder/src/wasm_project.rs rename to client/utils/wasm-builder/src/wasm_project.rs diff --git a/core/wasm-interface/Cargo.toml b/client/wasm-interface/Cargo.toml similarity index 100% rename from core/wasm-interface/Cargo.toml rename to client/wasm-interface/Cargo.toml diff --git a/core/wasm-interface/src/lib.rs b/client/wasm-interface/src/lib.rs similarity index 100% rename from core/wasm-interface/src/lib.rs rename to client/wasm-interface/src/lib.rs diff --git a/core/wasm-interface/src/wasmi_impl.rs b/client/wasm-interface/src/wasmi_impl.rs similarity index 100% rename from core/wasm-interface/src/wasmi_impl.rs rename to client/wasm-interface/src/wasmi_impl.rs diff --git a/srml/assets/Cargo.toml b/srml/assets/Cargo.toml index 052a3045b2164..5ef6f46a1db63 100644 --- a/srml/assets/Cargo.toml +++ b/srml/assets/Cargo.toml @@ -8,16 +8,16 @@ edition = "2018" serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } # Needed for various traits. In our case, `OnFinalize`. -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } # Needed for type-safe access to storage DB. support = { package = "srml-support", path = "../support", default-features = false } # `system` module provides us with all sorts of useful stuff and macros depend on it being around. system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -rstd = { package = "sr-std", path = "../../core/sr-std" } -runtime-io = { package = "sr-io", path = "../../core/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +rstd = { package = "sr-std", path = "../../client/sr-std" } +runtime-io = { package = "sr-io", path = "../../client/sr-io" } [features] default = ["std"] diff --git a/srml/aura/Cargo.toml b/srml/aura/Cargo.toml index f1c37b7c08d45..467854b42c2c5 100644 --- a/srml/aura/Cargo.toml +++ b/srml/aura/Cargo.toml @@ -5,17 +5,17 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../core/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } -substrate-consensus-aura-primitives = { path = "../../core/consensus/aura/primitives", default-features = false} +substrate-consensus-aura-primitives = { path = "../../client/consensus/aura/primitives", default-features = false} system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } diff --git a/srml/aura/src/lib.rs b/srml/aura/src/lib.rs index f27cb98c0131d..7562936e06967 100644 --- a/srml/aura/src/lib.rs +++ b/srml/aura/src/lib.rs @@ -39,7 +39,7 @@ //! ## References //! //! If you're interested in hacking on this module, it is useful to understand the interaction with -//! `substrate/core/inherents/src/lib.rs` and, specifically, the required implementation of +//! `substrate/client/inherents/src/lib.rs` and, specifically, the required implementation of //! [`ProvideInherent`](../substrate_inherents/trait.ProvideInherent.html) and //! [`ProvideInherentData`](../substrate_inherents/trait.ProvideInherentData.html) to create and check inherents. diff --git a/srml/authority-discovery/Cargo.toml b/srml/authority-discovery/Cargo.toml index 3968ab52aec66..7b0552c11eb5b 100644 --- a/srml/authority-discovery/Cargo.toml +++ b/srml/authority-discovery/Cargo.toml @@ -5,20 +5,20 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../core/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } [features] default = ["std"] diff --git a/srml/authority-discovery/src/lib.rs b/srml/authority-discovery/src/lib.rs index 8c2951f3acbcc..09bba6fa69648 100644 --- a/srml/authority-discovery/src/lib.rs +++ b/srml/authority-discovery/src/lib.rs @@ -16,7 +16,7 @@ //! # Authority discovery module. //! -//! This module is used by the `core/authority-discovery` to retrieve the +//! This module is used by the `client/authority-discovery` to retrieve the //! current set of authorities, learn its own authority id as well as sign and //! verify messages to and from other authorities. //! diff --git a/srml/authorship/Cargo.toml b/srml/authorship/Cargo.toml index a59976c699096..ce879d153816e 100644 --- a/srml/authorship/Cargo.toml +++ b/srml/authorship/Cargo.toml @@ -6,14 +6,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" [features] diff --git a/srml/babe/Cargo.toml b/srml/babe/Cargo.toml index dc82906650bef..078dd5485fcdb 100644 --- a/srml/babe/Cargo.toml +++ b/srml/babe/Cargo.toml @@ -8,23 +8,23 @@ edition = "2018" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } [dev-dependencies] lazy_static = "1.4.0" parking_lot = "0.9.0" -sr-version = { path = "../../core/sr-version", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -test-runtime = { package = "substrate-test-runtime", path = "../../core/test-runtime" } +sr-version = { path = "../../client/sr-version", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +test-runtime = { package = "substrate-test-runtime", path = "../../client/test-runtime" } [features] default = ["std"] diff --git a/srml/balances/Cargo.toml b/srml/balances/Cargo.toml index f7f6041c6bb16..4b45cd5f74142 100644 --- a/srml/balances/Cargo.toml +++ b/srml/balances/Cargo.toml @@ -8,15 +8,15 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -substrate-keyring = { path = "../../core/keyring", optional = true } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +substrate-keyring = { path = "../../client/keyring", optional = true } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../core/sr-io" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +runtime-io = { package = "sr-io", path = "../../client/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } [features] diff --git a/srml/collective/Cargo.toml b/srml/collective/Cargo.toml index 347a289b57b89..80e312a9566d6 100644 --- a/srml/collective/Cargo.toml +++ b/srml/collective/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/srml/contracts/Cargo.toml b/srml/contracts/Cargo.toml index 365566cfb547e..1f14e6ce3dbb0 100644 --- a/srml/contracts/Cargo.toml +++ b/srml/contracts/Cargo.toml @@ -10,11 +10,11 @@ pwasm-utils = { version = "0.11.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } parity-wasm = { version = "0.40.3", default-features = false } wasmi-validation = { version = "0.2.0", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sandbox = { package = "sr-sandbox", path = "../../core/sr-sandbox", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sandbox = { package = "sr-sandbox", path = "../../client/sr-sandbox", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/srml/contracts/rpc/Cargo.toml b/srml/contracts/rpc/Cargo.toml index f9d51452f412f..2391c36c85570 100644 --- a/srml/contracts/rpc/Cargo.toml +++ b/srml/contracts/rpc/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../core/client" } +client = { package = "substrate-client", path = "../../../client/client" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../core/rpc/primitives" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../core/sr-primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } srml-contracts-rpc-runtime-api = { path = "./runtime-api" } diff --git a/srml/contracts/rpc/runtime-api/Cargo.toml b/srml/contracts/rpc/runtime-api/Cargo.toml index 2a36ed2c96cc4..5f52e96712f3c 100644 --- a/srml/contracts/rpc/runtime-api/Cargo.toml +++ b/srml/contracts/rpc/runtime-api/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../../core/client", default-features = false } +client = { package = "substrate-client", path = "../../../../client/client", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../../core/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../../../client/sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } -sr-primitives = { path = "../../../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../../../client/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/srml/democracy/Cargo.toml b/srml/democracy/Cargo.toml index 761e56ceda6cb..5e5cb152137dc 100644 --- a/srml/democracy/Cargo.toml +++ b/srml/democracy/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/srml/elections-phragmen/Cargo.toml b/srml/elections-phragmen/Cargo.toml index 85532849ecc00..b2c47b85d3ceb 100644 --- a/srml/elections-phragmen/Cargo.toml +++ b/srml/elections-phragmen/Cargo.toml @@ -6,17 +6,17 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -phragmen = { package = "substrate-phragmen", path = "../../core/phragmen", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } [dev-dependencies] -runtime_io = { package = "sr-io", path = "../../core/sr-io" } +runtime_io = { package = "sr-io", path = "../../client/sr-io" } hex-literal = "0.2.1" balances = { package = "srml-balances", path = "../balances" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } serde = { version = "1.0.101" } [features] diff --git a/srml/elections/Cargo.toml b/srml/elections/Cargo.toml index 88d147ac087aa..b37f59ab8a599 100644 --- a/srml/elections/Cargo.toml +++ b/srml/elections/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/srml/evm/Cargo.toml b/srml/evm/Cargo.toml index f0bad3e793ce8..d238dab61c441 100644 --- a/srml/evm/Cargo.toml +++ b/srml/evm/Cargo.toml @@ -11,10 +11,10 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } primitive-types = { version = "0.6", default-features = false, features = ["rlp"] } rlp = { version = "0.4", default-features = false } evm = { version = "0.14", default-features = false } diff --git a/srml/example/Cargo.toml b/srml/example/Cargo.toml index 695e0602fb327..16631eabd05dd 100644 --- a/srml/example/Cargo.toml +++ b/srml/example/Cargo.toml @@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/executive/Cargo.toml b/srml/executive/Cargo.toml index 92191a7aac4db..f67442a696fff 100644 --- a/srml/executive/Cargo.toml +++ b/srml/executive/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } srml-indices = { path = "../indices" } balances = { package = "srml-balances", path = "../balances" } transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } diff --git a/srml/finality-tracker/Cargo.toml b/srml/finality-tracker/Cargo.toml index a881b2906f045..ae74cac1147b6 100644 --- a/srml/finality-tracker/Cargo.toml +++ b/srml/finality-tracker/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } srml-system = { path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } [features] default = ["std"] diff --git a/srml/generic-asset/Cargo.toml b/srml/generic-asset/Cargo.toml index 49a9db4c0ecd8..b8ec80cc4a576 100644 --- a/srml/generic-asset/Cargo.toml +++ b/srml/generic-asset/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../core/sr-io" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/grandpa/Cargo.toml b/srml/grandpa/Cargo.toml index 21b48d3cdc51d..cf982a2ac60cb 100644 --- a/srml/grandpa/Cargo.toml +++ b/srml/grandpa/Cargo.toml @@ -7,18 +7,18 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +substrate-finality-grandpa-primitives = { path = "../../client/finality-grandpa/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } finality-tracker = { package = "srml-finality-tracker", path = "../finality-tracker", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../core/sr-io" } +runtime-io ={ package = "sr-io", path = "../../client/sr-io" } [features] default = ["std"] diff --git a/srml/im-online/Cargo.toml b/srml/im-online/Cargo.toml index 4c7ccf1487d9b..b5eefdccddd67 100644 --- a/srml/im-online/Cargo.toml +++ b/srml/im-online/Cargo.toml @@ -5,21 +5,21 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../core/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } authorship = { package = "srml-authorship", path = "../authorship", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package="substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +primitives = { package="substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -offchain = { package = "substrate-offchain", path = "../../core/offchain" } +offchain = { package = "substrate-offchain", path = "../../client/offchain" } [features] default = ["std", "session/historical"] diff --git a/srml/im-online/src/lib.rs b/srml/im-online/src/lib.rs index 3d8cf99bc5fca..8157c66c81a7c 100644 --- a/srml/im-online/src/lib.rs +++ b/srml/im-online/src/lib.rs @@ -26,7 +26,7 @@ //! //! The heartbeat is a signed transaction, which was signed using the session key //! and includes the recent best block number of the local validators chain as well -//! as the [NetworkState](../../core/offchain/struct.NetworkState.html). +//! as the [NetworkState](../../client/offchain/struct.NetworkState.html). //! It is submitted as an Unsigned Transaction via off-chain workers. //! //! - [`im_online::Trait`](./trait.Trait.html) diff --git a/srml/indices/Cargo.toml b/srml/indices/Cargo.toml index b8b560c3f9b4d..ab1278d828d9d 100644 --- a/srml/indices/Cargo.toml +++ b/srml/indices/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -substrate-keyring = { path = "../../core/keyring", optional = true } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } +substrate-keyring = { path = "../../client/keyring", optional = true } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/srml/membership/Cargo.toml b/srml/membership/Cargo.toml index a8cb73055563e..d90d60d83fac1 100644 --- a/srml/membership/Cargo.toml +++ b/srml/membership/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/metadata/Cargo.toml b/srml/metadata/Cargo.toml index e9381f68bbbf9..3daac81b4d834 100644 --- a/srml/metadata/Cargo.toml +++ b/srml/metadata/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } [features] default = ["std"] diff --git a/srml/nicks/Cargo.toml b/srml/nicks/Cargo.toml index 4b8fabe9effe5..ad709501d7916 100644 --- a/srml/nicks/Cargo.toml +++ b/srml/nicks/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances", default-features = false } [features] diff --git a/srml/offences/Cargo.toml b/srml/offences/Cargo.toml index 90a3396d11228..078f90b1538af 100644 --- a/srml/offences/Cargo.toml +++ b/srml/offences/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] balances = { package = "srml-balances", path = "../balances", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../core/sr-io" } -substrate-primitives = { path = "../../core/primitives" } +runtime-io = { package = "sr-io", path = "../../client/sr-io" } +substrate-primitives = { path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/randomness-collective-flip/Cargo.toml b/srml/randomness-collective-flip/Cargo.toml index 5be9aad50f0b3..ea168221d9e76 100644 --- a/srml/randomness-collective-flip/Cargo.toml +++ b/srml/randomness-collective-flip/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] safe-mix = { version = "1.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -runtime-io = { package = "sr-io", path = "../../core/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +runtime-io = { package = "sr-io", path = "../../client/sr-io" } [features] default = ["std"] diff --git a/srml/scored-pool/Cargo.toml b/srml/scored-pool/Cargo.toml index e65f71a10d13e..50043413eaf3c 100644 --- a/srml/scored-pool/Cargo.toml +++ b/srml/scored-pool/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] balances = { package = "srml-balances", path = "../balances" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/session/Cargo.toml b/srml/session/Cargo.toml index 1346867910313..53d05862bc229 100644 --- a/srml/session/Cargo.toml +++ b/srml/session/Cargo.toml @@ -8,19 +8,19 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } -substrate-trie = { path = "../../core/trie", default-features = false, optional = true } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } +substrate-trie = { path = "../../client/trie", default-features = false, optional = true } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } -app-crypto = { package = "substrate-application-crypto", path = "../../core/application-crypto" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } +app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto" } lazy_static = "1.4.0" [features] diff --git a/srml/staking/Cargo.toml b/srml/staking/Cargo.toml index 67f3ab41d6583..a8931edb21df2 100644 --- a/srml/staking/Cargo.toml +++ b/srml/staking/Cargo.toml @@ -8,19 +8,19 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -substrate-keyring = { path = "../../core/keyring", optional = true } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -phragmen = { package = "substrate-phragmen", path = "../../core/phragmen", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false } +substrate-keyring = { path = "../../client/keyring", optional = true } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false, features = ["historical"] } authorship = { package = "srml-authorship", path = "../authorship", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances" } timestamp = { package = "srml-timestamp", path = "../timestamp" } srml-staking-reward-curve = { path = "../staking/reward-curve"} diff --git a/srml/staking/reward-curve/Cargo.toml b/srml/staking/reward-curve/Cargo.toml index b33323a5e3190..e746bd910435c 100644 --- a/srml/staking/reward-curve/Cargo.toml +++ b/srml/staking/reward-curve/Cargo.toml @@ -14,4 +14,4 @@ proc-macro2 = "1.0.6" proc-macro-crate = "0.1.4" [dev-dependencies] -sr-primitives = { path = "../../../core/sr-primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } diff --git a/srml/sudo/Cargo.toml b/srml/sudo/Cargo.toml index 152f32ab89363..4235383f70385 100644 --- a/srml/sudo/Cargo.toml +++ b/srml/sudo/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/support/Cargo.toml b/srml/support/Cargo.toml index 46ebebc7d3bf4..2abe18b2c82c3 100644 --- a/srml/support/Cargo.toml +++ b/srml/support/Cargo.toml @@ -9,11 +9,11 @@ log = "0.4" serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } srml-metadata = { path = "../metadata", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" } paste = "0.1.6" once_cell = { version = "0.2.4", default-features = false, optional = true } diff --git a/srml/support/procedural/Cargo.toml b/srml/support/procedural/Cargo.toml index b891e7b46ff7f..233ae6252afc3 100644 --- a/srml/support/procedural/Cargo.toml +++ b/srml/support/procedural/Cargo.toml @@ -9,7 +9,7 @@ proc-macro = true [dependencies] srml-support-procedural-tools = { package = "srml-support-procedural-tools", path = "./tools" } -sr-api-macros = { path = "../../../core/sr-api-macros" } +sr-api-macros = { path = "../../../client/sr-api-macros" } proc-macro2 = "1.0.6" quote = "1.0.2" diff --git a/srml/support/test/Cargo.toml b/srml/support/test/Cargo.toml index a5e375b5c6b93..816db8d80d759 100644 --- a/srml/support/test/Cargo.toml +++ b/srml/support/test/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -runtime-io ={ package = "sr-io", path = "../../../core/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../../client/sr-io", default-features = false } support = { package = "srml-support", version = "2", path = "../", default-features = false } -inherents = { package = "substrate-inherents", path = "../../../core/inherents", default-features = false } -sr-primitives = { package = "sr-primitives", path = "../../../core/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } +sr-primitives = { package = "sr-primitives", path = "../../../client/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } trybuild = "1.0.17" pretty_assertions = "0.6.1" diff --git a/srml/system/Cargo.toml b/srml/system/Cargo.toml index 52570617a1b97..6cec5addfebe3 100644 --- a/srml/system/Cargo.toml +++ b/srml/system/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -sr-version = { path = "../../core/sr-version", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-version = { path = "../../client/sr-version", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/srml/system/rpc/Cargo.toml b/srml/system/rpc/Cargo.toml index e71e1f588a7ef..58eea7ba823fc 100644 --- a/srml/system/rpc/Cargo.toml +++ b/srml/system/rpc/Cargo.toml @@ -5,19 +5,19 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../core/client" } +client = { package = "substrate-client", path = "../../../client/client" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" log = "0.4.8" serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../core/sr-primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } srml-system-rpc-runtime-api = { path = "./runtime-api" } -substrate-primitives = { path = "../../../core/primitives" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../../core/transaction-pool" } +substrate-primitives = { path = "../../../client/primitives" } +transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../../core/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../client/test-runtime/client" } env_logger = "0.7.0" futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19" } diff --git a/srml/system/rpc/runtime-api/Cargo.toml b/srml/system/rpc/runtime-api/Cargo.toml index fc525d8fce2ad..d835ace4bd166 100644 --- a/srml/system/rpc/runtime-api/Cargo.toml +++ b/srml/system/rpc/runtime-api/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../../core/client", default-features = false } +client = { package = "substrate-client", path = "../../../../client/client", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } [features] diff --git a/srml/timestamp/Cargo.toml b/srml/timestamp/Cargo.toml index d8eab64f9f3d9..0fab68daf027f 100644 --- a/srml/timestamp/Cargo.toml +++ b/srml/timestamp/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../core/sr-io" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/transaction-payment/Cargo.toml b/srml/transaction-payment/Cargo.toml index cbce1e945e69b..10f813f753cfa 100644 --- a/srml/transaction-payment/Cargo.toml +++ b/srml/transaction-payment/Cargo.toml @@ -6,15 +6,15 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../core/sr-io" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +runtime-io = { package = "sr-io", path = "../../client/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/srml/transaction-payment/rpc/Cargo.toml b/srml/transaction-payment/rpc/Cargo.toml index 1fcfc21f805c3..398f1b88d7dc8 100644 --- a/srml/transaction-payment/rpc/Cargo.toml +++ b/srml/transaction-payment/rpc/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../core/client" } +client = { package = "substrate-client", path = "../../../client/client" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../core/rpc/primitives" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../core/sr-primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } srml-transaction-payment-rpc-runtime-api = { path = "./runtime-api" } diff --git a/srml/transaction-payment/rpc/runtime-api/Cargo.toml b/srml/transaction-payment/rpc/runtime-api/Cargo.toml index c26f295f4bec3..a13c3791aa0d5 100644 --- a/srml/transaction-payment/rpc/runtime-api/Cargo.toml +++ b/srml/transaction-payment/rpc/runtime-api/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } -client = { package = "substrate-client", path = "../../../../core/client", default-features = false } +client = { package = "substrate-client", path = "../../../../client/client", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../../core/sr-std", default-features = false } -sr-primitives = { path = "../../../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../../client/sr-std", default-features = false } +sr-primitives = { path = "../../../../client/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/srml/treasury/Cargo.toml b/srml/treasury/Cargo.toml index f19fa2c2188eb..d912b86b05722 100644 --- a/srml/treasury/Cargo.toml +++ b/srml/treasury/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../core/sr-io" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] default = ["std"] diff --git a/srml/utility/Cargo.toml b/srml/utility/Cargo.toml index 5e92bcf88ad48..f777299999072 100644 --- a/srml/utility/Cargo.toml +++ b/srml/utility/Cargo.toml @@ -9,12 +9,12 @@ serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/test-utils/chain-spec-builder/Cargo.toml b/test-utils/chain-spec-builder/Cargo.toml index a835c065ff1be..2093871c9da52 100644 --- a/test-utils/chain-spec-builder/Cargo.toml +++ b/test-utils/chain-spec-builder/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] ansi_term = "0.12.1" -keystore = { package = "substrate-keystore", path = "../../core/keystore" } +keystore = { package = "substrate-keystore", path = "../../client/keystore" } node-cli = { path = "../../bin/node/cli" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } rand = "0.7.2" structopt = "0.3.3" diff --git a/test-utils/transaction-factory/Cargo.toml b/test-utils/transaction-factory/Cargo.toml index e53972eec65c5..680cf1400ab99 100644 --- a/test-utils/transaction-factory/Cargo.toml +++ b/test-utils/transaction-factory/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -cli = { package = "substrate-cli", path = "../../core/cli" } -client = { package = "substrate-client", path = "../../core/client" } -consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } +cli = { package = "substrate-cli", path = "../../client/cli" } +client = { package = "substrate-client", path = "../../client/client" } +consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr-primitives = { path = "../../core/sr-primitives", default-features = false } -substrate-service = { path = "../../core/service" } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +sr-primitives = { path = "../../client/sr-primitives", default-features = false } +substrate-service = { path = "../../client/service" } [features] default = ["std"] From bd9cee16c5b6840d90a3df68aa64399e21656384 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 11:13:33 +0100 Subject: [PATCH 11/61] start up 'test' area --- Cargo.toml | 2 +- bin/node/cli/Cargo.toml | 2 +- {test-utils => test/utils}/chain-spec-builder/Cargo.toml | 0 {test-utils => test/utils}/chain-spec-builder/build.rs | 0 {test-utils => test/utils}/chain-spec-builder/src/main.rs | 0 {test-utils => test/utils}/transaction-factory/Cargo.toml | 0 .../utils}/transaction-factory/src/complex_mode.rs | 0 {test-utils => test/utils}/transaction-factory/src/lib.rs | 0 {test-utils => test/utils}/transaction-factory/src/modes.rs | 0 .../utils}/transaction-factory/src/simple_modes.rs | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename {test-utils => test/utils}/chain-spec-builder/Cargo.toml (100%) rename {test-utils => test/utils}/chain-spec-builder/build.rs (100%) rename {test-utils => test/utils}/chain-spec-builder/src/main.rs (100%) rename {test-utils => test/utils}/transaction-factory/Cargo.toml (100%) rename {test-utils => test/utils}/transaction-factory/src/complex_mode.rs (100%) rename {test-utils => test/utils}/transaction-factory/src/lib.rs (100%) rename {test-utils => test/utils}/transaction-factory/src/modes.rs (100%) rename {test-utils => test/utils}/transaction-factory/src/simple_modes.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 272946fb5b9d9..80809763a662c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,7 +103,7 @@ members = [ "bin/node/testing", "bin/node-template", "bin/subkey", - "test-utils/chain-spec-builder", + "test/utils/chain-spec-builder", ] [profile.release] diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 9fd06dfcdfe5e..fb5056e2d882e 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -76,7 +76,7 @@ node-executor = { path = "../executor" } tokio = { version = "0.1.22", optional = true } exit-future = { version = "0.1.4", optional = true } substrate-cli = { path = "../../../client/cli", optional = true } -transaction-factory = { path = "../../../test-utils/transaction-factory", optional = true } +transaction-factory = { path = "../../../test/utils/transaction-factory", optional = true } ctrlc = { version = "3.1.3", features = ["termination"], optional = true } # WASM-specific dependencies diff --git a/test-utils/chain-spec-builder/Cargo.toml b/test/utils/chain-spec-builder/Cargo.toml similarity index 100% rename from test-utils/chain-spec-builder/Cargo.toml rename to test/utils/chain-spec-builder/Cargo.toml diff --git a/test-utils/chain-spec-builder/build.rs b/test/utils/chain-spec-builder/build.rs similarity index 100% rename from test-utils/chain-spec-builder/build.rs rename to test/utils/chain-spec-builder/build.rs diff --git a/test-utils/chain-spec-builder/src/main.rs b/test/utils/chain-spec-builder/src/main.rs similarity index 100% rename from test-utils/chain-spec-builder/src/main.rs rename to test/utils/chain-spec-builder/src/main.rs diff --git a/test-utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml similarity index 100% rename from test-utils/transaction-factory/Cargo.toml rename to test/utils/transaction-factory/Cargo.toml diff --git a/test-utils/transaction-factory/src/complex_mode.rs b/test/utils/transaction-factory/src/complex_mode.rs similarity index 100% rename from test-utils/transaction-factory/src/complex_mode.rs rename to test/utils/transaction-factory/src/complex_mode.rs diff --git a/test-utils/transaction-factory/src/lib.rs b/test/utils/transaction-factory/src/lib.rs similarity index 100% rename from test-utils/transaction-factory/src/lib.rs rename to test/utils/transaction-factory/src/lib.rs diff --git a/test-utils/transaction-factory/src/modes.rs b/test/utils/transaction-factory/src/modes.rs similarity index 100% rename from test-utils/transaction-factory/src/modes.rs rename to test/utils/transaction-factory/src/modes.rs diff --git a/test-utils/transaction-factory/src/simple_modes.rs b/test/utils/transaction-factory/src/simple_modes.rs similarity index 100% rename from test-utils/transaction-factory/src/simple_modes.rs rename to test/utils/transaction-factory/src/simple_modes.rs From b18dac0d712adfb57a6f393004729e969a4938a6 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 11:15:09 +0100 Subject: [PATCH 12/61] move test client --- Cargo.toml | 2 +- bin/node/executor/Cargo.toml | 2 +- bin/node/testing/Cargo.toml | 2 +- client/network/Cargo.toml | 2 +- {client/test-client => test/utils/client}/Cargo.toml | 0 {client/test-client => test/utils/client}/src/client_ext.rs | 0 {client/test-client => test/utils/client}/src/lib.rs | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename {client/test-client => test/utils/client}/Cargo.toml (100%) rename {client/test-client => test/utils/client}/src/client_ext.rs (100%) rename {client/test-client => test/utils/client}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 80809763a662c..8f924810cbba1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ members = [ "client/sr-version", "client/state-machine", "client/telemetry", - "client/test-client", + "test/utils/client", "client/test-runtime", "client/test-runtime/client", "client/transaction-pool", diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index b3107cb2bae93..78f51a3d0d4bb 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -18,7 +18,7 @@ node-runtime = { path = "../runtime" } [dev-dependencies] node-testing = { path = "../testing" } -test-client = { package = "substrate-test-client", path = "../../../client/test-client" } +test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } sr-primitives = { path = "../../../client/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../srml/support" } balances = { package = "srml-balances", path = "../../../srml/balances" } diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index 2553d2d5a6c90..fafef5eb2e5bf 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -24,7 +24,7 @@ session = { package = "srml-session", path = "../../../srml/session" } staking = { package = "srml-staking", path = "../../../srml/staking" } substrate-executor = { path = "../../../client/executor" } system = { package = "srml-system", path = "../../../srml/system" } -test-client = { package = "substrate-test-client", path = "../../../client/test-client" } +test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } treasury = { package = "srml-treasury", path = "../../../srml/treasury" } transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index e590a0584d3bf..61e0ad914d46e 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -40,7 +40,7 @@ tokio-io = "0.1.12" tokio = { version = "0.1.22", optional = true } unsigned-varint = { version = "0.2.2", features = ["codec"] } keyring = { package = "substrate-keyring", path = "../../client/keyring", optional = true } -test_client = { package = "substrate-test-client", path = "../../client/test-client", optional = true } +test_client = { package = "substrate-test-client", path = "../../test/utils/client", optional = true } test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client", optional = true } erased-serde = "0.3.9" void = "1.0.2" diff --git a/client/test-client/Cargo.toml b/test/utils/client/Cargo.toml similarity index 100% rename from client/test-client/Cargo.toml rename to test/utils/client/Cargo.toml diff --git a/client/test-client/src/client_ext.rs b/test/utils/client/src/client_ext.rs similarity index 100% rename from client/test-client/src/client_ext.rs rename to test/utils/client/src/client_ext.rs diff --git a/client/test-client/src/lib.rs b/test/utils/client/src/lib.rs similarity index 100% rename from client/test-client/src/lib.rs rename to test/utils/client/src/lib.rs From a925eea2156503c804477a4eccb113db3e6dd27a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 11:15:56 +0100 Subject: [PATCH 13/61] move test runtime --- Cargo.toml | 4 ++-- client/authority-discovery/Cargo.toml | 2 +- client/basic-authorship/Cargo.toml | 2 +- client/network/Cargo.toml | 6 +++--- client/offchain/Cargo.toml | 2 +- client/transaction-pool/Cargo.toml | 2 +- srml/babe/Cargo.toml | 2 +- srml/system/rpc/Cargo.toml | 2 +- {client/test-runtime => test/utils/runtime}/Cargo.toml | 0 {client/test-runtime => test/utils/runtime}/build.rs | 0 .../test-runtime => test/utils/runtime}/client/Cargo.toml | 0 .../utils/runtime}/client/src/block_builder_ext.rs | 0 .../test-runtime => test/utils/runtime}/client/src/lib.rs | 0 .../utils/runtime}/client/src/trait_tests.rs | 0 .../test-runtime => test/utils/runtime}/src/genesismap.rs | 0 {client/test-runtime => test/utils/runtime}/src/lib.rs | 0 {client/test-runtime => test/utils/runtime}/src/system.rs | 0 17 files changed, 11 insertions(+), 11 deletions(-) rename {client/test-runtime => test/utils/runtime}/Cargo.toml (100%) rename {client/test-runtime => test/utils/runtime}/build.rs (100%) rename {client/test-runtime => test/utils/runtime}/client/Cargo.toml (100%) rename {client/test-runtime => test/utils/runtime}/client/src/block_builder_ext.rs (100%) rename {client/test-runtime => test/utils/runtime}/client/src/lib.rs (100%) rename {client/test-runtime => test/utils/runtime}/client/src/trait_tests.rs (100%) rename {client/test-runtime => test/utils/runtime}/src/genesismap.rs (100%) rename {client/test-runtime => test/utils/runtime}/src/lib.rs (100%) rename {client/test-runtime => test/utils/runtime}/src/system.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 8f924810cbba1..badd65c5323ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,8 @@ members = [ "client/state-machine", "client/telemetry", "test/utils/client", - "client/test-runtime", - "client/test-runtime/client", + "test/utils/runtime", + "test/utils/runtime/client", "client/transaction-pool", "client/transaction-pool/graph", "client/trie", diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index 8628e5d162286..c0dc864a94bf1 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -27,4 +27,4 @@ futures-timer = "0.4" [dev-dependencies] parking_lot = "0.9.0" peerset = { package = "substrate-peerset", path = "../../client/peerset" } -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index 6e646538ce2ab..7cdab7e6a2d5b 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -17,4 +17,4 @@ substrate-telemetry = { path = "../telemetry" } transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 61e0ad914d46e..9d3c8da10ec85 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -41,7 +41,7 @@ tokio = { version = "0.1.22", optional = true } unsigned-varint = { version = "0.2.2", features = ["codec"] } keyring = { package = "substrate-keyring", path = "../../client/keyring", optional = true } test_client = { package = "substrate-test-client", path = "../../test/utils/client", optional = true } -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client", optional = true } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client", optional = true } erased-serde = "0.3.9" void = "1.0.2" zeroize = "0.10.1" @@ -52,8 +52,8 @@ env_logger = "0.7.0" keyring = { package = "substrate-keyring", path = "../../client/keyring" } quickcheck = "0.9.0" rand = "0.7.2" -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } -test_runtime = { package = "substrate-test-runtime", path = "../../client/test-runtime" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } +test_runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" } tempdir = "0.3.7" tokio = "0.1.22" diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index 0940eaea14a8c..c4927e768357a 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -33,7 +33,7 @@ hyper-rustls = "0.17.1" [dev-dependencies] env_logger = "0.7.0" client-db = { package = "substrate-client-db", path = "../../client/client/db/", default-features = true } -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" [features] diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index aa9f1ee12624f..3942fc0a35cc0 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -17,4 +17,4 @@ txpool = { package = "substrate-transaction-graph", path = "./graph" } [dev-dependencies] keyring = { package = "substrate-keyring", path = "../../client/keyring" } -test-client = { package = "substrate-test-runtime-client", path = "../../client/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/srml/babe/Cargo.toml b/srml/babe/Cargo.toml index 078dd5485fcdb..5ce819fc8136a 100644 --- a/srml/babe/Cargo.toml +++ b/srml/babe/Cargo.toml @@ -24,7 +24,7 @@ lazy_static = "1.4.0" parking_lot = "0.9.0" sr-version = { path = "../../client/sr-version", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives" } -test-runtime = { package = "substrate-test-runtime", path = "../../client/test-runtime" } +test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" } [features] default = ["std"] diff --git a/srml/system/rpc/Cargo.toml b/srml/system/rpc/Cargo.toml index 58eea7ba823fc..90be99a188aab 100644 --- a/srml/system/rpc/Cargo.toml +++ b/srml/system/rpc/Cargo.toml @@ -18,6 +18,6 @@ substrate-primitives = { path = "../../../client/primitives" } transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../../client/test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } env_logger = "0.7.0" futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19" } diff --git a/client/test-runtime/Cargo.toml b/test/utils/runtime/Cargo.toml similarity index 100% rename from client/test-runtime/Cargo.toml rename to test/utils/runtime/Cargo.toml diff --git a/client/test-runtime/build.rs b/test/utils/runtime/build.rs similarity index 100% rename from client/test-runtime/build.rs rename to test/utils/runtime/build.rs diff --git a/client/test-runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml similarity index 100% rename from client/test-runtime/client/Cargo.toml rename to test/utils/runtime/client/Cargo.toml diff --git a/client/test-runtime/client/src/block_builder_ext.rs b/test/utils/runtime/client/src/block_builder_ext.rs similarity index 100% rename from client/test-runtime/client/src/block_builder_ext.rs rename to test/utils/runtime/client/src/block_builder_ext.rs diff --git a/client/test-runtime/client/src/lib.rs b/test/utils/runtime/client/src/lib.rs similarity index 100% rename from client/test-runtime/client/src/lib.rs rename to test/utils/runtime/client/src/lib.rs diff --git a/client/test-runtime/client/src/trait_tests.rs b/test/utils/runtime/client/src/trait_tests.rs similarity index 100% rename from client/test-runtime/client/src/trait_tests.rs rename to test/utils/runtime/client/src/trait_tests.rs diff --git a/client/test-runtime/src/genesismap.rs b/test/utils/runtime/src/genesismap.rs similarity index 100% rename from client/test-runtime/src/genesismap.rs rename to test/utils/runtime/src/genesismap.rs diff --git a/client/test-runtime/src/lib.rs b/test/utils/runtime/src/lib.rs similarity index 100% rename from client/test-runtime/src/lib.rs rename to test/utils/runtime/src/lib.rs diff --git a/client/test-runtime/src/system.rs b/test/utils/runtime/src/system.rs similarity index 100% rename from client/test-runtime/src/system.rs rename to test/utils/runtime/src/system.rs From 8c10e129d38ee4e19d0268f8e452508cfa5e7b3e Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 11:30:31 +0100 Subject: [PATCH 14/61] make test move compile --- client/application-crypto/Cargo.toml | 2 +- client/client/Cargo.toml | 2 +- client/client/db/Cargo.toml | 2 +- client/consensus/aura/Cargo.toml | 2 +- client/consensus/babe/Cargo.toml | 2 +- client/consensus/common/Cargo.toml | 2 +- client/consensus/slots/Cargo.toml | 2 +- client/finality-grandpa/Cargo.toml | 2 +- client/rpc/Cargo.toml | 2 +- client/service/Cargo.toml | 2 +- client/sr-api-macros/Cargo.toml | 2 +- client/transaction-pool/graph/Cargo.toml | 2 +- test/utils/chain-spec-builder/Cargo.toml | 6 +-- test/utils/client/Cargo.toml | 16 ++++---- test/utils/runtime/Cargo.toml | 46 +++++++++++------------ test/utils/runtime/build.rs | 2 +- test/utils/runtime/client/Cargo.toml | 8 ++-- test/utils/transaction-factory/Cargo.toml | 12 +++--- 18 files changed, 57 insertions(+), 57 deletions(-) diff --git a/client/application-crypto/Cargo.toml b/client/application-crypto/Cargo.toml index 663ca79d77045..e9045862d5abc 100644 --- a/client/application-crypto/Cargo.toml +++ b/client/application-crypto/Cargo.toml @@ -13,7 +13,7 @@ rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../sr-io", default-features = false } [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } sr-primitives = { path = "../sr-primitives" } [features] diff --git a/client/client/Cargo.toml b/client/client/Cargo.toml index 761b2a9da21b0..bbc37a3ce5f7f 100644 --- a/client/client/Cargo.toml +++ b/client/client/Cargo.toml @@ -33,7 +33,7 @@ header-metadata = { package = "substrate-header-metadata", path = "header-metada env_logger = "0.7.0" tempfile = "3.1.0" client-db = { package = "substrate-client-db", path = "./db", features = ["kvdb-rocksdb"] } -test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } diff --git a/client/client/db/Cargo.toml b/client/client/db/Cargo.toml index 7d88c39d7fd7e..e431d4ae60031 100644 --- a/client/client/db/Cargo.toml +++ b/client/client/db/Cargo.toml @@ -26,7 +26,7 @@ header_metadata = { package = "substrate-header-metadata", path = "../header-met [dev-dependencies] substrate-keyring = { path = "../../keyring" } -test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } env_logger = "0.7.0" [features] diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index a09d51095018e..127f305a343b1 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -33,7 +33,7 @@ keyring = { package = "substrate-keyring", path = "../../keyring" } substrate-executor = { path = "../../executor" } network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]} service = { package = "substrate-service", path = "../../service" } -test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } tokio = "0.1.22" env_logger = "0.7.0" tempfile = "3.1.0" diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index 30b7c1f8d6b1c..b7b5d6393de0c 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -43,7 +43,7 @@ keyring = { package = "substrate-keyring", path = "../../keyring" } substrate-executor = { path = "../../executor" } network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]} service = { package = "substrate-service", path = "../../service" } -test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } tokio = "0.1.22" env_logger = "0.7.0" tempfile = "3.1.0" diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index 9c4e96f65dcee..e452726226860 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive parking_lot = "0.9.0" [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } [features] default = [] diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 4074242502b71..36a4312de8811 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -20,4 +20,4 @@ parking_lot = "0.9.0" log = "0.4.8" [dev-dependencies] -test-client = { package = "substrate-test-runtime-client", path = "../../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 305539c273faa..b8e46328ba4e9 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -32,7 +32,7 @@ grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec", "test-helpers"] } network = { package = "substrate-network", path = "../network", features = ["test-helpers"] } keyring = { package = "substrate-keyring", path = "../keyring" } -test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client"} +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client"} babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } env_logger = "0.7.0" diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 109db34240ccd..3dba7747b0843 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -31,5 +31,5 @@ futures = "0.1.29" network = { package = "substrate-network", path = "../network" } rustc-hex = "2.0.1" sr-io = { path = "../sr-io" } -test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 0da6f4e293c15..b2451c0b1979f 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -49,7 +49,7 @@ offchain = { package = "substrate-offchain", path = "../../client/offchain" } parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" } [dev-dependencies] -substrate-test-runtime-client = { path = "../test-runtime/client" } +substrate-test-runtime-client = { path = "../../test/utils/runtime/client" } node-executor = { path = "../../bin/node/executor" } node-primitives = { path = "../../bin/node/primitives" } node-runtime = { path = "../../bin/node/runtime" } diff --git a/client/sr-api-macros/Cargo.toml b/client/sr-api-macros/Cargo.toml index ad258fcf67c66..b8157494d2f10 100644 --- a/client/sr-api-macros/Cargo.toml +++ b/client/sr-api-macros/Cargo.toml @@ -16,7 +16,7 @@ proc-macro-crate = "0.1.4" [dev-dependencies] client = { package = "substrate-client", path = "../client" } -test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } sr-primitives = { path = "../sr-primitives" } sr-version = { path = "../sr-version" } diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index 4b628079cd3ce..77356b7cd0f4c 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -17,7 +17,7 @@ sr-primitives = { path = "../../sr-primitives" } assert_matches = "1.3.0" env_logger = "0.7.0" codec = { package = "parity-scale-codec", version = "1.0.0" } -test_runtime = { package = "substrate-test-runtime", path = "../../test-runtime" } +test_runtime = { package = "substrate-test-runtime", path = "../../../test/utils/runtime" } criterion = "0.3" [[bench]] diff --git a/test/utils/chain-spec-builder/Cargo.toml b/test/utils/chain-spec-builder/Cargo.toml index 2093871c9da52..596fb17b94041 100644 --- a/test/utils/chain-spec-builder/Cargo.toml +++ b/test/utils/chain-spec-builder/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] ansi_term = "0.12.1" -keystore = { package = "substrate-keystore", path = "../../client/keystore" } -node-cli = { path = "../../bin/node/cli" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +keystore = { package = "substrate-keystore", path = "../../../client/keystore" } +node-cli = { path = "../../../bin/node/cli" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } rand = "0.7.2" structopt = "0.3.3" diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index de13b34d69753..1ae6959299464 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../client" } -client-db = { package = "substrate-client-db", path = "../client/db", features = ["test-helpers"] } -consensus = { package = "substrate-consensus-common", path = "../consensus/common" } -executor = { package = "substrate-executor", path = "../executor" } +client = { package = "substrate-client", path = "../../../client/client" } +client-db = { package = "substrate-client-db", path = "../../../client/client/db", features = ["test-helpers"] } +consensus = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } +executor = { package = "substrate-executor", path = "../../../client/executor" } futures-preview = "0.3.0-alpha.19" hash-db = "0.15.2" -keyring = { package = "substrate-keyring", path = "../keyring" } +keyring = { package = "substrate-keyring", path = "../../../client/keyring" } codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../primitives" } -sr-primitives = { path = "../sr-primitives" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +sr-primitives = { path = "../../../client/sr-primitives" } +state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 4e7c3f8bca450..721ea611733ff 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -9,37 +9,37 @@ build = "build.rs" log = { version = "0.4.8", optional = true } serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -keyring = { package = "substrate-keyring", path = "../keyring", optional = true } -substrate-client = { path = "../client", default-features = false } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../application-crypto", default-features = false } -inherents = { package = "substrate-inherents", path = "../inherents", default-features = false } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../consensus/aura/primitives", default-features = false } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives", default-features = false } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } -runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } -sr-primitives = { path = "../sr-primitives", default-features = false } -session = { package = "substrate-session", path = "../session", default-features = false } -runtime_version = { package = "sr-version", path = "../sr-version", default-features = false } -runtime_support = { package = "srml-support", path = "../../srml/support", default-features = false } -substrate-trie = { path = "../trie", default-features = false } +keyring = { package = "substrate-keyring", path = "../../../client/keyring", optional = true } +substrate-client = { path = "../../../client/client", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../../client/application-crypto", default-features = false } +inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../client/consensus/aura/primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../client/sr-std", default-features = false } +runtime_io = { package = "sr-io", path = "../../../client/sr-io", default-features = false } +sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +session = { package = "substrate-session", path = "../../../client/session", default-features = false } +runtime_version = { package = "sr-version", path = "../../../client/sr-version", default-features = false } +runtime_support = { package = "srml-support", path = "../../../client/../srml/support", default-features = false } +substrate-trie = { path = "../../../client/trie", default-features = false } trie-db = { version = "0.15.2", default-features = false } memory-db = { version = "0.15.2", default-features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../offchain/primitives", default-features = false} -executive = { package = "srml-executive", path = "../../srml/executive", default-features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false} +executive = { package = "srml-executive", path = "../../../client/../srml/executive", default-features = false } cfg-if = "0.1.10" -srml-babe = { path = "../../srml/babe", default-features = false } -srml-timestamp = { path = "../../srml/timestamp", default-features = false } -srml-system = { path = "../../srml/system", default-features = false } -srml-system-rpc-runtime-api = { path = "../../srml/system/rpc/runtime-api", default-features = false } +srml-babe = { path = "../../../srml/babe", default-features = false } +srml-timestamp = { path = "../../../srml/timestamp", default-features = false } +srml-system = { path = "../../../srml/system", default-features = false } +srml-system-rpc-runtime-api = { path = "../../../srml/system/rpc/runtime-api", default-features = false } [dev-dependencies] -substrate-executor = { path = "../executor" } +substrate-executor = { path = "../../../client/executor" } substrate-test-runtime-client = { path = "./client" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../utils/wasm-builder-runner" } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } [features] default = [ diff --git a/test/utils/runtime/build.rs b/test/utils/runtime/build.rs index 200cd6d42c2d7..587e9fbe0e82e 100644 --- a/test/utils/runtime/build.rs +++ b/test/utils/runtime/build.rs @@ -20,7 +20,7 @@ fn main() { build_current_project_with_rustflags( "wasm_binary.rs", WasmBuilderSource::CratesOrPath { - path: "../utils/wasm-builder", + path: "../../../client/utils/wasm-builder", version: "1.0.8", }, // Note that we set the stack-size to 1MB explicitly even though it is set diff --git a/test/utils/runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml index 6545048759687..68e3bf0ea5972 100644 --- a/test/utils/runtime/client/Cargo.toml +++ b/test/utils/runtime/client/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -generic-test-client = { package = "substrate-test-client", path = "../../test-client" } -primitives = { package = "substrate-primitives", path = "../../primitives" } -runtime = { package = "substrate-test-runtime", path = "../../test-runtime", default-features = false } -sr-primitives = { path = "../../sr-primitives" } +generic-test-client = { package = "substrate-test-client", path = "../../client" } +primitives = { package = "substrate-primitives", path = "../../../../client/primitives" } +runtime = { package = "substrate-test-runtime", path = "../../runtime", default-features = false } +sr-primitives = { path = "../../../../client/sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } [features] diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index 680cf1400ab99..ef378b921a19b 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -cli = { package = "substrate-cli", path = "../../client/cli" } -client = { package = "substrate-client", path = "../../client/client" } -consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } +cli = { package = "substrate-cli", path = "../../../client/cli" } +client = { package = "substrate-client", path = "../../../client/client" } +consensus_common = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -substrate-service = { path = "../../client/service" } +primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +substrate-service = { path = "../../../client/service" } [features] default = ["std"] From 95d99819106a18ef0d1c6930cfb2c3ef7f71488a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 11:43:27 +0100 Subject: [PATCH 15/61] Add dependencies rule enforcement. --- .gitlab-ci.yml | 8 ++++++ .maintain/ensure-deps.sh | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100755 .maintain/ensure-deps.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6ff46e3c23fb..e5a822dd26958 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,6 +145,14 @@ test-linux-stable: &test-linux paths: - ${CI_COMMIT_SHORT_SHA}_warnings.log +test-dependency-rules: &test-linux + stage: test + <<: *docker-env + except: + variables: + - $DEPLOY_TAG + script: + - .maintain/ensure-deps.sh test-srml-staking: &test-srml-staking stage: test diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh new file mode 100755 index 0000000000000..1f37d4aec9a66 --- /dev/null +++ b/.maintain/ensure-deps.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +# The script is meant to check if the rules regarding packages +# dependencies are satisfied. +# The general format is: +# [top-lvl-dir]<[crate-name-prefix] + +# For instance no crate within `./client` directory +# is allowed to import any crate with a name starting with `srml`. +# Such rule is just: `client /dev/null +done + +# Display violations and fail +I=0 +for v in "${VIOLATIONS[@]}" +do + cat << EOF + +=========================================== +======= Violation of rule: $v +=========================================== +${PACKAGES[$I]} + + +EOF + I+=1 +done + +exit ${#VIOLATIONS[@]} From c1eb31884c38889447e69a16ad6e5f01176f6a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 11:47:06 +0100 Subject: [PATCH 16/61] Fix indexing. --- .maintain/ensure-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh index 1f37d4aec9a66..e4657b3c482fb 100755 --- a/.maintain/ensure-deps.sh +++ b/.maintain/ensure-deps.sh @@ -53,7 +53,7 @@ ${PACKAGES[$I]} EOF - I+=1 + I=$I+1 done exit ${#VIOLATIONS[@]} From 26004a79cd8e1982c134505daf9346a0ce1fc5d7 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 11:58:28 +0100 Subject: [PATCH 17/61] Update docs to reflect latest changes --- docs/Structure.adoc | 47 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/docs/Structure.adoc b/docs/Structure.adoc index 0e187d0991ae2..1ec9ecc3bcc06 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -12,7 +12,13 @@ Substrate is split into multiple levels with increasing opinion and decreasing f * runtime * client * PAINT (formerly `srml`) -* node + +Putting all these components together we have: + +* Integration Tests +* Node +* Node template +* Subkey === Runtime @@ -21,8 +27,6 @@ Substrate is split into multiple levels with increasing opinion and decreasing f * _constrains_: ** must be `[no_std]` ** crates may not (dev-)depend on crates in other subfolders of this repo -** excluding `test`-crates, which **must not** to be published to crates.io - In the lowest level, substrate defines primitives, interfaces and traits to implement any on-chain substrate transition system and its interactions with the outside world. This is the lowest level of abstraction and opinion everything else builds upon. @@ -32,7 +36,6 @@ In the lowest level, substrate defines primitives, interfaces and traits to impl * _crates prefix_: `substrate-` * _constrains_: ** crates may not (dev-)depend on any `paint-`-crates -** excluding `test`-crates, which **must not** to be published to crates.io In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full* and light-client support. @@ -42,15 +45,43 @@ In the client you can find a set of crates to construct the outer substrate-node * _crates prefix_: `paint-` * _constrains_: ** must be `[no_std]` +** must not (dev-)depend on anything in `/client` PAINT, the Parity Application Interface for Networked Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. -=== the final Node +=== integration tests + +* _found in_: `/test` +* _crates prefix_: `substrate-test` +* _constrains_: +** only helpers may be published, purely testing crates must be `publish = false` + +All tests that have to pull (dev)-dependencies out of their substree and would thus break the dependency rules, are considered intergration tests and should be stored in here. Only helper-crates in here shall be published, everything else is expected to be non-publish. + +=== Binaries and template + +* _found in_: `/bin` + +We also provide some binaries pulling from the components creating full applications. + +==== Node + +* _found in_: `/bin/node` + +The default (testing) application pulling together our recommended setup of substrate-client with a wasm-contracts-supporting paint-runtime. The node pulls it all together, constructs the (upgradable) runtime and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being build and run if you do `cargo run`. + + +==== Node Template + +* _found in_: `/bin/node-template` + +We also provide a template to get you started building your own node. -* _found in_: `/examples` +==== Subkey -The node pulls it all together, constructs the (upgradable) runtime and wires up the client around it. You can find an example client, which includes a full wasm-contracts chain in `node`. This is also what is being build and run if you do `cargo run`. +* _found in_: `/bin/subkey` +Subkey is a client library to generate keys and sign transactions to send to a substrate node. == Internal Dependency Tree @@ -69,7 +100,7 @@ The node pulls it all together, constructs the (upgradable) runtime and wires up | client | +--+-------+--------+ | +<---------+ | +---------------+ | | - | Node | + | test /bin/* | | | | | +-------------------+ From d9ffec89467142b296c4e4c87ef2ded24dd4d143 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 14:33:38 +0100 Subject: [PATCH 18/61] Moving /srml->/paint --- Cargo.toml | 84 +++++++++---------- bin/node-template/runtime/Cargo.toml | 22 ++--- bin/node/cli/Cargo.toml | 18 ++-- bin/node/executor/Cargo.toml | 20 ++--- bin/node/rpc/Cargo.toml | 6 +- bin/node/runtime/Cargo.toml | 58 ++++++------- bin/node/testing/Cargo.toml | 22 ++--- bin/subkey/Cargo.toml | 6 +- client/consensus/aura/Cargo.toml | 4 +- client/consensus/babe/Cargo.toml | 4 +- client/consensus/pow/Cargo.toml | 2 +- client/consensus/rhd/Cargo.toml | 4 +- client/consensus/uncles/Cargo.toml | 2 +- client/finality-grandpa/Cargo.toml | 2 +- client/phragmen/Cargo.toml | 2 +- {srml => paint}/README.adoc | 0 {srml => paint}/assets/Cargo.toml | 0 {srml => paint}/assets/src/lib.rs | 0 {srml => paint}/aura/Cargo.toml | 0 {srml => paint}/aura/src/lib.rs | 0 {srml => paint}/aura/src/mock.rs | 0 {srml => paint}/aura/src/tests.rs | 0 .../authority-discovery/Cargo.toml | 0 .../authority-discovery/src/lib.rs | 0 {srml => paint}/authorship/Cargo.toml | 0 {srml => paint}/authorship/src/lib.rs | 0 {srml => paint}/babe/Cargo.toml | 0 {srml => paint}/babe/src/lib.rs | 0 {srml => paint}/babe/src/mock.rs | 0 {srml => paint}/babe/src/tests.rs | 0 {srml => paint}/balances/Cargo.toml | 0 {srml => paint}/balances/src/lib.rs | 0 {srml => paint}/balances/src/mock.rs | 0 {srml => paint}/balances/src/tests.rs | 0 {srml => paint}/collective/Cargo.toml | 0 {srml => paint}/collective/src/lib.rs | 0 {srml => paint}/contracts/COMPLEXITY.md | 0 {srml => paint}/contracts/Cargo.toml | 0 {srml => paint}/contracts/rpc/Cargo.toml | 0 .../contracts/rpc/runtime-api/Cargo.toml | 0 .../contracts/rpc/runtime-api/src/lib.rs | 0 {srml => paint}/contracts/rpc/src/lib.rs | 0 {srml => paint}/contracts/src/account_db.rs | 0 {srml => paint}/contracts/src/exec.rs | 0 {srml => paint}/contracts/src/gas.rs | 0 {srml => paint}/contracts/src/lib.rs | 0 {srml => paint}/contracts/src/rent.rs | 0 {srml => paint}/contracts/src/tests.rs | 0 .../contracts/src/wasm/code_cache.rs | 0 .../contracts/src/wasm/env_def/macros.rs | 0 .../contracts/src/wasm/env_def/mod.rs | 0 {srml => paint}/contracts/src/wasm/mod.rs | 0 {srml => paint}/contracts/src/wasm/prepare.rs | 0 {srml => paint}/contracts/src/wasm/runtime.rs | 0 {srml => paint}/democracy/Cargo.toml | 0 {srml => paint}/democracy/src/lib.rs | 0 .../democracy/src/vote_threshold.rs | 0 {srml => paint}/elections-phragmen/Cargo.toml | 0 {srml => paint}/elections-phragmen/src/lib.rs | 0 {srml => paint}/elections/Cargo.toml | 0 {srml => paint}/elections/src/lib.rs | 0 {srml => paint}/elections/src/mock.rs | 0 {srml => paint}/elections/src/tests.rs | 0 {srml => paint}/evm/Cargo.toml | 0 {srml => paint}/evm/src/backend.rs | 0 {srml => paint}/evm/src/lib.rs | 0 {srml => paint}/example/Cargo.toml | 0 {srml => paint}/example/src/lib.rs | 0 {srml => paint}/executive/Cargo.toml | 0 {srml => paint}/executive/src/lib.rs | 0 {srml => paint}/finality-tracker/Cargo.toml | 0 {srml => paint}/finality-tracker/src/lib.rs | 0 {srml => paint}/generic-asset/Cargo.toml | 0 {srml => paint}/generic-asset/src/lib.rs | 0 {srml => paint}/generic-asset/src/mock.rs | 0 {srml => paint}/generic-asset/src/tests.rs | 0 {srml => paint}/grandpa/Cargo.toml | 0 {srml => paint}/grandpa/src/lib.rs | 0 {srml => paint}/grandpa/src/mock.rs | 0 {srml => paint}/grandpa/src/tests.rs | 0 {srml => paint}/im-online/Cargo.toml | 0 {srml => paint}/im-online/src/lib.rs | 0 {srml => paint}/im-online/src/mock.rs | 0 {srml => paint}/im-online/src/tests.rs | 0 {srml => paint}/indices/Cargo.toml | 0 {srml => paint}/indices/src/address.rs | 0 {srml => paint}/indices/src/lib.rs | 0 {srml => paint}/indices/src/mock.rs | 0 {srml => paint}/indices/src/tests.rs | 0 {srml => paint}/membership/Cargo.toml | 0 {srml => paint}/membership/src/lib.rs | 0 {srml => paint}/metadata/Cargo.toml | 0 {srml => paint}/metadata/src/lib.rs | 0 {srml => paint}/nicks/Cargo.toml | 0 {srml => paint}/nicks/src/lib.rs | 0 {srml => paint}/offences/Cargo.toml | 0 {srml => paint}/offences/src/lib.rs | 0 {srml => paint}/offences/src/mock.rs | 0 {srml => paint}/offences/src/tests.rs | 0 .../randomness-collective-flip/Cargo.toml | 0 .../randomness-collective-flip/src/lib.rs | 0 {srml => paint}/scored-pool/Cargo.toml | 0 {srml => paint}/scored-pool/src/lib.rs | 0 {srml => paint}/scored-pool/src/mock.rs | 0 {srml => paint}/scored-pool/src/tests.rs | 0 {srml => paint}/session/Cargo.toml | 0 {srml => paint}/session/src/historical.rs | 0 {srml => paint}/session/src/lib.rs | 0 {srml => paint}/session/src/mock.rs | 0 {srml => paint}/staking/Cargo.toml | 0 .../staking/reward-curve/Cargo.toml | 0 .../staking/reward-curve/src/lib.rs | 0 .../staking/reward-curve/src/log.rs | 0 .../staking/reward-curve/tests/test.rs | 0 {srml => paint}/staking/src/inflation.rs | 0 {srml => paint}/staking/src/lib.rs | 0 {srml => paint}/staking/src/mock.rs | 0 {srml => paint}/staking/src/tests.rs | 0 {srml => paint}/sudo/Cargo.toml | 0 {srml => paint}/sudo/src/lib.rs | 0 {srml => paint}/support/Cargo.toml | 0 {srml => paint}/support/procedural/Cargo.toml | 0 {srml => paint}/support/procedural/src/lib.rs | 0 .../src/storage/genesis_config/builder_def.rs | 0 .../genesis_config/genesis_config_def.rs | 0 .../src/storage/genesis_config/mod.rs | 0 .../support/procedural/src/storage/getters.rs | 0 .../procedural/src/storage/instance_trait.rs | 0 .../procedural/src/storage/metadata.rs | 0 .../support/procedural/src/storage/mod.rs | 0 .../support/procedural/src/storage/parse.rs | 0 .../procedural/src/storage/storage_struct.rs | 0 .../procedural/src/storage/store_trait.rs | 0 .../support/procedural/tools/Cargo.toml | 0 .../procedural/tools/derive/Cargo.toml | 0 .../procedural/tools/derive/src/lib.rs | 0 .../support/procedural/tools/src/lib.rs | 0 .../support/procedural/tools/src/syn_ext.rs | 0 {srml => paint}/support/rpc/Cargo.toml | 0 {srml => paint}/support/rpc/src/lib.rs | 0 {srml => paint}/support/src/debug.rs | 0 {srml => paint}/support/src/dispatch.rs | 0 {srml => paint}/support/src/error.rs | 0 {srml => paint}/support/src/event.rs | 0 {srml => paint}/support/src/hash.rs | 0 {srml => paint}/support/src/inherent.rs | 0 {srml => paint}/support/src/lib.rs | 0 {srml => paint}/support/src/metadata.rs | 0 {srml => paint}/support/src/origin.rs | 0 {srml => paint}/support/src/runtime.rs | 0 {srml => paint}/support/src/storage/child.rs | 0 .../src/storage/generator/double_map.rs | 0 .../src/storage/generator/linked_map.rs | 0 .../support/src/storage/generator/map.rs | 0 .../support/src/storage/generator/mod.rs | 0 .../support/src/storage/generator/value.rs | 0 {srml => paint}/support/src/storage/hashed.rs | 0 {srml => paint}/support/src/storage/mod.rs | 0 .../support/src/storage/unhashed.rs | 0 {srml => paint}/support/src/traits.rs | 0 {srml => paint}/support/src/unsigned.rs | 0 {srml => paint}/support/test/Cargo.toml | 0 {srml => paint}/support/test/src/lib.rs | 0 .../support/test/tests/decl_storage.rs | 0 .../support/test/tests/decl_storage_ui.rs | 0 .../tests/decl_storage_ui/config_duplicate.rs | 0 .../decl_storage_ui/config_duplicate.stderr | 0 .../decl_storage_ui/config_get_duplicate.rs | 0 .../config_get_duplicate.stderr | 0 .../tests/decl_storage_ui/get_duplicate.rs | 0 .../decl_storage_ui/get_duplicate.stderr | 0 .../support/test/tests/final_keys.rs | 0 .../support/test/tests/genesisconfig.rs | 0 .../support/test/tests/instance.rs | 0 .../support/test/tests/issue2219.rs | 0 .../support/test/tests/reserved_keyword.rs | 0 .../tests/reserved_keyword/on_initialize.rs | 0 .../reserved_keyword/on_initialize.stderr | 0 {srml => paint}/support/test/tests/system.rs | 0 {srml => paint}/system/Cargo.toml | 0 {srml => paint}/system/benches/bench.rs | 0 {srml => paint}/system/rpc/Cargo.toml | 0 .../system/rpc/runtime-api/Cargo.toml | 0 .../system/rpc/runtime-api/src/lib.rs | 0 {srml => paint}/system/rpc/src/lib.rs | 0 {srml => paint}/system/src/lib.rs | 0 {srml => paint}/system/src/offchain.rs | 0 {srml => paint}/timestamp/Cargo.toml | 0 {srml => paint}/timestamp/src/lib.rs | 0 .../transaction-payment/Cargo.toml | 0 .../transaction-payment/rpc/Cargo.toml | 0 .../rpc/runtime-api/Cargo.toml | 0 .../rpc/runtime-api/src/lib.rs | 0 .../transaction-payment/rpc/src/lib.rs | 0 .../transaction-payment/src/lib.rs | 0 {srml => paint}/treasury/Cargo.toml | 0 {srml => paint}/treasury/src/lib.rs | 0 {srml => paint}/utility/Cargo.toml | 0 {srml => paint}/utility/src/lib.rs | 0 test/utils/runtime/Cargo.toml | 12 +-- 200 files changed, 134 insertions(+), 134 deletions(-) rename {srml => paint}/README.adoc (100%) rename {srml => paint}/assets/Cargo.toml (100%) rename {srml => paint}/assets/src/lib.rs (100%) rename {srml => paint}/aura/Cargo.toml (100%) rename {srml => paint}/aura/src/lib.rs (100%) rename {srml => paint}/aura/src/mock.rs (100%) rename {srml => paint}/aura/src/tests.rs (100%) rename {srml => paint}/authority-discovery/Cargo.toml (100%) rename {srml => paint}/authority-discovery/src/lib.rs (100%) rename {srml => paint}/authorship/Cargo.toml (100%) rename {srml => paint}/authorship/src/lib.rs (100%) rename {srml => paint}/babe/Cargo.toml (100%) rename {srml => paint}/babe/src/lib.rs (100%) rename {srml => paint}/babe/src/mock.rs (100%) rename {srml => paint}/babe/src/tests.rs (100%) rename {srml => paint}/balances/Cargo.toml (100%) rename {srml => paint}/balances/src/lib.rs (100%) rename {srml => paint}/balances/src/mock.rs (100%) rename {srml => paint}/balances/src/tests.rs (100%) rename {srml => paint}/collective/Cargo.toml (100%) rename {srml => paint}/collective/src/lib.rs (100%) rename {srml => paint}/contracts/COMPLEXITY.md (100%) rename {srml => paint}/contracts/Cargo.toml (100%) rename {srml => paint}/contracts/rpc/Cargo.toml (100%) rename {srml => paint}/contracts/rpc/runtime-api/Cargo.toml (100%) rename {srml => paint}/contracts/rpc/runtime-api/src/lib.rs (100%) rename {srml => paint}/contracts/rpc/src/lib.rs (100%) rename {srml => paint}/contracts/src/account_db.rs (100%) rename {srml => paint}/contracts/src/exec.rs (100%) rename {srml => paint}/contracts/src/gas.rs (100%) rename {srml => paint}/contracts/src/lib.rs (100%) rename {srml => paint}/contracts/src/rent.rs (100%) rename {srml => paint}/contracts/src/tests.rs (100%) rename {srml => paint}/contracts/src/wasm/code_cache.rs (100%) rename {srml => paint}/contracts/src/wasm/env_def/macros.rs (100%) rename {srml => paint}/contracts/src/wasm/env_def/mod.rs (100%) rename {srml => paint}/contracts/src/wasm/mod.rs (100%) rename {srml => paint}/contracts/src/wasm/prepare.rs (100%) rename {srml => paint}/contracts/src/wasm/runtime.rs (100%) rename {srml => paint}/democracy/Cargo.toml (100%) rename {srml => paint}/democracy/src/lib.rs (100%) rename {srml => paint}/democracy/src/vote_threshold.rs (100%) rename {srml => paint}/elections-phragmen/Cargo.toml (100%) rename {srml => paint}/elections-phragmen/src/lib.rs (100%) rename {srml => paint}/elections/Cargo.toml (100%) rename {srml => paint}/elections/src/lib.rs (100%) rename {srml => paint}/elections/src/mock.rs (100%) rename {srml => paint}/elections/src/tests.rs (100%) rename {srml => paint}/evm/Cargo.toml (100%) rename {srml => paint}/evm/src/backend.rs (100%) rename {srml => paint}/evm/src/lib.rs (100%) rename {srml => paint}/example/Cargo.toml (100%) rename {srml => paint}/example/src/lib.rs (100%) rename {srml => paint}/executive/Cargo.toml (100%) rename {srml => paint}/executive/src/lib.rs (100%) rename {srml => paint}/finality-tracker/Cargo.toml (100%) rename {srml => paint}/finality-tracker/src/lib.rs (100%) rename {srml => paint}/generic-asset/Cargo.toml (100%) rename {srml => paint}/generic-asset/src/lib.rs (100%) rename {srml => paint}/generic-asset/src/mock.rs (100%) rename {srml => paint}/generic-asset/src/tests.rs (100%) rename {srml => paint}/grandpa/Cargo.toml (100%) rename {srml => paint}/grandpa/src/lib.rs (100%) rename {srml => paint}/grandpa/src/mock.rs (100%) rename {srml => paint}/grandpa/src/tests.rs (100%) rename {srml => paint}/im-online/Cargo.toml (100%) rename {srml => paint}/im-online/src/lib.rs (100%) rename {srml => paint}/im-online/src/mock.rs (100%) rename {srml => paint}/im-online/src/tests.rs (100%) rename {srml => paint}/indices/Cargo.toml (100%) rename {srml => paint}/indices/src/address.rs (100%) rename {srml => paint}/indices/src/lib.rs (100%) rename {srml => paint}/indices/src/mock.rs (100%) rename {srml => paint}/indices/src/tests.rs (100%) rename {srml => paint}/membership/Cargo.toml (100%) rename {srml => paint}/membership/src/lib.rs (100%) rename {srml => paint}/metadata/Cargo.toml (100%) rename {srml => paint}/metadata/src/lib.rs (100%) rename {srml => paint}/nicks/Cargo.toml (100%) rename {srml => paint}/nicks/src/lib.rs (100%) rename {srml => paint}/offences/Cargo.toml (100%) rename {srml => paint}/offences/src/lib.rs (100%) rename {srml => paint}/offences/src/mock.rs (100%) rename {srml => paint}/offences/src/tests.rs (100%) rename {srml => paint}/randomness-collective-flip/Cargo.toml (100%) rename {srml => paint}/randomness-collective-flip/src/lib.rs (100%) rename {srml => paint}/scored-pool/Cargo.toml (100%) rename {srml => paint}/scored-pool/src/lib.rs (100%) rename {srml => paint}/scored-pool/src/mock.rs (100%) rename {srml => paint}/scored-pool/src/tests.rs (100%) rename {srml => paint}/session/Cargo.toml (100%) rename {srml => paint}/session/src/historical.rs (100%) rename {srml => paint}/session/src/lib.rs (100%) rename {srml => paint}/session/src/mock.rs (100%) rename {srml => paint}/staking/Cargo.toml (100%) rename {srml => paint}/staking/reward-curve/Cargo.toml (100%) rename {srml => paint}/staking/reward-curve/src/lib.rs (100%) rename {srml => paint}/staking/reward-curve/src/log.rs (100%) rename {srml => paint}/staking/reward-curve/tests/test.rs (100%) rename {srml => paint}/staking/src/inflation.rs (100%) rename {srml => paint}/staking/src/lib.rs (100%) rename {srml => paint}/staking/src/mock.rs (100%) rename {srml => paint}/staking/src/tests.rs (100%) rename {srml => paint}/sudo/Cargo.toml (100%) rename {srml => paint}/sudo/src/lib.rs (100%) rename {srml => paint}/support/Cargo.toml (100%) rename {srml => paint}/support/procedural/Cargo.toml (100%) rename {srml => paint}/support/procedural/src/lib.rs (100%) rename {srml => paint}/support/procedural/src/storage/genesis_config/builder_def.rs (100%) rename {srml => paint}/support/procedural/src/storage/genesis_config/genesis_config_def.rs (100%) rename {srml => paint}/support/procedural/src/storage/genesis_config/mod.rs (100%) rename {srml => paint}/support/procedural/src/storage/getters.rs (100%) rename {srml => paint}/support/procedural/src/storage/instance_trait.rs (100%) rename {srml => paint}/support/procedural/src/storage/metadata.rs (100%) rename {srml => paint}/support/procedural/src/storage/mod.rs (100%) rename {srml => paint}/support/procedural/src/storage/parse.rs (100%) rename {srml => paint}/support/procedural/src/storage/storage_struct.rs (100%) rename {srml => paint}/support/procedural/src/storage/store_trait.rs (100%) rename {srml => paint}/support/procedural/tools/Cargo.toml (100%) rename {srml => paint}/support/procedural/tools/derive/Cargo.toml (100%) rename {srml => paint}/support/procedural/tools/derive/src/lib.rs (100%) rename {srml => paint}/support/procedural/tools/src/lib.rs (100%) rename {srml => paint}/support/procedural/tools/src/syn_ext.rs (100%) rename {srml => paint}/support/rpc/Cargo.toml (100%) rename {srml => paint}/support/rpc/src/lib.rs (100%) rename {srml => paint}/support/src/debug.rs (100%) rename {srml => paint}/support/src/dispatch.rs (100%) rename {srml => paint}/support/src/error.rs (100%) rename {srml => paint}/support/src/event.rs (100%) rename {srml => paint}/support/src/hash.rs (100%) rename {srml => paint}/support/src/inherent.rs (100%) rename {srml => paint}/support/src/lib.rs (100%) rename {srml => paint}/support/src/metadata.rs (100%) rename {srml => paint}/support/src/origin.rs (100%) rename {srml => paint}/support/src/runtime.rs (100%) rename {srml => paint}/support/src/storage/child.rs (100%) rename {srml => paint}/support/src/storage/generator/double_map.rs (100%) rename {srml => paint}/support/src/storage/generator/linked_map.rs (100%) rename {srml => paint}/support/src/storage/generator/map.rs (100%) rename {srml => paint}/support/src/storage/generator/mod.rs (100%) rename {srml => paint}/support/src/storage/generator/value.rs (100%) rename {srml => paint}/support/src/storage/hashed.rs (100%) rename {srml => paint}/support/src/storage/mod.rs (100%) rename {srml => paint}/support/src/storage/unhashed.rs (100%) rename {srml => paint}/support/src/traits.rs (100%) rename {srml => paint}/support/src/unsigned.rs (100%) rename {srml => paint}/support/test/Cargo.toml (100%) rename {srml => paint}/support/test/src/lib.rs (100%) rename {srml => paint}/support/test/tests/decl_storage.rs (100%) rename {srml => paint}/support/test/tests/decl_storage_ui.rs (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/config_duplicate.rs (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/config_duplicate.stderr (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/config_get_duplicate.rs (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/config_get_duplicate.stderr (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/get_duplicate.rs (100%) rename {srml => paint}/support/test/tests/decl_storage_ui/get_duplicate.stderr (100%) rename {srml => paint}/support/test/tests/final_keys.rs (100%) rename {srml => paint}/support/test/tests/genesisconfig.rs (100%) rename {srml => paint}/support/test/tests/instance.rs (100%) rename {srml => paint}/support/test/tests/issue2219.rs (100%) rename {srml => paint}/support/test/tests/reserved_keyword.rs (100%) rename {srml => paint}/support/test/tests/reserved_keyword/on_initialize.rs (100%) rename {srml => paint}/support/test/tests/reserved_keyword/on_initialize.stderr (100%) rename {srml => paint}/support/test/tests/system.rs (100%) rename {srml => paint}/system/Cargo.toml (100%) rename {srml => paint}/system/benches/bench.rs (100%) rename {srml => paint}/system/rpc/Cargo.toml (100%) rename {srml => paint}/system/rpc/runtime-api/Cargo.toml (100%) rename {srml => paint}/system/rpc/runtime-api/src/lib.rs (100%) rename {srml => paint}/system/rpc/src/lib.rs (100%) rename {srml => paint}/system/src/lib.rs (100%) rename {srml => paint}/system/src/offchain.rs (100%) rename {srml => paint}/timestamp/Cargo.toml (100%) rename {srml => paint}/timestamp/src/lib.rs (100%) rename {srml => paint}/transaction-payment/Cargo.toml (100%) rename {srml => paint}/transaction-payment/rpc/Cargo.toml (100%) rename {srml => paint}/transaction-payment/rpc/runtime-api/Cargo.toml (100%) rename {srml => paint}/transaction-payment/rpc/runtime-api/src/lib.rs (100%) rename {srml => paint}/transaction-payment/rpc/src/lib.rs (100%) rename {srml => paint}/transaction-payment/src/lib.rs (100%) rename {srml => paint}/treasury/Cargo.toml (100%) rename {srml => paint}/treasury/src/lib.rs (100%) rename {srml => paint}/utility/Cargo.toml (100%) rename {srml => paint}/utility/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index caa3e00458de3..4fbab41ae020d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,48 +56,48 @@ members = [ # SRML - "srml/support", - "srml/support/rpc", - "srml/support/procedural", - "srml/support/procedural/tools", - "srml/support/procedural/tools/derive", - "srml/support/test", - "srml/authorship", - "srml/assets", - "srml/aura", - "srml/balances", - "srml/contracts", - "srml/contracts/rpc", - "srml/collective", - "srml/democracy", - "srml/elections", - "srml/elections-phragmen", - "srml/example", - "srml/executive", - "srml/finality-tracker", - "srml/generic-asset", - "srml/grandpa", - "srml/im-online", - "srml/authority-discovery", - "srml/indices", - "srml/membership", - "srml/metadata", - "srml/nicks", - "srml/offences", - "srml/randomness-collective-flip", - "srml/scored-pool", - "srml/session", - "srml/staking", - "srml/staking/reward-curve", - "srml/sudo", - "srml/system", - "srml/system/rpc", - "srml/timestamp", - "srml/treasury", - "srml/transaction-payment", - "srml/transaction-payment/rpc", - "srml/utility", - "srml/evm", + "paint/support", + "paint/support/rpc", + "paint/support/procedural", + "paint/support/procedural/tools", + "paint/support/procedural/tools/derive", + "paint/support/test", + "paint/authorship", + "paint/assets", + "paint/aura", + "paint/balances", + "paint/contracts", + "paint/contracts/rpc", + "paint/collective", + "paint/democracy", + "paint/elections", + "paint/elections-phragmen", + "paint/example", + "paint/executive", + "paint/finality-tracker", + "paint/generic-asset", + "paint/grandpa", + "paint/im-online", + "paint/authority-discovery", + "paint/indices", + "paint/membership", + "paint/metadata", + "paint/nicks", + "paint/offences", + "paint/randomness-collective-flip", + "paint/scored-pool", + "paint/session", + "paint/staking", + "paint/staking/reward-curve", + "paint/sudo", + "paint/system", + "paint/system/rpc", + "paint/timestamp", + "paint/treasury", + "paint/transaction-payment", + "paint/transaction-payment/rpc", + "paint/utility", + "paint/evm", # BIN diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml index a44674373073a..07faa60207244 100644 --- a/bin/node-template/runtime/Cargo.toml +++ b/bin/node-template/runtime/Cargo.toml @@ -11,20 +11,20 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = rstd = { package = "sr-std", path = "../../../client/sr-std", default_features = false } runtime-io = { package = "sr-io", path = "../../../client/sr-io", default_features = false } version = { package = "sr-version", path = "../../../client/sr-version", default_features = false } -support = { package = "srml-support", path = "../../../srml/support", default_features = false } +support = { package = "srml-support", path = "../../../paint/support", default_features = false } primitives = { package = "substrate-primitives", path = "../../../client/primitives", default_features = false } substrate-session = { path = "../../../client/session", default-features = false } -balances = { package = "srml-balances", path = "../../../srml/balances", default_features = false } -aura = { package = "srml-aura", path = "../../../srml/aura", default_features = false } +balances = { package = "srml-balances", path = "../../../paint/balances", default_features = false } +aura = { package = "srml-aura", path = "../../../paint/aura", default_features = false } aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../client/consensus/aura/primitives", default_features = false } -grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa", default_features = false } -executive = { package = "srml-executive", path = "../../../srml/executive", default_features = false } -indices = { package = "srml-indices", path = "../../../srml/indices", default_features = false } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../srml/randomness-collective-flip", default_features = false } -system = { package = "srml-system", path = "../../../srml/system", default_features = false } -timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default_features = false } -sudo = { package = "srml-sudo", path = "../../../srml/sudo", default_features = false } -transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment", default_features = false } +grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa", default_features = false } +executive = { package = "srml-executive", path = "../../../paint/executive", default_features = false } +indices = { package = "srml-indices", path = "../../../paint/indices", default_features = false } +randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../paint/randomness-collective-flip", default_features = false } +system = { package = "srml-system", path = "../../../paint/system", default_features = false } +timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", default_features = false } +sudo = { package = "srml-sudo", path = "../../../paint/sudo", default_features = false } +transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment", default_features = false } sr-primitives = { path = "../../../client/sr-primitives", default_features = false } client = { package = "substrate-client", path = "../../../client/client", default_features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 47af2b158174e..c65054f9d96d5 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -56,15 +56,15 @@ substrate-service = { path = "../../../client/service", default-features = false substrate-telemetry = { package = "substrate-telemetry", path = "../../../client/telemetry" } # srml dependencies -indices = { package = "srml-indices", path = "../../../srml/indices" } -timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default-features = false } -finality_tracker = { package = "srml-finality-tracker", path = "../../../srml/finality-tracker", default-features = false } -contracts = { package = "srml-contracts", path = "../../../srml/contracts" } -system = { package = "srml-system", path = "../../../srml/system" } -balances = { package = "srml-balances", path = "../../../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } -support = { package = "srml-support", path = "../../../srml/support", default-features = false } -im_online = { package = "srml-im-online", path = "../../../srml/im-online", default-features = false } +indices = { package = "srml-indices", path = "../../../paint/indices" } +timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", default-features = false } +finality_tracker = { package = "srml-finality-tracker", path = "../../../paint/finality-tracker", default-features = false } +contracts = { package = "srml-contracts", path = "../../../paint/contracts" } +system = { package = "srml-system", path = "../../../paint/system" } +balances = { package = "srml-balances", path = "../../../paint/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment" } +support = { package = "srml-support", path = "../../../paint/support", default-features = false } +im_online = { package = "srml-im-online", path = "../../../paint/im-online", default-features = false } # node-specific dependencies node-runtime = { path = "../runtime" } diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index 78f51a3d0d4bb..72cc337368002 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -20,16 +20,16 @@ node-runtime = { path = "../runtime" } node-testing = { path = "../testing" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } sr-primitives = { path = "../../../client/sr-primitives" } -runtime_support = { package = "srml-support", path = "../../../srml/support" } -balances = { package = "srml-balances", path = "../../../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } -session = { package = "srml-session", path = "../../../srml/session" } -system = { package = "srml-system", path = "../../../srml/system" } -timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } -treasury = { package = "srml-treasury", path = "../../../srml/treasury" } -contracts = { package = "srml-contracts", path = "../../../srml/contracts" } -grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa" } -indices = { package = "srml-indices", path = "../../../srml/indices" } +runtime_support = { package = "srml-support", path = "../../../paint/support" } +balances = { package = "srml-balances", path = "../../../paint/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment" } +session = { package = "srml-session", path = "../../../paint/session" } +system = { package = "srml-system", path = "../../../paint/system" } +timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp" } +treasury = { package = "srml-treasury", path = "../../../paint/treasury" } +contracts = { package = "srml-contracts", path = "../../../paint/contracts" } +grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa" } +indices = { package = "srml-indices", path = "../../../paint/indices" } wabt = "0.9.2" criterion = "0.3.0" diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index ae13f97497a4a..3bcafeb82ab49 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -10,7 +10,7 @@ jsonrpc-core = "14.0.3" node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } sr-primitives = { path = "../../../client/sr-primitives" } -srml-contracts-rpc = { path = "../../../srml/contracts/rpc/" } -srml-transaction-payment-rpc = { path = "../../../srml/transaction-payment/rpc/" } -srml-system-rpc = { path = "../../../srml/system/rpc/" } +srml-contracts-rpc = { path = "../../../paint/contracts/rpc/" } +srml-transaction-payment-rpc = { path = "../../../paint/transaction-payment/rpc/" } +srml-system-rpc = { path = "../../../paint/system/rpc/" } transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 6128258840fc4..d7eb2061c7270 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -29,35 +29,35 @@ substrate-session = { path = "../../../client/session", default-features = false substrate-keyring = { path = "../../../client/keyring", optional = true } # srml dependencies -authorship = { package = "srml-authorship", path = "../../../srml/authorship", default-features = false } -babe = { package = "srml-babe", path = "../../../srml/babe", default-features = false } -balances = { package = "srml-balances", path = "../../../srml/balances", default-features = false } -collective = { package = "srml-collective", path = "../../../srml/collective", default-features = false } -contracts = { package = "srml-contracts", path = "../../../srml/contracts", default-features = false } -contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../../srml/contracts/rpc/runtime-api/", default-features = false } -democracy = { package = "srml-democracy", path = "../../../srml/democracy", default-features = false } -elections-phragmen = { package = "srml-elections-phragmen", path = "../../../srml/elections-phragmen", default-features = false } -executive = { package = "srml-executive", path = "../../../srml/executive", default-features = false } -finality-tracker = { package = "srml-finality-tracker", path = "../../../srml/finality-tracker", default-features = false } -grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa", default-features = false } -im-online = { package = "srml-im-online", path = "../../../srml/im-online", default-features = false } -indices = { package = "srml-indices", path = "../../../srml/indices", default-features = false } -membership = { package = "srml-membership", path = "../../../srml/membership", default-features = false } -nicks = { package = "srml-nicks", path = "../../../srml/nicks", default-features = false } -offences = { package = "srml-offences", path = "../../../srml/offences", default-features = false } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../srml/randomness-collective-flip", default-features = false } -session = { package = "srml-session", path = "../../../srml/session", default-features = false, features = ["historical"] } -staking = { package = "srml-staking", path = "../../../srml/staking", default-features = false } -srml-staking-reward-curve = { path = "../../../srml/staking/reward-curve"} -sudo = { package = "srml-sudo", path = "../../../srml/sudo", default-features = false } -support = { package = "srml-support", path = "../../../srml/support", default-features = false } -system = { package = "srml-system", path = "../../../srml/system", default-features = false } -system-rpc-runtime-api = { package = "srml-system-rpc-runtime-api", path = "../../../srml/system/rpc/runtime-api/", default-features = false } -timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp", default-features = false } -treasury = { package = "srml-treasury", path = "../../../srml/treasury", default-features = false } -utility = { package = "srml-utility", path = "../../../srml/utility", default-features = false } -transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment", default-features = false } -transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../../srml/transaction-payment/rpc/runtime-api/", default-features = false } +authorship = { package = "srml-authorship", path = "../../../paint/authorship", default-features = false } +babe = { package = "srml-babe", path = "../../../paint/babe", default-features = false } +balances = { package = "srml-balances", path = "../../../paint/balances", default-features = false } +collective = { package = "srml-collective", path = "../../../paint/collective", default-features = false } +contracts = { package = "srml-contracts", path = "../../../paint/contracts", default-features = false } +contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../../paint/contracts/rpc/runtime-api/", default-features = false } +democracy = { package = "srml-democracy", path = "../../../paint/democracy", default-features = false } +elections-phragmen = { package = "srml-elections-phragmen", path = "../../../paint/elections-phragmen", default-features = false } +executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } +finality-tracker = { package = "srml-finality-tracker", path = "../../../paint/finality-tracker", default-features = false } +grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa", default-features = false } +im-online = { package = "srml-im-online", path = "../../../paint/im-online", default-features = false } +indices = { package = "srml-indices", path = "../../../paint/indices", default-features = false } +membership = { package = "srml-membership", path = "../../../paint/membership", default-features = false } +nicks = { package = "srml-nicks", path = "../../../paint/nicks", default-features = false } +offences = { package = "srml-offences", path = "../../../paint/offences", default-features = false } +randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../paint/randomness-collective-flip", default-features = false } +session = { package = "srml-session", path = "../../../paint/session", default-features = false, features = ["historical"] } +staking = { package = "srml-staking", path = "../../../paint/staking", default-features = false } +srml-staking-reward-curve = { path = "../../../paint/staking/reward-curve"} +sudo = { package = "srml-sudo", path = "../../../paint/sudo", default-features = false } +support = { package = "srml-support", path = "../../../paint/support", default-features = false } +system = { package = "srml-system", path = "../../../paint/system", default-features = false } +system-rpc-runtime-api = { package = "srml-system-rpc-runtime-api", path = "../../../paint/system/rpc/runtime-api/", default-features = false } +timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", default-features = false } +treasury = { package = "srml-treasury", path = "../../../paint/treasury", default-features = false } +utility = { package = "srml-utility", path = "../../../paint/utility", default-features = false } +transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment", default-features = false } +transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index 4fe3530571984..684f21d20e5f1 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -6,11 +6,11 @@ description = "Test utilities for Substrate node." edition = "2018" [dependencies] -balances = { package = "srml-balances", path = "../../../srml/balances" } +balances = { package = "srml-balances", path = "../../../paint/balances" } client = { package = "substrate-client", path = "../../../client/client" } -contracts = { package = "srml-contracts", path = "../../../srml/contracts" } -grandpa = { package = "srml-grandpa", path = "../../../srml/grandpa" } -indices = { package = "srml-indices", path = "../../../srml/indices" } +contracts = { package = "srml-contracts", path = "../../../paint/contracts" } +grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa" } +indices = { package = "srml-indices", path = "../../../paint/indices" } keyring = { package = "substrate-keyring", path = "../../../client/keyring" } node-executor = { path = "../executor" } node-primitives = { path = "../primitives" } @@ -19,13 +19,13 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../../client/primitives" } runtime-io = { package = "sr-io", path = "../../../client/sr-io" } sr-primitives = { path = "../../../client/sr-primitives" } -runtime_support = { package = "srml-support", path = "../../../srml/support" } -session = { package = "srml-session", path = "../../../srml/session" } -staking = { package = "srml-staking", path = "../../../srml/staking" } +runtime_support = { package = "srml-support", path = "../../../paint/support" } +session = { package = "srml-session", path = "../../../paint/session" } +staking = { package = "srml-staking", path = "../../../paint/staking" } substrate-executor = { path = "../../../client/executor" } -system = { package = "srml-system", path = "../../../srml/system" } +system = { package = "srml-system", path = "../../../paint/system" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } -timestamp = { package = "srml-timestamp", path = "../../../srml/timestamp" } -treasury = { package = "srml-treasury", path = "../../../srml/treasury" } -transaction-payment = { package = "srml-transaction-payment", path = "../../../srml/transaction-payment" } +timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp" } +treasury = { package = "srml-treasury", path = "../../../paint/treasury" } +transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment" } wabt = "0.9.2" diff --git a/bin/subkey/Cargo.toml b/bin/subkey/Cargo.toml index 0d227dadddafa..519c7bcaf5a67 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -17,9 +17,9 @@ substrate-bip39 = "0.3.1" hex = "0.3.2" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0" } -system = { package = "srml-system", path = "../../srml/system" } -balances = { package = "srml-balances", path = "../../srml/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../srml/transaction-payment" } +system = { package = "srml-system", path = "../../paint/system" } +balances = { package = "srml-balances", path = "../../paint/balances" } +transaction-payment = { package = "srml-transaction-payment", path = "../../paint/transaction-payment" } [features] bench = [] diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index 127f305a343b1..5b43ed86cf767 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -9,13 +9,13 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../primitives" } app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto" } -runtime_support = { package = "srml-support", path = "../../../srml/support" } +runtime_support = { package = "srml-support", path = "../../../paint/support" } runtime_version = { package = "sr-version", path = "../../sr-version" } runtime_io = { package = "sr-io", path = "../../sr-io" } slots = { package = "substrate-consensus-slots", path = "../slots" } aura_primitives = { package = "substrate-consensus-aura-primitives", path = "primitives" } inherents = { package = "substrate-inherents", path = "../../inherents" } -srml-aura = { path = "../../../srml/aura" } +srml-aura = { path = "../../../paint/aura" } client = { package = "substrate-client", path = "../../client" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index b7b5d6393de0c..04039090b13bb 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -13,13 +13,13 @@ app-crypto = { package = "substrate-application-crypto", path = "../../applicati num-bigint = "0.2.3" num-rational = "0.2.2" num-traits = "0.2.8" -runtime-support = { package = "srml-support", path = "../../../srml/support" } +runtime-support = { package = "srml-support", path = "../../../paint/support" } runtime-version = { package = "sr-version", path = "../../sr-version" } runtime-io = { package = "sr-io", path = "../../sr-io" } inherents = { package = "substrate-inherents", path = "../../inherents" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } -srml-babe = { path = "../../../srml/babe" } +srml-babe = { path = "../../../paint/babe" } client = { package = "substrate-client", path = "../../client" } header-metadata = { package = "substrate-header-metadata", path = "../../client/header-metadata" } consensus-common = { package = "substrate-consensus-common", path = "../common" } diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index 86efcbb95da2b..ff1e64cde0767 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive primitives = { package = "substrate-primitives", path = "../../primitives" } sr-primitives = { path = "../../sr-primitives" } client = { package = "substrate-client", path = "../../client" } -srml-timestamp = { path = "../../../srml/timestamp" } +srml-timestamp = { path = "../../../paint/timestamp" } inherents = { package = "substrate-inherents", path = "../../inherents" } pow-primitives = { package = "substrate-consensus-pow-primitives", path = "primitives" } consensus-common = { package = "substrate-consensus-common", path = "../common" } diff --git a/client/consensus/rhd/Cargo.toml b/client/consensus/rhd/Cargo.toml index 48d0840b5592d..4536afba6cfc6 100644 --- a/client/consensus/rhd/Cargo.toml +++ b/client/consensus/rhd/Cargo.toml @@ -13,8 +13,8 @@ primitives = { package = "substrate-primitives", path = "../../primitives" } consensus = { package = "substrate-consensus-common", path = "../common" } client = { package = "substrate-client", path = "../../client" } transaction_pool = { package = "substrate-transaction-pool", path = "../../transaction-pool" } -runtime_support = { package = "srml-support", path = "../../../srml/support" } -srml-system = { path = "../../../srml/system" } +runtime_support = { package = "srml-support", path = "../../../paint/support" } +srml-system = { path = "../../../paint/system" } sr-primitives = { path = "../../sr-primitives" } runtime_version = { package = "sr-version", path = "../../sr-version" } runtime_io = { package = "sr-io", path = "../../sr-io" } diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index 4820324870929..5508bd6ecdd76 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" client = { package = "substrate-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../primitives" } sr-primitives = { path = "../../sr-primitives" } -srml-authorship = { path = "../../../srml/authorship" } +srml-authorship = { path = "../../../paint/authorship" } consensus_common = { package = "substrate-consensus-common", path = "../common" } inherents = { package = "substrate-inherents", path = "../../inherents" } log = "0.4.8" diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index b8e46328ba4e9..e99561db5b3c9 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -24,7 +24,7 @@ client = { package = "substrate-client", path = "../client" } header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } inherents = { package = "substrate-inherents", path = "../../client/inherents" } network = { package = "substrate-network", path = "../network" } -srml-finality-tracker = { path = "../../srml/finality-tracker" } +srml-finality-tracker = { path = "../../paint/finality-tracker" } fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "primitives" } grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec"] } diff --git a/client/phragmen/Cargo.toml b/client/phragmen/Cargo.toml index 5ee6d3b3c24bc..7d1e1d82c05d0 100644 --- a/client/phragmen/Cargo.toml +++ b/client/phragmen/Cargo.toml @@ -11,7 +11,7 @@ sr-primitives = { path = "../sr-primitives", default-features = false } [dev-dependencies] runtime-io ={ package = "sr-io", path = "../sr-io" } -support = { package = "srml-support", path = "../../srml/support" } +support = { package = "srml-support", path = "../../paint/support" } rand = "0.7.2" [features] diff --git a/srml/README.adoc b/paint/README.adoc similarity index 100% rename from srml/README.adoc rename to paint/README.adoc diff --git a/srml/assets/Cargo.toml b/paint/assets/Cargo.toml similarity index 100% rename from srml/assets/Cargo.toml rename to paint/assets/Cargo.toml diff --git a/srml/assets/src/lib.rs b/paint/assets/src/lib.rs similarity index 100% rename from srml/assets/src/lib.rs rename to paint/assets/src/lib.rs diff --git a/srml/aura/Cargo.toml b/paint/aura/Cargo.toml similarity index 100% rename from srml/aura/Cargo.toml rename to paint/aura/Cargo.toml diff --git a/srml/aura/src/lib.rs b/paint/aura/src/lib.rs similarity index 100% rename from srml/aura/src/lib.rs rename to paint/aura/src/lib.rs diff --git a/srml/aura/src/mock.rs b/paint/aura/src/mock.rs similarity index 100% rename from srml/aura/src/mock.rs rename to paint/aura/src/mock.rs diff --git a/srml/aura/src/tests.rs b/paint/aura/src/tests.rs similarity index 100% rename from srml/aura/src/tests.rs rename to paint/aura/src/tests.rs diff --git a/srml/authority-discovery/Cargo.toml b/paint/authority-discovery/Cargo.toml similarity index 100% rename from srml/authority-discovery/Cargo.toml rename to paint/authority-discovery/Cargo.toml diff --git a/srml/authority-discovery/src/lib.rs b/paint/authority-discovery/src/lib.rs similarity index 100% rename from srml/authority-discovery/src/lib.rs rename to paint/authority-discovery/src/lib.rs diff --git a/srml/authorship/Cargo.toml b/paint/authorship/Cargo.toml similarity index 100% rename from srml/authorship/Cargo.toml rename to paint/authorship/Cargo.toml diff --git a/srml/authorship/src/lib.rs b/paint/authorship/src/lib.rs similarity index 100% rename from srml/authorship/src/lib.rs rename to paint/authorship/src/lib.rs diff --git a/srml/babe/Cargo.toml b/paint/babe/Cargo.toml similarity index 100% rename from srml/babe/Cargo.toml rename to paint/babe/Cargo.toml diff --git a/srml/babe/src/lib.rs b/paint/babe/src/lib.rs similarity index 100% rename from srml/babe/src/lib.rs rename to paint/babe/src/lib.rs diff --git a/srml/babe/src/mock.rs b/paint/babe/src/mock.rs similarity index 100% rename from srml/babe/src/mock.rs rename to paint/babe/src/mock.rs diff --git a/srml/babe/src/tests.rs b/paint/babe/src/tests.rs similarity index 100% rename from srml/babe/src/tests.rs rename to paint/babe/src/tests.rs diff --git a/srml/balances/Cargo.toml b/paint/balances/Cargo.toml similarity index 100% rename from srml/balances/Cargo.toml rename to paint/balances/Cargo.toml diff --git a/srml/balances/src/lib.rs b/paint/balances/src/lib.rs similarity index 100% rename from srml/balances/src/lib.rs rename to paint/balances/src/lib.rs diff --git a/srml/balances/src/mock.rs b/paint/balances/src/mock.rs similarity index 100% rename from srml/balances/src/mock.rs rename to paint/balances/src/mock.rs diff --git a/srml/balances/src/tests.rs b/paint/balances/src/tests.rs similarity index 100% rename from srml/balances/src/tests.rs rename to paint/balances/src/tests.rs diff --git a/srml/collective/Cargo.toml b/paint/collective/Cargo.toml similarity index 100% rename from srml/collective/Cargo.toml rename to paint/collective/Cargo.toml diff --git a/srml/collective/src/lib.rs b/paint/collective/src/lib.rs similarity index 100% rename from srml/collective/src/lib.rs rename to paint/collective/src/lib.rs diff --git a/srml/contracts/COMPLEXITY.md b/paint/contracts/COMPLEXITY.md similarity index 100% rename from srml/contracts/COMPLEXITY.md rename to paint/contracts/COMPLEXITY.md diff --git a/srml/contracts/Cargo.toml b/paint/contracts/Cargo.toml similarity index 100% rename from srml/contracts/Cargo.toml rename to paint/contracts/Cargo.toml diff --git a/srml/contracts/rpc/Cargo.toml b/paint/contracts/rpc/Cargo.toml similarity index 100% rename from srml/contracts/rpc/Cargo.toml rename to paint/contracts/rpc/Cargo.toml diff --git a/srml/contracts/rpc/runtime-api/Cargo.toml b/paint/contracts/rpc/runtime-api/Cargo.toml similarity index 100% rename from srml/contracts/rpc/runtime-api/Cargo.toml rename to paint/contracts/rpc/runtime-api/Cargo.toml diff --git a/srml/contracts/rpc/runtime-api/src/lib.rs b/paint/contracts/rpc/runtime-api/src/lib.rs similarity index 100% rename from srml/contracts/rpc/runtime-api/src/lib.rs rename to paint/contracts/rpc/runtime-api/src/lib.rs diff --git a/srml/contracts/rpc/src/lib.rs b/paint/contracts/rpc/src/lib.rs similarity index 100% rename from srml/contracts/rpc/src/lib.rs rename to paint/contracts/rpc/src/lib.rs diff --git a/srml/contracts/src/account_db.rs b/paint/contracts/src/account_db.rs similarity index 100% rename from srml/contracts/src/account_db.rs rename to paint/contracts/src/account_db.rs diff --git a/srml/contracts/src/exec.rs b/paint/contracts/src/exec.rs similarity index 100% rename from srml/contracts/src/exec.rs rename to paint/contracts/src/exec.rs diff --git a/srml/contracts/src/gas.rs b/paint/contracts/src/gas.rs similarity index 100% rename from srml/contracts/src/gas.rs rename to paint/contracts/src/gas.rs diff --git a/srml/contracts/src/lib.rs b/paint/contracts/src/lib.rs similarity index 100% rename from srml/contracts/src/lib.rs rename to paint/contracts/src/lib.rs diff --git a/srml/contracts/src/rent.rs b/paint/contracts/src/rent.rs similarity index 100% rename from srml/contracts/src/rent.rs rename to paint/contracts/src/rent.rs diff --git a/srml/contracts/src/tests.rs b/paint/contracts/src/tests.rs similarity index 100% rename from srml/contracts/src/tests.rs rename to paint/contracts/src/tests.rs diff --git a/srml/contracts/src/wasm/code_cache.rs b/paint/contracts/src/wasm/code_cache.rs similarity index 100% rename from srml/contracts/src/wasm/code_cache.rs rename to paint/contracts/src/wasm/code_cache.rs diff --git a/srml/contracts/src/wasm/env_def/macros.rs b/paint/contracts/src/wasm/env_def/macros.rs similarity index 100% rename from srml/contracts/src/wasm/env_def/macros.rs rename to paint/contracts/src/wasm/env_def/macros.rs diff --git a/srml/contracts/src/wasm/env_def/mod.rs b/paint/contracts/src/wasm/env_def/mod.rs similarity index 100% rename from srml/contracts/src/wasm/env_def/mod.rs rename to paint/contracts/src/wasm/env_def/mod.rs diff --git a/srml/contracts/src/wasm/mod.rs b/paint/contracts/src/wasm/mod.rs similarity index 100% rename from srml/contracts/src/wasm/mod.rs rename to paint/contracts/src/wasm/mod.rs diff --git a/srml/contracts/src/wasm/prepare.rs b/paint/contracts/src/wasm/prepare.rs similarity index 100% rename from srml/contracts/src/wasm/prepare.rs rename to paint/contracts/src/wasm/prepare.rs diff --git a/srml/contracts/src/wasm/runtime.rs b/paint/contracts/src/wasm/runtime.rs similarity index 100% rename from srml/contracts/src/wasm/runtime.rs rename to paint/contracts/src/wasm/runtime.rs diff --git a/srml/democracy/Cargo.toml b/paint/democracy/Cargo.toml similarity index 100% rename from srml/democracy/Cargo.toml rename to paint/democracy/Cargo.toml diff --git a/srml/democracy/src/lib.rs b/paint/democracy/src/lib.rs similarity index 100% rename from srml/democracy/src/lib.rs rename to paint/democracy/src/lib.rs diff --git a/srml/democracy/src/vote_threshold.rs b/paint/democracy/src/vote_threshold.rs similarity index 100% rename from srml/democracy/src/vote_threshold.rs rename to paint/democracy/src/vote_threshold.rs diff --git a/srml/elections-phragmen/Cargo.toml b/paint/elections-phragmen/Cargo.toml similarity index 100% rename from srml/elections-phragmen/Cargo.toml rename to paint/elections-phragmen/Cargo.toml diff --git a/srml/elections-phragmen/src/lib.rs b/paint/elections-phragmen/src/lib.rs similarity index 100% rename from srml/elections-phragmen/src/lib.rs rename to paint/elections-phragmen/src/lib.rs diff --git a/srml/elections/Cargo.toml b/paint/elections/Cargo.toml similarity index 100% rename from srml/elections/Cargo.toml rename to paint/elections/Cargo.toml diff --git a/srml/elections/src/lib.rs b/paint/elections/src/lib.rs similarity index 100% rename from srml/elections/src/lib.rs rename to paint/elections/src/lib.rs diff --git a/srml/elections/src/mock.rs b/paint/elections/src/mock.rs similarity index 100% rename from srml/elections/src/mock.rs rename to paint/elections/src/mock.rs diff --git a/srml/elections/src/tests.rs b/paint/elections/src/tests.rs similarity index 100% rename from srml/elections/src/tests.rs rename to paint/elections/src/tests.rs diff --git a/srml/evm/Cargo.toml b/paint/evm/Cargo.toml similarity index 100% rename from srml/evm/Cargo.toml rename to paint/evm/Cargo.toml diff --git a/srml/evm/src/backend.rs b/paint/evm/src/backend.rs similarity index 100% rename from srml/evm/src/backend.rs rename to paint/evm/src/backend.rs diff --git a/srml/evm/src/lib.rs b/paint/evm/src/lib.rs similarity index 100% rename from srml/evm/src/lib.rs rename to paint/evm/src/lib.rs diff --git a/srml/example/Cargo.toml b/paint/example/Cargo.toml similarity index 100% rename from srml/example/Cargo.toml rename to paint/example/Cargo.toml diff --git a/srml/example/src/lib.rs b/paint/example/src/lib.rs similarity index 100% rename from srml/example/src/lib.rs rename to paint/example/src/lib.rs diff --git a/srml/executive/Cargo.toml b/paint/executive/Cargo.toml similarity index 100% rename from srml/executive/Cargo.toml rename to paint/executive/Cargo.toml diff --git a/srml/executive/src/lib.rs b/paint/executive/src/lib.rs similarity index 100% rename from srml/executive/src/lib.rs rename to paint/executive/src/lib.rs diff --git a/srml/finality-tracker/Cargo.toml b/paint/finality-tracker/Cargo.toml similarity index 100% rename from srml/finality-tracker/Cargo.toml rename to paint/finality-tracker/Cargo.toml diff --git a/srml/finality-tracker/src/lib.rs b/paint/finality-tracker/src/lib.rs similarity index 100% rename from srml/finality-tracker/src/lib.rs rename to paint/finality-tracker/src/lib.rs diff --git a/srml/generic-asset/Cargo.toml b/paint/generic-asset/Cargo.toml similarity index 100% rename from srml/generic-asset/Cargo.toml rename to paint/generic-asset/Cargo.toml diff --git a/srml/generic-asset/src/lib.rs b/paint/generic-asset/src/lib.rs similarity index 100% rename from srml/generic-asset/src/lib.rs rename to paint/generic-asset/src/lib.rs diff --git a/srml/generic-asset/src/mock.rs b/paint/generic-asset/src/mock.rs similarity index 100% rename from srml/generic-asset/src/mock.rs rename to paint/generic-asset/src/mock.rs diff --git a/srml/generic-asset/src/tests.rs b/paint/generic-asset/src/tests.rs similarity index 100% rename from srml/generic-asset/src/tests.rs rename to paint/generic-asset/src/tests.rs diff --git a/srml/grandpa/Cargo.toml b/paint/grandpa/Cargo.toml similarity index 100% rename from srml/grandpa/Cargo.toml rename to paint/grandpa/Cargo.toml diff --git a/srml/grandpa/src/lib.rs b/paint/grandpa/src/lib.rs similarity index 100% rename from srml/grandpa/src/lib.rs rename to paint/grandpa/src/lib.rs diff --git a/srml/grandpa/src/mock.rs b/paint/grandpa/src/mock.rs similarity index 100% rename from srml/grandpa/src/mock.rs rename to paint/grandpa/src/mock.rs diff --git a/srml/grandpa/src/tests.rs b/paint/grandpa/src/tests.rs similarity index 100% rename from srml/grandpa/src/tests.rs rename to paint/grandpa/src/tests.rs diff --git a/srml/im-online/Cargo.toml b/paint/im-online/Cargo.toml similarity index 100% rename from srml/im-online/Cargo.toml rename to paint/im-online/Cargo.toml diff --git a/srml/im-online/src/lib.rs b/paint/im-online/src/lib.rs similarity index 100% rename from srml/im-online/src/lib.rs rename to paint/im-online/src/lib.rs diff --git a/srml/im-online/src/mock.rs b/paint/im-online/src/mock.rs similarity index 100% rename from srml/im-online/src/mock.rs rename to paint/im-online/src/mock.rs diff --git a/srml/im-online/src/tests.rs b/paint/im-online/src/tests.rs similarity index 100% rename from srml/im-online/src/tests.rs rename to paint/im-online/src/tests.rs diff --git a/srml/indices/Cargo.toml b/paint/indices/Cargo.toml similarity index 100% rename from srml/indices/Cargo.toml rename to paint/indices/Cargo.toml diff --git a/srml/indices/src/address.rs b/paint/indices/src/address.rs similarity index 100% rename from srml/indices/src/address.rs rename to paint/indices/src/address.rs diff --git a/srml/indices/src/lib.rs b/paint/indices/src/lib.rs similarity index 100% rename from srml/indices/src/lib.rs rename to paint/indices/src/lib.rs diff --git a/srml/indices/src/mock.rs b/paint/indices/src/mock.rs similarity index 100% rename from srml/indices/src/mock.rs rename to paint/indices/src/mock.rs diff --git a/srml/indices/src/tests.rs b/paint/indices/src/tests.rs similarity index 100% rename from srml/indices/src/tests.rs rename to paint/indices/src/tests.rs diff --git a/srml/membership/Cargo.toml b/paint/membership/Cargo.toml similarity index 100% rename from srml/membership/Cargo.toml rename to paint/membership/Cargo.toml diff --git a/srml/membership/src/lib.rs b/paint/membership/src/lib.rs similarity index 100% rename from srml/membership/src/lib.rs rename to paint/membership/src/lib.rs diff --git a/srml/metadata/Cargo.toml b/paint/metadata/Cargo.toml similarity index 100% rename from srml/metadata/Cargo.toml rename to paint/metadata/Cargo.toml diff --git a/srml/metadata/src/lib.rs b/paint/metadata/src/lib.rs similarity index 100% rename from srml/metadata/src/lib.rs rename to paint/metadata/src/lib.rs diff --git a/srml/nicks/Cargo.toml b/paint/nicks/Cargo.toml similarity index 100% rename from srml/nicks/Cargo.toml rename to paint/nicks/Cargo.toml diff --git a/srml/nicks/src/lib.rs b/paint/nicks/src/lib.rs similarity index 100% rename from srml/nicks/src/lib.rs rename to paint/nicks/src/lib.rs diff --git a/srml/offences/Cargo.toml b/paint/offences/Cargo.toml similarity index 100% rename from srml/offences/Cargo.toml rename to paint/offences/Cargo.toml diff --git a/srml/offences/src/lib.rs b/paint/offences/src/lib.rs similarity index 100% rename from srml/offences/src/lib.rs rename to paint/offences/src/lib.rs diff --git a/srml/offences/src/mock.rs b/paint/offences/src/mock.rs similarity index 100% rename from srml/offences/src/mock.rs rename to paint/offences/src/mock.rs diff --git a/srml/offences/src/tests.rs b/paint/offences/src/tests.rs similarity index 100% rename from srml/offences/src/tests.rs rename to paint/offences/src/tests.rs diff --git a/srml/randomness-collective-flip/Cargo.toml b/paint/randomness-collective-flip/Cargo.toml similarity index 100% rename from srml/randomness-collective-flip/Cargo.toml rename to paint/randomness-collective-flip/Cargo.toml diff --git a/srml/randomness-collective-flip/src/lib.rs b/paint/randomness-collective-flip/src/lib.rs similarity index 100% rename from srml/randomness-collective-flip/src/lib.rs rename to paint/randomness-collective-flip/src/lib.rs diff --git a/srml/scored-pool/Cargo.toml b/paint/scored-pool/Cargo.toml similarity index 100% rename from srml/scored-pool/Cargo.toml rename to paint/scored-pool/Cargo.toml diff --git a/srml/scored-pool/src/lib.rs b/paint/scored-pool/src/lib.rs similarity index 100% rename from srml/scored-pool/src/lib.rs rename to paint/scored-pool/src/lib.rs diff --git a/srml/scored-pool/src/mock.rs b/paint/scored-pool/src/mock.rs similarity index 100% rename from srml/scored-pool/src/mock.rs rename to paint/scored-pool/src/mock.rs diff --git a/srml/scored-pool/src/tests.rs b/paint/scored-pool/src/tests.rs similarity index 100% rename from srml/scored-pool/src/tests.rs rename to paint/scored-pool/src/tests.rs diff --git a/srml/session/Cargo.toml b/paint/session/Cargo.toml similarity index 100% rename from srml/session/Cargo.toml rename to paint/session/Cargo.toml diff --git a/srml/session/src/historical.rs b/paint/session/src/historical.rs similarity index 100% rename from srml/session/src/historical.rs rename to paint/session/src/historical.rs diff --git a/srml/session/src/lib.rs b/paint/session/src/lib.rs similarity index 100% rename from srml/session/src/lib.rs rename to paint/session/src/lib.rs diff --git a/srml/session/src/mock.rs b/paint/session/src/mock.rs similarity index 100% rename from srml/session/src/mock.rs rename to paint/session/src/mock.rs diff --git a/srml/staking/Cargo.toml b/paint/staking/Cargo.toml similarity index 100% rename from srml/staking/Cargo.toml rename to paint/staking/Cargo.toml diff --git a/srml/staking/reward-curve/Cargo.toml b/paint/staking/reward-curve/Cargo.toml similarity index 100% rename from srml/staking/reward-curve/Cargo.toml rename to paint/staking/reward-curve/Cargo.toml diff --git a/srml/staking/reward-curve/src/lib.rs b/paint/staking/reward-curve/src/lib.rs similarity index 100% rename from srml/staking/reward-curve/src/lib.rs rename to paint/staking/reward-curve/src/lib.rs diff --git a/srml/staking/reward-curve/src/log.rs b/paint/staking/reward-curve/src/log.rs similarity index 100% rename from srml/staking/reward-curve/src/log.rs rename to paint/staking/reward-curve/src/log.rs diff --git a/srml/staking/reward-curve/tests/test.rs b/paint/staking/reward-curve/tests/test.rs similarity index 100% rename from srml/staking/reward-curve/tests/test.rs rename to paint/staking/reward-curve/tests/test.rs diff --git a/srml/staking/src/inflation.rs b/paint/staking/src/inflation.rs similarity index 100% rename from srml/staking/src/inflation.rs rename to paint/staking/src/inflation.rs diff --git a/srml/staking/src/lib.rs b/paint/staking/src/lib.rs similarity index 100% rename from srml/staking/src/lib.rs rename to paint/staking/src/lib.rs diff --git a/srml/staking/src/mock.rs b/paint/staking/src/mock.rs similarity index 100% rename from srml/staking/src/mock.rs rename to paint/staking/src/mock.rs diff --git a/srml/staking/src/tests.rs b/paint/staking/src/tests.rs similarity index 100% rename from srml/staking/src/tests.rs rename to paint/staking/src/tests.rs diff --git a/srml/sudo/Cargo.toml b/paint/sudo/Cargo.toml similarity index 100% rename from srml/sudo/Cargo.toml rename to paint/sudo/Cargo.toml diff --git a/srml/sudo/src/lib.rs b/paint/sudo/src/lib.rs similarity index 100% rename from srml/sudo/src/lib.rs rename to paint/sudo/src/lib.rs diff --git a/srml/support/Cargo.toml b/paint/support/Cargo.toml similarity index 100% rename from srml/support/Cargo.toml rename to paint/support/Cargo.toml diff --git a/srml/support/procedural/Cargo.toml b/paint/support/procedural/Cargo.toml similarity index 100% rename from srml/support/procedural/Cargo.toml rename to paint/support/procedural/Cargo.toml diff --git a/srml/support/procedural/src/lib.rs b/paint/support/procedural/src/lib.rs similarity index 100% rename from srml/support/procedural/src/lib.rs rename to paint/support/procedural/src/lib.rs diff --git a/srml/support/procedural/src/storage/genesis_config/builder_def.rs b/paint/support/procedural/src/storage/genesis_config/builder_def.rs similarity index 100% rename from srml/support/procedural/src/storage/genesis_config/builder_def.rs rename to paint/support/procedural/src/storage/genesis_config/builder_def.rs diff --git a/srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs similarity index 100% rename from srml/support/procedural/src/storage/genesis_config/genesis_config_def.rs rename to paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs diff --git a/srml/support/procedural/src/storage/genesis_config/mod.rs b/paint/support/procedural/src/storage/genesis_config/mod.rs similarity index 100% rename from srml/support/procedural/src/storage/genesis_config/mod.rs rename to paint/support/procedural/src/storage/genesis_config/mod.rs diff --git a/srml/support/procedural/src/storage/getters.rs b/paint/support/procedural/src/storage/getters.rs similarity index 100% rename from srml/support/procedural/src/storage/getters.rs rename to paint/support/procedural/src/storage/getters.rs diff --git a/srml/support/procedural/src/storage/instance_trait.rs b/paint/support/procedural/src/storage/instance_trait.rs similarity index 100% rename from srml/support/procedural/src/storage/instance_trait.rs rename to paint/support/procedural/src/storage/instance_trait.rs diff --git a/srml/support/procedural/src/storage/metadata.rs b/paint/support/procedural/src/storage/metadata.rs similarity index 100% rename from srml/support/procedural/src/storage/metadata.rs rename to paint/support/procedural/src/storage/metadata.rs diff --git a/srml/support/procedural/src/storage/mod.rs b/paint/support/procedural/src/storage/mod.rs similarity index 100% rename from srml/support/procedural/src/storage/mod.rs rename to paint/support/procedural/src/storage/mod.rs diff --git a/srml/support/procedural/src/storage/parse.rs b/paint/support/procedural/src/storage/parse.rs similarity index 100% rename from srml/support/procedural/src/storage/parse.rs rename to paint/support/procedural/src/storage/parse.rs diff --git a/srml/support/procedural/src/storage/storage_struct.rs b/paint/support/procedural/src/storage/storage_struct.rs similarity index 100% rename from srml/support/procedural/src/storage/storage_struct.rs rename to paint/support/procedural/src/storage/storage_struct.rs diff --git a/srml/support/procedural/src/storage/store_trait.rs b/paint/support/procedural/src/storage/store_trait.rs similarity index 100% rename from srml/support/procedural/src/storage/store_trait.rs rename to paint/support/procedural/src/storage/store_trait.rs diff --git a/srml/support/procedural/tools/Cargo.toml b/paint/support/procedural/tools/Cargo.toml similarity index 100% rename from srml/support/procedural/tools/Cargo.toml rename to paint/support/procedural/tools/Cargo.toml diff --git a/srml/support/procedural/tools/derive/Cargo.toml b/paint/support/procedural/tools/derive/Cargo.toml similarity index 100% rename from srml/support/procedural/tools/derive/Cargo.toml rename to paint/support/procedural/tools/derive/Cargo.toml diff --git a/srml/support/procedural/tools/derive/src/lib.rs b/paint/support/procedural/tools/derive/src/lib.rs similarity index 100% rename from srml/support/procedural/tools/derive/src/lib.rs rename to paint/support/procedural/tools/derive/src/lib.rs diff --git a/srml/support/procedural/tools/src/lib.rs b/paint/support/procedural/tools/src/lib.rs similarity index 100% rename from srml/support/procedural/tools/src/lib.rs rename to paint/support/procedural/tools/src/lib.rs diff --git a/srml/support/procedural/tools/src/syn_ext.rs b/paint/support/procedural/tools/src/syn_ext.rs similarity index 100% rename from srml/support/procedural/tools/src/syn_ext.rs rename to paint/support/procedural/tools/src/syn_ext.rs diff --git a/srml/support/rpc/Cargo.toml b/paint/support/rpc/Cargo.toml similarity index 100% rename from srml/support/rpc/Cargo.toml rename to paint/support/rpc/Cargo.toml diff --git a/srml/support/rpc/src/lib.rs b/paint/support/rpc/src/lib.rs similarity index 100% rename from srml/support/rpc/src/lib.rs rename to paint/support/rpc/src/lib.rs diff --git a/srml/support/src/debug.rs b/paint/support/src/debug.rs similarity index 100% rename from srml/support/src/debug.rs rename to paint/support/src/debug.rs diff --git a/srml/support/src/dispatch.rs b/paint/support/src/dispatch.rs similarity index 100% rename from srml/support/src/dispatch.rs rename to paint/support/src/dispatch.rs diff --git a/srml/support/src/error.rs b/paint/support/src/error.rs similarity index 100% rename from srml/support/src/error.rs rename to paint/support/src/error.rs diff --git a/srml/support/src/event.rs b/paint/support/src/event.rs similarity index 100% rename from srml/support/src/event.rs rename to paint/support/src/event.rs diff --git a/srml/support/src/hash.rs b/paint/support/src/hash.rs similarity index 100% rename from srml/support/src/hash.rs rename to paint/support/src/hash.rs diff --git a/srml/support/src/inherent.rs b/paint/support/src/inherent.rs similarity index 100% rename from srml/support/src/inherent.rs rename to paint/support/src/inherent.rs diff --git a/srml/support/src/lib.rs b/paint/support/src/lib.rs similarity index 100% rename from srml/support/src/lib.rs rename to paint/support/src/lib.rs diff --git a/srml/support/src/metadata.rs b/paint/support/src/metadata.rs similarity index 100% rename from srml/support/src/metadata.rs rename to paint/support/src/metadata.rs diff --git a/srml/support/src/origin.rs b/paint/support/src/origin.rs similarity index 100% rename from srml/support/src/origin.rs rename to paint/support/src/origin.rs diff --git a/srml/support/src/runtime.rs b/paint/support/src/runtime.rs similarity index 100% rename from srml/support/src/runtime.rs rename to paint/support/src/runtime.rs diff --git a/srml/support/src/storage/child.rs b/paint/support/src/storage/child.rs similarity index 100% rename from srml/support/src/storage/child.rs rename to paint/support/src/storage/child.rs diff --git a/srml/support/src/storage/generator/double_map.rs b/paint/support/src/storage/generator/double_map.rs similarity index 100% rename from srml/support/src/storage/generator/double_map.rs rename to paint/support/src/storage/generator/double_map.rs diff --git a/srml/support/src/storage/generator/linked_map.rs b/paint/support/src/storage/generator/linked_map.rs similarity index 100% rename from srml/support/src/storage/generator/linked_map.rs rename to paint/support/src/storage/generator/linked_map.rs diff --git a/srml/support/src/storage/generator/map.rs b/paint/support/src/storage/generator/map.rs similarity index 100% rename from srml/support/src/storage/generator/map.rs rename to paint/support/src/storage/generator/map.rs diff --git a/srml/support/src/storage/generator/mod.rs b/paint/support/src/storage/generator/mod.rs similarity index 100% rename from srml/support/src/storage/generator/mod.rs rename to paint/support/src/storage/generator/mod.rs diff --git a/srml/support/src/storage/generator/value.rs b/paint/support/src/storage/generator/value.rs similarity index 100% rename from srml/support/src/storage/generator/value.rs rename to paint/support/src/storage/generator/value.rs diff --git a/srml/support/src/storage/hashed.rs b/paint/support/src/storage/hashed.rs similarity index 100% rename from srml/support/src/storage/hashed.rs rename to paint/support/src/storage/hashed.rs diff --git a/srml/support/src/storage/mod.rs b/paint/support/src/storage/mod.rs similarity index 100% rename from srml/support/src/storage/mod.rs rename to paint/support/src/storage/mod.rs diff --git a/srml/support/src/storage/unhashed.rs b/paint/support/src/storage/unhashed.rs similarity index 100% rename from srml/support/src/storage/unhashed.rs rename to paint/support/src/storage/unhashed.rs diff --git a/srml/support/src/traits.rs b/paint/support/src/traits.rs similarity index 100% rename from srml/support/src/traits.rs rename to paint/support/src/traits.rs diff --git a/srml/support/src/unsigned.rs b/paint/support/src/unsigned.rs similarity index 100% rename from srml/support/src/unsigned.rs rename to paint/support/src/unsigned.rs diff --git a/srml/support/test/Cargo.toml b/paint/support/test/Cargo.toml similarity index 100% rename from srml/support/test/Cargo.toml rename to paint/support/test/Cargo.toml diff --git a/srml/support/test/src/lib.rs b/paint/support/test/src/lib.rs similarity index 100% rename from srml/support/test/src/lib.rs rename to paint/support/test/src/lib.rs diff --git a/srml/support/test/tests/decl_storage.rs b/paint/support/test/tests/decl_storage.rs similarity index 100% rename from srml/support/test/tests/decl_storage.rs rename to paint/support/test/tests/decl_storage.rs diff --git a/srml/support/test/tests/decl_storage_ui.rs b/paint/support/test/tests/decl_storage_ui.rs similarity index 100% rename from srml/support/test/tests/decl_storage_ui.rs rename to paint/support/test/tests/decl_storage_ui.rs diff --git a/srml/support/test/tests/decl_storage_ui/config_duplicate.rs b/paint/support/test/tests/decl_storage_ui/config_duplicate.rs similarity index 100% rename from srml/support/test/tests/decl_storage_ui/config_duplicate.rs rename to paint/support/test/tests/decl_storage_ui/config_duplicate.rs diff --git a/srml/support/test/tests/decl_storage_ui/config_duplicate.stderr b/paint/support/test/tests/decl_storage_ui/config_duplicate.stderr similarity index 100% rename from srml/support/test/tests/decl_storage_ui/config_duplicate.stderr rename to paint/support/test/tests/decl_storage_ui/config_duplicate.stderr diff --git a/srml/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/paint/support/test/tests/decl_storage_ui/config_get_duplicate.rs similarity index 100% rename from srml/support/test/tests/decl_storage_ui/config_get_duplicate.rs rename to paint/support/test/tests/decl_storage_ui/config_get_duplicate.rs diff --git a/srml/support/test/tests/decl_storage_ui/config_get_duplicate.stderr b/paint/support/test/tests/decl_storage_ui/config_get_duplicate.stderr similarity index 100% rename from srml/support/test/tests/decl_storage_ui/config_get_duplicate.stderr rename to paint/support/test/tests/decl_storage_ui/config_get_duplicate.stderr diff --git a/srml/support/test/tests/decl_storage_ui/get_duplicate.rs b/paint/support/test/tests/decl_storage_ui/get_duplicate.rs similarity index 100% rename from srml/support/test/tests/decl_storage_ui/get_duplicate.rs rename to paint/support/test/tests/decl_storage_ui/get_duplicate.rs diff --git a/srml/support/test/tests/decl_storage_ui/get_duplicate.stderr b/paint/support/test/tests/decl_storage_ui/get_duplicate.stderr similarity index 100% rename from srml/support/test/tests/decl_storage_ui/get_duplicate.stderr rename to paint/support/test/tests/decl_storage_ui/get_duplicate.stderr diff --git a/srml/support/test/tests/final_keys.rs b/paint/support/test/tests/final_keys.rs similarity index 100% rename from srml/support/test/tests/final_keys.rs rename to paint/support/test/tests/final_keys.rs diff --git a/srml/support/test/tests/genesisconfig.rs b/paint/support/test/tests/genesisconfig.rs similarity index 100% rename from srml/support/test/tests/genesisconfig.rs rename to paint/support/test/tests/genesisconfig.rs diff --git a/srml/support/test/tests/instance.rs b/paint/support/test/tests/instance.rs similarity index 100% rename from srml/support/test/tests/instance.rs rename to paint/support/test/tests/instance.rs diff --git a/srml/support/test/tests/issue2219.rs b/paint/support/test/tests/issue2219.rs similarity index 100% rename from srml/support/test/tests/issue2219.rs rename to paint/support/test/tests/issue2219.rs diff --git a/srml/support/test/tests/reserved_keyword.rs b/paint/support/test/tests/reserved_keyword.rs similarity index 100% rename from srml/support/test/tests/reserved_keyword.rs rename to paint/support/test/tests/reserved_keyword.rs diff --git a/srml/support/test/tests/reserved_keyword/on_initialize.rs b/paint/support/test/tests/reserved_keyword/on_initialize.rs similarity index 100% rename from srml/support/test/tests/reserved_keyword/on_initialize.rs rename to paint/support/test/tests/reserved_keyword/on_initialize.rs diff --git a/srml/support/test/tests/reserved_keyword/on_initialize.stderr b/paint/support/test/tests/reserved_keyword/on_initialize.stderr similarity index 100% rename from srml/support/test/tests/reserved_keyword/on_initialize.stderr rename to paint/support/test/tests/reserved_keyword/on_initialize.stderr diff --git a/srml/support/test/tests/system.rs b/paint/support/test/tests/system.rs similarity index 100% rename from srml/support/test/tests/system.rs rename to paint/support/test/tests/system.rs diff --git a/srml/system/Cargo.toml b/paint/system/Cargo.toml similarity index 100% rename from srml/system/Cargo.toml rename to paint/system/Cargo.toml diff --git a/srml/system/benches/bench.rs b/paint/system/benches/bench.rs similarity index 100% rename from srml/system/benches/bench.rs rename to paint/system/benches/bench.rs diff --git a/srml/system/rpc/Cargo.toml b/paint/system/rpc/Cargo.toml similarity index 100% rename from srml/system/rpc/Cargo.toml rename to paint/system/rpc/Cargo.toml diff --git a/srml/system/rpc/runtime-api/Cargo.toml b/paint/system/rpc/runtime-api/Cargo.toml similarity index 100% rename from srml/system/rpc/runtime-api/Cargo.toml rename to paint/system/rpc/runtime-api/Cargo.toml diff --git a/srml/system/rpc/runtime-api/src/lib.rs b/paint/system/rpc/runtime-api/src/lib.rs similarity index 100% rename from srml/system/rpc/runtime-api/src/lib.rs rename to paint/system/rpc/runtime-api/src/lib.rs diff --git a/srml/system/rpc/src/lib.rs b/paint/system/rpc/src/lib.rs similarity index 100% rename from srml/system/rpc/src/lib.rs rename to paint/system/rpc/src/lib.rs diff --git a/srml/system/src/lib.rs b/paint/system/src/lib.rs similarity index 100% rename from srml/system/src/lib.rs rename to paint/system/src/lib.rs diff --git a/srml/system/src/offchain.rs b/paint/system/src/offchain.rs similarity index 100% rename from srml/system/src/offchain.rs rename to paint/system/src/offchain.rs diff --git a/srml/timestamp/Cargo.toml b/paint/timestamp/Cargo.toml similarity index 100% rename from srml/timestamp/Cargo.toml rename to paint/timestamp/Cargo.toml diff --git a/srml/timestamp/src/lib.rs b/paint/timestamp/src/lib.rs similarity index 100% rename from srml/timestamp/src/lib.rs rename to paint/timestamp/src/lib.rs diff --git a/srml/transaction-payment/Cargo.toml b/paint/transaction-payment/Cargo.toml similarity index 100% rename from srml/transaction-payment/Cargo.toml rename to paint/transaction-payment/Cargo.toml diff --git a/srml/transaction-payment/rpc/Cargo.toml b/paint/transaction-payment/rpc/Cargo.toml similarity index 100% rename from srml/transaction-payment/rpc/Cargo.toml rename to paint/transaction-payment/rpc/Cargo.toml diff --git a/srml/transaction-payment/rpc/runtime-api/Cargo.toml b/paint/transaction-payment/rpc/runtime-api/Cargo.toml similarity index 100% rename from srml/transaction-payment/rpc/runtime-api/Cargo.toml rename to paint/transaction-payment/rpc/runtime-api/Cargo.toml diff --git a/srml/transaction-payment/rpc/runtime-api/src/lib.rs b/paint/transaction-payment/rpc/runtime-api/src/lib.rs similarity index 100% rename from srml/transaction-payment/rpc/runtime-api/src/lib.rs rename to paint/transaction-payment/rpc/runtime-api/src/lib.rs diff --git a/srml/transaction-payment/rpc/src/lib.rs b/paint/transaction-payment/rpc/src/lib.rs similarity index 100% rename from srml/transaction-payment/rpc/src/lib.rs rename to paint/transaction-payment/rpc/src/lib.rs diff --git a/srml/transaction-payment/src/lib.rs b/paint/transaction-payment/src/lib.rs similarity index 100% rename from srml/transaction-payment/src/lib.rs rename to paint/transaction-payment/src/lib.rs diff --git a/srml/treasury/Cargo.toml b/paint/treasury/Cargo.toml similarity index 100% rename from srml/treasury/Cargo.toml rename to paint/treasury/Cargo.toml diff --git a/srml/treasury/src/lib.rs b/paint/treasury/src/lib.rs similarity index 100% rename from srml/treasury/src/lib.rs rename to paint/treasury/src/lib.rs diff --git a/srml/utility/Cargo.toml b/paint/utility/Cargo.toml similarity index 100% rename from srml/utility/Cargo.toml rename to paint/utility/Cargo.toml diff --git a/srml/utility/src/lib.rs b/paint/utility/src/lib.rs similarity index 100% rename from srml/utility/src/lib.rs rename to paint/utility/src/lib.rs diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 85209fd8685ec..7de7bf5c62e9c 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -21,18 +21,18 @@ runtime_io = { package = "sr-io", path = "../../../client/sr-io", default-featur sr-primitives = { path = "../../../client/sr-primitives", default-features = false } session = { package = "substrate-session", path = "../../../client/session", default-features = false } runtime_version = { package = "sr-version", path = "../../../client/sr-version", default-features = false } -runtime_support = { package = "srml-support", path = "../../../srml/support", default-features = false } +runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false } substrate-trie = { path = "../../../client/trie", default-features = false } trie-db = { version = "0.15.2", default-features = false } memory-db = { version = "0.15.2", default-features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false} runtime-interface = { package = "substrate-runtime-interface", path = "../../../client/runtime-interface", default-features = false} -executive = { package = "srml-executive", path = "../../../srml/executive", default-features = false } +executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } cfg-if = "0.1.10" -srml-babe = { path = "../../../srml/babe", default-features = false } -srml-timestamp = { path = "../../../srml/timestamp", default-features = false } -srml-system = { path = "../../../srml/system", default-features = false } -srml-system-rpc-runtime-api = { path = "../../../srml/system/rpc/runtime-api", default-features = false } +srml-babe = { path = "../../../paint/babe", default-features = false } +srml-timestamp = { path = "../../../paint/timestamp", default-features = false } +srml-system = { path = "../../../paint/system", default-features = false } +srml-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false } [dev-dependencies] substrate-executor = { path = "../../../client/executor" } From 3266289d34e652a09aacbe674c5f338220767616 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 15:04:05 +0100 Subject: [PATCH 19/61] update docs --- docs/Structure.adoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/Structure.adoc b/docs/Structure.adoc index 1ec9ecc3bcc06..c870177df71c1 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -9,7 +9,7 @@ Substrate is split into multiple levels with increasing opinion and decreasing flexibility: -* runtime +* primitives * client * PAINT (formerly `srml`) @@ -22,8 +22,8 @@ Putting all these components together we have: === Runtime -* _found in_: `/runtime` -* _crates prefix_: `sr-` +* _found in_: `/primitives` +* _crates prefix_: `sp-` * _constrains_: ** must be `[no_std]` ** crates may not (dev-)depend on crates in other subfolders of this repo @@ -44,17 +44,18 @@ In the client you can find a set of crates to construct the outer substrate-node * _found in_: `/paint` * _crates prefix_: `paint-` * _constrains_: -** must be `[no_std]` +** all crates that go on chain, must be `[no_std]` ** must not (dev-)depend on anything in `/client` -PAINT, the Parity Application Interface for Networked Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. +PAINT, the Parity Application Interface for Network-wide Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. === integration tests * _found in_: `/test` * _crates prefix_: `substrate-test` * _constrains_: -** only helpers may be published, purely testing crates must be `publish = false` +** only helpers may be published +** purely testing crates must be `publish = false` All tests that have to pull (dev)-dependencies out of their substree and would thus break the dependency rules, are considered intergration tests and should be stored in here. Only helper-crates in here shall be published, everything else is expected to be non-publish. From e04b4fc10e7122b509d82e92462630d8edb14825 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 15:30:59 +0100 Subject: [PATCH 20/61] move client/sr-* -> primitives/ --- Cargo.toml | 16 ++++++++-------- bin/node-template/Cargo.toml | 4 ++-- bin/node-template/runtime/Cargo.toml | 8 ++++---- bin/node/cli/Cargo.toml | 4 ++-- bin/node/executor/Cargo.toml | 4 ++-- bin/node/primitives/Cargo.toml | 2 +- bin/node/rpc/Cargo.toml | 2 +- bin/node/runtime/Cargo.toml | 10 +++++----- bin/node/testing/Cargo.toml | 4 ++-- bin/subkey/Cargo.toml | 2 +- client/application-crypto/Cargo.toml | 6 +++--- client/authority-discovery/Cargo.toml | 2 +- client/authority-discovery/primitives/Cargo.toml | 4 ++-- client/basic-authorship/Cargo.toml | 2 +- client/chain-spec/Cargo.toml | 2 +- client/cli/Cargo.toml | 2 +- client/client/Cargo.toml | 8 ++++---- client/client/db/Cargo.toml | 2 +- client/client/header-metadata/Cargo.toml | 2 +- client/consensus/aura/Cargo.toml | 6 +++--- client/consensus/aura/primitives/Cargo.toml | 4 ++-- client/consensus/babe/Cargo.toml | 6 +++--- client/consensus/babe/primitives/Cargo.toml | 4 ++-- client/consensus/common/Cargo.toml | 6 +++--- client/consensus/pow/Cargo.toml | 2 +- client/consensus/pow/primitives/Cargo.toml | 4 ++-- client/consensus/rhd/Cargo.toml | 6 +++--- client/consensus/slots/Cargo.toml | 2 +- client/consensus/uncles/Cargo.toml | 2 +- client/executor/Cargo.toml | 4 ++-- client/executor/runtime-test/Cargo.toml | 8 ++++---- client/externalities/Cargo.toml | 2 +- client/finality-grandpa/Cargo.toml | 2 +- client/finality-grandpa/primitives/Cargo.toml | 4 ++-- client/inherents/Cargo.toml | 4 ++-- client/keyring/Cargo.toml | 2 +- client/network/Cargo.toml | 2 +- client/offchain/Cargo.toml | 2 +- client/offchain/primitives/Cargo.toml | 2 +- client/phragmen/Cargo.toml | 6 +++--- client/primitives/Cargo.toml | 2 +- client/primitives/storage/Cargo.toml | 2 +- client/rpc-servers/Cargo.toml | 2 +- client/rpc/Cargo.toml | 6 +++--- client/rpc/api/Cargo.toml | 2 +- client/runtime-interface/Cargo.toml | 4 ++-- client/runtime-interface/test-wasm/Cargo.toml | 4 ++-- client/service/Cargo.toml | 4 ++-- client/service/test/Cargo.toml | 2 +- client/session/Cargo.toml | 4 ++-- client/transaction-pool/Cargo.toml | 2 +- client/transaction-pool/graph/Cargo.toml | 2 +- client/trie/Cargo.toml | 2 +- paint/assets/Cargo.toml | 6 +++--- paint/aura/Cargo.toml | 6 +++--- paint/authority-discovery/Cargo.toml | 8 ++++---- paint/authorship/Cargo.toml | 6 +++--- paint/babe/Cargo.toml | 10 +++++----- paint/balances/Cargo.toml | 6 +++--- paint/collective/Cargo.toml | 6 +++--- paint/contracts/Cargo.toml | 8 ++++---- paint/contracts/rpc/Cargo.toml | 2 +- paint/contracts/rpc/runtime-api/Cargo.toml | 4 ++-- paint/democracy/Cargo.toml | 6 +++--- paint/elections-phragmen/Cargo.toml | 6 +++--- paint/elections/Cargo.toml | 6 +++--- paint/evm/Cargo.toml | 6 +++--- paint/example/Cargo.toml | 6 +++--- paint/executive/Cargo.toml | 6 +++--- paint/finality-tracker/Cargo.toml | 6 +++--- paint/generic-asset/Cargo.toml | 6 +++--- paint/grandpa/Cargo.toml | 8 ++++---- paint/im-online/Cargo.toml | 8 ++++---- paint/indices/Cargo.toml | 6 +++--- paint/membership/Cargo.toml | 6 +++--- paint/metadata/Cargo.toml | 2 +- paint/nicks/Cargo.toml | 6 +++--- paint/offences/Cargo.toml | 8 ++++---- paint/randomness-collective-flip/Cargo.toml | 6 +++--- paint/scored-pool/Cargo.toml | 6 +++--- paint/session/Cargo.toml | 8 ++++---- paint/staking/Cargo.toml | 8 ++++---- paint/staking/reward-curve/Cargo.toml | 2 +- paint/sudo/Cargo.toml | 6 +++--- paint/support/Cargo.toml | 6 +++--- paint/support/procedural/Cargo.toml | 2 +- paint/support/test/Cargo.toml | 4 ++-- paint/system/Cargo.toml | 8 ++++---- paint/system/rpc/Cargo.toml | 2 +- paint/timestamp/Cargo.toml | 6 +++--- paint/transaction-payment/Cargo.toml | 6 +++--- paint/transaction-payment/rpc/Cargo.toml | 2 +- .../rpc/runtime-api/Cargo.toml | 4 ++-- paint/treasury/Cargo.toml | 6 +++--- paint/utility/Cargo.toml | 6 +++--- {client => primitives}/sr-api-macros/Cargo.toml | 8 ++++---- .../sr-api-macros/benches/bench.rs | 0 .../sr-api-macros/src/decl_runtime_apis.rs | 0 .../sr-api-macros/src/impl_runtime_apis.rs | 0 {client => primitives}/sr-api-macros/src/lib.rs | 0 .../sr-api-macros/src/utils.rs | 0 .../sr-api-macros/tests/decl_and_impl.rs | 0 .../sr-api-macros/tests/runtime_calls.rs | 0 .../sr-api-macros/tests/trybuild.rs | 0 .../tests/ui/adding_self_parameter.rs | 0 .../tests/ui/adding_self_parameter.stderr | 0 .../tests/ui/changed_in_unknown_version.rs | 0 .../tests/ui/changed_in_unknown_version.stderr | 0 .../tests/ui/declaring_old_block.rs | 0 .../tests/ui/declaring_old_block.stderr | 0 .../declaring_own_block_with_different_name.rs | 0 ...eclaring_own_block_with_different_name.stderr | 0 .../tests/ui/empty_impl_runtime_apis_call.rs | 0 .../tests/ui/empty_impl_runtime_apis_call.stderr | 0 .../tests/ui/impl_incorrect_method_signature.rs | 0 .../ui/impl_incorrect_method_signature.stderr | 0 .../tests/ui/impl_two_traits_with_same_name.rs | 0 .../ui/impl_two_traits_with_same_name.stderr | 0 .../tests/ui/invalid_api_version.rs | 0 .../tests/ui/invalid_api_version.stderr | 0 .../tests/ui/invalid_api_version_2.rs | 0 .../tests/ui/invalid_api_version_2.stderr | 0 .../tests/ui/invalid_api_version_3.rs | 0 .../tests/ui/invalid_api_version_3.stderr | 0 .../tests/ui/missing_block_generic_parameter.rs | 0 .../ui/missing_block_generic_parameter.stderr | 0 .../tests/ui/missing_path_for_trait.rs | 0 .../tests/ui/missing_path_for_trait.stderr | 0 .../type_reference_in_impl_runtime_apis_call.rs | 0 ...pe_reference_in_impl_runtime_apis_call.stderr | 0 {client => primitives}/sr-arithmetic/Cargo.toml | 2 +- .../sr-arithmetic/benches/bench.rs | 0 .../sr-arithmetic/fuzzer/.gitignore | 0 .../sr-arithmetic/fuzzer/Cargo.lock | 0 .../sr-arithmetic/fuzzer/Cargo.toml | 0 .../sr-arithmetic/fuzzer/src/biguint.rs | 0 .../sr-arithmetic/fuzzer/src/rational128.rs | 0 .../sr-arithmetic/src/biguint.rs | 0 .../sr-arithmetic/src/fixed64.rs | 0 .../sr-arithmetic/src/helpers_128bit.rs | 0 {client => primitives}/sr-arithmetic/src/lib.rs | 0 .../sr-arithmetic/src/per_things.rs | 0 .../sr-arithmetic/src/rational128.rs | 0 .../sr-arithmetic/src/traits.rs | 0 {client => primitives}/sr-io/Cargo.toml | 10 +++++----- {client => primitives}/sr-io/src/lib.rs | 0 {client => primitives}/sr-io/with_std.rs | 0 {client => primitives}/sr-io/without_std.rs | 0 {client => primitives}/sr-primitives/Cargo.toml | 6 +++--- .../sr-primitives/src/curve.rs | 0 .../sr-primitives/src/generic/block.rs | 0 .../src/generic/checked_extrinsic.rs | 0 .../sr-primitives/src/generic/digest.rs | 0 .../sr-primitives/src/generic/era.rs | 0 .../sr-primitives/src/generic/header.rs | 0 .../sr-primitives/src/generic/mod.rs | 0 .../sr-primitives/src/generic/tests.rs | 0 .../src/generic/unchecked_extrinsic.rs | 0 {client => primitives}/sr-primitives/src/lib.rs | 0 .../sr-primitives/src/offchain/http.rs | 0 .../sr-primitives/src/offchain/mod.rs | 0 .../sr-primitives/src/testing.rs | 0 .../sr-primitives/src/traits.rs | 0 .../sr-primitives/src/transaction_validity.rs | 0 .../sr-primitives/src/weights.rs | 0 {client => primitives}/sr-sandbox/Cargo.toml | 2 +- {client => primitives}/sr-sandbox/src/lib.rs | 0 {client => primitives}/sr-sandbox/with_std.rs | 0 {client => primitives}/sr-sandbox/without_std.rs | 0 .../sr-staking-primitives/Cargo.toml | 0 .../sr-staking-primitives/src/lib.rs | 0 .../sr-staking-primitives/src/offence.rs | 0 {client => primitives}/sr-std/Cargo.toml | 0 {client => primitives}/sr-std/src/lib.rs | 0 {client => primitives}/sr-std/with_std.rs | 0 {client => primitives}/sr-std/without_std.rs | 0 {client => primitives}/sr-version/Cargo.toml | 0 {client => primitives}/sr-version/src/lib.rs | 0 test/utils/client/Cargo.toml | 2 +- test/utils/runtime/Cargo.toml | 8 ++++---- test/utils/runtime/client/Cargo.toml | 2 +- test/utils/transaction-factory/Cargo.toml | 2 +- 182 files changed, 244 insertions(+), 244 deletions(-) rename {client => primitives}/sr-api-macros/Cargo.toml (81%) rename {client => primitives}/sr-api-macros/benches/bench.rs (100%) rename {client => primitives}/sr-api-macros/src/decl_runtime_apis.rs (100%) rename {client => primitives}/sr-api-macros/src/impl_runtime_apis.rs (100%) rename {client => primitives}/sr-api-macros/src/lib.rs (100%) rename {client => primitives}/sr-api-macros/src/utils.rs (100%) rename {client => primitives}/sr-api-macros/tests/decl_and_impl.rs (100%) rename {client => primitives}/sr-api-macros/tests/runtime_calls.rs (100%) rename {client => primitives}/sr-api-macros/tests/trybuild.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/adding_self_parameter.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/adding_self_parameter.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/changed_in_unknown_version.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/changed_in_unknown_version.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/declaring_old_block.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/declaring_old_block.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version_2.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version_2.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version_3.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/invalid_api_version_3.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/missing_block_generic_parameter.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/missing_path_for_trait.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/missing_path_for_trait.stderr (100%) rename {client => primitives}/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs (100%) rename {client => primitives}/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr (100%) rename {client => primitives}/sr-arithmetic/Cargo.toml (87%) rename {client => primitives}/sr-arithmetic/benches/bench.rs (100%) rename {client => primitives}/sr-arithmetic/fuzzer/.gitignore (100%) rename {client => primitives}/sr-arithmetic/fuzzer/Cargo.lock (100%) rename {client => primitives}/sr-arithmetic/fuzzer/Cargo.toml (100%) rename {client => primitives}/sr-arithmetic/fuzzer/src/biguint.rs (100%) rename {client => primitives}/sr-arithmetic/fuzzer/src/rational128.rs (100%) rename {client => primitives}/sr-arithmetic/src/biguint.rs (100%) rename {client => primitives}/sr-arithmetic/src/fixed64.rs (100%) rename {client => primitives}/sr-arithmetic/src/helpers_128bit.rs (100%) rename {client => primitives}/sr-arithmetic/src/lib.rs (100%) rename {client => primitives}/sr-arithmetic/src/per_things.rs (100%) rename {client => primitives}/sr-arithmetic/src/rational128.rs (100%) rename {client => primitives}/sr-arithmetic/src/traits.rs (100%) rename {client => primitives}/sr-io/Cargo.toml (74%) rename {client => primitives}/sr-io/src/lib.rs (100%) rename {client => primitives}/sr-io/with_std.rs (100%) rename {client => primitives}/sr-io/without_std.rs (100%) rename {client => primitives}/sr-primitives/Cargo.toml (81%) rename {client => primitives}/sr-primitives/src/curve.rs (100%) rename {client => primitives}/sr-primitives/src/generic/block.rs (100%) rename {client => primitives}/sr-primitives/src/generic/checked_extrinsic.rs (100%) rename {client => primitives}/sr-primitives/src/generic/digest.rs (100%) rename {client => primitives}/sr-primitives/src/generic/era.rs (100%) rename {client => primitives}/sr-primitives/src/generic/header.rs (100%) rename {client => primitives}/sr-primitives/src/generic/mod.rs (100%) rename {client => primitives}/sr-primitives/src/generic/tests.rs (100%) rename {client => primitives}/sr-primitives/src/generic/unchecked_extrinsic.rs (100%) rename {client => primitives}/sr-primitives/src/lib.rs (100%) rename {client => primitives}/sr-primitives/src/offchain/http.rs (100%) rename {client => primitives}/sr-primitives/src/offchain/mod.rs (100%) rename {client => primitives}/sr-primitives/src/testing.rs (100%) rename {client => primitives}/sr-primitives/src/traits.rs (100%) rename {client => primitives}/sr-primitives/src/transaction_validity.rs (100%) rename {client => primitives}/sr-primitives/src/weights.rs (100%) rename {client => primitives}/sr-sandbox/Cargo.toml (84%) rename {client => primitives}/sr-sandbox/src/lib.rs (100%) rename {client => primitives}/sr-sandbox/with_std.rs (100%) rename {client => primitives}/sr-sandbox/without_std.rs (100%) rename {client => primitives}/sr-staking-primitives/Cargo.toml (100%) rename {client => primitives}/sr-staking-primitives/src/lib.rs (100%) rename {client => primitives}/sr-staking-primitives/src/offence.rs (100%) rename {client => primitives}/sr-std/Cargo.toml (100%) rename {client => primitives}/sr-std/src/lib.rs (100%) rename {client => primitives}/sr-std/with_std.rs (100%) rename {client => primitives}/sr-std/without_std.rs (100%) rename {client => primitives}/sr-version/Cargo.toml (100%) rename {client => primitives}/sr-version/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 4fbab41ae020d..99aa195f92057 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,14 +36,14 @@ members = [ "client/service", "client/service/test", "client/session", - "client/sr-api-macros", - "client/sr-arithmetic", - "client/sr-io", - "client/sr-primitives", - "client/sr-staking-primitives", - "client/sr-sandbox", - "client/sr-std", - "client/sr-version", + "primitives/sr-api-macros", + "primitives/sr-arithmetic", + "primitives/sr-io", + "primitives/sr-primitives", + "primitives/sr-staking-primitives", + "primitives/sr-sandbox", + "primitives/sr-std", + "primitives/sr-version", "client/state-machine", "client/telemetry", "client/transaction-pool", diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml index c7321dd6dd616..79c3d786ae03f 100644 --- a/bin/node-template/Cargo.toml +++ b/bin/node-template/Cargo.toml @@ -19,7 +19,7 @@ exit-future = "0.1.4" parking_lot = "0.9.0" codec = { package = "parity-scale-codec", version = "1.0.0" } trie-root = "0.15.2" -sr-io = { path = "../../client/sr-io" } +sr-io = { path = "../../primitives/sr-io" } substrate-cli = { path = "../../client/cli" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } substrate-executor = { path = "../../client/executor" } @@ -33,7 +33,7 @@ grandpa = { package = "substrate-finality-grandpa", path = "../../client/finalit grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../client/finality-grandpa/primitives" } substrate-client = { path = "../../client/client" } runtime = { package = "node-template-runtime", path = "runtime" } -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } basic-authorship = { package = "substrate-basic-authorship", path = "../../client/basic-authorship"} [build-dependencies] diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml index 07faa60207244..706cb866ff246 100644 --- a/bin/node-template/runtime/Cargo.toml +++ b/bin/node-template/runtime/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../client/sr-std", default_features = false } -runtime-io = { package = "sr-io", path = "../../../client/sr-io", default_features = false } -version = { package = "sr-version", path = "../../../client/sr-version", default_features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default_features = false } +runtime-io = { package = "sr-io", path = "../../../primitives/sr-io", default_features = false } +version = { package = "sr-version", path = "../../../primitives/sr-version", default_features = false } support = { package = "srml-support", path = "../../../paint/support", default_features = false } primitives = { package = "substrate-primitives", path = "../../../client/primitives", default_features = false } substrate-session = { path = "../../../client/session", default-features = false } @@ -25,7 +25,7 @@ system = { package = "srml-system", path = "../../../paint/system", default_feat timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", default_features = false } sudo = { package = "srml-sudo", path = "../../../paint/sudo", default_features = false } transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment", default_features = false } -sr-primitives = { path = "../../../client/sr-primitives", default_features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default_features = false } client = { package = "substrate-client", path = "../../../client/client", default_features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index c65054f9d96d5..f307c8a85278e 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -34,12 +34,12 @@ structopt = "0.3.3" # primitives primitives = { package = "substrate-primitives", path = "../../../client/primitives" } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives" } grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../../client/finality-grandpa/primitives" } # core dependencies -runtime-io = { package = "sr-io", path = "../../../client/sr-io" } +runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } client = { package = "substrate-client", path = "../../../client/client" } inherents = { package = "substrate-inherents", path = "../../../client/inherents" } chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" } diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index 72cc337368002..0ae317415776e 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] trie-root = "0.15.2" codec = { package = "parity-scale-codec", version = "1.0.0" } -runtime_io = { package = "sr-io", path = "../../../client/sr-io" } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } substrate-executor = { path = "../../../client/executor" } primitives = { package = "substrate-primitives", path = "../../../client/primitives" } @@ -19,7 +19,7 @@ node-runtime = { path = "../runtime" } [dev-dependencies] node-testing = { path = "../testing" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../paint/support" } balances = { package = "srml-balances", path = "../../../paint/balances" } transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment" } diff --git a/bin/node/primitives/Cargo.toml b/bin/node/primitives/Cargo.toml index ebcde46b22d99..c129828f295a0 100644 --- a/bin/node/primitives/Cargo.toml +++ b/bin/node/primitives/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } -sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } [dev-dependencies] substrate-serializer = { path = "../../../client/serializer" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 3bcafeb82ab49..323dd94496924 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -9,7 +9,7 @@ client = { package = "substrate-client", path = "../../../client/client" } jsonrpc-core = "14.0.3" node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } srml-contracts-rpc = { path = "../../../paint/contracts/rpc/" } srml-transaction-payment-rpc = { path = "../../../paint/transaction-payment/rpc/" } srml-system-rpc = { path = "../../../paint/system/rpc/" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index d7eb2061c7270..165dee66c5432 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -18,13 +18,13 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../ node-primitives = { path = "../primitives", default-features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } -sr-primitives = { path = "../../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../../client/sr-staking-primitives", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../../primitives/sr-staking-primitives", default-features = false } # core dependencies client = { package = "substrate-client", path = "../../../client/client", default-features = false } -rstd = { package = "sr-std", path = "../../../client/sr-std", default-features = false } -version = { package = "sr-version", path = "../../../client/sr-version", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } substrate-session = { path = "../../../client/session", default-features = false } substrate-keyring = { path = "../../../client/keyring", optional = true } @@ -63,7 +63,7 @@ transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc- wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } [dev-dependencies] -runtime_io = { package = "sr-io", path = "../../../client/sr-io" } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } [features] default = ["std"] diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index 684f21d20e5f1..10240a2490c78 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -17,8 +17,8 @@ node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../../client/primitives" } -runtime-io = { package = "sr-io", path = "../../../client/sr-io" } -sr-primitives = { path = "../../../client/sr-primitives" } +runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } +sr-primitives = { path = "../../../primitives/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../paint/support" } session = { package = "srml-session", path = "../../../paint/session" } staking = { package = "srml-staking", path = "../../../paint/staking" } diff --git a/bin/subkey/Cargo.toml b/bin/subkey/Cargo.toml index 519c7bcaf5a67..81f83ee539ee8 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" primitives = { package = "substrate-primitives", version = "*", path = "../../client/primitives" } node-runtime = { version = "*", path = "../node/runtime" } node-primitives = { version = "*", path = "../node/primitives" } -sr-primitives = { version = "*", path = "../../client/sr-primitives" } +sr-primitives = { version = "*", path = "../../primitives/sr-primitives" } rand = "0.7.2" clap = { version = "2.33.0", features = ["yaml"] } tiny-bip39 = "0.6.2" diff --git a/client/application-crypto/Cargo.toml b/client/application-crypto/Cargo.toml index e9045862d5abc..fe57c69c69c98 100644 --- a/client/application-crypto/Cargo.toml +++ b/client/application-crypto/Cargo.toml @@ -9,12 +9,12 @@ description = "Provides facilities for generating application specific crypto wr primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } [features] default = [ "std" ] diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index c0dc864a94bf1..07509b6fb2657 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -21,7 +21,7 @@ network = { package = "substrate-network", path = "../../client/network" } primitives = { package = "substrate-primitives", path = "../primitives" } prost = "0.5.0" serde_json = "1.0.41" -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } futures-timer = "0.4" [dev-dependencies] diff --git a/client/authority-discovery/primitives/Cargo.toml b/client/authority-discovery/primitives/Cargo.toml index 8e9e465a299f6..6bf2acfc2812f 100644 --- a/client/authority-discovery/primitives/Cargo.toml +++ b/client/authority-discovery/primitives/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } client = { package = "substrate-client", path = "../../client", default-features = false } -sr-primitives = { path = "../../sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } [features] default = ["std"] diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index 7cdab7e6a2d5b..eb46f4d017878 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" log = "0.4.8" futures-preview = "0.3.0-alpha.19" codec = { package = "parity-scale-codec", version = "1.0.0" } -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } client = { package = "substrate-client", path = "../../client/client" } consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml index 74474acadc2ac..52269e0f97977 100644 --- a/client/chain-spec/Cargo.toml +++ b/client/chain-spec/Cargo.toml @@ -11,7 +11,7 @@ network = { package = "substrate-network", path = "../../client/network" } primitives = { package = "substrate-primitives", path = "../primitives" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } tel = { package = "substrate-telemetry", path = "../../client/telemetry" } [dev-dependencies] diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index b2bfa331512ee..74c60f51b7616 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -26,7 +26,7 @@ panic-handler = { package = "substrate-panic-handler", path = "../../client/pani client = { package = "substrate-client", path = "../../client/client" } header-metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } network = { package = "substrate-network", path = "../../client/network" } -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } service = { package = "substrate-service", path = "../../client/service", default-features = false } state-machine = { package = "substrate-state-machine", path = "../../client/state-machine" } diff --git a/client/client/Cargo.toml b/client/client/Cargo.toml index bbc37a3ce5f7f..c6b8b03a31f90 100644 --- a/client/client/Cargo.toml +++ b/client/client/Cargo.toml @@ -22,11 +22,11 @@ hash-db = { version = "0.15.2", default-features = false } kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } -sr-primitives = { path = "../sr-primitives", default-features = false } -runtime-version = { package = "sr-version", path = "../sr-version", default-features = false } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } inherents = { package = "substrate-inherents", path = "../inherents", default-features = false } -sr-api-macros = { path = "../sr-api-macros" } +sr-api-macros = { path = "../../primitives/sr-api-macros" } header-metadata = { package = "substrate-header-metadata", path = "header-metadata", optional = true } [dev-dependencies] diff --git a/client/client/db/Cargo.toml b/client/client/db/Cargo.toml index e431d4ae60031..68a3371826bc9 100644 --- a/client/client/db/Cargo.toml +++ b/client/client/db/Cargo.toml @@ -14,7 +14,7 @@ kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b031 linked-hash-map = "0.5.2" hash-db = "0.15.2" primitives = { package = "substrate-primitives", path = "../../primitives" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../../client" } state-machine = { package = "substrate-state-machine", path = "../../state-machine" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } diff --git a/client/client/header-metadata/Cargo.toml b/client/client/header-metadata/Cargo.toml index 43fcebb25bf96..d2b9f7ede4408 100644 --- a/client/client/header-metadata/Cargo.toml +++ b/client/client/header-metadata/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" [dependencies] lru-cache = { version = "0.1.2" } parking_lot = { version = "0.9.0" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index 5b43ed86cf767..ec601917292af 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../primitives" } app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto" } runtime_support = { package = "srml-support", path = "../../../paint/support" } -runtime_version = { package = "sr-version", path = "../../sr-version" } -runtime_io = { package = "sr-io", path = "../../sr-io" } +runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } slots = { package = "substrate-consensus-slots", path = "../slots" } aura_primitives = { package = "substrate-consensus-aura-primitives", path = "primitives" } inherents = { package = "substrate-inherents", path = "../../inherents" } @@ -20,7 +20,7 @@ client = { package = "substrate-client", path = "../../client" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } consensus_common = { package = "substrate-consensus-common", path = "../common" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } futures-timer = "0.4.0" diff --git a/client/consensus/aura/primitives/Cargo.toml b/client/consensus/aura/primitives/Cargo.toml index 7fd3f3d05d9bf..99843553c871d 100644 --- a/client/consensus/aura/primitives/Cargo.toml +++ b/client/consensus/aura/primitives/Cargo.toml @@ -9,8 +9,8 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } substrate-client = { path = "../../../client", default-features = false } app-crypto = { package = "substrate-application-crypto", path = "../../../application-crypto", default-features = false } -rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } -sr-primitives = { path = "../../../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index 04039090b13bb..6b8e51799b7a4 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -14,8 +14,8 @@ num-bigint = "0.2.3" num-rational = "0.2.2" num-traits = "0.2.8" runtime-support = { package = "srml-support", path = "../../../paint/support" } -runtime-version = { package = "sr-version", path = "../../sr-version" } -runtime-io = { package = "sr-io", path = "../../sr-io" } +runtime-version = { package = "sr-version", path = "../../../primitives/sr-version" } +runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } inherents = { package = "substrate-inherents", path = "../../inherents" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } @@ -25,7 +25,7 @@ header-metadata = { package = "substrate-header-metadata", path = "../../client/ consensus-common = { package = "substrate-consensus-common", path = "../common" } uncles = { package = "substrate-consensus-uncles", path = "../uncles" } slots = { package = "substrate-consensus-slots", path = "../slots" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } fork-tree = { path = "../../utils/fork-tree" } futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } diff --git a/client/consensus/babe/primitives/Cargo.toml b/client/consensus/babe/primitives/Cargo.toml index 79e817d081028..181f3d313c715 100644 --- a/client/consensus/babe/primitives/Cargo.toml +++ b/client/consensus/babe/primitives/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] substrate-client = { path = "../../../client", default-features = false } -rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } -sr-primitives = { path = "../../../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } app-crypto = { package = "substrate-application-crypto", path = "../../../application-crypto", default-features = false } slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true } schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true } diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index e452726226860..ddffbe58e123a 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -13,9 +13,9 @@ primitives = { package = "substrate-primitives", path= "../../primitives" } inherents = { package = "substrate-inherents", path = "../../inherents" } futures-preview = "0.3.0-alpha.19" futures-timer = "0.4.0" -rstd = { package = "sr-std", path = "../../sr-std" } -runtime_version = { package = "sr-version", path = "../../sr-version" } -sr-primitives = { path = "../../sr-primitives" } +rstd = { package = "sr-std", path = "../../../primitives/sr-std" } +runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } +sr-primitives = { path = "../../../primitives/sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } parking_lot = "0.9.0" diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index ff1e64cde0767..da79d48a71974 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../primitives" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../../client" } srml-timestamp = { path = "../../../paint/timestamp" } inherents = { package = "substrate-inherents", path = "../../inherents" } diff --git a/client/consensus/pow/primitives/Cargo.toml b/client/consensus/pow/primitives/Cargo.toml index 021e4c80a754c..c0f0ca146ab31 100644 --- a/client/consensus/pow/primitives/Cargo.toml +++ b/client/consensus/pow/primitives/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] substrate-client = { path = "../../../client", default-features = false } -rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } -sr-primitives = { path = "../../../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } diff --git a/client/consensus/rhd/Cargo.toml b/client/consensus/rhd/Cargo.toml index 4536afba6cfc6..da7d462931e88 100644 --- a/client/consensus/rhd/Cargo.toml +++ b/client/consensus/rhd/Cargo.toml @@ -15,9 +15,9 @@ client = { package = "substrate-client", path = "../../client" } transaction_pool = { package = "substrate-transaction-pool", path = "../../transaction-pool" } runtime_support = { package = "srml-support", path = "../../../paint/support" } srml-system = { path = "../../../paint/system" } -sr-primitives = { path = "../../sr-primitives" } -runtime_version = { package = "sr-version", path = "../../sr-version" } -runtime_io = { package = "sr-io", path = "../../sr-io" } +sr-primitives = { path = "../../../primitives/sr-primitives" } +runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } tokio = "0.1.22" parking_lot = "0.9.0" log = "0.4.8" diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 36a4312de8811..8ad10f39597a7 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -10,7 +10,7 @@ build = "build.rs" codec = { package = "parity-scale-codec", version = "1.0.0" } client = { package = "substrate-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../primitives" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } substrate-telemetry = { path = "../../telemetry" } consensus_common = { package = "substrate-consensus-common", path = "../common" } inherents = { package = "substrate-inherents", path = "../../inherents" } diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index 5508bd6ecdd76..16664d2bc7f3f 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../primitives" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } srml-authorship = { path = "../../../paint/authorship" } consensus_common = { package = "substrate-consensus-common", path = "../common" } inherents = { package = "substrate-inherents", path = "../../inherents" } diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index 228ef5e0c311b..88ac7506b0dd3 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] derive_more = "0.15.0" codec = { package = "parity-scale-codec", version = "1.0.0" } -runtime_io = { package = "sr-io", path = "../sr-io" } +runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../primitives" } trie = { package = "substrate-trie", path = "../trie" } serializer = { package = "substrate-serializer", path = "../serializer" } -runtime_version = { package = "sr-version", path = "../sr-version" } +runtime_version = { package = "sr-version", path = "../../primitives/sr-version" } panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } wasmi = "0.5.1" parity-wasm = "0.40.3" diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml index 72041218bf9f2..fbdc23d07a4e9 100644 --- a/client/executor/runtime-test/Cargo.toml +++ b/client/executor/runtime-test/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" build = "build.rs" [dependencies] -rstd = { package = "sr-std", path = "../../sr-std", default-features = false } -runtime_io = { package = "sr-io", path = "../../sr-io", default-features = false } -sandbox = { package = "sr-sandbox", path = "../../sr-sandbox", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } +sandbox = { package = "sr-sandbox", path = "../../../primitives/sr-sandbox", default-features = false } primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } -sr-primitives = { package = "sr-primitives", path = "../../sr-primitives", default-features = false } +sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../utils/wasm-builder-runner" } diff --git a/client/externalities/Cargo.toml b/client/externalities/Cargo.toml index babb3e7f9f4a2..62ca7fc6ff1a2 100644 --- a/client/externalities/Cargo.toml +++ b/client/externalities/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" [dependencies] primitive-types = { version = "0.6", features = ["codec"] } primitives-storage = { package = "substrate-primitives-storage", path = "../primitives/storage" } -rstd = { package = "sr-std", path = "../sr-std" } +rstd = { package = "sr-std", path = "../../primitives/sr-std" } environmental = { version = "1.0.2" } diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index e99561db5b3c9..3961e7c7e4878 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -14,7 +14,7 @@ tokio-executor = "0.1.8" tokio-timer = "0.2.11" rand = "0.7.2" codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } primitives = { package = "substrate-primitives", path = "../primitives" } substrate-telemetry = { path = "../telemetry" } diff --git a/client/finality-grandpa/primitives/Cargo.toml b/client/finality-grandpa/primitives/Cargo.toml index 02439d4150d81..26740a171beba 100644 --- a/client/finality-grandpa/primitives/Cargo.toml +++ b/client/finality-grandpa/primitives/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" client = { package = "substrate-client", path = "../../client", default-features = false } app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } [features] diff --git a/client/inherents/Cargo.toml b/client/inherents/Cargo.toml index 45e0b9e828ec7..2fa389ed0fba3 100644 --- a/client/inherents/Cargo.toml +++ b/client/inherents/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" [dependencies] parking_lot = { version = "0.9.0", optional = true } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } [features] default = [ "std" ] diff --git a/client/keyring/Cargo.toml b/client/keyring/Cargo.toml index 0147689985fa9..3304c0a044710 100644 --- a/client/keyring/Cargo.toml +++ b/client/keyring/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] primitives = { package = "substrate-primitives", path = "../primitives" } -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } lazy_static = "1.4.0" strum = "0.15.0" strum_macros = "0.15.0" diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 9d3c8da10ec85..f408680458a4e 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -27,7 +27,7 @@ fork-tree = { path = "../../client/utils/fork-tree" } consensus = { package = "substrate-consensus-common", path = "../../client/consensus/common" } client = { package = "substrate-client", path = "../../client/client" } header_metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } peerset = { package = "substrate-peerset", path = "../../client/peerset" } diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index c4927e768357a..2f7c6f2a8f427 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive parking_lot = "0.9.0" primitives = { package = "substrate-primitives", path = "../../client/primitives" } rand = "0.7.2" -sr-primitives = { path = "../../client/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } network = { package = "substrate-network", path = "../../client/network" } keystore = { package = "substrate-keystore", path = "../keystore" } diff --git a/client/offchain/primitives/Cargo.toml b/client/offchain/primitives/Cargo.toml index c96a579c4446d..2bcac75cea80d 100644 --- a/client/offchain/primitives/Cargo.toml +++ b/client/offchain/primitives/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../client", default-features = false } -sr-primitives = { path = "../../sr-primitives", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/client/phragmen/Cargo.toml b/client/phragmen/Cargo.toml index 7d1e1d82c05d0..8677cb5560860 100644 --- a/client/phragmen/Cargo.toml +++ b/client/phragmen/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } -sr-primitives = { path = "../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../sr-io" } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } support = { package = "srml-support", path = "../../paint/support" } rand = "0.7.2" diff --git a/client/primitives/Cargo.toml b/client/primitives/Cargo.toml index 20c7e7c9caa2f..9aa51c8b65997 100644 --- a/client/primitives/Cargo.toml +++ b/client/primitives/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -rstd = { package = "sr-std", path = "../sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } rustc-hex = { version = "2.0.1", default-features = false } log = { version = "0.4.8", default-features = false } diff --git a/client/primitives/storage/Cargo.toml b/client/primitives/storage/Cargo.toml index 1e5d7ee8b4548..c288ccfb731a6 100644 --- a/client/primitives/storage/Cargo.toml +++ b/client/primitives/storage/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" description = "Storage related primitives" [dependencies] -rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } impl-serde = { version = "0.2.3", optional = true } substrate-debug-derive = { version = "2.0.0", path = "../debug-derive" } diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml index 8fdf31db328d2..c3b9802f567cf 100644 --- a/client/rpc-servers/Cargo.toml +++ b/client/rpc-servers/Cargo.toml @@ -10,7 +10,7 @@ pubsub = { package = "jsonrpc-pubsub", version = "14.0.3" } log = "0.4.8" serde = "1.0.101" serde_json = "1.0.41" -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } [target.'cfg(not(target_os = "unknown"))'.dependencies] http = { package = "jsonrpc-http-server", version = "14.0.3" } diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 3dba7747b0843..a28cc28730bcf 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -13,10 +13,10 @@ jsonrpc-pubsub = "14.0.3" log = "0.4.8" primitives = { package = "substrate-primitives", path = "../primitives" } rpc = { package = "jsonrpc-core", version = "14.0.3" } -runtime_version = { package = "sr-version", path = "../sr-version" } +runtime_version = { package = "sr-version", path = "../../primitives/sr-version" } serde_json = "1.0.41" session = { package = "substrate-session", path = "../session" } -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } rpc-primitives = { package = "substrate-rpc-primitives", path = "primitives" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } substrate-executor = { path = "../executor" } @@ -30,6 +30,6 @@ assert_matches = "1.3.0" futures = "0.1.29" network = { package = "substrate-network", path = "../network" } rustc-hex = "2.0.1" -sr-io = { path = "../sr-io" } +sr-io = { path = "../../primitives/sr-io" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" diff --git a/client/rpc/api/Cargo.toml b/client/rpc/api/Cargo.toml index 5fb0e4cbaec71..bd73819f50922 100644 --- a/client/rpc/api/Cargo.toml +++ b/client/rpc/api/Cargo.toml @@ -15,7 +15,7 @@ jsonrpc-pubsub = "14.0.3" log = "0.4.8" parking_lot = "0.9.0" primitives = { package = "substrate-primitives", path = "../../primitives" } -runtime_version = { package = "sr-version", path = "../../sr-version" } +runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" txpool = { package = "substrate-transaction-graph", path = "../../transaction-pool/graph" } diff --git a/client/runtime-interface/Cargo.toml b/client/runtime-interface/Cargo.toml index b809e0ccbe1ac..cfa456d4f80ee 100644 --- a/client/runtime-interface/Cargo.toml +++ b/client/runtime-interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] wasm-interface = { package = "substrate-wasm-interface", path = "../wasm-interface", optional = true } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } substrate-runtime-interface-proc-macro = { path = "proc-macro" } externalities = { package = "substrate-externalities", path = "../externalities", optional = true } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false } @@ -19,7 +19,7 @@ executor = { package = "substrate-executor", path = "../executor" } test-wasm = { package = "substrate-runtime-interface-test-wasm", path = "test-wasm" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } primitives = { package = "substrate-primitives", path = "../primitives" } -runtime-io = { package = "sr-io", path = "../sr-io" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } [features] default = [ "std" ] diff --git a/client/runtime-interface/test-wasm/Cargo.toml b/client/runtime-interface/test-wasm/Cargo.toml index dd870164e98c2..1f4fa2dead541 100644 --- a/client/runtime-interface/test-wasm/Cargo.toml +++ b/client/runtime-interface/test-wasm/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] runtime-interface = { package = "substrate-runtime-interface", path = "../", default-features = false } -rstd = { package = "sr-std", path = "../../sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } [build-dependencies] diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index b2451c0b1979f..1fb0980999a71 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -29,8 +29,8 @@ serde_json = "1.0.41" sysinfo = "0.9.5" target_info = "0.1.0" keystore = { package = "substrate-keystore", path = "../../client/keystore" } -sr-io = { path = "../../client/sr-io" } -sr-primitives = { path = "../../client/sr-primitives" } +sr-io = { path = "../../primitives/sr-io" } +sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../primitives" } session = { package = "substrate-session", path = "../session" } app-crypto = { package = "substrate-application-crypto", path = "../application-crypto" } diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml index 781379626eb20..9c12751e6980c 100644 --- a/client/service/test/Cargo.toml +++ b/client/service/test/Cargo.toml @@ -16,5 +16,5 @@ service = { package = "substrate-service", path = "../../../client/service", def network = { package = "substrate-network", path = "../../../client/network" } consensus = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } client = { package = "substrate-client", path = "../../../client/client" } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../../client/primitives" } diff --git a/client/session/Cargo.toml b/client/session/Cargo.toml index 5d8cb3f0001ba..b91a74de00df0 100644 --- a/client/session/Cargo.toml +++ b/client/session/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../client", default-features = false } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } -sr-primitives = { path = "../sr-primitives", optional = true } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", optional = true } primitives = { package = "substrate-primitives", path = "../primitives", optional = true } [features] diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index 3942fc0a35cc0..cf70d8affb7a3 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -10,7 +10,7 @@ log = "0.4.8" futures = { version = "0.3.0", features = ["thread-pool"] } codec = { package = "parity-scale-codec", version = "1.0.0" } parking_lot = "0.9.0" -sr-primitives = { path = "../sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../client" } primitives = { package = "substrate-primitives", path = "../primitives" } txpool = { package = "substrate-transaction-graph", path = "./graph" } diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index 77356b7cd0f4c..52db2c4a41809 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -11,7 +11,7 @@ log = "0.4.8" parking_lot = "0.9.0" serde = { version = "1.0.101", features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../primitives" } -sr-primitives = { path = "../../sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } [dev-dependencies] assert_matches = "1.3.0" diff --git a/client/trie/Cargo.toml b/client/trie/Cargo.toml index 50498a17ba65d..ff3cc226716cd 100644 --- a/client/trie/Cargo.toml +++ b/client/trie/Cargo.toml @@ -13,7 +13,7 @@ harness = false [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -rstd = { package = "sr-std", path = "../sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } hash-db = { version = "0.15.2", default-features = false } trie-db = { version = "0.15.2", default-features = false } trie-root = { version = "0.15.2", default-features = false } diff --git a/paint/assets/Cargo.toml b/paint/assets/Cargo.toml index 5ef6f46a1db63..6a833a3417b13 100644 --- a/paint/assets/Cargo.toml +++ b/paint/assets/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } # Needed for various traits. In our case, `OnFinalize`. -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } # Needed for type-safe access to storage DB. support = { package = "srml-support", path = "../support", default-features = false } # `system` module provides us with all sorts of useful stuff and macros depend on it being around. @@ -16,8 +16,8 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives" } -rstd = { package = "sr-std", path = "../../client/sr-std" } -runtime-io = { package = "sr-io", path = "../../client/sr-io" } +rstd = { package = "sr-std", path = "../../primitives/sr-std" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } [features] default = ["std"] diff --git a/paint/aura/Cargo.toml b/paint/aura/Cargo.toml index 467854b42c2c5..98e12498ad9ff 100644 --- a/paint/aura/Cargo.toml +++ b/paint/aura/Cargo.toml @@ -9,11 +9,11 @@ app-crypto = { package = "substrate-application-crypto", path = "../../client/a codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } substrate-consensus-aura-primitives = { path = "../../client/consensus/aura/primitives", default-features = false} system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/authority-discovery/Cargo.toml b/paint/authority-discovery/Cargo.toml index 7b0552c11eb5b..b3b18c6b2454c 100644 --- a/paint/authority-discovery/Cargo.toml +++ b/paint/authority-discovery/Cargo.toml @@ -8,17 +8,17 @@ edition = "2018" app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } [features] default = ["std"] diff --git a/paint/authorship/Cargo.toml b/paint/authorship/Cargo.toml index ce879d153816e..649472b3a8fd5 100644 --- a/paint/authorship/Cargo.toml +++ b/paint/authorship/Cargo.toml @@ -9,11 +9,11 @@ edition = "2018" primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" [features] diff --git a/paint/babe/Cargo.toml b/paint/babe/Cargo.toml index 5ce819fc8136a..8f1b26c1e7c95 100644 --- a/paint/babe/Cargo.toml +++ b/paint/babe/Cargo.toml @@ -9,20 +9,20 @@ hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] lazy_static = "1.4.0" parking_lot = "0.9.0" -sr-version = { path = "../../client/sr-version", default-features = false } +sr-version = { path = "../../primitives/sr-version", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives" } test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" } diff --git a/paint/balances/Cargo.toml b/paint/balances/Cargo.toml index 4b45cd5f74142..9dcc1e99a7e7c 100644 --- a/paint/balances/Cargo.toml +++ b/paint/balances/Cargo.toml @@ -9,13 +9,13 @@ serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } substrate-keyring = { path = "../../client/keyring", optional = true } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../client/sr-io" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } diff --git a/paint/collective/Cargo.toml b/paint/collective/Cargo.toml index 80e312a9566d6..6d15ba9986d78 100644 --- a/paint/collective/Cargo.toml +++ b/paint/collective/Cargo.toml @@ -9,9 +9,9 @@ serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/contracts/Cargo.toml b/paint/contracts/Cargo.toml index 1f14e6ce3dbb0..d322c13067916 100644 --- a/paint/contracts/Cargo.toml +++ b/paint/contracts/Cargo.toml @@ -11,10 +11,10 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = parity-wasm = { version = "0.40.3", default-features = false } wasmi-validation = { version = "0.2.0", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sandbox = { package = "sr-sandbox", path = "../../client/sr-sandbox", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sandbox = { package = "sr-sandbox", path = "../../primitives/sr-sandbox", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/contracts/rpc/Cargo.toml b/paint/contracts/rpc/Cargo.toml index 2391c36c85570..5db3b2cb256dd 100644 --- a/paint/contracts/rpc/Cargo.toml +++ b/paint/contracts/rpc/Cargo.toml @@ -13,5 +13,5 @@ jsonrpc-derive = "14.0.3" primitives = { package = "substrate-primitives", path = "../../../client/primitives" } rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } srml-contracts-rpc-runtime-api = { path = "./runtime-api" } diff --git a/paint/contracts/rpc/runtime-api/Cargo.toml b/paint/contracts/rpc/runtime-api/Cargo.toml index 5f52e96712f3c..5d2623c5a6509 100644 --- a/paint/contracts/rpc/runtime-api/Cargo.toml +++ b/paint/contracts/rpc/runtime-api/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../../../client/client", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } -sr-primitives = { path = "../../../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/paint/democracy/Cargo.toml b/paint/democracy/Cargo.toml index 5e5cb152137dc..a79b96a24eda9 100644 --- a/paint/democracy/Cargo.toml +++ b/paint/democracy/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/elections-phragmen/Cargo.toml b/paint/elections-phragmen/Cargo.toml index b2c47b85d3ceb..f4ef67b2b2036 100644 --- a/paint/elections-phragmen/Cargo.toml +++ b/paint/elections-phragmen/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] -runtime_io = { package = "sr-io", path = "../../client/sr-io" } +runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } hex-literal = "0.2.1" balances = { package = "srml-balances", path = "../balances" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } diff --git a/paint/elections/Cargo.toml b/paint/elections/Cargo.toml index b37f59ab8a599..2738074ea2192 100644 --- a/paint/elections/Cargo.toml +++ b/paint/elections/Cargo.toml @@ -9,9 +9,9 @@ serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/evm/Cargo.toml b/paint/evm/Cargo.toml index d238dab61c441..4dc18b1e2adbd 100644 --- a/paint/evm/Cargo.toml +++ b/paint/evm/Cargo.toml @@ -12,9 +12,9 @@ system = { package = "srml-system", path = "../system", default-features = false timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } primitive-types = { version = "0.6", default-features = false, features = ["rlp"] } rlp = { version = "0.4", default-features = false } evm = { version = "0.14", default-features = false } diff --git a/paint/example/Cargo.toml b/paint/example/Cargo.toml index 16631eabd05dd..53a61a7d131a9 100644 --- a/paint/example/Cargo.toml +++ b/paint/example/Cargo.toml @@ -10,9 +10,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives" } diff --git a/paint/executive/Cargo.toml b/paint/executive/Cargo.toml index f67442a696fff..3f37e5500a2b1 100644 --- a/paint/executive/Cargo.toml +++ b/paint/executive/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/finality-tracker/Cargo.toml b/paint/finality-tracker/Cargo.toml index ae74cac1147b6..c9ab01eacbd57 100644 --- a/paint/finality-tracker/Cargo.toml +++ b/paint/finality-tracker/Cargo.toml @@ -8,15 +8,15 @@ edition = "2018" serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } srml-system = { path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [features] default = ["std"] diff --git a/paint/generic-asset/Cargo.toml b/paint/generic-asset/Cargo.toml index b8ec80cc4a576..e950a09d3cbd6 100644 --- a/paint/generic-asset/Cargo.toml +++ b/paint/generic-asset/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] diff --git a/paint/grandpa/Cargo.toml b/paint/grandpa/Cargo.toml index cf982a2ac60cb..51da415613603 100644 --- a/paint/grandpa/Cargo.toml +++ b/paint/grandpa/Cargo.toml @@ -9,16 +9,16 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } substrate-finality-grandpa-primitives = { path = "../../client/finality-grandpa/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } finality-tracker = { package = "srml-finality-tracker", path = "../finality-tracker", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } [features] default = ["std"] diff --git a/paint/im-online/Cargo.toml b/paint/im-online/Cargo.toml index b5eefdccddd67..15e735465a1c8 100644 --- a/paint/im-online/Cargo.toml +++ b/paint/im-online/Cargo.toml @@ -9,12 +9,12 @@ app-crypto = { package = "substrate-application-crypto", path = "../../client/ap authorship = { package = "srml-authorship", path = "../authorship", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package="substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/indices/Cargo.toml b/paint/indices/Cargo.toml index ab1278d828d9d..0729ee0dcdbfa 100644 --- a/paint/indices/Cargo.toml +++ b/paint/indices/Cargo.toml @@ -9,9 +9,9 @@ serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } substrate-keyring = { path = "../../client/keyring", optional = true } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/membership/Cargo.toml b/paint/membership/Cargo.toml index d90d60d83fac1..8346647107b65 100644 --- a/paint/membership/Cargo.toml +++ b/paint/membership/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives" } diff --git a/paint/metadata/Cargo.toml b/paint/metadata/Cargo.toml index 3daac81b4d834..9586b64da3180 100644 --- a/paint/metadata/Cargo.toml +++ b/paint/metadata/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } [features] diff --git a/paint/nicks/Cargo.toml b/paint/nicks/Cargo.toml index ad709501d7916..9079ad1d49eea 100644 --- a/paint/nicks/Cargo.toml +++ b/paint/nicks/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/offences/Cargo.toml b/paint/offences/Cargo.toml index 078f90b1538af..5dfa0abf22fd4 100644 --- a/paint/offences/Cargo.toml +++ b/paint/offences/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] balances = { package = "srml-balances", path = "../balances", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../client/sr-io" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } substrate-primitives = { path = "../../client/primitives" } [features] diff --git a/paint/randomness-collective-flip/Cargo.toml b/paint/randomness-collective-flip/Cargo.toml index ea168221d9e76..b16c0c245fbb8 100644 --- a/paint/randomness-collective-flip/Cargo.toml +++ b/paint/randomness-collective-flip/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] safe-mix = { version = "1.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives" } -runtime-io = { package = "sr-io", path = "../../client/sr-io" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } [features] default = ["std"] diff --git a/paint/scored-pool/Cargo.toml b/paint/scored-pool/Cargo.toml index 50043413eaf3c..91c782d6a48d0 100644 --- a/paint/scored-pool/Cargo.toml +++ b/paint/scored-pool/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/session/Cargo.toml b/paint/session/Cargo.toml index 53d05862bc229..788bf33ebcef9 100644 --- a/paint/session/Cargo.toml +++ b/paint/session/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } substrate-trie = { path = "../../client/trie", default-features = false, optional = true } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] diff --git a/paint/staking/Cargo.toml b/paint/staking/Cargo.toml index a8931edb21df2..29ee99496ed1e 100644 --- a/paint/staking/Cargo.toml +++ b/paint/staking/Cargo.toml @@ -9,11 +9,11 @@ serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } substrate-keyring = { path = "../../client/keyring", optional = true } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-staking-primitives = { path = "../../client/sr-staking-primitives", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false, features = ["historical"] } diff --git a/paint/staking/reward-curve/Cargo.toml b/paint/staking/reward-curve/Cargo.toml index e746bd910435c..cf911666af4bb 100644 --- a/paint/staking/reward-curve/Cargo.toml +++ b/paint/staking/reward-curve/Cargo.toml @@ -14,4 +14,4 @@ proc-macro2 = "1.0.6" proc-macro-crate = "0.1.4" [dev-dependencies] -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } diff --git a/paint/sudo/Cargo.toml b/paint/sudo/Cargo.toml index 4235383f70385..5ce0554da2665 100644 --- a/paint/sudo/Cargo.toml +++ b/paint/sudo/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/support/Cargo.toml b/paint/support/Cargo.toml index 4119ab66ede5b..ed7a3b07fa2e9 100644 --- a/paint/support/Cargo.toml +++ b/paint/support/Cargo.toml @@ -9,9 +9,9 @@ log = "0.4" serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } srml-metadata = { path = "../metadata", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" } diff --git a/paint/support/procedural/Cargo.toml b/paint/support/procedural/Cargo.toml index 233ae6252afc3..c9b4f0099b75c 100644 --- a/paint/support/procedural/Cargo.toml +++ b/paint/support/procedural/Cargo.toml @@ -9,7 +9,7 @@ proc-macro = true [dependencies] srml-support-procedural-tools = { package = "srml-support-procedural-tools", path = "./tools" } -sr-api-macros = { path = "../../../client/sr-api-macros" } +sr-api-macros = { path = "../../../primitives/sr-api-macros" } proc-macro2 = "1.0.6" quote = "1.0.2" diff --git a/paint/support/test/Cargo.toml b/paint/support/test/Cargo.toml index c6b19b339016f..ee50ff581b179 100644 --- a/paint/support/test/Cargo.toml +++ b/paint/support/test/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -runtime-io ={ package = "sr-io", path = "../../../client/sr-io", default-features = false } +runtime-io ={ package = "sr-io", path = "../../../primitives/sr-io", default-features = false } state-machine ={ package = "substrate-state-machine", path = "../../../client/state-machine", optional = true } support = { package = "srml-support", version = "2", path = "../", default-features = false } inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } -sr-primitives = { package = "sr-primitives", path = "../../../client/sr-primitives", default-features = false } +sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false } primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } trybuild = "1.0.17" pretty_assertions = "0.6.1" diff --git a/paint/system/Cargo.toml b/paint/system/Cargo.toml index 6cec5addfebe3..f216cdc210066 100644 --- a/paint/system/Cargo.toml +++ b/paint/system/Cargo.toml @@ -9,10 +9,10 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io ={ package = "sr-io", path = "../../client/sr-io", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -sr-version = { path = "../../client/sr-version", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-version = { path = "../../primitives/sr-version", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/paint/system/rpc/Cargo.toml b/paint/system/rpc/Cargo.toml index 90be99a188aab..2bce92dbe8fdf 100644 --- a/paint/system/rpc/Cargo.toml +++ b/paint/system/rpc/Cargo.toml @@ -12,7 +12,7 @@ jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" log = "0.4.8" serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } srml-system-rpc-runtime-api = { path = "./runtime-api" } substrate-primitives = { path = "../../../client/primitives" } transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } diff --git a/paint/timestamp/Cargo.toml b/paint/timestamp/Cargo.toml index 0fab68daf027f..fc9c551be601c 100644 --- a/paint/timestamp/Cargo.toml +++ b/paint/timestamp/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] diff --git a/paint/transaction-payment/Cargo.toml b/paint/transaction-payment/Cargo.toml index 10f813f753cfa..9ea00b1aee2ce 100644 --- a/paint/transaction-payment/Cargo.toml +++ b/paint/transaction-payment/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false } [dev-dependencies] -runtime-io = { package = "sr-io", path = "../../client/sr-io" } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } balances = { package = "srml-balances", path = "../balances" } diff --git a/paint/transaction-payment/rpc/Cargo.toml b/paint/transaction-payment/rpc/Cargo.toml index 398f1b88d7dc8..e993998f43dfd 100644 --- a/paint/transaction-payment/rpc/Cargo.toml +++ b/paint/transaction-payment/rpc/Cargo.toml @@ -13,5 +13,5 @@ jsonrpc-derive = "14.0.3" primitives = { package = "substrate-primitives", path = "../../../client/primitives" } rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } serde = { version = "1.0.101", features = ["derive"] } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } srml-transaction-payment-rpc-runtime-api = { path = "./runtime-api" } diff --git a/paint/transaction-payment/rpc/runtime-api/Cargo.toml b/paint/transaction-payment/rpc/runtime-api/Cargo.toml index a13c3791aa0d5..b832c8b2281cb 100644 --- a/paint/transaction-payment/rpc/runtime-api/Cargo.toml +++ b/paint/transaction-payment/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } client = { package = "substrate-client", path = "../../../../client/client", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../../../client/sr-std", default-features = false } -sr-primitives = { path = "../../../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } [features] default = ["std"] diff --git a/paint/treasury/Cargo.toml b/paint/treasury/Cargo.toml index d912b86b05722..5eff91b63a50f 100644 --- a/paint/treasury/Cargo.toml +++ b/paint/treasury/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } [dev-dependencies] -runtime-io ={ package = "sr-io", path = "../../client/sr-io" } +runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../client/primitives" } [features] diff --git a/paint/utility/Cargo.toml b/paint/utility/Cargo.toml index f777299999072..70538e3544091 100644 --- a/paint/utility/Cargo.toml +++ b/paint/utility/Cargo.toml @@ -9,9 +9,9 @@ serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -sr-primitives = { path = "../../client/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../client/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../client/sr-io", default-features = false } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../client/primitives" } diff --git a/client/sr-api-macros/Cargo.toml b/primitives/sr-api-macros/Cargo.toml similarity index 81% rename from client/sr-api-macros/Cargo.toml rename to primitives/sr-api-macros/Cargo.toml index b8157494d2f10..565cfd4111abf 100644 --- a/client/sr-api-macros/Cargo.toml +++ b/primitives/sr-api-macros/Cargo.toml @@ -15,14 +15,14 @@ blake2-rfc = "0.2.18" proc-macro-crate = "0.1.4" [dev-dependencies] -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../../client/client" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../client/state-machine" } sr-primitives = { path = "../sr-primitives" } sr-version = { path = "../sr-version" } -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../client/primitives" } criterion = "0.3.0" -consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } +consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } codec = { package = "parity-scale-codec", version = "1.0.0" } trybuild = "1.0.17" rustversion = "1.0.0" diff --git a/client/sr-api-macros/benches/bench.rs b/primitives/sr-api-macros/benches/bench.rs similarity index 100% rename from client/sr-api-macros/benches/bench.rs rename to primitives/sr-api-macros/benches/bench.rs diff --git a/client/sr-api-macros/src/decl_runtime_apis.rs b/primitives/sr-api-macros/src/decl_runtime_apis.rs similarity index 100% rename from client/sr-api-macros/src/decl_runtime_apis.rs rename to primitives/sr-api-macros/src/decl_runtime_apis.rs diff --git a/client/sr-api-macros/src/impl_runtime_apis.rs b/primitives/sr-api-macros/src/impl_runtime_apis.rs similarity index 100% rename from client/sr-api-macros/src/impl_runtime_apis.rs rename to primitives/sr-api-macros/src/impl_runtime_apis.rs diff --git a/client/sr-api-macros/src/lib.rs b/primitives/sr-api-macros/src/lib.rs similarity index 100% rename from client/sr-api-macros/src/lib.rs rename to primitives/sr-api-macros/src/lib.rs diff --git a/client/sr-api-macros/src/utils.rs b/primitives/sr-api-macros/src/utils.rs similarity index 100% rename from client/sr-api-macros/src/utils.rs rename to primitives/sr-api-macros/src/utils.rs diff --git a/client/sr-api-macros/tests/decl_and_impl.rs b/primitives/sr-api-macros/tests/decl_and_impl.rs similarity index 100% rename from client/sr-api-macros/tests/decl_and_impl.rs rename to primitives/sr-api-macros/tests/decl_and_impl.rs diff --git a/client/sr-api-macros/tests/runtime_calls.rs b/primitives/sr-api-macros/tests/runtime_calls.rs similarity index 100% rename from client/sr-api-macros/tests/runtime_calls.rs rename to primitives/sr-api-macros/tests/runtime_calls.rs diff --git a/client/sr-api-macros/tests/trybuild.rs b/primitives/sr-api-macros/tests/trybuild.rs similarity index 100% rename from client/sr-api-macros/tests/trybuild.rs rename to primitives/sr-api-macros/tests/trybuild.rs diff --git a/client/sr-api-macros/tests/ui/adding_self_parameter.rs b/primitives/sr-api-macros/tests/ui/adding_self_parameter.rs similarity index 100% rename from client/sr-api-macros/tests/ui/adding_self_parameter.rs rename to primitives/sr-api-macros/tests/ui/adding_self_parameter.rs diff --git a/client/sr-api-macros/tests/ui/adding_self_parameter.stderr b/primitives/sr-api-macros/tests/ui/adding_self_parameter.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/adding_self_parameter.stderr rename to primitives/sr-api-macros/tests/ui/adding_self_parameter.stderr diff --git a/client/sr-api-macros/tests/ui/changed_in_unknown_version.rs b/primitives/sr-api-macros/tests/ui/changed_in_unknown_version.rs similarity index 100% rename from client/sr-api-macros/tests/ui/changed_in_unknown_version.rs rename to primitives/sr-api-macros/tests/ui/changed_in_unknown_version.rs diff --git a/client/sr-api-macros/tests/ui/changed_in_unknown_version.stderr b/primitives/sr-api-macros/tests/ui/changed_in_unknown_version.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/changed_in_unknown_version.stderr rename to primitives/sr-api-macros/tests/ui/changed_in_unknown_version.stderr diff --git a/client/sr-api-macros/tests/ui/declaring_old_block.rs b/primitives/sr-api-macros/tests/ui/declaring_old_block.rs similarity index 100% rename from client/sr-api-macros/tests/ui/declaring_old_block.rs rename to primitives/sr-api-macros/tests/ui/declaring_old_block.rs diff --git a/client/sr-api-macros/tests/ui/declaring_old_block.stderr b/primitives/sr-api-macros/tests/ui/declaring_old_block.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/declaring_old_block.stderr rename to primitives/sr-api-macros/tests/ui/declaring_old_block.stderr diff --git a/client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs b/primitives/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs similarity index 100% rename from client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs rename to primitives/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs diff --git a/client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr b/primitives/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr rename to primitives/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr diff --git a/client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs b/primitives/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs similarity index 100% rename from client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs rename to primitives/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs diff --git a/client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr b/primitives/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr rename to primitives/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.stderr diff --git a/client/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs b/primitives/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs similarity index 100% rename from client/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs rename to primitives/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs diff --git a/client/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr b/primitives/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr rename to primitives/sr-api-macros/tests/ui/impl_incorrect_method_signature.stderr diff --git a/client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs b/primitives/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs similarity index 100% rename from client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs rename to primitives/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs diff --git a/client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr b/primitives/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr rename to primitives/sr-api-macros/tests/ui/impl_two_traits_with_same_name.stderr diff --git a/client/sr-api-macros/tests/ui/invalid_api_version.rs b/primitives/sr-api-macros/tests/ui/invalid_api_version.rs similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version.rs rename to primitives/sr-api-macros/tests/ui/invalid_api_version.rs diff --git a/client/sr-api-macros/tests/ui/invalid_api_version.stderr b/primitives/sr-api-macros/tests/ui/invalid_api_version.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version.stderr rename to primitives/sr-api-macros/tests/ui/invalid_api_version.stderr diff --git a/client/sr-api-macros/tests/ui/invalid_api_version_2.rs b/primitives/sr-api-macros/tests/ui/invalid_api_version_2.rs similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version_2.rs rename to primitives/sr-api-macros/tests/ui/invalid_api_version_2.rs diff --git a/client/sr-api-macros/tests/ui/invalid_api_version_2.stderr b/primitives/sr-api-macros/tests/ui/invalid_api_version_2.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version_2.stderr rename to primitives/sr-api-macros/tests/ui/invalid_api_version_2.stderr diff --git a/client/sr-api-macros/tests/ui/invalid_api_version_3.rs b/primitives/sr-api-macros/tests/ui/invalid_api_version_3.rs similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version_3.rs rename to primitives/sr-api-macros/tests/ui/invalid_api_version_3.rs diff --git a/client/sr-api-macros/tests/ui/invalid_api_version_3.stderr b/primitives/sr-api-macros/tests/ui/invalid_api_version_3.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/invalid_api_version_3.stderr rename to primitives/sr-api-macros/tests/ui/invalid_api_version_3.stderr diff --git a/client/sr-api-macros/tests/ui/missing_block_generic_parameter.rs b/primitives/sr-api-macros/tests/ui/missing_block_generic_parameter.rs similarity index 100% rename from client/sr-api-macros/tests/ui/missing_block_generic_parameter.rs rename to primitives/sr-api-macros/tests/ui/missing_block_generic_parameter.rs diff --git a/client/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr b/primitives/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr rename to primitives/sr-api-macros/tests/ui/missing_block_generic_parameter.stderr diff --git a/client/sr-api-macros/tests/ui/missing_path_for_trait.rs b/primitives/sr-api-macros/tests/ui/missing_path_for_trait.rs similarity index 100% rename from client/sr-api-macros/tests/ui/missing_path_for_trait.rs rename to primitives/sr-api-macros/tests/ui/missing_path_for_trait.rs diff --git a/client/sr-api-macros/tests/ui/missing_path_for_trait.stderr b/primitives/sr-api-macros/tests/ui/missing_path_for_trait.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/missing_path_for_trait.stderr rename to primitives/sr-api-macros/tests/ui/missing_path_for_trait.stderr diff --git a/client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/primitives/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs similarity index 100% rename from client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs rename to primitives/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs diff --git a/client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr similarity index 100% rename from client/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr rename to primitives/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.stderr diff --git a/client/sr-arithmetic/Cargo.toml b/primitives/sr-arithmetic/Cargo.toml similarity index 87% rename from client/sr-arithmetic/Cargo.toml rename to primitives/sr-arithmetic/Cargo.toml index fd484671dd848..505047c542679 100644 --- a/client/sr-arithmetic/Cargo.toml +++ b/primitives/sr-arithmetic/Cargo.toml @@ -10,7 +10,7 @@ integer-sqrt = "0.1.2" num-traits = { version = "0.2.8", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } -substrate-debug-derive = { path = "../primitives/debug-derive", default-features = false } +substrate-debug-derive = { path = "../../client/primitives/debug-derive", default-features = false } [dev-dependencies] primitive-types = "0.6.0" diff --git a/client/sr-arithmetic/benches/bench.rs b/primitives/sr-arithmetic/benches/bench.rs similarity index 100% rename from client/sr-arithmetic/benches/bench.rs rename to primitives/sr-arithmetic/benches/bench.rs diff --git a/client/sr-arithmetic/fuzzer/.gitignore b/primitives/sr-arithmetic/fuzzer/.gitignore similarity index 100% rename from client/sr-arithmetic/fuzzer/.gitignore rename to primitives/sr-arithmetic/fuzzer/.gitignore diff --git a/client/sr-arithmetic/fuzzer/Cargo.lock b/primitives/sr-arithmetic/fuzzer/Cargo.lock similarity index 100% rename from client/sr-arithmetic/fuzzer/Cargo.lock rename to primitives/sr-arithmetic/fuzzer/Cargo.lock diff --git a/client/sr-arithmetic/fuzzer/Cargo.toml b/primitives/sr-arithmetic/fuzzer/Cargo.toml similarity index 100% rename from client/sr-arithmetic/fuzzer/Cargo.toml rename to primitives/sr-arithmetic/fuzzer/Cargo.toml diff --git a/client/sr-arithmetic/fuzzer/src/biguint.rs b/primitives/sr-arithmetic/fuzzer/src/biguint.rs similarity index 100% rename from client/sr-arithmetic/fuzzer/src/biguint.rs rename to primitives/sr-arithmetic/fuzzer/src/biguint.rs diff --git a/client/sr-arithmetic/fuzzer/src/rational128.rs b/primitives/sr-arithmetic/fuzzer/src/rational128.rs similarity index 100% rename from client/sr-arithmetic/fuzzer/src/rational128.rs rename to primitives/sr-arithmetic/fuzzer/src/rational128.rs diff --git a/client/sr-arithmetic/src/biguint.rs b/primitives/sr-arithmetic/src/biguint.rs similarity index 100% rename from client/sr-arithmetic/src/biguint.rs rename to primitives/sr-arithmetic/src/biguint.rs diff --git a/client/sr-arithmetic/src/fixed64.rs b/primitives/sr-arithmetic/src/fixed64.rs similarity index 100% rename from client/sr-arithmetic/src/fixed64.rs rename to primitives/sr-arithmetic/src/fixed64.rs diff --git a/client/sr-arithmetic/src/helpers_128bit.rs b/primitives/sr-arithmetic/src/helpers_128bit.rs similarity index 100% rename from client/sr-arithmetic/src/helpers_128bit.rs rename to primitives/sr-arithmetic/src/helpers_128bit.rs diff --git a/client/sr-arithmetic/src/lib.rs b/primitives/sr-arithmetic/src/lib.rs similarity index 100% rename from client/sr-arithmetic/src/lib.rs rename to primitives/sr-arithmetic/src/lib.rs diff --git a/client/sr-arithmetic/src/per_things.rs b/primitives/sr-arithmetic/src/per_things.rs similarity index 100% rename from client/sr-arithmetic/src/per_things.rs rename to primitives/sr-arithmetic/src/per_things.rs diff --git a/client/sr-arithmetic/src/rational128.rs b/primitives/sr-arithmetic/src/rational128.rs similarity index 100% rename from client/sr-arithmetic/src/rational128.rs rename to primitives/sr-arithmetic/src/rational128.rs diff --git a/client/sr-arithmetic/src/traits.rs b/primitives/sr-arithmetic/src/traits.rs similarity index 100% rename from client/sr-arithmetic/src/traits.rs rename to primitives/sr-arithmetic/src/traits.rs diff --git a/client/sr-io/Cargo.toml b/primitives/sr-io/Cargo.toml similarity index 74% rename from client/sr-io/Cargo.toml rename to primitives/sr-io/Cargo.toml index 4e6d0b652b427..5b6c7ebac642e 100644 --- a/client/sr-io/Cargo.toml +++ b/primitives/sr-io/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false } hash-db = { version = "0.15.2", default-features = false } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } libsecp256k1 = { version = "0.3.0", optional = true } tiny-keccak = { version = "1.5.0", optional = true } -substrate-state-machine = { path = "../state-machine", optional = true } -runtime-interface = { package = "substrate-runtime-interface", path = "../runtime-interface", default-features = false } -trie = { package = "substrate-trie", path = "../trie", optional = true } -externalities = { package = "substrate-externalities", path = "../externalities", optional = true } +substrate-state-machine = { path = "../../client/state-machine", optional = true } +runtime-interface = { package = "substrate-runtime-interface", path = "../../client/runtime-interface", default-features = false } +trie = { package = "substrate-trie", path = "../../client/trie", optional = true } +externalities = { package = "substrate-externalities", path = "../../client/externalities", optional = true } log = { version = "0.4.8", optional = true } [features] diff --git a/client/sr-io/src/lib.rs b/primitives/sr-io/src/lib.rs similarity index 100% rename from client/sr-io/src/lib.rs rename to primitives/sr-io/src/lib.rs diff --git a/client/sr-io/with_std.rs b/primitives/sr-io/with_std.rs similarity index 100% rename from client/sr-io/with_std.rs rename to primitives/sr-io/with_std.rs diff --git a/client/sr-io/without_std.rs b/primitives/sr-io/without_std.rs similarity index 100% rename from client/sr-io/without_std.rs rename to primitives/sr-io/without_std.rs diff --git a/client/sr-primitives/Cargo.toml b/primitives/sr-primitives/Cargo.toml similarity index 81% rename from client/sr-primitives/Cargo.toml rename to primitives/sr-primitives/Cargo.toml index 1b1434b91930d..6ee692df2ed78 100644 --- a/client/sr-primitives/Cargo.toml +++ b/primitives/sr-primitives/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../application-crypto", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } arithmetic = { package = "sr-arithmetic", path = "../sr-arithmetic", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } @@ -20,7 +20,7 @@ impl-trait-for-tuples = "0.1.3" [dev-dependencies] serde_json = "1.0.41" rand = "0.7.2" -substrate-offchain = { path = "../offchain" } +substrate-offchain = { path = "../../client/offchain" } [features] bench = [] diff --git a/client/sr-primitives/src/curve.rs b/primitives/sr-primitives/src/curve.rs similarity index 100% rename from client/sr-primitives/src/curve.rs rename to primitives/sr-primitives/src/curve.rs diff --git a/client/sr-primitives/src/generic/block.rs b/primitives/sr-primitives/src/generic/block.rs similarity index 100% rename from client/sr-primitives/src/generic/block.rs rename to primitives/sr-primitives/src/generic/block.rs diff --git a/client/sr-primitives/src/generic/checked_extrinsic.rs b/primitives/sr-primitives/src/generic/checked_extrinsic.rs similarity index 100% rename from client/sr-primitives/src/generic/checked_extrinsic.rs rename to primitives/sr-primitives/src/generic/checked_extrinsic.rs diff --git a/client/sr-primitives/src/generic/digest.rs b/primitives/sr-primitives/src/generic/digest.rs similarity index 100% rename from client/sr-primitives/src/generic/digest.rs rename to primitives/sr-primitives/src/generic/digest.rs diff --git a/client/sr-primitives/src/generic/era.rs b/primitives/sr-primitives/src/generic/era.rs similarity index 100% rename from client/sr-primitives/src/generic/era.rs rename to primitives/sr-primitives/src/generic/era.rs diff --git a/client/sr-primitives/src/generic/header.rs b/primitives/sr-primitives/src/generic/header.rs similarity index 100% rename from client/sr-primitives/src/generic/header.rs rename to primitives/sr-primitives/src/generic/header.rs diff --git a/client/sr-primitives/src/generic/mod.rs b/primitives/sr-primitives/src/generic/mod.rs similarity index 100% rename from client/sr-primitives/src/generic/mod.rs rename to primitives/sr-primitives/src/generic/mod.rs diff --git a/client/sr-primitives/src/generic/tests.rs b/primitives/sr-primitives/src/generic/tests.rs similarity index 100% rename from client/sr-primitives/src/generic/tests.rs rename to primitives/sr-primitives/src/generic/tests.rs diff --git a/client/sr-primitives/src/generic/unchecked_extrinsic.rs b/primitives/sr-primitives/src/generic/unchecked_extrinsic.rs similarity index 100% rename from client/sr-primitives/src/generic/unchecked_extrinsic.rs rename to primitives/sr-primitives/src/generic/unchecked_extrinsic.rs diff --git a/client/sr-primitives/src/lib.rs b/primitives/sr-primitives/src/lib.rs similarity index 100% rename from client/sr-primitives/src/lib.rs rename to primitives/sr-primitives/src/lib.rs diff --git a/client/sr-primitives/src/offchain/http.rs b/primitives/sr-primitives/src/offchain/http.rs similarity index 100% rename from client/sr-primitives/src/offchain/http.rs rename to primitives/sr-primitives/src/offchain/http.rs diff --git a/client/sr-primitives/src/offchain/mod.rs b/primitives/sr-primitives/src/offchain/mod.rs similarity index 100% rename from client/sr-primitives/src/offchain/mod.rs rename to primitives/sr-primitives/src/offchain/mod.rs diff --git a/client/sr-primitives/src/testing.rs b/primitives/sr-primitives/src/testing.rs similarity index 100% rename from client/sr-primitives/src/testing.rs rename to primitives/sr-primitives/src/testing.rs diff --git a/client/sr-primitives/src/traits.rs b/primitives/sr-primitives/src/traits.rs similarity index 100% rename from client/sr-primitives/src/traits.rs rename to primitives/sr-primitives/src/traits.rs diff --git a/client/sr-primitives/src/transaction_validity.rs b/primitives/sr-primitives/src/transaction_validity.rs similarity index 100% rename from client/sr-primitives/src/transaction_validity.rs rename to primitives/sr-primitives/src/transaction_validity.rs diff --git a/client/sr-primitives/src/weights.rs b/primitives/sr-primitives/src/weights.rs similarity index 100% rename from client/sr-primitives/src/weights.rs rename to primitives/sr-primitives/src/weights.rs diff --git a/client/sr-sandbox/Cargo.toml b/primitives/sr-sandbox/Cargo.toml similarity index 84% rename from client/sr-sandbox/Cargo.toml rename to primitives/sr-sandbox/Cargo.toml index 20d569f043c60..7ec0a67dbf3da 100755 --- a/client/sr-sandbox/Cargo.toml +++ b/primitives/sr-sandbox/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] wasmi = { version = "0.5.1", optional = true } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../sr-io", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } diff --git a/client/sr-sandbox/src/lib.rs b/primitives/sr-sandbox/src/lib.rs similarity index 100% rename from client/sr-sandbox/src/lib.rs rename to primitives/sr-sandbox/src/lib.rs diff --git a/client/sr-sandbox/with_std.rs b/primitives/sr-sandbox/with_std.rs similarity index 100% rename from client/sr-sandbox/with_std.rs rename to primitives/sr-sandbox/with_std.rs diff --git a/client/sr-sandbox/without_std.rs b/primitives/sr-sandbox/without_std.rs similarity index 100% rename from client/sr-sandbox/without_std.rs rename to primitives/sr-sandbox/without_std.rs diff --git a/client/sr-staking-primitives/Cargo.toml b/primitives/sr-staking-primitives/Cargo.toml similarity index 100% rename from client/sr-staking-primitives/Cargo.toml rename to primitives/sr-staking-primitives/Cargo.toml diff --git a/client/sr-staking-primitives/src/lib.rs b/primitives/sr-staking-primitives/src/lib.rs similarity index 100% rename from client/sr-staking-primitives/src/lib.rs rename to primitives/sr-staking-primitives/src/lib.rs diff --git a/client/sr-staking-primitives/src/offence.rs b/primitives/sr-staking-primitives/src/offence.rs similarity index 100% rename from client/sr-staking-primitives/src/offence.rs rename to primitives/sr-staking-primitives/src/offence.rs diff --git a/client/sr-std/Cargo.toml b/primitives/sr-std/Cargo.toml similarity index 100% rename from client/sr-std/Cargo.toml rename to primitives/sr-std/Cargo.toml diff --git a/client/sr-std/src/lib.rs b/primitives/sr-std/src/lib.rs similarity index 100% rename from client/sr-std/src/lib.rs rename to primitives/sr-std/src/lib.rs diff --git a/client/sr-std/with_std.rs b/primitives/sr-std/with_std.rs similarity index 100% rename from client/sr-std/with_std.rs rename to primitives/sr-std/with_std.rs diff --git a/client/sr-std/without_std.rs b/primitives/sr-std/without_std.rs similarity index 100% rename from client/sr-std/without_std.rs rename to primitives/sr-std/without_std.rs diff --git a/client/sr-version/Cargo.toml b/primitives/sr-version/Cargo.toml similarity index 100% rename from client/sr-version/Cargo.toml rename to primitives/sr-version/Cargo.toml diff --git a/client/sr-version/src/lib.rs b/primitives/sr-version/src/lib.rs similarity index 100% rename from client/sr-version/src/lib.rs rename to primitives/sr-version/src/lib.rs diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index 1ae6959299464..4ad8f0b1f786f 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -14,5 +14,5 @@ hash-db = "0.15.2" keyring = { package = "substrate-keyring", path = "../../../client/keyring" } codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../../client/primitives" } -sr-primitives = { path = "../../../client/sr-primitives" } +sr-primitives = { path = "../../../primitives/sr-primitives" } state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 7de7bf5c62e9c..9e8411dc8c17f 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -16,11 +16,11 @@ app-crypto = { package = "substrate-application-crypto", path = "../../../client inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../client/consensus/aura/primitives", default-features = false } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives", default-features = false } -rstd = { package = "sr-std", path = "../../../client/sr-std", default-features = false } -runtime_io = { package = "sr-io", path = "../../../client/sr-io", default-features = false } -sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } session = { package = "substrate-session", path = "../../../client/session", default-features = false } -runtime_version = { package = "sr-version", path = "../../../client/sr-version", default-features = false } +runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false } substrate-trie = { path = "../../../client/trie", default-features = false } trie-db = { version = "0.15.2", default-features = false } diff --git a/test/utils/runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml index 68e3bf0ea5972..fdd4adc788bd5 100644 --- a/test/utils/runtime/client/Cargo.toml +++ b/test/utils/runtime/client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" generic-test-client = { package = "substrate-test-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../../../client/primitives" } runtime = { package = "substrate-test-runtime", path = "../../runtime", default-features = false } -sr-primitives = { path = "../../../../client/sr-primitives" } +sr-primitives = { path = "../../../../primitives/sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } [features] diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index ef378b921a19b..a72e7ea480212 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -11,7 +11,7 @@ consensus_common = { package = "substrate-consensus-common", path = "../../../cl log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } -sr-primitives = { path = "../../../client/sr-primitives", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } substrate-service = { path = "../../../client/service" } [features] From ddd0ffbeecbbadfc6575ab17ee16dbee998fcb0a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 16:08:12 +0100 Subject: [PATCH 21/61] clean old readme --- paint/README.adoc | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 paint/README.adoc diff --git a/paint/README.adoc b/paint/README.adoc deleted file mode 100644 index 05da2de0a0357..0000000000000 --- a/paint/README.adoc +++ /dev/null @@ -1,26 +0,0 @@ - -= SRML - -The Substrate Runtime Module Library (SRML) is a collection of runtime modules. - -== What are runtime modules? - -A Substrate runtime can be composed of several smaller components for separation of concerns. These components are called runtime _modules_. Each runtime module packages together a set of functions (dispatchable extrinsic calls, public or private, mutable or immutable), storage items, and events. - -There are four primary components that support runtime modules: - -=== system module - -https://github.com/paritytech/substrate/tree/master/srml/system[`system`] provides low-level APIs and utilities for other modules. https://github.com/paritytech/substrate/tree/master/srml/system[`system`] also defines all core types and extrinsic events for the Substrate runtime. *All modules depend on the system module.* - -=== executive module - -https://github.com/paritytech/substrate/tree/master/srml/executive[`executive`] dispatches incoming extrinsic calls to the respective modules in the runtime. - -=== support macros - -https://github.com/paritytech/substrate/tree/master/srml/support[`support` macros] are a collection of Rust macros to facilitate the implementation of common module components. https://github.com/paritytech/substrate/tree/master/srml/support[`support` macros] expand at runtime to generate types (e.g. `Module`, `Call`, `Store`, `Event`) which are thereafter used by the runtime to communicate with the modules. Common support macros include https://crates.parity.io/srml_support/macro.decl_module.html[`decl_module`], https://crates.parity.io/srml_support_procedural/macro.decl_storage.html[`decl_storage`], https://crates.parity.io/srml_support/macro.decl_event.html[`decl_event`], and https://crates.parity.io/srml_support/macro.ensure.html[`ensure`]. - -=== runtime - -The runtime expands the support macros to get type and trait implementations for each module before calling https://github.com/paritytech/substrate/tree/master/srml/executive[`executive`] to dispatch calls to the individual modules. To see an example of how this might look, see https://github.com/paritytech/substrate/blob/master/node/runtime/src/lib.rs[`../node/runtime`]. \ No newline at end of file From 83de63451bc853e924ed196c4c59b3d09087c434 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 16:16:15 +0100 Subject: [PATCH 22/61] remove old broken code in rhd --- Cargo.toml | 1 - client/consensus/rhd/Cargo.toml | 37 - client/consensus/rhd/src/error.rs | 50 - client/consensus/rhd/src/lib.rs | 1699 ----------------- .../consensus/rhd/src/misbehaviour_check.rs | 191 -- client/consensus/rhd/src/service.rs | 181 -- 6 files changed, 2159 deletions(-) delete mode 100644 client/consensus/rhd/Cargo.toml delete mode 100644 client/consensus/rhd/src/error.rs delete mode 100644 client/consensus/rhd/src/lib.rs delete mode 100644 client/consensus/rhd/src/misbehaviour_check.rs delete mode 100644 client/consensus/rhd/src/service.rs diff --git a/Cargo.toml b/Cargo.toml index 99aa195f92057..08eb327cb0568 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,6 @@ members = [ "client/consensus/aura", "client/consensus/babe", "client/consensus/common", - "client/consensus/rhd", "client/consensus/slots", "client/consensus/uncles", "client/consensus/pow", diff --git a/client/consensus/rhd/Cargo.toml b/client/consensus/rhd/Cargo.toml deleted file mode 100644 index da7d462931e88..0000000000000 --- a/client/consensus/rhd/Cargo.toml +++ /dev/null @@ -1,37 +0,0 @@ -[package] -name = "substrate-consensus-rhd" -version = "2.0.0" -authors = ["Parity Technologies "] -description = "Rhododendron Round-Based consensus-algorithm for substrate" -edition = "2018" - -[dependencies] -derive_more = "0.15.0" -futures = "0.1.29" -codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../primitives" } -consensus = { package = "substrate-consensus-common", path = "../common" } -client = { package = "substrate-client", path = "../../client" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../transaction-pool" } -runtime_support = { package = "srml-support", path = "../../../paint/support" } -srml-system = { path = "../../../paint/system" } -sr-primitives = { path = "../../../primitives/sr-primitives" } -runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } -runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } -tokio = "0.1.22" -parking_lot = "0.9.0" -log = "0.4.8" -rhododendron = { version = "0.7.0", features = ["codec"] } -exit-future = "0.1.4" - -[dev-dependencies] -keyring = { package = "substrate-keyring", path = "../../keyring" } - -[features] -default = ["std"] -std = [ - "primitives/std", - "runtime_support/std", - "sr-primitives/std", - "runtime_version/std", -] diff --git a/client/consensus/rhd/src/error.rs b/client/consensus/rhd/src/error.rs deleted file mode 100644 index 601cf1c963a58..0000000000000 --- a/client/consensus/rhd/src/error.rs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2018-2019 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -//! Error types in the rhododendron Consensus service. -use consensus::error::{Error as CommonError}; -use primitives::AuthorityId; -use client; - -/// A result alias. -pub type Result = std::result::Result; - -/// A RHD error type. -#[derive(Debug, derive_more::Display, derive_more::From)] -pub enum Error { - /// Client error. - Client(client::error::Error), - /// Consensus error. - Common(CommonError), - /// Local account ID not a validator at this block. - #[display(fmt="Local account ID ({:?}) not a validator at this block.", _0)] - NotValidator(AuthorityId), - /// Proposer destroyed before finishing proposing or evaluating - #[display(fmt="Proposer destroyed before finishing proposing or evaluating")] - PrematureDestruction, - /// Failed to register or resolve async timer. - #[display(fmt="Timer failed: {}", _0)] - Timer(tokio::timer::Error), - /// Unable to dispatch agreement future - #[display(fmt="Unable to dispatch agreement future: {:?}", _0)] - Executor(futures::future::ExecuteErrorKind), -} - -impl From<::rhododendron::InputStreamConcluded> for Error { - fn from(_: ::rhododendron::InputStreamConcluded) -> Self { - CommonError::IoTerminated.into() - } -} diff --git a/client/consensus/rhd/src/lib.rs b/client/consensus/rhd/src/lib.rs deleted file mode 100644 index 3bcd1346d47c9..0000000000000 --- a/client/consensus/rhd/src/lib.rs +++ /dev/null @@ -1,1699 +0,0 @@ -// Copyright 2017-2019 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -//! BFT Agreement based on a rotating proposer in different rounds. -//! -//! Where this crate refers to input stream, should never logically conclude. -//! The logic in this crate assumes that messages flushed to the output stream -//! will eventually reach other nodes and that our own messages are not included -//! in the input stream. -//! -//! Note that it is possible to witness agreement being reached without ever -//! seeing the candidate. Any candidates seen will be checked for validity. -//! -//! Although technically the agreement will always complete (given the eventual -//! delivery of messages), in practice it is possible for this future to -//! conclude without having witnessed the conclusion. -//! In general, this future should be pre-empted by the import of a justification -//! set for this block height. - -#![cfg(feature="rhd")] -// FIXME #1020 doesn't compile -// NOTE: this is the legacy constant used for transaction size. No longer used except -// for the rhd code which is not updated. Placed here for compatibility. -const MAX_TRANSACTIONS_SIZE: u32 = 4 * 1024 * 1024; - -use std::sync::Arc; -use std::sync::atomic::{AtomicUsize, Ordering}; -use std::time::{self, Instant, Duration}; - -use codec::{Decode, Encode}; -use consensus::offline_tracker::OfflineTracker; -use consensus::error::{ErrorKind as CommonErrorKind}; -use consensus::{Authorities, BlockImport, Environment, Proposer as BaseProposer}; -use client::{Client as SubstrateClient, CallExecutor}; -use client::runtime_api::{Core, BlockBuilder as BlockBuilderAPI, OldTxQueue, BlockBuilderError}; -use sr_primitives::generic::{BlockId, Era, ImportResult, BlockImportParams, BlockOrigin}; -use sr_primitives::traits::{Block, Header}; -use sr_primitives::traits::{ - Block as BlockT, Hash as HashT, Header as HeaderT, - BlockNumberToHash, SaturatedConversion -}; -use sr_primitives::Justification; -use primitives::{AuthorityId, ed25519, Blake2Hasher, ed25519::LocalizedSignature}; -use srml_system::Trait as SystemT; - -use node_runtime::Runtime; -use transaction_pool::txpool::{self, Pool as TransactionPool}; - -use futures::prelude::*; -use futures::future; -use futures::sync::oneshot; -use tokio::runtime::TaskExecutor; -use tokio::timer::Delay; -use parking_lot::{RwLock, Mutex}; - -pub use rhododendron::{ - self, InputStreamConcluded, AdvanceRoundReason, Message as RhdMessage, - Vote as RhdMessageVote, Communication as RhdCommunication, -}; -pub use self::error::{Error, ErrorKind}; - -// pub mod misbehavior_check; -mod error; -mod service; - -// statuses for an agreement -mod status { - pub const LIVE: usize = 0; - pub const BAD: usize = 1; - pub const GOOD: usize = 2; -} - -pub type Timestamp = u64; - -pub type AccountId = ::primitives::H256; - -/// Localized message type. -pub type LocalizedMessage = rhododendron::LocalizedMessage< - B, - ::Hash, - AuthorityId, - LocalizedSignature ->; - -/// Justification of some hash. -pub struct RhdJustification(rhododendron::Justification); - -/// Justification of a prepare message. -pub struct PrepareJustification(rhododendron::PrepareJustification); - -/// Unchecked justification. -#[derive(Encode, Decode)] -pub struct UncheckedJustification(rhododendron::UncheckedJustification); - -impl UncheckedJustification { - /// Create a new, unchecked justification. - pub fn new(digest: H, signatures: Vec, round_number: u32) -> Self { - UncheckedJustification(rhododendron::UncheckedJustification { - digest, - signatures, - round_number, - }) - } -} - -impl UncheckedJustification { - /// Decode a justification. - pub fn decode_justification(justification: Justification) -> Option { - let inner: rhododendron::UncheckedJustification<_, _> = Decode::decode(&mut &justification[..])?; - - Some(UncheckedJustification(inner)) - } -} - -impl Into for UncheckedJustification { - fn into(self) -> Justification { - self.0.encode() - } -} - -impl From> for UncheckedJustification { - fn from(inner: rhododendron::UncheckedJustification) -> Self { - UncheckedJustification(inner) - } -} - -/// Result of a committed round of BFT -pub type Committed = rhododendron::Committed::Hash, LocalizedSignature>; - -/// Communication between BFT participants. -pub type Communication = rhododendron::Communication::Hash, AuthorityId, LocalizedSignature>; - -/// Misbehavior observed from BFT participants. -pub type Misbehavior = rhododendron::Misbehavior; - -/// Shared offline validator tracker. -pub type SharedOfflineTracker = Arc>; - -/// A proposer for a rhododendron instance. This must implement the base proposer logic. -pub trait LocalProposer: BaseProposer { - /// Import witnessed rhododendron misbehavior. - fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, Misbehavior)>); - - /// Determine the proposer for a given round. This should be a deterministic function - /// with consistent results across all authorities. - fn round_proposer(&self, round_number: u32, authorities: &[AuthorityId]) -> AuthorityId; - - /// Hook called when a BFT round advances without a proposal. - fn on_round_end(&self, _round_number: u32, _proposed: bool) { } -} - - -/// Build new blocks. -pub trait BlockBuilder { - /// Push an extrinsic onto the block. Fails if the extrinsic is invalid. - fn push_extrinsic(&mut self, extrinsic: ::Extrinsic) -> Result<(), Error>; -} - -/// Local client abstraction for the consensus. -pub trait AuthoringApi: - Send - + Sync - + BlockBuilderAPI<::Block, InherentData, Error=::Error> - + Core<::Block, AuthorityId, Error=::Error> - + OldTxQueue<::Block, Error=::Error> -{ - /// The block used for this API type. - type Block: BlockT; - /// The error used by this API type. - type Error: std::error::Error; - - /// Build a block on top of the given, with inherent extrinsics pre-pushed. - fn build_block) -> ()>( - &self, - at: &BlockId, - inherent_data: InherentData, - build_ctx: F, - ) -> Result; -} - -/// A long-lived network which can create BFT message routing processes on demand. -pub trait Network { - /// The block used for this API type. - type Block: BlockT; - /// The input stream of BFT messages. Should never logically conclude. - type Input: Stream,Error=Error>; - /// The output sink of BFT messages. Messages sent here should eventually pass to all - /// current authorities. - type Output: Sink,SinkError=Error>; - - /// Instantiate input and output streams. - fn communication_for( - &self, - validators: &[AuthorityId], - local_id: AuthorityId, - parent_hash: ::Hash, - task_executor: TaskExecutor - ) -> (Self::Input, Self::Output); -} - - -// caches the round number to start at if we end up with BFT consensus on the same -// parent hash more than once (happens if block is bad). -// -// this will force a committed but locally-bad block to be considered analogous to -// a round advancement vote. -#[derive(Debug)] -struct RoundCache { - hash: Option, - start_round: u32, -} - -/// Instance of BFT agreement. -struct BftInstance { - key: Arc, - authorities: Vec, - parent_hash: B::Hash, - round_timeout_multiplier: u64, - cache: Arc>>, - proposer: P, -} - -impl> BftInstance - where - B: Clone + Eq, - B::Hash: ::std::hash::Hash - -{ - fn round_timeout_duration(&self, round: u32) -> Duration { - // 2^(min(6, x/8)) * 10 - // Grows exponentially starting from 10 seconds, capped at 640 seconds. - const ROUND_INCREMENT_STEP: u32 = 8; - - let round = round / ROUND_INCREMENT_STEP; - let round = ::std::cmp::min(6, round); - - let timeout = 1u64.checked_shl(round) - .unwrap_or_else(u64::max_value) - .saturating_mul(self.round_timeout_multiplier); - - Duration::from_secs(timeout) - } - - fn update_round_cache(&self, current_round: u32) { - let mut cache = self.cache.lock(); - if cache.hash.as_ref() == Some(&self.parent_hash) { - cache.start_round = current_round + 1; - } - } -} - -impl> rhododendron::Context for BftInstance - where - B: Clone + Eq, - B::Hash: ::std::hash::Hash, -{ - type Error = P::Error; - type AuthorityId = AuthorityId; - type Digest = B::Hash; - type Signature = LocalizedSignature; - type Candidate = B; - type RoundTimeout = Box>; - type CreateProposal = ::Future; - type EvaluateProposal = ::Future; - - fn local_id(&self) -> AuthorityId { - self.key.public().into() - } - - fn proposal(&self) -> Self::CreateProposal { - self.proposer.propose().into_future() - } - - fn candidate_digest(&self, proposal: &B) -> B::Hash { - proposal.hash() - } - - fn sign_local(&self, message: RhdMessage) -> LocalizedMessage { - sign_message(message, &*self.key, self.parent_hash.clone()) - } - - fn round_proposer(&self, round: u32) -> AuthorityId { - self.proposer.round_proposer(round, &self.authorities[..]) - } - - fn proposal_valid(&self, proposal: &B) -> Self::EvaluateProposal { - self.proposer.evaluate(proposal).into_future() - } - - fn begin_round_timeout(&self, round: u32) -> Self::RoundTimeout { - let timeout = self.round_timeout_duration(round); - let fut = Delay::new(Instant::now() + timeout) - .map_err(|e| Error::from(CommonErrorKind::FaultyTimer(e))) - .map_err(Into::into); - - Box::new(fut) - } - - fn on_advance_round( - &self, - accumulator: &rhododendron::Accumulator, - round: u32, - next_round: u32, - reason: AdvanceRoundReason, - ) { - use std::collections::HashSet; - - let collect_pubkeys = |participants: HashSet<&Self::AuthorityId>| participants.into_iter() - .map(|p| ::ed25519::Public::from_raw(p.0)) - .collect::>(); - - let round_timeout = self.round_timeout_duration(next_round); - debug!(target: "rhd", "Advancing to round {} from {}", next_round, round); - debug!(target: "rhd", "Participating authorities: {:?}", - collect_pubkeys(accumulator.participants())); - debug!(target: "rhd", "Voting authorities: {:?}", - collect_pubkeys(accumulator.voters())); - debug!(target: "rhd", "Round {} should end in at most {} seconds from now", next_round, round_timeout.as_secs()); - - self.update_round_cache(next_round); - - if let AdvanceRoundReason::Timeout = reason { - self.proposer.on_round_end(round, accumulator.proposal().is_some()); - } - } -} - -/// A future that resolves either when canceled (witnessing a block from the network at same height) -/// or when agreement completes. -pub struct BftFuture where - B: Block + Clone + Eq, - B::Hash: ::std::hash::Hash, - P: LocalProposer, - P: BaseProposer, - InStream: Stream, Error=Error>, - OutSink: Sink, SinkError=Error>, -{ - inner: rhododendron::Agreement, InStream, OutSink>, - status: Arc, - cancel: oneshot::Receiver<()>, - import: Arc, -} - -impl Future for BftFuture where - B: Block + Clone + Eq, - B::Hash: ::std::hash::Hash, - P: LocalProposer, - P: BaseProposer, - I: BlockImport, - InStream: Stream, Error=Error>, - OutSink: Sink, SinkError=Error>, -{ - type Item = (); - type Error = (); - - fn poll(&mut self) -> ::futures::Poll<(), ()> { - // service has canceled the future. bail - let cancel = match self.cancel.poll() { - Ok(Async::Ready(())) | Err(_) => true, - Ok(Async::NotReady) => false, - }; - - let committed = match self.inner.poll().map_err(|_| ()) { - Ok(Async::Ready(x)) => x, - Ok(Async::NotReady) => - return Ok(if cancel { Async::Ready(()) } else { Async::NotReady }), - Err(()) => return Err(()), - }; - - // if something was committed, the round leader must have proposed. - self.inner.context().proposer.on_round_end(committed.round_number, true); - - // If we didn't see the proposal (very unlikely), - // we will get the block from the network later. - if let Some(justified_block) = committed.candidate { - let hash = justified_block.hash(); - info!(target: "rhd", "Importing block #{} ({}) directly from BFT consensus", - justified_block.header().number(), hash); - let just: Justification = UncheckedJustification(committed.justification.uncheck()).into(); - let (header, body) = justified_block.deconstruct(); - let import_block = BlockImportParams { - origin: BlockOrigin::ConsensusBroadcast, - header: header, - justification: Some(just), - body: Some(body), - finalized: true, - post_digests: Default::default(), - auxiliary: Default::default() - }; - - let new_status = match self.import.import_block(import_block, None) { - Err(e) => { - warn!(target: "rhd", "Error importing block {:?} in round #{}: {:?}", - hash, committed.round_number, e); - status::BAD - } - Ok(ImportResult::KnownBad) => { - warn!(target: "rhd", "{:?} was bad block agreed on in round #{}", - hash, committed.round_number); - status::BAD - } - _ => status::GOOD - }; - - self.status.store(new_status, Ordering::Release); - - } else { - // assume good unless we received the proposal. - self.status.store(status::GOOD, Ordering::Release); - } - - self.inner.context().update_round_cache(committed.round_number); - - Ok(Async::Ready(())) - } -} - -impl Drop for BftFuture where - B: Block + Clone + Eq, - B::Hash: ::std::hash::Hash, - P: LocalProposer, - P: BaseProposer, - InStream: Stream, Error=Error>, - OutSink: Sink, SinkError=Error>, -{ - fn drop(&mut self) { - let misbehavior = self.inner.drain_misbehavior().collect::>(); - self.inner.context().proposer.import_misbehavior(misbehavior); - } -} - -struct AgreementHandle { - status: Arc, - send_cancel: Option>, -} - -impl AgreementHandle { - fn status(&self) -> usize { - self.status.load(Ordering::Acquire) - } -} - -impl Drop for AgreementHandle { - fn drop(&mut self) { - if let Some(sender) = self.send_cancel.take() { - let _ = sender.send(()); - } - } -} - -/// The BftService kicks off the agreement process on top of any blocks it -/// is notified of. -/// -/// This assumes that it is being run in the context of a tokio runtime. -pub struct BftService { - client: Arc, - live_agreement: Mutex>, - round_cache: Arc>>, - round_timeout_multiplier: u64, - key: Arc, - factory: P, -} - -impl BftService - where - B: Block + Clone + Eq, - P: Environment, - P::Proposer: LocalProposer, - P::Proposer: BaseProposer, - I: BlockImport + Authorities, -{ - /// Create a new service instance. - pub fn new(client: Arc, key: Arc, factory: P) -> BftService { - BftService { - client: client, - live_agreement: Mutex::new(None), - round_cache: Arc::new(Mutex::new(RoundCache { - hash: None, - start_round: 0, - })), - round_timeout_multiplier: 10, - key: key, - factory, - } - } - - /// Get the local Authority ID. - pub fn local_id(&self) -> AuthorityId { - self.key.public().into() - } - - /// Signal that a valid block with the given header has been imported. - /// Provide communication streams that are localized to this block. - /// It's recommended to use the communication primitives provided by this - /// module for signature checking and decoding. See `CheckedStream` and - /// `SigningSink` for more details. - /// - /// Messages received on the stream that don't match the expected format - /// will be dropped. - /// - /// If the local signing key is an authority, this will begin the consensus process to build a - /// block on top of it. If the executor fails to run the future, an error will be returned. - /// Returns `None` if the agreement on the block with given parent is already in progress. - pub fn build_upon(&self, header: &B::Header, input: In, output: Out) - -> Result>::Proposer, - I, - In, - Out, - >>, P::Error> - where - In: Stream, Error=Error>, - Out: Sink, SinkError=Error>, - { - let hash = header.hash(); - - let mut live_agreement = self.live_agreement.lock(); - let can_build = live_agreement.as_ref() - .map_or(true, |x| self.can_build_on_inner(header, x)); - - if !can_build { - return Ok(None) - } - - let authorities = self.client.authorities(&BlockId::Hash(hash.clone())) - .map_err(|e| CommonErrorKind::Other(Box::new(e)).into())?; - - let n = authorities.len(); - let max_faulty = max_faulty_of(n); - trace!(target: "rhd", "Initiating agreement on top of #{}, {:?}", header.number(), hash); - trace!(target: "rhd", "max_faulty_of({})={}", n, max_faulty); - - let local_id = self.local_id(); - - if !authorities.contains(&local_id) { - // cancel current agreement - live_agreement.take(); - Err(CommonErrorKind::InvalidAuthority(local_id).into())?; - } - - let proposer = self.factory.init(header, &authorities, self.key.clone())?; - - let bft_instance = BftInstance { - proposer, - parent_hash: hash.clone(), - cache: self.round_cache.clone(), - round_timeout_multiplier: self.round_timeout_multiplier, - key: self.key.clone(), - authorities: authorities, - }; - - let mut agreement = rhododendron::agree( - bft_instance, - n, - max_faulty, - input, - output, - ); - - // fast forward round number if necessary. - { - let mut cache = self.round_cache.lock(); - trace!(target: "rhd", "Round cache: {:?}", &*cache); - if cache.hash.as_ref() == Some(&hash) { - trace!(target: "rhd", "Fast-forwarding to round {}", cache.start_round); - let start_round = cache.start_round; - cache.start_round += 1; - - drop(cache); - agreement.fast_forward(start_round); - } else { - *cache = RoundCache { - hash: Some(hash.clone()), - start_round: 1, - }; - } - } - - let status = Arc::new(AtomicUsize::new(status::LIVE)); - let (tx, rx) = oneshot::channel(); - - // cancel current agreement. - *live_agreement = Some((header.clone(), AgreementHandle { - send_cancel: Some(tx), - status: status.clone(), - })); - - Ok(Some(BftFuture { - inner: agreement, - status: status, - cancel: rx, - import: self.client.clone(), - })) - } - - /// Cancel current agreement if any. - pub fn cancel_agreement(&self) { - self.live_agreement.lock().take(); - } - - /// Whether we can build using the given header. - pub fn can_build_on(&self, header: &B::Header) -> bool { - self.live_agreement.lock().as_ref() - .map_or(true, |x| self.can_build_on_inner(header, x)) - } - - /// Get a reference to the underlying client. - pub fn client(&self) -> &I { &*self.client } - - fn can_build_on_inner(&self, header: &B::Header, live: &(B::Header, AgreementHandle)) -> bool { - let hash = header.hash(); - let &(ref live_header, ref handle) = live; - match handle.status() { - _ if *header != *live_header && *live_header.parent_hash() != hash => true, // can always follow with next block. - status::BAD => hash == live_header.hash(), // bad block can be re-agreed on. - _ => false, // canceled won't appear since we overwrite the handle before returning. - } - } -} - -/// Stream that decodes rhododendron messages and checks signatures. -/// -/// This stream is localized to a specific parent block-hash, as all messages -/// will be signed in a way that accounts for it. When using this with -/// `BftService::build_upon`, the user should take care to use the same hash as for that. -pub struct CheckedStream { - inner: S, - local_id: AuthorityId, - authorities: Vec, - parent_hash: B::Hash, -} - -impl CheckedStream { - /// Construct a new checked stream. - pub fn new( - inner: S, - local_id: AuthorityId, - authorities: Vec, - parent_hash: B::Hash, - ) -> Self { - CheckedStream { - inner, - local_id, - authorities, - parent_hash, - } - } -} - -impl>> Stream for CheckedStream - where S::Error: From, -{ - type Item = Communication; - type Error = S::Error; - - fn poll(&mut self) -> Poll, Self::Error> { - use rhododendron::LocalizedMessage as RhdLocalized; - loop { - match self.inner.poll()? { - Async::Ready(Some(item)) => { - let comms: Communication = match Decode::decode(&mut &item[..]) { - Some(x) => x, - None => continue, - }; - - match comms { - RhdCommunication::Auxiliary(prepare_just) => { - let checked = check_prepare_justification::( - &self.authorities, - self.parent_hash, - UncheckedJustification(prepare_just.uncheck()), - ); - if let Ok(checked) = checked { - return Ok(Async::Ready( - Some(RhdCommunication::Auxiliary(checked.0)) - )); - } - } - RhdCommunication::Consensus(RhdLocalized::Propose(p)) => { - if p.sender == self.local_id { continue } - - let checked = check_proposal::( - &self.authorities, - &self.parent_hash, - &p, - ); - - if let Ok(()) = checked { - return Ok(Async::Ready( - Some(RhdCommunication::Consensus(RhdLocalized::Propose(p))) - )); - } - } - RhdCommunication::Consensus(RhdLocalized::Vote(v)) => { - if v.sender == self.local_id { continue } - - let checked = check_vote::( - &self.authorities, - &self.parent_hash, - &v, - ); - - if let Ok(()) = checked { - return Ok(Async::Ready( - Some(RhdCommunication::Consensus(RhdLocalized::Vote(v))) - )); - } - } - } - } - Async::Ready(None) => return Ok(Async::Ready(None)), - Async::NotReady => return Ok(Async::NotReady), - } - } - } -} - -/// Given a total number of authorities, yield the maximum faulty that would be allowed. -/// This will always be under 1/3. -pub fn max_faulty_of(n: usize) -> usize { - n.saturating_sub(1) / 3 -} - -/// Given a total number of authorities, yield the minimum required signatures. -/// This will always be over 2/3. -pub fn bft_threshold(n: usize) -> usize { - n - max_faulty_of(n) -} - -// actions in the signature scheme. -#[derive(Encode)] -enum Action { - Prepare(u32, H), - Commit(u32, H), - AdvanceRound(u32), - // signatures of header hash and full candidate are both included. - ProposeHeader(u32, H), - Propose(u32, B), -} - -// encode something in a way which is localized to a specific parent-hash -fn localized_encode(parent_hash: H, value: E) -> Vec { - (parent_hash, value).encode() -} - -fn check_justification_signed_message( - authorities: &[AuthorityId], - message: &[u8], - just: UncheckedJustification) --> Result, UncheckedJustification> { - // additional error information could be useful here. - just.0.check(authorities.len() - max_faulty_of(authorities.len()), |_, _, sig| { - let auth_id = sig.signer.clone().into(); - if !authorities.contains(&auth_id) { return None } - - if ed25519::Pair::verify(&sig.signature, message, &sig.signer) { - Some(sig.signer.0) - } else { - None - } - }).map(RhdJustification).map_err(UncheckedJustification) -} - -/// Check a full justification for a header hash. -/// Provide all valid authorities. -/// -/// On failure, returns the justification back. -pub fn check_justification( - authorities: &[AuthorityId], - parent: B::Hash, - just: UncheckedJustification -) -> Result, UncheckedJustification> { - let vote: Action = Action::Commit(just.0.round_number as u32, just.0.digest.clone()); - let message = localized_encode(parent, vote); - - check_justification_signed_message(authorities, &message[..], just) -} - -/// Check a prepare justification for a header hash. -/// Provide all valid authorities. -/// -/// On failure, returns the justification back. -pub fn check_prepare_justification( - authorities: &[AuthorityId], - parent: B::Hash, - just: UncheckedJustification -) -> Result, UncheckedJustification> { - let vote: Action = Action::Prepare(just.0.round_number as u32, just.0.digest.clone()); - let message = localized_encode(parent, vote); - - check_justification_signed_message(authorities, &message[..], just).map(|e| PrepareJustification(e.0)) -} - -/// Check proposal message signatures and authority. -/// Provide all valid authorities. -pub fn check_proposal( - authorities: &[AuthorityId], - parent_hash: &B::Hash, - propose: &rhododendron::LocalizedProposal) - -> Result<(), Error> -{ - if !authorities.contains(&propose.sender) { - return Err(CommonErrorKind::InvalidAuthority(propose.sender.into()).into()); - } - - let action_header = Action::ProposeHeader(propose.round_number as u32, propose.digest.clone()); - let action_propose = Action::Propose(propose.round_number as u32, propose.proposal.clone()); - check_action::(action_header, parent_hash, &propose.digest_signature)?; - check_action::(action_propose, parent_hash, &propose.full_signature) -} - -/// Check vote message signatures and authority. -/// Provide all valid authorities. -pub fn check_vote( - authorities: &[AuthorityId], - parent_hash: &B::Hash, - vote: &rhododendron::LocalizedVote) - -> Result<(), Error> -{ - if !authorities.contains(&vote.sender) { - return Err(CommonErrorKind::InvalidAuthority(vote.sender.into()).into()); - } - - let action = match vote.vote { - rhododendron::Vote::Prepare(r, ref h) => Action::Prepare(r as u32, h.clone()), - rhododendron::Vote::Commit(r, ref h) => Action::Commit(r as u32, h.clone()), - rhododendron::Vote::AdvanceRound(r) => Action::AdvanceRound(r as u32), - }; - check_action::(action, parent_hash, &vote.signature) -} - -fn check_action( - action: Action, - parent_hash: &B::Hash, - sig: &LocalizedSignature -) -> Result<(), Error> { - let message = localized_encode(*parent_hash, action); - if ed25519::Pair::verify(&sig.signature, &message, &sig.signer) { - Ok(()) - } else { - Err(CommonErrorKind::InvalidSignature(sig.signature.into(), sig.signer.clone().into()).into()) - } -} - -/// Sign a BFT message with the given key. -pub fn sign_message( - message: RhdMessage, - key: &ed25519::Pair, - parent_hash: B::Hash -) -> LocalizedMessage { - let signer = key.public(); - - let sign_action = |action: Action| { - let to_sign = localized_encode(parent_hash.clone(), action); - - LocalizedSignature { - signer: signer.clone(), - signature: key.sign(&to_sign), - } - }; - - match message { - RhdMessage::Propose(r, proposal) => { - let header_hash = proposal.hash(); - let action_header = Action::ProposeHeader(r as u32, header_hash.clone()); - let action_propose = Action::Propose(r as u32, proposal.clone()); - - rhododendron::LocalizedMessage::Propose(rhododendron::LocalizedProposal { - round_number: r, - proposal, - digest: header_hash, - sender: signer.clone().into(), - digest_signature: sign_action(action_header), - full_signature: sign_action(action_propose), - }) - } - RhdMessage::Vote(vote) => rhododendron::LocalizedMessage::Vote({ - let action = match vote { - RhdMessageVote::Prepare(r, h) => Action::Prepare(r as u32, h), - RhdMessageVote::Commit(r, h) => Action::Commit(r as u32, h), - RhdMessageVote::AdvanceRound(r) => Action::AdvanceRound(r as u32), - }; - - rhododendron::LocalizedVote { - vote: vote, - sender: signer.clone().into(), - signature: sign_action(action), - } - }) - } -} - - -impl<'a, B, E, Block> BlockBuilder for client::block_builder::BlockBuilder<'a, B, E, Block, Blake2Hasher> where - B: client::backend::Backend + Send + Sync + 'static, - E: CallExecutor + Send + Sync + Clone + 'static, - Block: BlockT -{ - fn push_extrinsic(&mut self, extrinsic: ::Extrinsic) -> Result<(), Error> { - client::block_builder::BlockBuilder::push(self, extrinsic).map_err(Into::into) - } -} - -impl<'a, B, E, Block> AuthoringApi for SubstrateClient where - B: client::backend::Backend + Send + Sync + 'static, - E: CallExecutor + Send + Sync + Clone + 'static, - Block: BlockT, -{ - type Block = Block; - type Error = client::error::Error; - - fn build_block) -> ()>( - &self, - at: &BlockId, - inherent_data: InherentData, - mut build_ctx: F, - ) -> Result { - let runtime_version = self.runtime_version_at(at)?; - - let mut block_builder = self.new_block_at(at)?; - if runtime_version.has_api(*b"blkbuild", 1) { - for inherent in self.inherent_extrinsics(at, &inherent_data)? { - block_builder.push(inherent)?; - } - } - - build_ctx(&mut block_builder); - - block_builder.bake().map_err(Into::into) - } -} - - -/// Proposer factory. -pub struct ProposerFactory where - C: AuthoringApi, - A: txpool::ChainApi, -{ - /// The client instance. - pub client: Arc, - /// The transaction pool. - pub transaction_pool: Arc>, - /// The backing network handle. - pub network: N, - /// handle to remote task executor - pub handle: TaskExecutor, - /// Offline-tracker. - pub offline: SharedOfflineTracker, - /// Force delay in evaluation this long. - pub force_delay: u64, -} - -impl consensus::Environment<::Block> for ProposerFactory where - N: Network::Block>, - C: AuthoringApi + BlockNumberToHash, - A: txpool::ChainApi::Block>, - // <::Block as BlockT>::Hash: - // Into<::Hash> + PartialEq + Into, - Error: From<::Error> -{ - type Proposer = Proposer; - type Error = Error; - - fn init( - &self, - parent_header: &<::Block as BlockT>::Header, - authorities: &[AuthorityId], - sign_with: Arc, - ) -> Result { - use sr_primitives::traits::Hash as HashT; - let parent_hash = parent_header.hash(); - - let id = BlockId::hash(parent_hash); - let random_seed = self.client.random_seed(&id)?; - let random_seed = <<::Block as BlockT>::Header as HeaderT> - ::Hashing::hash(random_seed.as_ref()); - - let validators = self.client.validators(&id)?; - self.offline.write().note_new_block(&validators[..]); - - info!("Starting consensus session on top of parent {:?}", parent_hash); - - let local_id = sign_with.public().0.into(); - let (input, output) = self.network.communication_for( - authorities, - local_id, - parent_hash.clone(), - self.handle.clone(), - ); - let now = Instant::now(); - let proposer = Proposer { - client: self.client.clone(), - start: now, - local_key: sign_with, - parent_hash, - parent_id: id, - parent_number: *parent_header.number(), - random_seed, - transaction_pool: self.transaction_pool.clone(), - offline: self.offline.clone(), - validators, - minimum_timestamp: current_timestamp() + self.force_delay, - network: self.network.clone() - }; - - Ok(proposer) - } -} - -/// The proposer logic. -pub struct Proposer { - client: Arc, - start: Instant, - local_key: Arc, - parent_hash: <::Block as BlockT>::Hash, - parent_id: BlockId<::Block>, - parent_number: <<::Block as BlockT>::Header as HeaderT>::Number, - random_seed: <::Block as BlockT>::Hash, - transaction_pool: Arc>, - offline: SharedOfflineTracker, - validators: Vec, - minimum_timestamp: u64, - network: N, -} - -impl Proposer { - fn primary_index(&self, round_number: u32, len: usize) -> usize { - use primitives::uint::U256; - - let big_len = U256::from(len); - let offset = U256::from_big_endian(self.random_seed.as_ref()) % big_len; - let offset = offset.low_u64() as usize + round_number as usize; - offset % len - } -} - -impl BaseProposer<::Block> for Proposer where - C: AuthoringApi + BlockNumberToHash, - A: txpool::ChainApi::Block>, - <::Block as BlockT>::Hash: - Into<::Hash> + PartialEq + Into, - error::Error: From<::Error> -{ - type Create = Result<::Block, Error>; - type Error = Error; - type Evaluate = Box>; - - fn propose(&self) -> Self::Create { - use sr_primitives::traits::BlakeTwo256; - - const MAX_VOTE_OFFLINE_SECONDS: Duration = Duration::from_secs(60); - - let timestamp = ::std::cmp::max(self.minimum_timestamp, current_timestamp()); - - let elapsed_since_start = self.start.elapsed(); - let offline_indices = if elapsed_since_start > MAX_VOTE_OFFLINE_SECONDS { - Vec::new() - } else { - self.offline.read().reports(&self.validators[..]) - }; - - if !offline_indices.is_empty() { - info!( - "Submitting offline validators {:?} for slash-vote", - offline_indices.iter().map(|&i| self.validators[i as usize]).collect::>(), - ) - } - - let inherent_data = InherentData { - timestamp, - offline_indices, - }; - - let block = self.client.build_block( - &self.parent_id, - inherent_data, - |block_builder| { - let mut unqueue_invalid = Vec::new(); - self.transaction_pool.ready(|pending_iterator| { - let mut pending_size = 0; - for pending in pending_iterator { - let encoded_size = pending.data.encode().len(); - if pending_size + encoded_size >= MAX_TRANSACTIONS_SIZE { break } - - match block_builder.push_extrinsic(pending.data.clone()) { - Ok(()) => { - pending_size += encoded_size; - } - Err(e) => { - trace!(target: "transaction-pool", "Invalid transaction: {}", e); - unqueue_invalid.push(pending.hash.clone()); - } - } - } - }); - - self.transaction_pool.remove_invalid(&unqueue_invalid); - })?; - - info!("Proposing block [number: {}; hash: {}; parent_hash: {}; extrinsics: [{}]]", - block.header().number(), - <::Block as BlockT>::Hash::from(block.header().hash()), - block.header().parent_hash(), - block.extrinsics().iter() - .map(|xt| format!("{}", BlakeTwo256::hash_of(xt))) - .collect::>() - .join(", ") - ); - - let substrate_block = Decode::decode(&mut block.encode().as_slice()) - .expect("blocks are defined to serialize to substrate blocks correctly; qed"); - - assert!(evaluation::evaluate_initial( - &substrate_block, - &self.parent_hash, - self.parent_number, - ).is_ok()); - - Ok(substrate_block) - } - - fn evaluate(&self, unchecked_proposal: &::Block) -> Self::Evaluate { - debug!(target: "rhd", "evaluating block on top of parent ({}, {:?})", self.parent_number, self.parent_hash); - - // do initial serialization and structural integrity checks. - if let Err(e) = evaluation::evaluate_initial( - unchecked_proposal, - &self.parent_hash, - self.parent_number, - ) { - debug!(target: "rhd", "Invalid proposal: {:?}", e); - return Box::new(future::ok(false)); - }; - - let current_timestamp = current_timestamp(); - let inherent = InherentData::new( - current_timestamp, - self.offline.read().reports(&self.validators) - ); - let proposed_timestamp = match self.client.check_inherents( - &self.parent_id, - &unchecked_proposal, - &inherent, - ) { - Ok(Ok(())) => None, - Ok(Err(BlockBuilderError::ValidAtTimestamp(timestamp))) => Some(timestamp), - Ok(Err(e)) => { - debug!(target: "rhd", "Invalid proposal (check_inherents): {:?}", e); - return Box::new(future::ok(false)); - }, - Err(e) => { - debug!(target: "rhd", "Could not call into runtime: {:?}", e); - return Box::new(future::ok(false)); - } - }; - - let vote_delays = { - - // the duration until the given timestamp is current - let proposed_timestamp = ::std::cmp::max(self.minimum_timestamp, proposed_timestamp.unwrap_or(0)); - let timestamp_delay = if proposed_timestamp > current_timestamp { - let delay_s = proposed_timestamp - current_timestamp; - debug!(target: "rhd", "Delaying evaluation of proposal for {} seconds", delay_s); - Some(Instant::now() + Duration::from_secs(delay_s)) - } else { - None - }; - - match timestamp_delay { - Some(duration) => future::Either::A( - Delay::new(duration).map_err(|e| ErrorKind::Timer(e).into()) - ), - None => future::Either::B(future::ok(())), - } - }; - - // evaluate whether the block is actually valid. - // it may be better to delay this until the delays are finished - let evaluated = match self.client.execute_block(&self.parent_id, &unchecked_proposal.clone()) - .map_err(Error::from) { - Ok(()) => Ok(true), - Err(err) => match err.kind() { - error::ErrorKind::Client(client::error::ErrorKind::Execution(_)) => Ok(false), - _ => Err(err) - } - }; - - let future = future::result(evaluated).and_then(move |good| { - let end_result = future::ok(good); - if good { - // delay a "good" vote. - future::Either::A(vote_delays.and_then(|_| end_result)) - } else { - // don't delay a "bad" evaluation. - future::Either::B(end_result) - } - }); - - Box::new(future) as Box<_> - } -} - -impl LocalProposer<::Block> for Proposer where - C: AuthoringApi + BlockNumberToHash, - A: txpool::ChainApi::Block>, - Self: BaseProposer<::Block, Error=Error>, - <::Block as BlockT>::Hash: - Into<::Hash> + PartialEq + Into, - error::Error: From<::Error> -{ - - fn round_proposer(&self, round_number: u32, authorities: &[AuthorityId]) -> AuthorityId { - let offset = self.primary_index(round_number, authorities.len()); - let proposer = authorities[offset as usize].clone(); - trace!(target: "rhd", "proposer for round {} is {}", round_number, proposer); - - proposer - } - - fn import_misbehavior( - &self, - _misbehavior: Vec<(AuthorityId, Misbehavior<<::Block as BlockT>::Hash>)> - ) { - use rhododendron::Misbehavior as GenericMisbehavior; - use sr_primitives::bft::{MisbehaviorKind, MisbehaviorReport}; - use node_runtime::{Call, UncheckedExtrinsic, ConsensusCall}; - - let mut next_index = { - let local_id = self.local_key.public().0; - let cur_index = self.transaction_pool.cull_and_get_pending(&BlockId::hash(self.parent_hash), |pending| pending - .filter(|tx| tx.verified.sender == local_id) - .last() - .map(|tx| Ok(tx.verified.index())) - .unwrap_or_else(|| self.client.account_nonce(&self.parent_id, local_id)) - .map_err(Error::from) - ); - - match cur_index { - Ok(cur_index) => cur_index + 1, - Err(e) => { - warn!(target: "consensus", "Error computing next transaction index: {:?}", e); - return; - } - } - }; - - for (target, misbehavior) in misbehavior { - let report = MisbehaviorReport { - parent_hash: self.parent_hash.into(), - parent_number: self.parent_number.saturated_into::(), - target, - misbehavior: match misbehavior { - GenericMisbehavior::ProposeOutOfTurn(_, _, _) => continue, - GenericMisbehavior::DoublePropose(_, _, _) => continue, - GenericMisbehavior::DoublePrepare(round, (h1, s1), (h2, s2)) - => MisbehaviorKind::BftDoublePrepare(round as u32, (h1.into(), s1.signature), (h2.into(), s2.signature)), - GenericMisbehavior::DoubleCommit(round, (h1, s1), (h2, s2)) - => MisbehaviorKind::BftDoubleCommit(round as u32, (h1.into(), s1.signature), (h2.into(), s2.signature)), - } - }; - let payload = ( - next_index, - Call::Consensus(ConsensusCall::report_misbehavior(report)), - Era::immortal(), - self.client.genesis_hash() - ); - let signature = self.local_key.sign(&payload.encode()).into(); - next_index += 1; - - let local_id = self.local_key.public().0.into(); - let extrinsic = UncheckedExtrinsic { - signature: Some((node_runtime::RawAddress::Id(local_id), signature, payload.0, Era::immortal())), - function: payload.1, - }; - let uxt: <::Block as BlockT>::Extrinsic = Decode::decode( - &mut extrinsic.encode().as_slice()).expect("Encoded extrinsic is valid"); - let hash = BlockId::<::Block>::hash(self.parent_hash); - if let Err(e) = self.transaction_pool.submit_one(&hash, uxt) { - warn!("Error importing misbehavior report: {:?}", e); - } - } - } - - fn on_round_end(&self, round_number: u32, was_proposed: bool) { - let primary_validator = self.validators[ - self.primary_index(round_number, self.validators.len()) - ]; - - // alter the message based on whether we think the empty proposer was forced to skip the round. - // this is determined by checking if our local validator would have been forced to skip the round. - if !was_proposed { - let public = ed25519::Public::from_raw(primary_validator.0); - info!( - "Potential Offline Validator: {} failed to propose during assigned slot: {}", - public, - round_number, - ); - } - - self.offline.write().note_round_end(primary_validator, was_proposed); - } -} - -fn current_timestamp() -> u64 { - time::SystemTime::now().duration_since(time::UNIX_EPOCH) - .expect("now always later than unix epoch; qed") - .as_secs() -} - - -#[cfg(test)] -mod tests { - use super::*; - use std::collections::HashSet; - use std::marker::PhantomData; - - use sr_primitives::testing::{Block as GenericTestBlock, Header as TestHeader}; - use primitives::H256; - use keyring::Ed25519Keyring; - - type TestBlock = GenericTestBlock<()>; - - struct FakeClient { - authorities: Vec, - imported_heights: Mutex> - } - - impl BlockImport for FakeClient { - type Error = Error; - - fn import_block(&self, - block: BlockImportParams, - _new_authorities: Option> - ) -> Result { - assert!(self.imported_heights.lock().insert(block.header.number)); - Ok(ImportResult::Queued) - } - } - - impl Authorities for FakeClient { - type Error = Error; - - fn authorities(&self, _at: &BlockId) -> Result, Self::Error> { - Ok(self.authorities.clone()) - } - } - - // "black hole" output sink. - struct Comms(::std::marker::PhantomData); - - impl Sink for Comms { - type SinkItem = Communication; - type SinkError = E; - - fn start_send(&mut self, _item: Communication) -> ::futures::StartSend, E> { - Ok(::futures::AsyncSink::Ready) - } - - fn poll_complete(&mut self) -> ::futures::Poll<(), E> { - Ok(Async::Ready(())) - } - } - - impl Stream for Comms { - type Item = Communication; - type Error = E; - - fn poll(&mut self) -> ::futures::Poll, Self::Error> { - Ok(::futures::Async::NotReady) - } - } - - struct DummyFactory; - struct DummyProposer(u64); - - impl Environment for DummyFactory { - type Proposer = DummyProposer; - type Error = Error; - - fn init(&mut self, parent_header: &TestHeader, _authorities: &[AuthorityId], _sign_with: Arc) - -> Result - { - Ok(DummyProposer(parent_header.number + 1)) - } - } - - impl BaseProposer for DummyProposer { - type Error = Error; - type Create = Result; - type Evaluate = Result; - - fn propose(&self) -> Result { - - Ok(TestBlock { - header: from_block_number(self.0), - extrinsics: Default::default() - }) - } - - fn evaluate(&self, proposal: &TestBlock) -> Result { - Ok(proposal.header.number == self.0) - } - } - - impl LocalProposer for DummyProposer { - fn import_misbehavior(&self, _misbehavior: Vec<(AuthorityId, Misbehavior)>) {} - - fn round_proposer(&self, round_number: u32, authorities: &[AuthorityId]) -> AuthorityId { - authorities[(round_number as usize) % authorities.len()].clone() - } - } - - fn make_service(client: FakeClient) - -> BftService - { - BftService { - client: Arc::new(client), - live_agreement: Mutex::new(None), - round_cache: Arc::new(Mutex::new(RoundCache { - hash: None, - start_round: 0, - })), - round_timeout_multiplier: 10, - key: Arc::new(Ed25519Keyring::One.into()), - factory: DummyFactory - } - } - - fn sign_vote(vote: rhododendron::Vote, key: &ed25519::Pair, parent_hash: H256) -> LocalizedSignature { - match sign_message::(vote.into(), key, parent_hash) { - rhododendron::LocalizedMessage::Vote(vote) => vote.signature, - _ => panic!("signing vote leads to signed vote"), - } - } - - fn from_block_number(num: u64) -> TestHeader { - TestHeader::new( - num, - Default::default(), - Default::default(), - Default::default(), - Default::default(), - ) - } - - #[test] - fn future_gets_preempted() { - let client = FakeClient { - authorities: vec![ - Ed25519Keyring::One.into(), - Ed25519Keyring::Two.into(), - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ], - imported_heights: Mutex::new(HashSet::new()), - }; - - let service = make_service(client); - - let first = from_block_number(2); - let first_hash = first.hash(); - - let mut second = from_block_number(3); - second.parent_hash = first_hash; - let _second_hash = second.hash(); - - let mut first_bft = service.build_upon(&first, Comms(PhantomData), Comms(PhantomData)).unwrap().unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == first); - - let _second_bft = service.build_upon(&second, Comms(PhantomData), Comms(PhantomData)).unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 != first); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == second); - - // first_bft has been cancelled. need to swap out so we can check it. - let (_tx, mut rx) = oneshot::channel(); - ::std::mem::swap(&mut rx, &mut first_bft.cancel); - - assert!(rx.wait().is_ok()); - } - - #[test] - fn max_faulty() { - assert_eq!(max_faulty_of(3), 0); - assert_eq!(max_faulty_of(4), 1); - assert_eq!(max_faulty_of(100), 33); - assert_eq!(max_faulty_of(0), 0); - assert_eq!(max_faulty_of(11), 3); - assert_eq!(max_faulty_of(99), 32); - } - - #[test] - fn justification_check_works() { - let parent_hash = Default::default(); - let hash = [0xff; 32].into(); - - let authorities = vec![ - Ed25519Keyring::One.into(), - Ed25519Keyring::Two.into(), - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ]; - - let authorities_keys = vec![ - Ed25519Keyring::One.into(), - Ed25519Keyring::Two.into(), - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ]; - - let unchecked = UncheckedJustification(rhododendron::UncheckedJustification { - digest: hash, - round_number: 1, - signatures: authorities_keys.iter().take(3).map(|key| { - sign_vote(rhododendron::Vote::Commit(1, hash).into(), key, parent_hash) - }).collect(), - }); - - assert!(check_justification::(&authorities, parent_hash, unchecked).is_ok()); - - let unchecked = UncheckedJustification(rhododendron::UncheckedJustification { - digest: hash, - round_number: 0, // wrong round number (vs. the signatures) - signatures: authorities_keys.iter().take(3).map(|key| { - sign_vote(rhododendron::Vote::Commit(1, hash).into(), key, parent_hash) - }).collect(), - }); - - assert!(check_justification::(&authorities, parent_hash, unchecked).is_err()); - - // not enough signatures. - let unchecked = UncheckedJustification(rhododendron::UncheckedJustification { - digest: hash, - round_number: 1, - signatures: authorities_keys.iter().take(2).map(|key| { - sign_vote(rhododendron::Vote::Commit(1, hash).into(), key, parent_hash) - }).collect(), - }); - - assert!(check_justification::(&authorities, parent_hash, unchecked).is_err()); - - // wrong hash. - let unchecked = UncheckedJustification(rhododendron::UncheckedJustification { - digest: [0xfe; 32].into(), - round_number: 1, - signatures: authorities_keys.iter().take(3).map(|key| { - sign_vote(rhododendron::Vote::Commit(1, hash).into(), key, parent_hash) - }).collect(), - }); - - assert!(check_justification::(&authorities, parent_hash, unchecked).is_err()); - } - - #[test] - fn propose_check_works() { - let parent_hash = Default::default(); - - let authorities = vec![ - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ]; - - let block = TestBlock { - header: from_block_number(1), - extrinsics: Default::default() - }; - - let proposal = sign_message( - rhododendron::Message::Propose(1, block.clone()), - &Ed25519Keyring::Alice.pair(), - parent_hash, - ); - if let rhododendron::LocalizedMessage::Propose(proposal) = proposal { - assert!(check_proposal(&authorities, &parent_hash, &proposal).is_ok()); - let mut invalid_round = proposal.clone(); - invalid_round.round_number = 0; - assert!(check_proposal(&authorities, &parent_hash, &invalid_round).is_err()); - let mut invalid_digest = proposal.clone(); - invalid_digest.digest = [0xfe; 32].into(); - assert!(check_proposal(&authorities, &parent_hash, &invalid_digest).is_err()); - } else { - assert!(false); - } - - // Not an authority - let proposal = sign_message::( - rhododendron::Message::Propose(1, block), - &Ed25519Keyring::Bob.pair(), - parent_hash, - ); - if let rhododendron::LocalizedMessage::Propose(proposal) = proposal { - assert!(check_proposal(&authorities, &parent_hash, &proposal).is_err()); - } else { - assert!(false); - } - } - - #[test] - fn vote_check_works() { - let parent_hash: H256 = Default::default(); - let hash: H256 = [0xff; 32].into(); - - let authorities = vec![ - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ]; - - let vote = sign_message::(rhododendron::Message::Vote(rhododendron::Vote::Prepare(1, hash)), &Keyring::Alice.pair(), parent_hash);; - if let rhododendron::LocalizedMessage::Vote(vote) = vote { - assert!(check_vote::(&authorities, &parent_hash, &vote).is_ok()); - let mut invalid_sender = vote.clone(); - invalid_sender.signature.signer = Keyring::Eve.into(); - assert!(check_vote::(&authorities, &parent_hash, &invalid_sender).is_err()); - } else { - assert!(false); - } - - // Not an authority - let vote = sign_message::(rhododendron::Message::Vote(rhododendron::Vote::Prepare(1, hash)), &Keyring::Bob.pair(), parent_hash);; - if let rhododendron::LocalizedMessage::Vote(vote) = vote { - assert!(check_vote::(&authorities, &parent_hash, &vote).is_err()); - } else { - assert!(false); - } - } - - #[test] - fn drop_bft_future_does_not_deadlock() { - let client = FakeClient { - authorities: vec![ - Ed25519Keyring::One.into(), - Ed25519Keyring::Two.into(), - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ], - imported_heights: Mutex::new(HashSet::new()), - }; - - let service = make_service(client); - - let first = from_block_number(2); - let first_hash = first.hash(); - - let mut second = from_block_number(3); - second.parent_hash = first_hash; - - let _ = service.build_upon(&first, Comms(PhantomData), Comms(PhantomData)).unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == first); - service.live_agreement.lock().take(); - } - - #[test] - fn bft_can_build_though_skipped() { - let client = FakeClient { - authorities: vec![ - Ed25519Keyring::One.into(), - Ed25519Keyring::Two.into(), - Ed25519Keyring::Alice.into(), - Ed25519Keyring::Eve.into(), - ], - imported_heights: Mutex::new(HashSet::new()), - }; - - let service = make_service(client); - - let first = from_block_number(2); - let first_hash = first.hash(); - - let mut second = from_block_number(3); - second.parent_hash = first_hash; - - let mut third = from_block_number(4); - third.parent_hash = second.hash(); - - let _ = service.build_upon(&first, Comms(PhantomData), Comms(PhantomData)).unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == first); - // BFT has not seen second, but will move forward on third - service.build_upon(&third, Comms(PhantomData), Comms(PhantomData)).unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == third); - - // but we are not walking backwards - service.build_upon(&second, Comms(PhantomData), Comms(PhantomData)).unwrap(); - assert!(service.live_agreement.lock().as_ref().unwrap().0 == third); - } -} diff --git a/client/consensus/rhd/src/misbehaviour_check.rs b/client/consensus/rhd/src/misbehaviour_check.rs deleted file mode 100644 index bde3976c19b09..0000000000000 --- a/client/consensus/rhd/src/misbehaviour_check.rs +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright 2017-2019 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -//! Utility for substrate-based runtimes that want to check misbehavior reports. - -use codec::{Codec, Encode}; -use primitives::{AuthorityId, Signature}; - -use rhododendron::messages::{Action, Message, MisbehaviorKind}; -use runtime_io; - -// check a message signature. returns true if signed by that authority. -fn check_message_sig( - message: Message, - signature: &Signature, - from: &AuthorityId, -) -> bool { - let msg: Vec = message.encode(); - runtime_io::ed25519_verify(&signature.0, &msg, from) -} - -fn prepare(parent: H, round_number: u32, hash: H) -> Message { - Message { - parent, - action: Action::Prepare(round_number, hash), - } -} - -fn commit(parent: H, round_number: u32, hash: H) -> Message { - Message { - parent, - action: Action::Commit(round_number, hash), - } -} - -/// Evaluate misbehavior. -/// -/// Doesn't check that the header hash in question is -/// valid or whether the misbehaving authority was part of -/// the set at that block. -pub fn evaluate_misbehavior( - misbehaved: &AuthorityId, - parent_hash: H, - kind: &MisbehaviorKind, -) -> bool { - match *kind { - MisbehaviorKind::BftDoublePrepare(round, (h_1, ref s_1), (h_2, ref s_2)) => { - s_1 != s_2 && - check_message_sig::(prepare::(parent_hash, round, h_1), s_1, misbehaved) && - check_message_sig::(prepare::(parent_hash, round, h_2), s_2, misbehaved) - } - MisbehaviorKind::BftDoubleCommit(round, (h_1, ref s_1), (h_2, ref s_2)) => { - s_1 != s_2 && - check_message_sig::(commit::(parent_hash, round, h_1), s_1, misbehaved) && - check_message_sig::(commit::(parent_hash, round, h_2), s_2, misbehaved) - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - - use keyring::Ed25519Keyring; - use rhododendron; - - use sr_primitives::testing::{H256, Block as RawBlock}; - - type Block = RawBlock; - - fn sign_prepare(key: &ed25519::Pair, round: u32, hash: H256, parent_hash: H256) -> (H256, Signature) { - let msg = ::sign_message::( - rhododendron::Message::Vote(rhododendron::Vote::Prepare(round as _, hash)), - key, - parent_hash - ); - - match msg { - rhododendron::LocalizedMessage::Vote(vote) => (hash, vote.signature.signature), - _ => panic!("signing vote leads to signed vote"), - } - } - - fn sign_commit(key: &ed25519::Pair, round: u32, hash: H256, parent_hash: H256) -> (H256, Signature) { - let msg = ::sign_message::( - rhododendron::Message::Vote(rhododendron::Vote::Commit(round as _, hash)), - key, - parent_hash - ); - - match msg { - rhododendron::LocalizedMessage::Vote(vote) => (hash, vote.signature.signature), - _ => panic!("signing vote leads to signed vote"), - } - } - - #[test] - fn evaluates_double_prepare() { - let key = Ed25519Keyring::One.pair(); - let parent_hash = [0xff; 32].into(); - let hash_1 = [0; 32].into(); - let hash_2 = [1; 32].into(); - - assert!(evaluate_misbehavior::( - &key.public().into(), - parent_hash, - &MisbehaviorKind::BftDoublePrepare( - 1, - sign_prepare(&key, 1, hash_1, parent_hash), - sign_prepare(&key, 1, hash_2, parent_hash) - ) - )); - - // same signature twice is not misbehavior. - let signed = sign_prepare(&key, 1, hash_1, parent_hash); - assert!(!evaluate_misbehavior::( - &key.public().into(), - parent_hash, - &MisbehaviorKind::BftDoublePrepare( - 1, - signed, - signed, - ) - )); - - // misbehavior has wrong target. - assert!(!evaluate_misbehavior::( - &Ed25519Keyring::Two.into(), - parent_hash, - &MisbehaviorKind::BftDoublePrepare( - 1, - sign_prepare(&key, 1, hash_1, parent_hash), - sign_prepare(&key, 1, hash_2, parent_hash), - ) - )); - } - - #[test] - fn evaluates_double_commit() { - let key = Ed25519Keyring::One.pair(); - let parent_hash = [0xff; 32].into(); - let hash_1 = [0; 32].into(); - let hash_2 = [1; 32].into(); - - assert!(evaluate_misbehavior::( - &key.public().into(), - parent_hash, - &MisbehaviorKind::BftDoubleCommit( - 1, - sign_commit(&key, 1, hash_1, parent_hash), - sign_commit(&key, 1, hash_2, parent_hash) - ) - )); - - // same signature twice is not misbehavior. - let signed = sign_commit(&key, 1, hash_1, parent_hash); - assert!(!evaluate_misbehavior::( - &key.public().into(), - parent_hash, - &MisbehaviorKind::BftDoubleCommit( - 1, - signed, - signed, - ) - )); - - // misbehavior has wrong target. - assert!(!evaluate_misbehavior::( - &Ed25519Keyring::Two.into(), - parent_hash, - &MisbehaviorKind::BftDoubleCommit( - 1, - sign_commit(&key, 1, hash_1, parent_hash), - sign_commit(&key, 1, hash_2, parent_hash), - ) - )); - } -} diff --git a/client/consensus/rhd/src/service.rs b/client/consensus/rhd/src/service.rs deleted file mode 100644 index 641a97fe06e9b..0000000000000 --- a/client/consensus/rhd/src/service.rs +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright 2018-2019 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -//! Consensus service. - -/// Consensus service. A long running service that manages BFT agreement -/// the network. -use std::thread; -use std::time::{Duration, Instant}; -use std::sync::Arc; - -use client::{BlockchainEvents, BlockBody}; -use futures::prelude::*; -use transaction_pool::txpool::{Pool as TransactionPool, ChainApi as PoolChainApi}; -use sr_primitives::traits::{Block as BlockT, Header as HeaderT, BlockNumberToHash}; - -use tokio::executor::current_thread::TaskExecutor as LocalThreadHandle; -use tokio::runtime::TaskExecutor as ThreadPoolHandle; -use tokio::runtime::current_thread::Runtime as LocalRuntime; -use tokio::timer::Interval; - -use parking_lot::RwLock; -use consensus::{self, offline_tracker::OfflineTracker}; - -use super::{Network, ProposerFactory, AuthoringApi}; -use {consensus, primitives, ed25519, error, BftService, LocalProposer}; - -const TIMER_DELAY_MS: u64 = 5000; -const TIMER_INTERVAL_MS: u64 = 500; - -// spin up an instance of BFT agreement on the current thread's executor. -// panics if there is no current thread executor. -fn start_bft( - header: ::Header, - bft_service: Arc>, -) where - F: consensus::Environment + 'static, - C: consensus::BlockImport + consensus::Authorities + 'static, - F::Error: ::std::fmt::Debug, - >::Error: ::std::fmt::Display + Into, - >::Proposer : LocalProposer, - >::Error: ::std::fmt::Display, - Block: BlockT, -{ - let mut handle = LocalThreadHandle::current(); - match bft_service.build_upon(&header) { - Ok(Some(bft_work)) => if let Err(e) = handle.spawn_local(Box::new(bft_work)) { - warn!(target: "bft", "Couldn't initialize BFT agreement: {:?}", e); - } - Ok(None) => trace!(target: "bft", "Could not start agreement on top of {}", header.hash()), - Err(e) => warn!(target: "bft", "BFT agreement error: {}", e), - } -} - -/// Consensus service. Starts working when created. -pub struct Service { - thread: Option>, - exit_signal: Option<::exit_future::Signal>, -} - -impl Service { - /// Create and start a new instance. - pub fn new( - client: Arc, - api: Arc, - network: N, - transaction_pool: Arc>, - thread_pool: ThreadPoolHandle, - key: ed25519::Pair, - block_delay: u64, - ) -> Service - where - error::Error: From<::Error>, - A: AuthoringApi + BlockNumberToHash + 'static, - P: PoolChainApi::Block> + 'static, - C: BlockchainEvents<::Block> - + BlockBody<::Block> - + consensus::SelectChain<::Block> - + consensus::BlockImport<::Block> - + consensus::Authorities<::Block> + Send + Sync + 'static, - primitives::H256: From<<::Block as BlockT>::Hash>, - <::Block as BlockT>::Hash: PartialEq + PartialEq, - N: Network::Block> + Send + 'static, - { - - let (signal, exit) = ::exit_future::signal(); - let thread = thread::spawn(move || { - let mut runtime = LocalRuntime::new().expect("Could not create local runtime"); - let key = Arc::new(key); - - let factory = ProposerFactory { - client: api.clone(), - transaction_pool: transaction_pool.clone(), - network, - handle: thread_pool.clone(), - offline: Arc::new(RwLock::new(OfflineTracker::new())), - force_delay: block_delay, - }; - let bft_service = Arc::new(BftService::new(client.clone(), key, factory)); - - let notifications = { - let client = client.clone(); - let bft_service = bft_service.clone(); - - client.import_notification_stream().for_each(move |notification| { - if notification.is_new_best { - start_bft(notification.header, bft_service.clone()); - } - Ok(()) - }) - }; - - let interval = Interval::new( - Instant::now() + Duration::from_millis(TIMER_DELAY_MS), - Duration::from_millis(TIMER_INTERVAL_MS), - ); - - let mut prev_best = match client.best_block_header() { - Ok(header) => header.hash(), - Err(e) => { - warn!("Cant's start consensus service. Error reading best block header: {:?}", e); - return; - } - }; - - let timed = { - let c = client.clone(); - let s = bft_service.clone(); - - interval.map_err(|e| debug!(target: "bft", "Timer error: {:?}", e)).for_each(move |_| { - if let Ok(best_block) = c.best_block_header() { - let hash = best_block.hash(); - - if hash == prev_best { - debug!(target: "bft", "Starting consensus round after a timeout"); - start_bft(best_block, s.clone()); - } - prev_best = hash; - } - Ok(()) - }) - }; - - runtime.spawn(notifications); - runtime.spawn(timed); - - if let Err(e) = runtime.block_on(exit) { - debug!("BFT event loop error {:?}", e); - } - }); - Service { - thread: Some(thread), - exit_signal: Some(signal), - } - } -} - -impl Drop for Service { - fn drop(&mut self) { - if let Some(signal) = self.exit_signal.take() { - signal.fire(); - } - - if let Some(thread) = self.thread.take() { - thread.join().expect("The service thread has panicked"); - } - } -} From 1fd17a88eb6294d44adc0f14cac7c4930d3fdb8e Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 16:17:33 +0100 Subject: [PATCH 23/61] update lock --- Cargo.lock | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b858cf3fbae8c..1f49ece9f9fa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -999,15 +999,6 @@ dependencies = [ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "error-chain" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "evm" version = "0.14.0" @@ -3824,17 +3815,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rhododendron" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ring" version = "0.16.9" @@ -5546,30 +5526,6 @@ dependencies = [ "substrate-primitives 2.0.0", ] -[[package]] -name = "substrate-consensus-rhd" -version = "2.0.0" -dependencies = [ - "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rhododendron 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0", - "sr-primitives 2.0.0", - "sr-version 2.0.0", - "srml-support 2.0.0", - "srml-system 2.0.0", - "substrate-client 2.0.0", - "substrate-consensus-common 2.0.0", - "substrate-keyring 2.0.0", - "substrate-primitives 2.0.0", - "substrate-transaction-pool 2.0.0", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "substrate-consensus-slots" version = "2.0.0" @@ -7578,7 +7534,6 @@ dependencies = [ "checksum erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3beee4bc16478a1b26f2e80ad819a52d24745e292f521a63c16eea5f74b7eb60" "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" "checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" "checksum evm 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1138816a9b7f9a9d1fcabb1b8a7afed2687d035692baf297bd3fea122acdc96f" "checksum evm-core 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bcde5af3d542874ddeb53de0919302d57586ea04b3f76f54d865f8a6cdc70ae" "checksum evm-gasometer 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b82bc9f275cb59d2bcc05d85c98736ddfaba003a7ef7b73893fa7c1c1fab29dc" @@ -7836,7 +7791,6 @@ dependencies = [ "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum rhododendron 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36542aafc2429a4c010fafa079a20dee953b663cb2427f51d86cf1d436846b4d" "checksum ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6747f8da1f2b1fabbee1aaa4eb8a11abf9adef0bf58a41cee45db5d59cecdfac" "checksum rlp 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8376a3f725ebb53f69263bbebb42196361fdfd551212409c8a721239aab4f09f" "checksum rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1651697fefd273bfb4fd69466cc2a9d20de557a0213b97233b22b5e95924b5e" From 733c0f66b48535bc54d23e4a34f560af9e5942ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 17:46:11 +0100 Subject: [PATCH 24/61] Step 1. --- .maintain/ensure-deps.sh | 8 +- Cargo.toml | 97 ++++++++----------- bin/node-template/Cargo.toml | 8 +- bin/node-template/runtime/Cargo.toml | 8 +- bin/node/cli/Cargo.toml | 10 +- bin/node/executor/Cargo.toml | 2 +- bin/node/primitives/Cargo.toml | 4 +- bin/node/runtime/Cargo.toml | 8 +- bin/node/testing/Cargo.toml | 2 +- bin/subkey/Cargo.toml | 2 +- client/authority-discovery/Cargo.toml | 10 +- client/basic-authorship/Cargo.toml | 10 +- client/chain-spec/Cargo.toml | 6 +- client/cli/Cargo.toml | 16 +-- client/client/Cargo.toml | 6 +- client/client/db/Cargo.toml | 6 +- client/consensus/aura/Cargo.toml | 10 +- client/consensus/babe/Cargo.toml | 10 +- client/consensus/pow/Cargo.toml | 8 +- client/consensus/rhd/Cargo.toml | 4 +- client/consensus/slots/Cargo.toml | 6 +- client/consensus/uncles/Cargo.toml | 6 +- client/executor/Cargo.toml | 10 +- client/executor/runtime-test/Cargo.toml | 2 +- client/executor/src/sandbox.rs | 4 +- client/finality-grandpa/Cargo.toml | 12 +-- client/keyring/Cargo.toml | 2 +- client/keystore/Cargo.toml | 4 +- client/network/Cargo.toml | 18 ++-- client/offchain/Cargo.toml | 12 +-- client/rpc/Cargo.toml | 6 +- client/rpc/api/Cargo.toml | 4 +- client/service/Cargo.toml | 34 +++---- client/service/test/Cargo.toml | 10 +- client/session/Cargo.toml | 15 --- client/state-db/Cargo.toml | 2 +- client/state-machine/Cargo.toml | 4 +- client/transaction-pool/Cargo.toml | 4 +- client/transaction-pool/graph/Cargo.toml | 2 +- client/trie/Cargo.toml | 2 +- paint/assets/Cargo.toml | 2 +- paint/aura/Cargo.toml | 8 +- paint/aura/src/lib.rs | 2 +- paint/authority-discovery/Cargo.toml | 6 +- paint/authorship/Cargo.toml | 4 +- paint/babe/Cargo.toml | 6 +- paint/balances/Cargo.toml | 2 +- paint/collective/Cargo.toml | 2 +- paint/contracts/Cargo.toml | 2 +- paint/contracts/rpc/Cargo.toml | 4 +- paint/democracy/Cargo.toml | 2 +- paint/elections-phragmen/Cargo.toml | 4 +- paint/elections/Cargo.toml | 2 +- paint/evm/Cargo.toml | 2 +- paint/example/Cargo.toml | 2 +- paint/executive/Cargo.toml | 2 +- paint/finality-tracker/Cargo.toml | 4 +- paint/generic-asset/Cargo.toml | 2 +- paint/grandpa/Cargo.toml | 4 +- paint/im-online/Cargo.toml | 4 +- paint/indices/Cargo.toml | 2 +- paint/membership/Cargo.toml | 2 +- paint/metadata/Cargo.toml | 2 +- paint/nicks/Cargo.toml | 2 +- paint/offences/Cargo.toml | 2 +- paint/randomness-collective-flip/Cargo.toml | 2 +- paint/scored-pool/Cargo.toml | 2 +- paint/session/Cargo.toml | 4 +- paint/staking/Cargo.toml | 4 +- paint/sudo/Cargo.toml | 2 +- paint/support/Cargo.toml | 4 +- paint/support/rpc/Cargo.toml | 2 +- paint/support/test/Cargo.toml | 4 +- paint/system/Cargo.toml | 2 +- paint/system/rpc/Cargo.toml | 2 +- paint/timestamp/Cargo.toml | 4 +- paint/transaction-payment/Cargo.toml | 2 +- paint/transaction-payment/rpc/Cargo.toml | 4 +- paint/treasury/Cargo.toml | 2 +- paint/utility/Cargo.toml | 2 +- .../application-crypto/Cargo.toml | 4 +- .../application-crypto/src/ed25519.rs | 0 .../application-crypto/src/lib.rs | 0 .../application-crypto/src/sr25519.rs | 0 .../application-crypto/src/traits.rs | 0 .../authority-discovery}/Cargo.toml | 6 +- .../authority-discovery}/src/lib.rs | 0 .../consensus/aura}/Cargo.toml | 8 +- .../consensus/aura}/src/lib.rs | 0 .../consensus/babe}/Cargo.toml | 10 +- .../consensus/babe}/src/digest.rs | 0 .../consensus/babe}/src/lib.rs | 0 .../consensus/common/Cargo.toml | 8 +- .../consensus/common/src/block_import.rs | 0 .../consensus/common/src/block_validation.rs | 0 .../consensus/common/src/error.rs | 0 .../consensus/common/src/evaluation.rs | 0 .../consensus/common/src/import_queue.rs | 0 .../common/src/import_queue/basic_queue.rs | 0 .../common/src/import_queue/buffered_link.rs | 0 .../consensus/common/src/lib.rs | 0 .../consensus/common/src/offline_tracker.rs | 0 .../consensus/common/src/select_chain.rs | 0 .../consensus/pow}/Cargo.toml | 8 +- .../consensus/pow}/src/lib.rs | 0 .../primitives => primitives/core}/Cargo.toml | 2 +- .../core}/benches/bench.rs | 0 .../core}/debug-derive/Cargo.toml | 0 .../core}/debug-derive/src/impls.rs | 0 .../core}/debug-derive/src/lib.rs | 0 .../core}/debug-derive/tests/tests.rs | 0 .../core}/src/changes_trie.rs | 0 .../core}/src/crypto.rs | 0 .../core}/src/ecdsa.rs | 0 .../core}/src/ed25519.rs | 0 .../core}/src/hash.rs | 0 .../core}/src/hasher.rs | 0 .../core}/src/hashing.rs | 0 .../core}/src/hexdisplay.rs | 0 .../primitives => primitives/core}/src/lib.rs | 0 .../core}/src/offchain.rs | 0 .../core}/src/sandbox.rs | 0 .../core}/src/sr25519.rs | 0 .../core}/src/testing.rs | 0 .../core}/src/tests.rs | 0 .../core}/src/traits.rs | 0 .../core}/src/u32_trait.rs | 0 .../core}/src/uint.rs | 0 .../core}/storage/Cargo.toml | 2 +- .../core}/storage/src/lib.rs | 0 .../externalities/Cargo.toml | 4 +- .../externalities/src/extensions.rs | 0 .../externalities/src/lib.rs | 0 .../externalities/src/scope_limited.rs | 0 .../finality-grandpa}/Cargo.toml | 8 +- .../finality-grandpa}/src/lib.rs | 0 {client => primitives}/inherents/Cargo.toml | 4 +- {client => primitives}/inherents/src/lib.rs | 0 .../offchain}/Cargo.toml | 4 +- .../offchain}/src/lib.rs | 0 {client => primitives}/peerset/Cargo.toml | 0 {client => primitives}/peerset/src/lib.rs | 0 .../peerset/src/peersstate.rs | 0 {client => primitives}/peerset/tests/fuzz.rs | 0 {client => primitives}/phragmen/Cargo.toml | 2 +- .../phragmen/benches/phragmen.rs | 0 {client => primitives}/phragmen/src/lib.rs | 0 {client => primitives}/phragmen/src/mock.rs | 0 {client => primitives}/phragmen/src/tests.rs | 0 .../primitives => primitives/rpc}/Cargo.toml | 2 +- .../primitives => primitives/rpc}/src/lib.rs | 0 .../rpc}/src/number.rs | 0 .../runtime-interface/Cargo.toml | 10 +- .../runtime-interface/proc-macro/Cargo.toml | 0 .../runtime-interface/proc-macro/src/lib.rs | 0 .../proc-macro/src/pass_by/codec.rs | 0 .../proc-macro/src/pass_by/enum_.rs | 0 .../proc-macro/src/pass_by/inner.rs | 0 .../proc-macro/src/pass_by/mod.rs | 0 .../bare_function_interface.rs | 0 .../host_function_interface.rs | 0 .../proc-macro/src/runtime_interface/mod.rs | 0 .../src/runtime_interface/trait_decl_impl.rs | 0 .../runtime-interface/proc-macro/src/utils.rs | 0 .../runtime-interface/proc-macro/tests/ui.rs | 0 .../tests/ui/no_generic_parameters.rs | 0 .../tests/ui/no_generic_parameters.stderr | 0 .../tests/ui/no_method_implementation.rs | 0 .../tests/ui/no_method_implementation.stderr | 0 .../tests/ui/pass_by_enum_with_struct.rs | 0 .../tests/ui/pass_by_enum_with_struct.stderr | 0 .../ui/pass_by_enum_with_value_variant.rs | 0 .../ui/pass_by_enum_with_value_variant.stderr | 0 .../tests/ui/pass_by_inner_with_two_fields.rs | 0 .../ui/pass_by_inner_with_two_fields.stderr | 0 .../proc-macro/tests/ui/take_self_by_value.rs | 0 .../tests/ui/take_self_by_value.stderr | 0 .../runtime-interface/src/host.rs | 0 .../runtime-interface/src/impls.rs | 0 .../runtime-interface/src/lib.rs | 0 .../runtime-interface/src/pass_by.rs | 0 .../runtime-interface/src/wasm.rs | 0 .../runtime-interface/test-wasm/Cargo.toml | 8 +- .../runtime-interface/test-wasm/build.rs | 2 +- .../runtime-interface/test-wasm/src/lib.rs | 0 {client => primitives}/serializer/Cargo.toml | 0 {client => primitives}/serializer/src/lib.rs | 0 primitives/session/Cargo.toml | 15 +++ {client => primitives}/session/src/lib.rs | 0 primitives/sr-api-macros/Cargo.toml | 4 +- primitives/sr-arithmetic/Cargo.toml | 2 +- primitives/sr-io/Cargo.toml | 6 +- primitives/sr-primitives/Cargo.toml | 4 +- primitives/sr-sandbox/Cargo.toml | 2 +- .../wasm-interface/Cargo.toml | 0 .../wasm-interface/src/lib.rs | 0 .../wasm-interface/src/wasmi_impl.rs | 0 test/utils/chain-spec-builder/Cargo.toml | 2 +- test/utils/client/Cargo.toml | 4 +- test/utils/runtime/Cargo.toml | 16 +-- test/utils/runtime/client/Cargo.toml | 2 +- test/utils/transaction-factory/Cargo.toml | 4 +- 202 files changed, 328 insertions(+), 337 deletions(-) delete mode 100644 client/session/Cargo.toml rename {client => primitives}/application-crypto/Cargo.toml (84%) rename {client => primitives}/application-crypto/src/ed25519.rs (100%) rename {client => primitives}/application-crypto/src/lib.rs (100%) rename {client => primitives}/application-crypto/src/sr25519.rs (100%) rename {client => primitives}/application-crypto/src/traits.rs (100%) rename {client/authority-discovery/primitives => primitives/authority-discovery}/Cargo.toml (60%) rename {client/authority-discovery/primitives => primitives/authority-discovery}/src/lib.rs (100%) rename {client/consensus/aura/primitives => primitives/consensus/aura}/Cargo.toml (60%) rename {client/consensus/aura/primitives => primitives/consensus/aura}/src/lib.rs (100%) rename {client/consensus/babe/primitives => primitives/consensus/babe}/Cargo.toml (59%) rename {client/consensus/babe/primitives => primitives/consensus/babe}/src/digest.rs (100%) rename {client/consensus/babe/primitives => primitives/consensus/babe}/src/lib.rs (100%) rename {client => primitives}/consensus/common/Cargo.toml (70%) rename {client => primitives}/consensus/common/src/block_import.rs (100%) rename {client => primitives}/consensus/common/src/block_validation.rs (100%) rename {client => primitives}/consensus/common/src/error.rs (100%) rename {client => primitives}/consensus/common/src/evaluation.rs (100%) rename {client => primitives}/consensus/common/src/import_queue.rs (100%) rename {client => primitives}/consensus/common/src/import_queue/basic_queue.rs (100%) rename {client => primitives}/consensus/common/src/import_queue/buffered_link.rs (100%) rename {client => primitives}/consensus/common/src/lib.rs (100%) rename {client => primitives}/consensus/common/src/offline_tracker.rs (100%) rename {client => primitives}/consensus/common/src/select_chain.rs (100%) rename {client/consensus/pow/primitives => primitives/consensus/pow}/Cargo.toml (54%) rename {client/consensus/pow/primitives => primitives/consensus/pow}/src/lib.rs (100%) rename {client/primitives => primitives/core}/Cargo.toml (97%) rename {client/primitives => primitives/core}/benches/bench.rs (100%) rename {client/primitives => primitives/core}/debug-derive/Cargo.toml (100%) rename {client/primitives => primitives/core}/debug-derive/src/impls.rs (100%) rename {client/primitives => primitives/core}/debug-derive/src/lib.rs (100%) rename {client/primitives => primitives/core}/debug-derive/tests/tests.rs (100%) rename {client/primitives => primitives/core}/src/changes_trie.rs (100%) rename {client/primitives => primitives/core}/src/crypto.rs (100%) rename {client/primitives => primitives/core}/src/ecdsa.rs (100%) rename {client/primitives => primitives/core}/src/ed25519.rs (100%) rename {client/primitives => primitives/core}/src/hash.rs (100%) rename {client/primitives => primitives/core}/src/hasher.rs (100%) rename {client/primitives => primitives/core}/src/hashing.rs (100%) rename {client/primitives => primitives/core}/src/hexdisplay.rs (100%) rename {client/primitives => primitives/core}/src/lib.rs (100%) rename {client/primitives => primitives/core}/src/offchain.rs (100%) rename {client/primitives => primitives/core}/src/sandbox.rs (100%) rename {client/primitives => primitives/core}/src/sr25519.rs (100%) rename {client/primitives => primitives/core}/src/testing.rs (100%) rename {client/primitives => primitives/core}/src/tests.rs (100%) rename {client/primitives => primitives/core}/src/traits.rs (100%) rename {client/primitives => primitives/core}/src/u32_trait.rs (100%) rename {client/primitives => primitives/core}/src/uint.rs (100%) rename {client/primitives => primitives/core}/storage/Cargo.toml (83%) rename {client/primitives => primitives/core}/storage/src/lib.rs (100%) rename {client => primitives}/externalities/Cargo.toml (76%) rename {client => primitives}/externalities/src/extensions.rs (100%) rename {client => primitives}/externalities/src/lib.rs (100%) rename {client => primitives}/externalities/src/scope_limited.rs (100%) rename {client/finality-grandpa/primitives => primitives/finality-grandpa}/Cargo.toml (62%) rename {client/finality-grandpa/primitives => primitives/finality-grandpa}/src/lib.rs (100%) rename {client => primitives}/inherents/Cargo.toml (70%) rename {client => primitives}/inherents/src/lib.rs (100%) rename {client/offchain/primitives => primitives/offchain}/Cargo.toml (62%) rename {client/offchain/primitives => primitives/offchain}/src/lib.rs (100%) rename {client => primitives}/peerset/Cargo.toml (100%) rename {client => primitives}/peerset/src/lib.rs (100%) rename {client => primitives}/peerset/src/peersstate.rs (100%) rename {client => primitives}/peerset/tests/fuzz.rs (100%) rename {client => primitives}/phragmen/Cargo.toml (86%) rename {client => primitives}/phragmen/benches/phragmen.rs (100%) rename {client => primitives}/phragmen/src/lib.rs (100%) rename {client => primitives}/phragmen/src/mock.rs (100%) rename {client => primitives}/phragmen/src/tests.rs (100%) rename {client/rpc/primitives => primitives/rpc}/Cargo.toml (72%) rename {client/rpc/primitives => primitives/rpc}/src/lib.rs (100%) rename {client/rpc/primitives => primitives/rpc}/src/number.rs (100%) rename {client => primitives}/runtime-interface/Cargo.toml (79%) rename {client => primitives}/runtime-interface/proc-macro/Cargo.toml (100%) rename {client => primitives}/runtime-interface/proc-macro/src/lib.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/pass_by/codec.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/pass_by/enum_.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/pass_by/inner.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/pass_by/mod.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/runtime_interface/mod.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/src/utils.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/no_generic_parameters.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/no_generic_parameters.stderr (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/no_method_implementation.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/no_method_implementation.stderr (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.stderr (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.stderr (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.stderr (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/take_self_by_value.rs (100%) rename {client => primitives}/runtime-interface/proc-macro/tests/ui/take_self_by_value.stderr (100%) rename {client => primitives}/runtime-interface/src/host.rs (100%) rename {client => primitives}/runtime-interface/src/impls.rs (100%) rename {client => primitives}/runtime-interface/src/lib.rs (100%) rename {client => primitives}/runtime-interface/src/pass_by.rs (100%) rename {client => primitives}/runtime-interface/src/wasm.rs (100%) rename {client => primitives}/runtime-interface/test-wasm/Cargo.toml (57%) rename {client => primitives}/runtime-interface/test-wasm/build.rs (95%) rename {client => primitives}/runtime-interface/test-wasm/src/lib.rs (100%) rename {client => primitives}/serializer/Cargo.toml (100%) rename {client => primitives}/serializer/src/lib.rs (100%) create mode 100644 primitives/session/Cargo.toml rename {client => primitives}/session/src/lib.rs (100%) rename {client => primitives}/wasm-interface/Cargo.toml (100%) rename {client => primitives}/wasm-interface/src/lib.rs (100%) rename {client => primitives}/wasm-interface/src/wasmi_impl.rs (100%) diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh index e4657b3c482fb..188b1f1d319cc 100755 --- a/.maintain/ensure-deps.sh +++ b/.maintain/ensure-deps.sh @@ -14,10 +14,12 @@ set -u PLEASE_DONT=( - "client"] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } [dev-dependencies] -substrate-serializer = { path = "../../../client/serializer" } +substrate-serializer = { path = "../../../primitives/serializer" } pretty_assertions = "0.6.1" [features] diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 165dee66c5432..6acd321f2d6e4 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -14,10 +14,10 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # primitives -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe", default-features = false } node-primitives = { path = "../primitives", default-features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../../primitives/sr-staking-primitives", default-features = false } @@ -25,7 +25,7 @@ sr-staking-primitives = { path = "../../../primitives/sr-staking-primitives", de client = { package = "substrate-client", path = "../../../client/client", default-features = false } rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } -substrate-session = { path = "../../../client/session", default-features = false } +substrate-session = { path = "../../../primitives/session", default-features = false } substrate-keyring = { path = "../../../client/keyring", optional = true } # srml dependencies diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index 10240a2490c78..bc476b847baf3 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -16,7 +16,7 @@ node-executor = { path = "../executor" } node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } sr-primitives = { path = "../../../primitives/sr-primitives" } runtime_support = { package = "srml-support", path = "../../../paint/support" } diff --git a/bin/subkey/Cargo.toml b/bin/subkey/Cargo.toml index 81f83ee539ee8..6f27a161738b9 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", version = "*", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", version = "*", path = "../../primitives/core" } node-runtime = { version = "*", path = "../node/runtime" } node-primitives = { version = "*", path = "../node/primitives" } sr-primitives = { version = "*", path = "../../primitives/sr-primitives" } diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index 07509b6fb2657..db629c07e3519 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -9,16 +9,16 @@ build = "build.rs" prost-build = "0.5.0" [dependencies] -authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "./primitives" } +authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../primitives/authority-discovery" } bytes = "0.4.12" -client = { package = "substrate-client", path = "../../client/client" } +client = { package = "substrate-client", path = "../client" } codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } derive_more = "0.15.0" futures-preview = "0.3.0-alpha.19" libp2p = { version = "0.13.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] } log = "0.4.8" -network = { package = "substrate-network", path = "../../client/network" } -primitives = { package = "substrate-primitives", path = "../primitives" } +network = { package = "substrate-network", path = "../network" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } prost = "0.5.0" serde_json = "1.0.41" sr-primitives = { path = "../../primitives/sr-primitives" } @@ -26,5 +26,5 @@ futures-timer = "0.4" [dev-dependencies] parking_lot = "0.9.0" -peerset = { package = "substrate-peerset", path = "../../client/peerset" } +peerset = { package = "substrate-peerset", path = "../../primitives/peerset" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index eb46f4d017878..d16a1fb83db8b 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -9,12 +9,12 @@ log = "0.4.8" futures-preview = "0.3.0-alpha.19" codec = { package = "parity-scale-codec", version = "1.0.0" } sr-primitives = { path = "../../primitives/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } -client = { package = "substrate-client", path = "../../client/client" } -consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } -inherents = { package = "substrate-inherents", path = "../inherents" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +client = { package = "substrate-client", path = "../client" } +consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } substrate-telemetry = { path = "../telemetry" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } +transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } [dev-dependencies] test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml index 52269e0f97977..88cd6e633349a 100644 --- a/client/chain-spec/Cargo.toml +++ b/client/chain-spec/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] substrate-chain-spec-derive = { path = "./derive" } impl-trait-for-tuples = "0.1.3" -network = { package = "substrate-network", path = "../../client/network" } -primitives = { package = "substrate-primitives", path = "../primitives" } +network = { package = "substrate-network", path = "../network" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" sr-primitives = { path = "../../primitives/sr-primitives" } -tel = { package = "substrate-telemetry", path = "../../client/telemetry" } +tel = { package = "substrate-telemetry", path = "../telemetry" } [dev-dependencies] diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index 74c60f51b7616..ed0f33ef59e73 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -22,15 +22,15 @@ futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features fdlimit = "0.1.1" exit-future = "0.1.4" serde_json = "1.0.41" -panic-handler = { package = "substrate-panic-handler", path = "../../client/panic-handler" } -client = { package = "substrate-client", path = "../../client/client" } -header-metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } -network = { package = "substrate-network", path = "../../client/network" } +panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } +client = { package = "substrate-client", path = "../client" } +header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } +network = { package = "substrate-network", path = "../network" } sr-primitives = { path = "../../primitives/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } -service = { package = "substrate-service", path = "../../client/service", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../../client/state-machine" } -substrate-telemetry = { path = "../../client/telemetry" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +service = { package = "substrate-service", path = "../service", default-features = false } +state-machine = { package = "substrate-state-machine", path = "../state-machine" } +substrate-telemetry = { path = "../telemetry" } keyring = { package = "substrate-keyring", path = "../keyring" } names = "0.11.0" structopt = "0.3.3" diff --git a/client/client/Cargo.toml b/client/client/Cargo.toml index c6b8b03a31f90..b2555dd7aa88a 100644 --- a/client/client/Cargo.toml +++ b/client/client/Cargo.toml @@ -12,7 +12,7 @@ parking_lot = { version = "0.9.0", optional = true } hex-literal = { version = "0.2.1", optional = true } futures = { version = "0.1.29", optional = true } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"], optional = true } -consensus = { package = "substrate-consensus-common", path = "../consensus/common", optional = true } +consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common", optional = true } executor = { package = "substrate-executor", path = "../executor", optional = true } state-machine = { package = "substrate-state-machine", path = "../state-machine", optional = true } keyring = { package = "substrate-keyring", path = "../keyring", optional = true } @@ -21,11 +21,11 @@ substrate-telemetry = { path = "../telemetry", optional = true } hash-db = { version = "0.15.2", default-features = false } kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -inherents = { package = "substrate-inherents", path = "../inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } sr-api-macros = { path = "../../primitives/sr-api-macros" } header-metadata = { package = "substrate-header-metadata", path = "header-metadata", optional = true } diff --git a/client/client/db/Cargo.toml b/client/client/db/Cargo.toml index 68a3371826bc9..798436a049929 100644 --- a/client/client/db/Cargo.toml +++ b/client/client/db/Cargo.toml @@ -13,15 +13,15 @@ kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317 kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } linked-hash-map = "0.5.2" hash-db = "0.15.2" -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../" } state-machine = { package = "substrate-state-machine", path = "../../state-machine" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } executor = { package = "substrate-executor", path = "../../executor" } state_db = { package = "substrate-state-db", path = "../../state-db" } trie = { package = "substrate-trie", path = "../../trie" } -consensus_common = { package = "substrate-consensus-common", path = "../../consensus/common" } +consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" } [dev-dependencies] diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index ec601917292af..f7a6b641fcdc7 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -7,19 +7,19 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../../primitives" } -app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto" } runtime_support = { package = "srml-support", path = "../../../paint/support" } runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } slots = { package = "substrate-consensus-slots", path = "../slots" } -aura_primitives = { package = "substrate-consensus-aura-primitives", path = "primitives" } -inherents = { package = "substrate-inherents", path = "../../inherents" } +aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura" } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } srml-aura = { path = "../../../paint/aura" } client = { package = "substrate-client", path = "../../client" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } -consensus_common = { package = "substrate-consensus-common", path = "../common" } +consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } sr-primitives = { path = "../../../primitives/sr-primitives" } futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index 6b8e51799b7a4..7fe72cad1f392 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -7,22 +7,22 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -babe_primitives = { package = "substrate-consensus-babe-primitives", path = "primitives" } -primitives = { package = "substrate-primitives", path = "../../primitives" } -app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto" } +babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto" } num-bigint = "0.2.3" num-rational = "0.2.2" num-traits = "0.2.8" runtime-support = { package = "srml-support", path = "../../../paint/support" } runtime-version = { package = "sr-version", path = "../../../primitives/sr-version" } runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } -inherents = { package = "substrate-inherents", path = "../../inherents" } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } srml-babe = { path = "../../../paint/babe" } client = { package = "substrate-client", path = "../../client" } header-metadata = { package = "substrate-header-metadata", path = "../../client/header-metadata" } -consensus-common = { package = "substrate-consensus-common", path = "../common" } +consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } uncles = { package = "substrate-consensus-uncles", path = "../uncles" } slots = { package = "substrate-consensus-slots", path = "../slots" } sr-primitives = { path = "../../../primitives/sr-primitives" } diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index da79d48a71974..2020f93cf67e1 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../../client" } srml-timestamp = { path = "../../../paint/timestamp" } -inherents = { package = "substrate-inherents", path = "../../inherents" } -pow-primitives = { package = "substrate-consensus-pow-primitives", path = "primitives" } -consensus-common = { package = "substrate-consensus-common", path = "../common" } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } +pow-primitives = { package = "substrate-consensus-pow-primitives", path = "../../../primitives/consensus/pow" } +consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } log = "0.4.8" futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] } derive_more = "0.15.0" diff --git a/client/consensus/rhd/Cargo.toml b/client/consensus/rhd/Cargo.toml index da7d462931e88..fee11031bd8ee 100644 --- a/client/consensus/rhd/Cargo.toml +++ b/client/consensus/rhd/Cargo.toml @@ -9,8 +9,8 @@ edition = "2018" derive_more = "0.15.0" futures = "0.1.29" codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../primitives" } -consensus = { package = "substrate-consensus-common", path = "../common" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } client = { package = "substrate-client", path = "../../client" } transaction_pool = { package = "substrate-transaction-pool", path = "../../transaction-pool" } runtime_support = { package = "srml-support", path = "../../../paint/support" } diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 8ad10f39597a7..5e7de3148cebd 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -9,11 +9,11 @@ build = "build.rs" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } client = { package = "substrate-client", path = "../../client" } -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } substrate-telemetry = { path = "../../telemetry" } -consensus_common = { package = "substrate-consensus-common", path = "../common" } -inherents = { package = "substrate-inherents", path = "../../inherents" } +consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } futures-preview = "0.3.0-alpha.19" futures-timer = "0.4.0" parking_lot = "0.9.0" diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index 16664d2bc7f3f..ee831dce08bb2 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../client" } -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-authorship = { path = "../../../paint/authorship" } -consensus_common = { package = "substrate-consensus-common", path = "../common" } -inherents = { package = "substrate-inherents", path = "../../inherents" } +consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } log = "0.4.8" diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index 88ac7506b0dd3..e5363832ddba1 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -8,17 +8,17 @@ edition = "2018" derive_more = "0.15.0" codec = { package = "parity-scale-codec", version = "1.0.0" } runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } trie = { package = "substrate-trie", path = "../trie" } -serializer = { package = "substrate-serializer", path = "../serializer" } +serializer = { package = "substrate-serializer", path = "../../primitives/serializer" } runtime_version = { package = "sr-version", path = "../../primitives/sr-version" } panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } wasmi = "0.5.1" parity-wasm = "0.40.3" lazy_static = "1.4.0" -wasm-interface = { package = "substrate-wasm-interface", path = "../wasm-interface" } -runtime-interface = { package = "substrate-runtime-interface", path = "../runtime-interface" } -externalities = { package = "substrate-externalities", path = "../externalities" } +wasm-interface = { package = "substrate-wasm-interface", path = "../../primitives/wasm-interface" } +runtime-interface = { package = "substrate-runtime-interface", path = "../../primitives/runtime-interface" } +externalities = { package = "substrate-externalities", path = "../../primitives/externalities" } parking_lot = "0.9.0" log = "0.4.8" libsecp256k1 = "0.3.0" diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml index fbdc23d07a4e9..435ce078f7268 100644 --- a/client/executor/runtime-test/Cargo.toml +++ b/client/executor/runtime-test/Cargo.toml @@ -9,7 +9,7 @@ build = "build.rs" rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } sandbox = { package = "sr-sandbox", path = "../../../primitives/sr-sandbox", default-features = false } -primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false } [build-dependencies] diff --git a/client/executor/src/sandbox.rs b/client/executor/src/sandbox.rs index 87edae8c3037d..da71b06672465 100644 --- a/client/executor/src/sandbox.rs +++ b/client/executor/src/sandbox.rs @@ -211,7 +211,7 @@ pub trait SandboxCapabilities { /// Implementation of [`Externals`] that allows execution of guest module with /// [externals][`Externals`] that might refer functions defined by supervisor. /// -/// [`Externals`]: ../../wasmi/trait.Externals.html +/// [`Externals`]: ../wasmi/trait.Externals.html pub struct GuestExternals<'a, FE: SandboxCapabilities + 'a> { supervisor_externals: &'a mut FE, sandbox_instance: &'a SandboxInstance, @@ -432,7 +432,7 @@ fn decode_environment_definition( /// - `raw_env_def` can't be deserialized as a [`EnvironmentDefinition`]. /// - Module in `wasm` is invalid or couldn't be instantiated. /// -/// [`EnvironmentDefinition`]: ../../sandbox/struct.EnvironmentDefinition.html +/// [`EnvironmentDefinition`]: ../sandbox/struct.EnvironmentDefinition.html pub fn instantiate( supervisor_externals: &mut FE, dispatch_thunk: FE::SupervisorFuncRef, diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 3961e7c7e4878..ee0732f79c0b4 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -fork-tree = { path = "../../client/utils/fork-tree" } +fork-tree = { path = "../utils/fork-tree" } futures = "0.1.29" futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } log = "0.4.8" @@ -15,17 +15,17 @@ tokio-timer = "0.2.11" rand = "0.7.2" codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } sr-primitives = { path = "../../primitives/sr-primitives" } -consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } -primitives = { package = "substrate-primitives", path = "../primitives" } +consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } substrate-telemetry = { path = "../telemetry" } keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" client = { package = "substrate-client", path = "../client" } header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } -inherents = { package = "substrate-inherents", path = "../../client/inherents" } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } network = { package = "substrate-network", path = "../network" } srml-finality-tracker = { path = "../../paint/finality-tracker" } -fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "primitives" } +fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" } grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec"] } [dev-dependencies] @@ -33,7 +33,7 @@ grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive network = { package = "substrate-network", path = "../network", features = ["test-helpers"] } keyring = { package = "substrate-keyring", path = "../keyring" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client"} -babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives" } +babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } env_logger = "0.7.0" tokio = "0.1.22" diff --git a/client/keyring/Cargo.toml b/client/keyring/Cargo.toml index 3304c0a044710..e31da0b7c67c7 100644 --- a/client/keyring/Cargo.toml +++ b/client/keyring/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } sr-primitives = { path = "../../primitives/sr-primitives" } lazy_static = "1.4.0" strum = "0.15.0" diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml index cc491337cf83a..9923a7f357d1f 100644 --- a/client/keystore/Cargo.toml +++ b/client/keystore/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] derive_more = "0.15.0" -primitives = { package = "substrate-primitives", path = "../primitives" } -app-crypto = { package = "substrate-application-crypto", path = "../application-crypto" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto" } hex = "0.3.2" rand = "0.7.2" serde_json = "1.0.41" diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index f408680458a4e..4f94c92bf1d7f 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -23,14 +23,14 @@ lru-cache = "0.1.2" rustc-hex = "2.0.1" rand = "0.7.2" libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-websocket"] } -fork-tree = { path = "../../client/utils/fork-tree" } -consensus = { package = "substrate-consensus-common", path = "../../client/consensus/common" } -client = { package = "substrate-client", path = "../../client/client" } -header_metadata = { package = "substrate-header-metadata", path = "../../client/client/header-metadata" } +fork-tree = { path = "../utils/fork-tree" } +consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } +client = { package = "substrate-client", path = "../client" } +header_metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } sr-primitives = { path = "../../primitives/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -peerset = { package = "substrate-peerset", path = "../../client/peerset" } +peerset = { package = "substrate-peerset", path = "../../primitives/peerset" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" slog = { version = "2.5.2", features = ["nested-values"] } @@ -39,17 +39,17 @@ smallvec = "0.6.10" tokio-io = "0.1.12" tokio = { version = "0.1.22", optional = true } unsigned-varint = { version = "0.2.2", features = ["codec"] } -keyring = { package = "substrate-keyring", path = "../../client/keyring", optional = true } +keyring = { package = "substrate-keyring", path = "../keyring", optional = true } test_client = { package = "substrate-test-client", path = "../../test/utils/client", optional = true } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client", optional = true } erased-serde = "0.3.9" void = "1.0.2" zeroize = "0.10.1" -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives" } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" } [dev-dependencies] env_logger = "0.7.0" -keyring = { package = "substrate-keyring", path = "../../client/keyring" } +keyring = { package = "substrate-keyring", path = "../keyring" } quickcheck = "0.9.0" rand = "0.7.2" test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index 2f7c6f2a8f427..6210058fdc819 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] bytes = "0.4.12" -client = { package = "substrate-client", path = "../../client/client" } +client = { package = "substrate-client", path = "../client" } fnv = "1.0.6" futures01 = { package = "futures", version = "0.1" } futures-preview = "0.3.0-alpha.19" @@ -16,14 +16,14 @@ futures-timer = "0.4.0" log = "0.4.8" threadpool = "1.7" num_cpus = "1.10" -offchain-primitives = { package = "substrate-offchain-primitives", path = "./primitives" } +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../primitives/offchain" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } parking_lot = "0.9.0" -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } rand = "0.7.2" sr-primitives = { path = "../../primitives/sr-primitives" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } -network = { package = "substrate-network", path = "../../client/network" } +transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } +network = { package = "substrate-network", path = "../network" } keystore = { package = "substrate-keystore", path = "../keystore" } [target.'cfg(not(target_os = "unknown"))'.dependencies] @@ -32,7 +32,7 @@ hyper-rustls = "0.17.1" [dev-dependencies] env_logger = "0.7.0" -client-db = { package = "substrate-client-db", path = "../../client/client/db/", default-features = true } +client-db = { package = "substrate-client-db", path = "../client/db/", default-features = true } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index a28cc28730bcf..8eb77a84d40d5 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -11,13 +11,13 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } jsonrpc-pubsub = "14.0.3" log = "0.4.8" -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } rpc = { package = "jsonrpc-core", version = "14.0.3" } runtime_version = { package = "sr-version", path = "../../primitives/sr-version" } serde_json = "1.0.41" -session = { package = "substrate-session", path = "../session" } +session = { package = "substrate-session", path = "../../primitives/session" } sr-primitives = { path = "../../primitives/sr-primitives" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "primitives" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../primitives/rpc" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } substrate-executor = { path = "../executor" } substrate-keystore = { path = "../keystore" } diff --git a/client/rpc/api/Cargo.toml b/client/rpc/api/Cargo.toml index bd73819f50922..053e58d031548 100644 --- a/client/rpc/api/Cargo.toml +++ b/client/rpc/api/Cargo.toml @@ -14,9 +14,9 @@ jsonrpc-derive = "14.0.3" jsonrpc-pubsub = "14.0.3" log = "0.4.8" parking_lot = "0.9.0" -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" txpool = { package = "substrate-transaction-graph", path = "../../transaction-pool/graph" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "../../rpc/primitives" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 1fb0980999a71..4a2ff21fd5b30 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -28,24 +28,24 @@ serde = "1.0.101" serde_json = "1.0.41" sysinfo = "0.9.5" target_info = "0.1.0" -keystore = { package = "substrate-keystore", path = "../../client/keystore" } +keystore = { package = "substrate-keystore", path = "../keystore" } sr-io = { path = "../../primitives/sr-io" } sr-primitives = { path = "../../primitives/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../primitives" } -session = { package = "substrate-session", path = "../session" } -app-crypto = { package = "substrate-application-crypto", path = "../application-crypto" } -consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } -network = { package = "substrate-network", path = "../../client/network" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +session = { package = "substrate-session", path = "../../primitives/session" } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto" } +consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } +network = { package = "substrate-network", path = "../network" } chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" } -client = { package = "substrate-client", path = "../../client/client" } -client_db = { package = "substrate-client-db", path = "../../client/client/db" } +client = { package = "substrate-client", path = "../client" } +client_db = { package = "substrate-client-db", path = "../client/db" } codec = { package = "parity-scale-codec", version = "1.0.0" } -substrate-executor = { path = "../../client/executor" } -transaction_pool = { package = "substrate-transaction-pool", path = "../../client/transaction-pool" } -rpc-servers = { package = "substrate-rpc-servers", path = "../../client/rpc-servers" } -rpc = { package = "substrate-rpc", path = "../../client/rpc" } -tel = { package = "substrate-telemetry", path = "../../client/telemetry" } -offchain = { package = "substrate-offchain", path = "../../client/offchain" } +substrate-executor = { path = "../executor" } +transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } +rpc-servers = { package = "substrate-rpc-servers", path = "../rpc-servers" } +rpc = { package = "substrate-rpc", path = "../rpc" } +tel = { package = "substrate-telemetry", path = "../telemetry" } +offchain = { package = "substrate-offchain", path = "../offchain" } parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" } [dev-dependencies] @@ -53,7 +53,7 @@ substrate-test-runtime-client = { path = "../../test/utils/runtime/client" } node-executor = { path = "../../bin/node/executor" } node-primitives = { path = "../../bin/node/primitives" } node-runtime = { path = "../../bin/node/runtime" } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives" } -grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" } -grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../client/finality-grandpa/primitives" } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" } +grandpa = { package = "substrate-finality-grandpa", path = "../finality-grandpa" } +grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" } tokio = "0.1" diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml index 9c12751e6980c..8d379a0e46b45 100644 --- a/client/service/test/Cargo.toml +++ b/client/service/test/Cargo.toml @@ -12,9 +12,9 @@ log = "0.4.8" env_logger = "0.7.0" fdlimit = "0.1.1" futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features = ["compat"] } -service = { package = "substrate-service", path = "../../../client/service", default-features = false } -network = { package = "substrate-network", path = "../../../client/network" } -consensus = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } -client = { package = "substrate-client", path = "../../../client/client" } +service = { package = "substrate-service", path = "../../service", default-features = false } +network = { package = "substrate-network", path = "../../network" } +consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } +client = { package = "substrate-client", path = "../../client" } sr-primitives = { path = "../../../primitives/sr-primitives" } -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } diff --git a/client/session/Cargo.toml b/client/session/Cargo.toml deleted file mode 100644 index b91a74de00df0..0000000000000 --- a/client/session/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "substrate-session" -version = "2.0.0" -authors = ["Parity Technologies "] -edition = "2018" - -[dependencies] -client = { package = "substrate-client", path = "../client", default-features = false } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -sr-primitives = { path = "../../primitives/sr-primitives", optional = true } -primitives = { package = "substrate-primitives", path = "../primitives", optional = true } - -[features] -default = [ "std" ] -std = [ "client/std", "rstd/std", "sr-primitives", "primitives" ] diff --git a/client/state-db/Cargo.toml b/client/state-db/Cargo.toml index 8ecf1c2f10d3b..d2752c14dd9c8 100644 --- a/client/state-db/Cargo.toml +++ b/client/state-db/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] parking_lot = "0.9.0" log = "0.4.8" -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } [dev-dependencies] diff --git a/client/state-machine/Cargo.toml b/client/state-machine/Cargo.toml index 7cd8601a3b636..dfd73e8d7c9e4 100644 --- a/client/state-machine/Cargo.toml +++ b/client/state-machine/Cargo.toml @@ -12,12 +12,12 @@ hash-db = "0.15.2" trie-db = "0.15.2" trie-root = "0.15.2" trie = { package = "substrate-trie", path = "../trie" } -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } codec = { package = "parity-scale-codec", version = "1.0.0" } num-traits = "0.2.8" rand = "0.7.2" -externalities = { package = "substrate-externalities", path = "../externalities" } +externalities = { package = "substrate-externalities", path = "../../primitives/externalities" } [dev-dependencies] hex-literal = "0.2.1" diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index cf70d8affb7a3..716b70f46f193 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -12,9 +12,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } parking_lot = "0.9.0" sr-primitives = { path = "../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../client" } -primitives = { package = "substrate-primitives", path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } txpool = { package = "substrate-transaction-graph", path = "./graph" } [dev-dependencies] -keyring = { package = "substrate-keyring", path = "../../client/keyring" } +keyring = { package = "substrate-keyring", path = "../keyring" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index 52db2c4a41809..93068c514add0 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -10,7 +10,7 @@ futures-preview = "0.3.0-alpha.19" log = "0.4.8" parking_lot = "0.9.0" serde = { version = "1.0.101", features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } [dev-dependencies] diff --git a/client/trie/Cargo.toml b/client/trie/Cargo.toml index ff3cc226716cd..273433320c36f 100644 --- a/client/trie/Cargo.toml +++ b/client/trie/Cargo.toml @@ -18,7 +18,7 @@ hash-db = { version = "0.15.2", default-features = false } trie-db = { version = "0.15.2", default-features = false } trie-root = { version = "0.15.2", default-features = false } memory-db = { version = "0.15.2", default-features = false } -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } [dev-dependencies] trie-bench = "0.16.2" diff --git a/paint/assets/Cargo.toml b/paint/assets/Cargo.toml index 6a833a3417b13..10b471682fad3 100644 --- a/paint/assets/Cargo.toml +++ b/paint/assets/Cargo.toml @@ -15,7 +15,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } rstd = { package = "sr-std", path = "../../primitives/sr-std" } runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } diff --git a/paint/aura/Cargo.toml b/paint/aura/Cargo.toml index 98e12498ad9ff..15e9219e8cbe0 100644 --- a/paint/aura/Cargo.toml +++ b/paint/aura/Cargo.toml @@ -5,17 +5,17 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } -substrate-consensus-aura-primitives = { path = "../../client/consensus/aura/primitives", default-features = false} +substrate-consensus-aura-primitives = { path = "../../primitives/consensus/aura", default-features = false} system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } diff --git a/paint/aura/src/lib.rs b/paint/aura/src/lib.rs index 7562936e06967..4a78941db1001 100644 --- a/paint/aura/src/lib.rs +++ b/paint/aura/src/lib.rs @@ -39,7 +39,7 @@ //! ## References //! //! If you're interested in hacking on this module, it is useful to understand the interaction with -//! `substrate/client/inherents/src/lib.rs` and, specifically, the required implementation of +//! `substrate/primitives/inherents/src/lib.rs` and, specifically, the required implementation of //! [`ProvideInherent`](../substrate_inherents/trait.ProvideInherent.html) and //! [`ProvideInherentData`](../substrate_inherents/trait.ProvideInherentData.html) to create and check inherents. diff --git a/paint/authority-discovery/Cargo.toml b/paint/authority-discovery/Cargo.toml index b3b18c6b2454c..c00664891de88 100644 --- a/paint/authority-discovery/Cargo.toml +++ b/paint/authority-discovery/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } @@ -17,7 +17,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } [features] diff --git a/paint/authorship/Cargo.toml b/paint/authorship/Cargo.toml index 649472b3a8fd5..477ec15d529bd 100644 --- a/paint/authorship/Cargo.toml +++ b/paint/authorship/Cargo.toml @@ -6,9 +6,9 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } diff --git a/paint/babe/Cargo.toml b/paint/babe/Cargo.toml index 8f1b26c1e7c95..da96a59279fee 100644 --- a/paint/babe/Cargo.toml +++ b/paint/babe/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } @@ -16,14 +16,14 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../client/consensus/babe/primitives", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] lazy_static = "1.4.0" parking_lot = "0.9.0" sr-version = { path = "../../primitives/sr-version", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" } [features] diff --git a/paint/balances/Cargo.toml b/paint/balances/Cargo.toml index 9dcc1e99a7e7c..8403b9a727aff 100644 --- a/paint/balances/Cargo.toml +++ b/paint/balances/Cargo.toml @@ -16,7 +16,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } [features] diff --git a/paint/collective/Cargo.toml b/paint/collective/Cargo.toml index 6d15ba9986d78..2f98e0e436986 100644 --- a/paint/collective/Cargo.toml +++ b/paint/collective/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } diff --git a/paint/contracts/Cargo.toml b/paint/contracts/Cargo.toml index d322c13067916..aa4e6439bbc61 100644 --- a/paint/contracts/Cargo.toml +++ b/paint/contracts/Cargo.toml @@ -10,7 +10,7 @@ pwasm-utils = { version = "0.11.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } parity-wasm = { version = "0.40.3", default-features = false } wasmi-validation = { version = "0.2.0", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } diff --git a/paint/contracts/rpc/Cargo.toml b/paint/contracts/rpc/Cargo.toml index 5db3b2cb256dd..935634113d753 100644 --- a/paint/contracts/rpc/Cargo.toml +++ b/paint/contracts/rpc/Cargo.toml @@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" } serde = { version = "1.0.101", features = ["derive"] } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-contracts-rpc-runtime-api = { path = "./runtime-api" } diff --git a/paint/democracy/Cargo.toml b/paint/democracy/Cargo.toml index a79b96a24eda9..b455d070bb41d 100644 --- a/paint/democracy/Cargo.toml +++ b/paint/democracy/Cargo.toml @@ -15,7 +15,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/paint/elections-phragmen/Cargo.toml b/paint/elections-phragmen/Cargo.toml index f4ef67b2b2036..53bfd42322894 100644 --- a/paint/elections-phragmen/Cargo.toml +++ b/paint/elections-phragmen/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } +phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } @@ -16,7 +16,7 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } hex-literal = "0.2.1" balances = { package = "srml-balances", path = "../balances" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } serde = { version = "1.0.101" } [features] diff --git a/paint/elections/Cargo.toml b/paint/elections/Cargo.toml index 2738074ea2192..829f09acec65d 100644 --- a/paint/elections/Cargo.toml +++ b/paint/elections/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = { version = "1.0.101", optional = true } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } diff --git a/paint/evm/Cargo.toml b/paint/evm/Cargo.toml index 4dc18b1e2adbd..ed7f03790e695 100644 --- a/paint/evm/Cargo.toml +++ b/paint/evm/Cargo.toml @@ -11,7 +11,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } diff --git a/paint/example/Cargo.toml b/paint/example/Cargo.toml index 53a61a7d131a9..3a2cb88d09342 100644 --- a/paint/example/Cargo.toml +++ b/paint/example/Cargo.toml @@ -15,7 +15,7 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/executive/Cargo.toml b/paint/executive/Cargo.toml index 3f37e5500a2b1..23a67872d756d 100644 --- a/paint/executive/Cargo.toml +++ b/paint/executive/Cargo.toml @@ -15,7 +15,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] hex-literal = "0.2.1" -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } srml-indices = { path = "../indices" } balances = { package = "srml-balances", path = "../balances" } transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } diff --git a/paint/finality-tracker/Cargo.toml b/paint/finality-tracker/Cargo.toml index c9ab01eacbd57..031016e0143da 100644 --- a/paint/finality-tracker/Cargo.toml +++ b/paint/finality-tracker/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } @@ -15,7 +15,7 @@ srml-system = { path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [features] diff --git a/paint/generic-asset/Cargo.toml b/paint/generic-asset/Cargo.toml index e950a09d3cbd6..5e0767db140b5 100644 --- a/paint/generic-asset/Cargo.toml +++ b/paint/generic-asset/Cargo.toml @@ -14,7 +14,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/grandpa/Cargo.toml b/paint/grandpa/Cargo.toml index 51da415613603..482eacacbdf14 100644 --- a/paint/grandpa/Cargo.toml +++ b/paint/grandpa/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -substrate-finality-grandpa-primitives = { path = "../../client/finality-grandpa/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } +substrate-finality-grandpa-primitives = { path = "../../primitives/finality-grandpa", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } diff --git a/paint/im-online/Cargo.toml b/paint/im-online/Cargo.toml index 15e735465a1c8..15ddfa73ac38e 100644 --- a/paint/im-online/Cargo.toml +++ b/paint/im-online/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto", default-features = false } authorship = { package = "srml-authorship", path = "../authorship", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package="substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package="substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } session = { package = "srml-session", path = "../session", default-features = false } diff --git a/paint/indices/Cargo.toml b/paint/indices/Cargo.toml index 0729ee0dcdbfa..35719aa13da84 100644 --- a/paint/indices/Cargo.toml +++ b/paint/indices/Cargo.toml @@ -12,7 +12,7 @@ substrate-keyring = { path = "../../client/keyring", optional = true } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } diff --git a/paint/membership/Cargo.toml b/paint/membership/Cargo.toml index 8346647107b65..09605578e6e65 100644 --- a/paint/membership/Cargo.toml +++ b/paint/membership/Cargo.toml @@ -14,7 +14,7 @@ system = { package = "srml-system", path = "../system", default-features = false sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/metadata/Cargo.toml b/paint/metadata/Cargo.toml index 9586b64da3180..0aa8d6edb9d2f 100644 --- a/paint/metadata/Cargo.toml +++ b/paint/metadata/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } [features] default = ["std"] diff --git a/paint/nicks/Cargo.toml b/paint/nicks/Cargo.toml index 9079ad1d49eea..097b6351ce16f 100644 --- a/paint/nicks/Cargo.toml +++ b/paint/nicks/Cargo.toml @@ -14,7 +14,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } balances = { package = "srml-balances", path = "../balances", default-features = false } [features] diff --git a/paint/offences/Cargo.toml b/paint/offences/Cargo.toml index 5dfa0abf22fd4..60190a7518dc9 100644 --- a/paint/offences/Cargo.toml +++ b/paint/offences/Cargo.toml @@ -16,7 +16,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } -substrate-primitives = { path = "../../client/primitives" } +substrate-primitives = { path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/randomness-collective-flip/Cargo.toml b/paint/randomness-collective-flip/Cargo.toml index b16c0c245fbb8..314578e6a7fab 100644 --- a/paint/randomness-collective-flip/Cargo.toml +++ b/paint/randomness-collective-flip/Cargo.toml @@ -13,7 +13,7 @@ system = { package = "srml-system", path = "../system", default-features = false rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } [features] diff --git a/paint/scored-pool/Cargo.toml b/paint/scored-pool/Cargo.toml index 91c782d6a48d0..e145e12a7a0cf 100644 --- a/paint/scored-pool/Cargo.toml +++ b/paint/scored-pool/Cargo.toml @@ -15,7 +15,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] balances = { package = "srml-balances", path = "../balances" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/session/Cargo.toml b/paint/session/Cargo.toml index 788bf33ebcef9..b1dbbded8c5ae 100644 --- a/paint/session/Cargo.toml +++ b/paint/session/Cargo.toml @@ -19,8 +19,8 @@ runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-featur impl-trait-for-tuples = "0.1.3" [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } -app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto" } lazy_static = "1.4.0" [features] diff --git a/paint/staking/Cargo.toml b/paint/staking/Cargo.toml index 29ee99496ed1e..2ec289e1ebc91 100644 --- a/paint/staking/Cargo.toml +++ b/paint/staking/Cargo.toml @@ -10,7 +10,7 @@ safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } substrate-keyring = { path = "../../client/keyring", optional = true } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -phragmen = { package = "substrate-phragmen", path = "../../client/phragmen", default-features = false } +phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } @@ -20,7 +20,7 @@ session = { package = "srml-session", path = "../session", default-features = fa authorship = { package = "srml-authorship", path = "../authorship", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } balances = { package = "srml-balances", path = "../balances" } timestamp = { package = "srml-timestamp", path = "../timestamp" } srml-staking-reward-curve = { path = "../staking/reward-curve"} diff --git a/paint/sudo/Cargo.toml b/paint/sudo/Cargo.toml index 5ce0554da2665..80568a2650f35 100644 --- a/paint/sudo/Cargo.toml +++ b/paint/sudo/Cargo.toml @@ -14,7 +14,7 @@ support = { package = "srml-support", path = "../support", default-features = fa system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/support/Cargo.toml b/paint/support/Cargo.toml index ed7a3b07fa2e9..4191b033cfea1 100644 --- a/paint/support/Cargo.toml +++ b/paint/support/Cargo.toml @@ -12,8 +12,8 @@ srml-metadata = { path = "../metadata", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" } paste = "0.1.6" once_cell = { version = "0.2.4", default-features = false, optional = true } diff --git a/paint/support/rpc/Cargo.toml b/paint/support/rpc/Cargo.toml index ba39951398291..a57bfa3e8dbb9 100644 --- a/paint/support/rpc/Cargo.toml +++ b/paint/support/rpc/Cargo.toml @@ -11,7 +11,7 @@ jsonrpc-core = "14" parity-scale-codec = "1" serde = "1" srml-support = { path = "../" } -substrate-primitives-storage = { path = "../../../client/primitives/storage" } +substrate-primitives-storage = { path = "../../../primitives/core/storage" } substrate-rpc-api = { path = "../../../client/rpc/api" } [dev-dependencies] diff --git a/paint/support/test/Cargo.toml b/paint/support/test/Cargo.toml index ee50ff581b179..9aa58a25fa163 100644 --- a/paint/support/test/Cargo.toml +++ b/paint/support/test/Cargo.toml @@ -10,9 +10,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = runtime-io ={ package = "sr-io", path = "../../../primitives/sr-io", default-features = false } state-machine ={ package = "substrate-state-machine", path = "../../../client/state-machine", optional = true } support = { package = "srml-support", version = "2", path = "../", default-features = false } -inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } trybuild = "1.0.17" pretty_assertions = "0.6.1" diff --git a/paint/system/Cargo.toml b/paint/system/Cargo.toml index f216cdc210066..4fbcdeaabf763 100644 --- a/paint/system/Cargo.toml +++ b/paint/system/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = { version = "1.0.101", optional = true, features = ["derive"] } safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } diff --git a/paint/system/rpc/Cargo.toml b/paint/system/rpc/Cargo.toml index 2bce92dbe8fdf..4b6f3669081f6 100644 --- a/paint/system/rpc/Cargo.toml +++ b/paint/system/rpc/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4.8" serde = { version = "1.0.101", features = ["derive"] } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-system-rpc-runtime-api = { path = "./runtime-api" } -substrate-primitives = { path = "../../../client/primitives" } +substrate-primitives = { path = "../../../primitives/core" } transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } [dev-dependencies] diff --git a/paint/timestamp/Cargo.toml b/paint/timestamp/Cargo.toml index fc9c551be601c..0c38e912e69de 100644 --- a/paint/timestamp/Cargo.toml +++ b/paint/timestamp/Cargo.toml @@ -9,14 +9,14 @@ serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -inherents = { package = "substrate-inherents", path = "../../client/inherents", default-features = false } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } impl-trait-for-tuples = "0.1.3" [dev-dependencies] runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/transaction-payment/Cargo.toml b/paint/transaction-payment/Cargo.toml index 9ea00b1aee2ce..1fa591b329737 100644 --- a/paint/transaction-payment/Cargo.toml +++ b/paint/transaction-payment/Cargo.toml @@ -14,7 +14,7 @@ transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc- [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/paint/transaction-payment/rpc/Cargo.toml b/paint/transaction-payment/rpc/Cargo.toml index e993998f43dfd..cda6ccd05790b 100644 --- a/paint/transaction-payment/rpc/Cargo.toml +++ b/paint/transaction-payment/rpc/Cargo.toml @@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" jsonrpc-derive = "14.0.3" -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } -rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../client/rpc/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" } serde = { version = "1.0.101", features = ["derive"] } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-transaction-payment-rpc-runtime-api = { path = "./runtime-api" } diff --git a/paint/treasury/Cargo.toml b/paint/treasury/Cargo.toml index 5eff91b63a50f..4fb82cded37c3 100644 --- a/paint/treasury/Cargo.toml +++ b/paint/treasury/Cargo.toml @@ -15,7 +15,7 @@ balances = { package = "srml-balances", path = "../balances", default-features = [dev-dependencies] runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } [features] default = ["std"] diff --git a/paint/utility/Cargo.toml b/paint/utility/Cargo.toml index 70538e3544091..675f31c150629 100644 --- a/paint/utility/Cargo.toml +++ b/paint/utility/Cargo.toml @@ -14,7 +14,7 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } balances = { package = "srml-balances", path = "../balances" } [features] diff --git a/client/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml similarity index 84% rename from client/application-crypto/Cargo.toml rename to primitives/application-crypto/Cargo.toml index fe57c69c69c98..598f74ac15bd4 100644 --- a/client/application-crypto/Cargo.toml +++ b/primitives/application-crypto/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" description = "Provides facilities for generating application specific crypto wrapper types." [dependencies] -primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../core", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } [dev-dependencies] diff --git a/client/application-crypto/src/ed25519.rs b/primitives/application-crypto/src/ed25519.rs similarity index 100% rename from client/application-crypto/src/ed25519.rs rename to primitives/application-crypto/src/ed25519.rs diff --git a/client/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs similarity index 100% rename from client/application-crypto/src/lib.rs rename to primitives/application-crypto/src/lib.rs diff --git a/client/application-crypto/src/sr25519.rs b/primitives/application-crypto/src/sr25519.rs similarity index 100% rename from client/application-crypto/src/sr25519.rs rename to primitives/application-crypto/src/sr25519.rs diff --git a/client/application-crypto/src/traits.rs b/primitives/application-crypto/src/traits.rs similarity index 100% rename from client/application-crypto/src/traits.rs rename to primitives/application-crypto/src/traits.rs diff --git a/client/authority-discovery/primitives/Cargo.toml b/primitives/authority-discovery/Cargo.toml similarity index 60% rename from client/authority-discovery/primitives/Cargo.toml rename to primitives/authority-discovery/Cargo.toml index 6bf2acfc2812f..2b5da184e45ca 100644 --- a/client/authority-discovery/primitives/Cargo.toml +++ b/primitives/authority-discovery/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } -client = { package = "substrate-client", path = "../../client", default-features = false } -sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +client = { package = "substrate-client", path = "../../client/client", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } [features] default = ["std"] diff --git a/client/authority-discovery/primitives/src/lib.rs b/primitives/authority-discovery/src/lib.rs similarity index 100% rename from client/authority-discovery/primitives/src/lib.rs rename to primitives/authority-discovery/src/lib.rs diff --git a/client/consensus/aura/primitives/Cargo.toml b/primitives/consensus/aura/Cargo.toml similarity index 60% rename from client/consensus/aura/primitives/Cargo.toml rename to primitives/consensus/aura/Cargo.toml index 99843553c871d..49eb936d945e9 100644 --- a/client/consensus/aura/primitives/Cargo.toml +++ b/primitives/consensus/aura/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -substrate-client = { path = "../../../client", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../../../application-crypto", default-features = false } -rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } -sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } +substrate-client = { path = "../../../client/client", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto", default-features = false } +rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +sr-primitives = { path = "../../sr-primitives", default-features = false } [features] default = ["std"] diff --git a/client/consensus/aura/primitives/src/lib.rs b/primitives/consensus/aura/src/lib.rs similarity index 100% rename from client/consensus/aura/primitives/src/lib.rs rename to primitives/consensus/aura/src/lib.rs diff --git a/client/consensus/babe/primitives/Cargo.toml b/primitives/consensus/babe/Cargo.toml similarity index 59% rename from client/consensus/babe/primitives/Cargo.toml rename to primitives/consensus/babe/Cargo.toml index 181f3d313c715..9fdbe444d50a3 100644 --- a/client/consensus/babe/primitives/Cargo.toml +++ b/primitives/consensus/babe/Cargo.toml @@ -6,11 +6,11 @@ description = "Primitives for BABE consensus" edition = "2018" [dependencies] -substrate-client = { path = "../../../client", default-features = false } -rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } -sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../../../application-crypto", default-features = false } -slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true } +substrate-client = { path = "../../../client/client", default-features = false } +rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +sr-primitives = { path = "../../sr-primitives", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto", default-features = false } +slots = { package = "substrate-consensus-slots", path = "../../../client/consensus/slots", optional = true } schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } diff --git a/client/consensus/babe/primitives/src/digest.rs b/primitives/consensus/babe/src/digest.rs similarity index 100% rename from client/consensus/babe/primitives/src/digest.rs rename to primitives/consensus/babe/src/digest.rs diff --git a/client/consensus/babe/primitives/src/lib.rs b/primitives/consensus/babe/src/lib.rs similarity index 100% rename from client/consensus/babe/primitives/src/lib.rs rename to primitives/consensus/babe/src/lib.rs diff --git a/client/consensus/common/Cargo.toml b/primitives/consensus/common/Cargo.toml similarity index 70% rename from client/consensus/common/Cargo.toml rename to primitives/consensus/common/Cargo.toml index ddffbe58e123a..6901bf09b70dc 100644 --- a/client/consensus/common/Cargo.toml +++ b/primitives/consensus/common/Cargo.toml @@ -9,13 +9,13 @@ edition = "2018" derive_more = "0.15.0" libp2p = { version = "0.13.0", default-features = false } log = "0.4.8" -primitives = { package = "substrate-primitives", path= "../../primitives" } +primitives = { package = "substrate-primitives", path= "../../core" } inherents = { package = "substrate-inherents", path = "../../inherents" } futures-preview = "0.3.0-alpha.19" futures-timer = "0.4.0" -rstd = { package = "sr-std", path = "../../../primitives/sr-std" } -runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } -sr-primitives = { path = "../../../primitives/sr-primitives" } +rstd = { package = "sr-std", path = "../../sr-std" } +runtime_version = { package = "sr-version", path = "../../sr-version" } +sr-primitives = { path = "../../sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } parking_lot = "0.9.0" diff --git a/client/consensus/common/src/block_import.rs b/primitives/consensus/common/src/block_import.rs similarity index 100% rename from client/consensus/common/src/block_import.rs rename to primitives/consensus/common/src/block_import.rs diff --git a/client/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs similarity index 100% rename from client/consensus/common/src/block_validation.rs rename to primitives/consensus/common/src/block_validation.rs diff --git a/client/consensus/common/src/error.rs b/primitives/consensus/common/src/error.rs similarity index 100% rename from client/consensus/common/src/error.rs rename to primitives/consensus/common/src/error.rs diff --git a/client/consensus/common/src/evaluation.rs b/primitives/consensus/common/src/evaluation.rs similarity index 100% rename from client/consensus/common/src/evaluation.rs rename to primitives/consensus/common/src/evaluation.rs diff --git a/client/consensus/common/src/import_queue.rs b/primitives/consensus/common/src/import_queue.rs similarity index 100% rename from client/consensus/common/src/import_queue.rs rename to primitives/consensus/common/src/import_queue.rs diff --git a/client/consensus/common/src/import_queue/basic_queue.rs b/primitives/consensus/common/src/import_queue/basic_queue.rs similarity index 100% rename from client/consensus/common/src/import_queue/basic_queue.rs rename to primitives/consensus/common/src/import_queue/basic_queue.rs diff --git a/client/consensus/common/src/import_queue/buffered_link.rs b/primitives/consensus/common/src/import_queue/buffered_link.rs similarity index 100% rename from client/consensus/common/src/import_queue/buffered_link.rs rename to primitives/consensus/common/src/import_queue/buffered_link.rs diff --git a/client/consensus/common/src/lib.rs b/primitives/consensus/common/src/lib.rs similarity index 100% rename from client/consensus/common/src/lib.rs rename to primitives/consensus/common/src/lib.rs diff --git a/client/consensus/common/src/offline_tracker.rs b/primitives/consensus/common/src/offline_tracker.rs similarity index 100% rename from client/consensus/common/src/offline_tracker.rs rename to primitives/consensus/common/src/offline_tracker.rs diff --git a/client/consensus/common/src/select_chain.rs b/primitives/consensus/common/src/select_chain.rs similarity index 100% rename from client/consensus/common/src/select_chain.rs rename to primitives/consensus/common/src/select_chain.rs diff --git a/client/consensus/pow/primitives/Cargo.toml b/primitives/consensus/pow/Cargo.toml similarity index 54% rename from client/consensus/pow/primitives/Cargo.toml rename to primitives/consensus/pow/Cargo.toml index c0f0ca146ab31..6abd1b6d60c1e 100644 --- a/client/consensus/pow/primitives/Cargo.toml +++ b/primitives/consensus/pow/Cargo.toml @@ -6,10 +6,10 @@ description = "Primitives for Aura consensus" edition = "2018" [dependencies] -substrate-client = { path = "../../../client", default-features = false } -rstd = { package = "sr-std", path = "../../../../primitives/sr-std", default-features = false } -sr-primitives = { path = "../../../../primitives/sr-primitives", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false } +substrate-client = { path = "../../../client/client", default-features = false } +rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +sr-primitives = { path = "../../sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } [features] diff --git a/client/consensus/pow/primitives/src/lib.rs b/primitives/consensus/pow/src/lib.rs similarity index 100% rename from client/consensus/pow/primitives/src/lib.rs rename to primitives/consensus/pow/src/lib.rs diff --git a/client/primitives/Cargo.toml b/primitives/core/Cargo.toml similarity index 97% rename from client/primitives/Cargo.toml rename to primitives/core/Cargo.toml index 9aa51c8b65997..20c7e7c9caa2f 100644 --- a/client/primitives/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } rustc-hex = { version = "2.0.1", default-features = false } log = { version = "0.4.8", default-features = false } diff --git a/client/primitives/benches/bench.rs b/primitives/core/benches/bench.rs similarity index 100% rename from client/primitives/benches/bench.rs rename to primitives/core/benches/bench.rs diff --git a/client/primitives/debug-derive/Cargo.toml b/primitives/core/debug-derive/Cargo.toml similarity index 100% rename from client/primitives/debug-derive/Cargo.toml rename to primitives/core/debug-derive/Cargo.toml diff --git a/client/primitives/debug-derive/src/impls.rs b/primitives/core/debug-derive/src/impls.rs similarity index 100% rename from client/primitives/debug-derive/src/impls.rs rename to primitives/core/debug-derive/src/impls.rs diff --git a/client/primitives/debug-derive/src/lib.rs b/primitives/core/debug-derive/src/lib.rs similarity index 100% rename from client/primitives/debug-derive/src/lib.rs rename to primitives/core/debug-derive/src/lib.rs diff --git a/client/primitives/debug-derive/tests/tests.rs b/primitives/core/debug-derive/tests/tests.rs similarity index 100% rename from client/primitives/debug-derive/tests/tests.rs rename to primitives/core/debug-derive/tests/tests.rs diff --git a/client/primitives/src/changes_trie.rs b/primitives/core/src/changes_trie.rs similarity index 100% rename from client/primitives/src/changes_trie.rs rename to primitives/core/src/changes_trie.rs diff --git a/client/primitives/src/crypto.rs b/primitives/core/src/crypto.rs similarity index 100% rename from client/primitives/src/crypto.rs rename to primitives/core/src/crypto.rs diff --git a/client/primitives/src/ecdsa.rs b/primitives/core/src/ecdsa.rs similarity index 100% rename from client/primitives/src/ecdsa.rs rename to primitives/core/src/ecdsa.rs diff --git a/client/primitives/src/ed25519.rs b/primitives/core/src/ed25519.rs similarity index 100% rename from client/primitives/src/ed25519.rs rename to primitives/core/src/ed25519.rs diff --git a/client/primitives/src/hash.rs b/primitives/core/src/hash.rs similarity index 100% rename from client/primitives/src/hash.rs rename to primitives/core/src/hash.rs diff --git a/client/primitives/src/hasher.rs b/primitives/core/src/hasher.rs similarity index 100% rename from client/primitives/src/hasher.rs rename to primitives/core/src/hasher.rs diff --git a/client/primitives/src/hashing.rs b/primitives/core/src/hashing.rs similarity index 100% rename from client/primitives/src/hashing.rs rename to primitives/core/src/hashing.rs diff --git a/client/primitives/src/hexdisplay.rs b/primitives/core/src/hexdisplay.rs similarity index 100% rename from client/primitives/src/hexdisplay.rs rename to primitives/core/src/hexdisplay.rs diff --git a/client/primitives/src/lib.rs b/primitives/core/src/lib.rs similarity index 100% rename from client/primitives/src/lib.rs rename to primitives/core/src/lib.rs diff --git a/client/primitives/src/offchain.rs b/primitives/core/src/offchain.rs similarity index 100% rename from client/primitives/src/offchain.rs rename to primitives/core/src/offchain.rs diff --git a/client/primitives/src/sandbox.rs b/primitives/core/src/sandbox.rs similarity index 100% rename from client/primitives/src/sandbox.rs rename to primitives/core/src/sandbox.rs diff --git a/client/primitives/src/sr25519.rs b/primitives/core/src/sr25519.rs similarity index 100% rename from client/primitives/src/sr25519.rs rename to primitives/core/src/sr25519.rs diff --git a/client/primitives/src/testing.rs b/primitives/core/src/testing.rs similarity index 100% rename from client/primitives/src/testing.rs rename to primitives/core/src/testing.rs diff --git a/client/primitives/src/tests.rs b/primitives/core/src/tests.rs similarity index 100% rename from client/primitives/src/tests.rs rename to primitives/core/src/tests.rs diff --git a/client/primitives/src/traits.rs b/primitives/core/src/traits.rs similarity index 100% rename from client/primitives/src/traits.rs rename to primitives/core/src/traits.rs diff --git a/client/primitives/src/u32_trait.rs b/primitives/core/src/u32_trait.rs similarity index 100% rename from client/primitives/src/u32_trait.rs rename to primitives/core/src/u32_trait.rs diff --git a/client/primitives/src/uint.rs b/primitives/core/src/uint.rs similarity index 100% rename from client/primitives/src/uint.rs rename to primitives/core/src/uint.rs diff --git a/client/primitives/storage/Cargo.toml b/primitives/core/storage/Cargo.toml similarity index 83% rename from client/primitives/storage/Cargo.toml rename to primitives/core/storage/Cargo.toml index c288ccfb731a6..1e5d7ee8b4548 100644 --- a/client/primitives/storage/Cargo.toml +++ b/primitives/core/storage/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" description = "Storage related primitives" [dependencies] -rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../../sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } impl-serde = { version = "0.2.3", optional = true } substrate-debug-derive = { version = "2.0.0", path = "../debug-derive" } diff --git a/client/primitives/storage/src/lib.rs b/primitives/core/storage/src/lib.rs similarity index 100% rename from client/primitives/storage/src/lib.rs rename to primitives/core/storage/src/lib.rs diff --git a/client/externalities/Cargo.toml b/primitives/externalities/Cargo.toml similarity index 76% rename from client/externalities/Cargo.toml rename to primitives/externalities/Cargo.toml index 62ca7fc6ff1a2..0b806ecee0494 100644 --- a/client/externalities/Cargo.toml +++ b/primitives/externalities/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] primitive-types = { version = "0.6", features = ["codec"] } -primitives-storage = { package = "substrate-primitives-storage", path = "../primitives/storage" } -rstd = { package = "sr-std", path = "../../primitives/sr-std" } +primitives-storage = { package = "substrate-primitives-storage", path = "../core/storage" } +rstd = { package = "sr-std", path = "../sr-std" } environmental = { version = "1.0.2" } diff --git a/client/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs similarity index 100% rename from client/externalities/src/extensions.rs rename to primitives/externalities/src/extensions.rs diff --git a/client/externalities/src/lib.rs b/primitives/externalities/src/lib.rs similarity index 100% rename from client/externalities/src/lib.rs rename to primitives/externalities/src/lib.rs diff --git a/client/externalities/src/scope_limited.rs b/primitives/externalities/src/scope_limited.rs similarity index 100% rename from client/externalities/src/scope_limited.rs rename to primitives/externalities/src/scope_limited.rs diff --git a/client/finality-grandpa/primitives/Cargo.toml b/primitives/finality-grandpa/Cargo.toml similarity index 62% rename from client/finality-grandpa/primitives/Cargo.toml rename to primitives/finality-grandpa/Cargo.toml index 26740a171beba..bbb4f30bc418c 100644 --- a/client/finality-grandpa/primitives/Cargo.toml +++ b/primitives/finality-grandpa/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../client", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto", default-features = false } +client = { package = "substrate-client", path = "../../client/client", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../application-crypto", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } -rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } [features] diff --git a/client/finality-grandpa/primitives/src/lib.rs b/primitives/finality-grandpa/src/lib.rs similarity index 100% rename from client/finality-grandpa/primitives/src/lib.rs rename to primitives/finality-grandpa/src/lib.rs diff --git a/client/inherents/Cargo.toml b/primitives/inherents/Cargo.toml similarity index 70% rename from client/inherents/Cargo.toml rename to primitives/inherents/Cargo.toml index 2fa389ed0fba3..45e0b9e828ec7 100644 --- a/client/inherents/Cargo.toml +++ b/primitives/inherents/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" [dependencies] parking_lot = { version = "0.9.0", optional = true } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } [features] default = [ "std" ] diff --git a/client/inherents/src/lib.rs b/primitives/inherents/src/lib.rs similarity index 100% rename from client/inherents/src/lib.rs rename to primitives/inherents/src/lib.rs diff --git a/client/offchain/primitives/Cargo.toml b/primitives/offchain/Cargo.toml similarity index 62% rename from client/offchain/primitives/Cargo.toml rename to primitives/offchain/Cargo.toml index 2bcac75cea80d..d6114c306e14a 100644 --- a/client/offchain/primitives/Cargo.toml +++ b/primitives/offchain/Cargo.toml @@ -7,8 +7,8 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../client", default-features = false } -sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +client = { package = "substrate-client", path = "../../client/client", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } [features] default = ["std"] diff --git a/client/offchain/primitives/src/lib.rs b/primitives/offchain/src/lib.rs similarity index 100% rename from client/offchain/primitives/src/lib.rs rename to primitives/offchain/src/lib.rs diff --git a/client/peerset/Cargo.toml b/primitives/peerset/Cargo.toml similarity index 100% rename from client/peerset/Cargo.toml rename to primitives/peerset/Cargo.toml diff --git a/client/peerset/src/lib.rs b/primitives/peerset/src/lib.rs similarity index 100% rename from client/peerset/src/lib.rs rename to primitives/peerset/src/lib.rs diff --git a/client/peerset/src/peersstate.rs b/primitives/peerset/src/peersstate.rs similarity index 100% rename from client/peerset/src/peersstate.rs rename to primitives/peerset/src/peersstate.rs diff --git a/client/peerset/tests/fuzz.rs b/primitives/peerset/tests/fuzz.rs similarity index 100% rename from client/peerset/tests/fuzz.rs rename to primitives/peerset/tests/fuzz.rs diff --git a/client/phragmen/Cargo.toml b/primitives/phragmen/Cargo.toml similarity index 86% rename from client/phragmen/Cargo.toml rename to primitives/phragmen/Cargo.toml index 8677cb5560860..9b6a58363172a 100644 --- a/client/phragmen/Cargo.toml +++ b/primitives/phragmen/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } [dev-dependencies] diff --git a/client/phragmen/benches/phragmen.rs b/primitives/phragmen/benches/phragmen.rs similarity index 100% rename from client/phragmen/benches/phragmen.rs rename to primitives/phragmen/benches/phragmen.rs diff --git a/client/phragmen/src/lib.rs b/primitives/phragmen/src/lib.rs similarity index 100% rename from client/phragmen/src/lib.rs rename to primitives/phragmen/src/lib.rs diff --git a/client/phragmen/src/mock.rs b/primitives/phragmen/src/mock.rs similarity index 100% rename from client/phragmen/src/mock.rs rename to primitives/phragmen/src/mock.rs diff --git a/client/phragmen/src/tests.rs b/primitives/phragmen/src/tests.rs similarity index 100% rename from client/phragmen/src/tests.rs rename to primitives/phragmen/src/tests.rs diff --git a/client/rpc/primitives/Cargo.toml b/primitives/rpc/Cargo.toml similarity index 72% rename from client/rpc/primitives/Cargo.toml rename to primitives/rpc/Cargo.toml index 4044428112780..5216882b1a22e 100644 --- a/client/rpc/primitives/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../core" } diff --git a/client/rpc/primitives/src/lib.rs b/primitives/rpc/src/lib.rs similarity index 100% rename from client/rpc/primitives/src/lib.rs rename to primitives/rpc/src/lib.rs diff --git a/client/rpc/primitives/src/number.rs b/primitives/rpc/src/number.rs similarity index 100% rename from client/rpc/primitives/src/number.rs rename to primitives/rpc/src/number.rs diff --git a/client/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml similarity index 79% rename from client/runtime-interface/Cargo.toml rename to primitives/runtime-interface/Cargo.toml index cfa456d4f80ee..5e98cb3d9bcd3 100644 --- a/client/runtime-interface/Cargo.toml +++ b/primitives/runtime-interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] wasm-interface = { package = "substrate-wasm-interface", path = "../wasm-interface", optional = true } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } substrate-runtime-interface-proc-macro = { path = "proc-macro" } externalities = { package = "substrate-externalities", path = "../externalities", optional = true } codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false } @@ -15,11 +15,11 @@ static_assertions = "1.0.0" primitive-types = { version = "0.6.1", default-features = false } [dev-dependencies] -executor = { package = "substrate-executor", path = "../executor" } +executor = { package = "substrate-executor", path = "../../client/executor" } test-wasm = { package = "substrate-runtime-interface-test-wasm", path = "test-wasm" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } -primitives = { package = "substrate-primitives", path = "../primitives" } -runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } +state_machine = { package = "substrate-state-machine", path = "../../client/state-machine" } +primitives = { package = "substrate-primitives", path = "../core" } +runtime-io = { package = "sr-io", path = "../sr-io" } [features] default = [ "std" ] diff --git a/client/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml similarity index 100% rename from client/runtime-interface/proc-macro/Cargo.toml rename to primitives/runtime-interface/proc-macro/Cargo.toml diff --git a/client/runtime-interface/proc-macro/src/lib.rs b/primitives/runtime-interface/proc-macro/src/lib.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/lib.rs rename to primitives/runtime-interface/proc-macro/src/lib.rs diff --git a/client/runtime-interface/proc-macro/src/pass_by/codec.rs b/primitives/runtime-interface/proc-macro/src/pass_by/codec.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/pass_by/codec.rs rename to primitives/runtime-interface/proc-macro/src/pass_by/codec.rs diff --git a/client/runtime-interface/proc-macro/src/pass_by/enum_.rs b/primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/pass_by/enum_.rs rename to primitives/runtime-interface/proc-macro/src/pass_by/enum_.rs diff --git a/client/runtime-interface/proc-macro/src/pass_by/inner.rs b/primitives/runtime-interface/proc-macro/src/pass_by/inner.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/pass_by/inner.rs rename to primitives/runtime-interface/proc-macro/src/pass_by/inner.rs diff --git a/client/runtime-interface/proc-macro/src/pass_by/mod.rs b/primitives/runtime-interface/proc-macro/src/pass_by/mod.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/pass_by/mod.rs rename to primitives/runtime-interface/proc-macro/src/pass_by/mod.rs diff --git a/client/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs rename to primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs diff --git a/client/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs rename to primitives/runtime-interface/proc-macro/src/runtime_interface/host_function_interface.rs diff --git a/client/runtime-interface/proc-macro/src/runtime_interface/mod.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/runtime_interface/mod.rs rename to primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs diff --git a/client/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs b/primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs rename to primitives/runtime-interface/proc-macro/src/runtime_interface/trait_decl_impl.rs diff --git a/client/runtime-interface/proc-macro/src/utils.rs b/primitives/runtime-interface/proc-macro/src/utils.rs similarity index 100% rename from client/runtime-interface/proc-macro/src/utils.rs rename to primitives/runtime-interface/proc-macro/src/utils.rs diff --git a/client/runtime-interface/proc-macro/tests/ui.rs b/primitives/runtime-interface/proc-macro/tests/ui.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui.rs rename to primitives/runtime-interface/proc-macro/tests/ui.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/no_generic_parameters.rs b/primitives/runtime-interface/proc-macro/tests/ui/no_generic_parameters.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/no_generic_parameters.rs rename to primitives/runtime-interface/proc-macro/tests/ui/no_generic_parameters.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/no_generic_parameters.stderr b/primitives/runtime-interface/proc-macro/tests/ui/no_generic_parameters.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/no_generic_parameters.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/no_generic_parameters.stderr diff --git a/client/runtime-interface/proc-macro/tests/ui/no_method_implementation.rs b/primitives/runtime-interface/proc-macro/tests/ui/no_method_implementation.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/no_method_implementation.rs rename to primitives/runtime-interface/proc-macro/tests/ui/no_method_implementation.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/no_method_implementation.stderr b/primitives/runtime-interface/proc-macro/tests/ui/no_method_implementation.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/no_method_implementation.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/no_method_implementation.stderr diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.rs b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.rs rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.stderr b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_struct.stderr diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.rs b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.rs rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.stderr b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_enum_with_value_variant.stderr diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.rs b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.rs rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.stderr b/primitives/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/pass_by_inner_with_two_fields.stderr diff --git a/client/runtime-interface/proc-macro/tests/ui/take_self_by_value.rs b/primitives/runtime-interface/proc-macro/tests/ui/take_self_by_value.rs similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/take_self_by_value.rs rename to primitives/runtime-interface/proc-macro/tests/ui/take_self_by_value.rs diff --git a/client/runtime-interface/proc-macro/tests/ui/take_self_by_value.stderr b/primitives/runtime-interface/proc-macro/tests/ui/take_self_by_value.stderr similarity index 100% rename from client/runtime-interface/proc-macro/tests/ui/take_self_by_value.stderr rename to primitives/runtime-interface/proc-macro/tests/ui/take_self_by_value.stderr diff --git a/client/runtime-interface/src/host.rs b/primitives/runtime-interface/src/host.rs similarity index 100% rename from client/runtime-interface/src/host.rs rename to primitives/runtime-interface/src/host.rs diff --git a/client/runtime-interface/src/impls.rs b/primitives/runtime-interface/src/impls.rs similarity index 100% rename from client/runtime-interface/src/impls.rs rename to primitives/runtime-interface/src/impls.rs diff --git a/client/runtime-interface/src/lib.rs b/primitives/runtime-interface/src/lib.rs similarity index 100% rename from client/runtime-interface/src/lib.rs rename to primitives/runtime-interface/src/lib.rs diff --git a/client/runtime-interface/src/pass_by.rs b/primitives/runtime-interface/src/pass_by.rs similarity index 100% rename from client/runtime-interface/src/pass_by.rs rename to primitives/runtime-interface/src/pass_by.rs diff --git a/client/runtime-interface/src/wasm.rs b/primitives/runtime-interface/src/wasm.rs similarity index 100% rename from client/runtime-interface/src/wasm.rs rename to primitives/runtime-interface/src/wasm.rs diff --git a/client/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml similarity index 57% rename from client/runtime-interface/test-wasm/Cargo.toml rename to primitives/runtime-interface/test-wasm/Cargo.toml index 1f4fa2dead541..13d6e2591421b 100644 --- a/client/runtime-interface/test-wasm/Cargo.toml +++ b/primitives/runtime-interface/test-wasm/Cargo.toml @@ -7,12 +7,12 @@ build = "build.rs" [dependencies] runtime-interface = { package = "substrate-runtime-interface", path = "../", default-features = false } -rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } -runtime-io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } -primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } +rstd = { package = "sr-std", path = "../../sr-std", default-features = false } +runtime-io = { package = "sr-io", path = "../../sr-io", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core", default-features = false } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../utils/wasm-builder-runner" } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../client/utils/wasm-builder-runner" } [features] default = [ "std" ] diff --git a/client/runtime-interface/test-wasm/build.rs b/primitives/runtime-interface/test-wasm/build.rs similarity index 95% rename from client/runtime-interface/test-wasm/build.rs rename to primitives/runtime-interface/test-wasm/build.rs index fd4749b34c45e..5268f86d6dfc2 100644 --- a/client/runtime-interface/test-wasm/build.rs +++ b/primitives/runtime-interface/test-wasm/build.rs @@ -20,7 +20,7 @@ fn main() { build_current_project_with_rustflags( "wasm_binary.rs", WasmBuilderSource::CratesOrPath { - path: "../../utils/wasm-builder", + path: "../../../client/utils/wasm-builder", version: "1.0.6", }, // This instructs LLD to export __heap_base as a global variable, which is used by the diff --git a/client/runtime-interface/test-wasm/src/lib.rs b/primitives/runtime-interface/test-wasm/src/lib.rs similarity index 100% rename from client/runtime-interface/test-wasm/src/lib.rs rename to primitives/runtime-interface/test-wasm/src/lib.rs diff --git a/client/serializer/Cargo.toml b/primitives/serializer/Cargo.toml similarity index 100% rename from client/serializer/Cargo.toml rename to primitives/serializer/Cargo.toml diff --git a/client/serializer/src/lib.rs b/primitives/serializer/src/lib.rs similarity index 100% rename from client/serializer/src/lib.rs rename to primitives/serializer/src/lib.rs diff --git a/primitives/session/Cargo.toml b/primitives/session/Cargo.toml new file mode 100644 index 0000000000000..677a4aaf293c1 --- /dev/null +++ b/primitives/session/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "substrate-session" +version = "2.0.0" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +client = { package = "substrate-client", path = "../../client/client", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } +sr-primitives = { path = "../sr-primitives", optional = true } +primitives = { package = "substrate-primitives", path = "../core", optional = true } + +[features] +default = [ "std" ] +std = [ "client/std", "rstd/std", "sr-primitives", "primitives" ] diff --git a/client/session/src/lib.rs b/primitives/session/src/lib.rs similarity index 100% rename from client/session/src/lib.rs rename to primitives/session/src/lib.rs diff --git a/primitives/sr-api-macros/Cargo.toml b/primitives/sr-api-macros/Cargo.toml index 565cfd4111abf..dd1064770ef25 100644 --- a/primitives/sr-api-macros/Cargo.toml +++ b/primitives/sr-api-macros/Cargo.toml @@ -20,9 +20,9 @@ test-client = { package = "substrate-test-runtime-client", path = "../../test/ut state_machine = { package = "substrate-state-machine", path = "../../client/state-machine" } sr-primitives = { path = "../sr-primitives" } sr-version = { path = "../sr-version" } -primitives = { package = "substrate-primitives", path = "../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../core" } criterion = "0.3.0" -consensus_common = { package = "substrate-consensus-common", path = "../../client/consensus/common" } +consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } codec = { package = "parity-scale-codec", version = "1.0.0" } trybuild = "1.0.17" rustversion = "1.0.0" diff --git a/primitives/sr-arithmetic/Cargo.toml b/primitives/sr-arithmetic/Cargo.toml index 505047c542679..47b3315e86193 100644 --- a/primitives/sr-arithmetic/Cargo.toml +++ b/primitives/sr-arithmetic/Cargo.toml @@ -10,7 +10,7 @@ integer-sqrt = "0.1.2" num-traits = { version = "0.2.8", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } -substrate-debug-derive = { path = "../../client/primitives/debug-derive", default-features = false } +substrate-debug-derive = { path = "../../primitives/core/debug-derive", default-features = false } [dev-dependencies] primitive-types = "0.6.0" diff --git a/primitives/sr-io/Cargo.toml b/primitives/sr-io/Cargo.toml index 5b6c7ebac642e..1a0276be8d095 100644 --- a/primitives/sr-io/Cargo.toml +++ b/primitives/sr-io/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false } hash-db = { version = "0.15.2", default-features = false } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../core", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } libsecp256k1 = { version = "0.3.0", optional = true } tiny-keccak = { version = "1.5.0", optional = true } substrate-state-machine = { path = "../../client/state-machine", optional = true } -runtime-interface = { package = "substrate-runtime-interface", path = "../../client/runtime-interface", default-features = false } +runtime-interface = { package = "substrate-runtime-interface", path = "../runtime-interface", default-features = false } trie = { package = "substrate-trie", path = "../../client/trie", optional = true } -externalities = { package = "substrate-externalities", path = "../../client/externalities", optional = true } +externalities = { package = "substrate-externalities", path = "../externalities", optional = true } log = { version = "0.4.8", optional = true } [features] diff --git a/primitives/sr-primitives/Cargo.toml b/primitives/sr-primitives/Cargo.toml index 6ee692df2ed78..4a6f56fdd7b2e 100644 --- a/primitives/sr-primitives/Cargo.toml +++ b/primitives/sr-primitives/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../../client/application-crypto", default-features = false } +primitives = { package = "substrate-primitives", path = "../core", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../application-crypto", default-features = false } arithmetic = { package = "sr-arithmetic", path = "../sr-arithmetic", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } diff --git a/primitives/sr-sandbox/Cargo.toml b/primitives/sr-sandbox/Cargo.toml index 7ec0a67dbf3da..82851f39a7a1e 100755 --- a/primitives/sr-sandbox/Cargo.toml +++ b/primitives/sr-sandbox/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] wasmi = { version = "0.5.1", optional = true } -primitives = { package = "substrate-primitives", path = "../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../core", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../sr-io", default-features = false } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } diff --git a/client/wasm-interface/Cargo.toml b/primitives/wasm-interface/Cargo.toml similarity index 100% rename from client/wasm-interface/Cargo.toml rename to primitives/wasm-interface/Cargo.toml diff --git a/client/wasm-interface/src/lib.rs b/primitives/wasm-interface/src/lib.rs similarity index 100% rename from client/wasm-interface/src/lib.rs rename to primitives/wasm-interface/src/lib.rs diff --git a/client/wasm-interface/src/wasmi_impl.rs b/primitives/wasm-interface/src/wasmi_impl.rs similarity index 100% rename from client/wasm-interface/src/wasmi_impl.rs rename to primitives/wasm-interface/src/wasmi_impl.rs diff --git a/test/utils/chain-spec-builder/Cargo.toml b/test/utils/chain-spec-builder/Cargo.toml index 596fb17b94041..7498880e0f566 100644 --- a/test/utils/chain-spec-builder/Cargo.toml +++ b/test/utils/chain-spec-builder/Cargo.toml @@ -9,6 +9,6 @@ build = "build.rs" ansi_term = "0.12.1" keystore = { package = "substrate-keystore", path = "../../../client/keystore" } node-cli = { path = "../../../bin/node/cli" } -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } rand = "0.7.2" structopt = "0.3.3" diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index 4ad8f0b1f786f..6b01e1849715c 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../../client/client" } client-db = { package = "substrate-client-db", path = "../../../client/client/db", features = ["test-helpers"] } -consensus = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } +consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } executor = { package = "substrate-executor", path = "../../../client/executor" } futures-preview = "0.3.0-alpha.19" hash-db = "0.15.2" keyring = { package = "substrate-keyring", path = "../../../client/keyring" } codec = { package = "parity-scale-codec", version = "1.0.0" } -primitives = { package = "substrate-primitives", path = "../../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 9e8411dc8c17f..676b507f0ad35 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -11,22 +11,22 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } keyring = { package = "substrate-keyring", path = "../../../client/keyring", optional = true } substrate-client = { path = "../../../client/client", default-features = false } -primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } -app-crypto = { package = "substrate-application-crypto", path = "../../../client/application-crypto", default-features = false } -inherents = { package = "substrate-inherents", path = "../../../client/inherents", default-features = false } -aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../client/consensus/aura/primitives", default-features = false } -babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../client/consensus/babe/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } +app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto", default-features = false } +inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } +aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura", default-features = false } +babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe", default-features = false } rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } -session = { package = "substrate-session", path = "../../../client/session", default-features = false } +session = { package = "substrate-session", path = "../../../primitives/session", default-features = false } runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false } substrate-trie = { path = "../../../client/trie", default-features = false } trie-db = { version = "0.15.2", default-features = false } memory-db = { version = "0.15.2", default-features = false } -offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../client/offchain/primitives", default-features = false} -runtime-interface = { package = "substrate-runtime-interface", path = "../../../client/runtime-interface", default-features = false} +offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false} +runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false} executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } cfg-if = "0.1.10" srml-babe = { path = "../../../paint/babe", default-features = false } diff --git a/test/utils/runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml index fdd4adc788bd5..cb136c40c63c7 100644 --- a/test/utils/runtime/client/Cargo.toml +++ b/test/utils/runtime/client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] generic-test-client = { package = "substrate-test-client", path = "../../client" } -primitives = { package = "substrate-primitives", path = "../../../../client/primitives" } +primitives = { package = "substrate-primitives", path = "../../../../primitives/core" } runtime = { package = "substrate-test-runtime", path = "../../runtime", default-features = false } sr-primitives = { path = "../../../../primitives/sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index a72e7ea480212..7f2bdbd8bb73f 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" [dependencies] cli = { package = "substrate-cli", path = "../../../client/cli" } client = { package = "substrate-client", path = "../../../client/client" } -consensus_common = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } +consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../../client/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } substrate-service = { path = "../../../client/service" } From 367819e9e11a266131917c2973c43e0c115c0b6a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 19:54:08 +0100 Subject: [PATCH 25/61] starting to untangle client --- Cargo.toml | 6 ++-- bin/node-template/Cargo.toml | 2 +- bin/node-template/runtime/Cargo.toml | 2 +- bin/node/cli/Cargo.toml | 4 +-- bin/node/rpc/Cargo.toml | 2 +- bin/node/runtime/Cargo.toml | 2 +- bin/node/testing/Cargo.toml | 2 +- client/{client => }/Cargo.toml | 30 +++++++++---------- client/authority-discovery/Cargo.toml | 2 +- client/basic-authorship/Cargo.toml | 2 +- client/block-builder/Cargo.toml | 2 +- client/cli/Cargo.toml | 4 +-- client/consensus/aura/Cargo.toml | 2 +- client/consensus/babe/Cargo.toml | 6 ++-- client/consensus/pow/Cargo.toml | 2 +- client/consensus/slots/Cargo.toml | 2 +- client/consensus/uncles/Cargo.toml | 2 +- client/{client => }/db/Cargo.toml | 18 +++++------ .../{client => }/db/src/cache/list_cache.rs | 0 .../{client => }/db/src/cache/list_entry.rs | 0 .../{client => }/db/src/cache/list_storage.rs | 0 client/{client => }/db/src/cache/mod.rs | 0 client/{client => }/db/src/lib.rs | 0 client/{client => }/db/src/light.rs | 0 client/{client => }/db/src/offchain.rs | 0 client/{client => }/db/src/storage_cache.rs | 0 client/{client => }/db/src/utils.rs | 0 client/executor/Cargo.toml | 2 +- client/finality-grandpa/Cargo.toml | 4 +-- .../{client => }/header-metadata/Cargo.toml | 2 +- .../{client => }/header-metadata/src/lib.rs | 0 client/network/Cargo.toml | 6 ++-- client/offchain/Cargo.toml | 4 +-- client/rpc/Cargo.toml | 2 +- client/service/Cargo.toml | 4 +-- client/service/test/Cargo.toml | 2 +- client/{client => }/src/backend.rs | 0 client/{client => }/src/blockchain.rs | 0 client/{client => }/src/call_executor.rs | 0 client/{client => }/src/children.rs | 0 client/{client => }/src/cht.rs | 0 client/{client => }/src/client.rs | 0 client/{client => }/src/error.rs | 0 client/{client => }/src/genesis.rs | 0 client/{client => }/src/in_mem.rs | 0 client/{client => }/src/leaves.rs | 0 client/{client => }/src/lib.rs | 0 client/{client => }/src/light/backend.rs | 0 client/{client => }/src/light/blockchain.rs | 0 .../{client => }/src/light/call_executor.rs | 0 client/{client => }/src/light/fetcher.rs | 0 client/{client => }/src/light/mod.rs | 0 client/{client => }/src/notifications.rs | 0 paint/contracts/rpc/Cargo.toml | 2 +- paint/system/rpc/Cargo.toml | 2 +- paint/transaction-payment/rpc/Cargo.toml | 2 +- test/utils/client/Cargo.toml | 4 +-- test/utils/runtime/Cargo.toml | 2 +- test/utils/transaction-factory/Cargo.toml | 2 +- 59 files changed, 66 insertions(+), 66 deletions(-) rename client/{client => }/Cargo.toml (53%) rename client/{client => }/db/Cargo.toml (70%) rename client/{client => }/db/src/cache/list_cache.rs (100%) rename client/{client => }/db/src/cache/list_entry.rs (100%) rename client/{client => }/db/src/cache/list_storage.rs (100%) rename client/{client => }/db/src/cache/mod.rs (100%) rename client/{client => }/db/src/lib.rs (100%) rename client/{client => }/db/src/light.rs (100%) rename client/{client => }/db/src/offchain.rs (100%) rename client/{client => }/db/src/storage_cache.rs (100%) rename client/{client => }/db/src/utils.rs (100%) rename client/{client => }/header-metadata/Cargo.toml (77%) rename client/{client => }/header-metadata/src/lib.rs (100%) rename client/{client => }/src/backend.rs (100%) rename client/{client => }/src/blockchain.rs (100%) rename client/{client => }/src/call_executor.rs (100%) rename client/{client => }/src/children.rs (100%) rename client/{client => }/src/cht.rs (100%) rename client/{client => }/src/client.rs (100%) rename client/{client => }/src/error.rs (100%) rename client/{client => }/src/genesis.rs (100%) rename client/{client => }/src/in_mem.rs (100%) rename client/{client => }/src/leaves.rs (100%) rename client/{client => }/src/lib.rs (100%) rename client/{client => }/src/light/backend.rs (100%) rename client/{client => }/src/light/blockchain.rs (100%) rename client/{client => }/src/light/call_executor.rs (100%) rename client/{client => }/src/light/fetcher.rs (100%) rename client/{client => }/src/light/mod.rs (100%) rename client/{client => }/src/notifications.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index a986237d468e3..7da3b84fab38e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,9 @@ members = [ "client/chain-spec", "client/chain-spec/derive", "client/cli", - "client/client", - "client/client/db", - "client/client/header-metadata", + "client/", + "client//db", + "client//header-metadata", "client/executor", "client/executor/runtime-test", "client/finality-grandpa", diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml index ce7e630065984..d2b6dd068de3d 100644 --- a/bin/node-template/Cargo.toml +++ b/bin/node-template/Cargo.toml @@ -31,7 +31,7 @@ aura = { package = "substrate-consensus-aura", path = "../../client/consensus/au aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../primitives/consensus/aura" } grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" } grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" } -substrate-client = { path = "../../client/client" } +substrate-client = { path = "../../client/" } runtime = { package = "node-template-runtime", path = "runtime" } sr-primitives = { path = "../../primitives/sr-primitives" } basic-authorship = { package = "substrate-basic-authorship", path = "../../client/basic-authorship"} diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml index b8bea98b301de..b74cc90252905 100644 --- a/bin/node-template/runtime/Cargo.toml +++ b/bin/node-template/runtime/Cargo.toml @@ -26,7 +26,7 @@ timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", def sudo = { package = "srml-sudo", path = "../../../paint/sudo", default_features = false } transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment", default_features = false } sr-primitives = { path = "../../../primitives/sr-primitives", default_features = false } -client = { package = "substrate-client", path = "../../../client/client", default_features = false } +client = { package = "substrate-client", path = "../../../client/", default_features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false } [build-dependencies] diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 655c8b86f3d18..b95b65a9f0344 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -40,7 +40,7 @@ grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = # core dependencies runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" } transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" } @@ -48,7 +48,7 @@ network = { package = "substrate-network", path = "../../../client/network" } babe = { package = "substrate-consensus-babe", path = "../../../client/consensus/babe" } grandpa = { package = "substrate-finality-grandpa", path = "../../../client/finality-grandpa" } keyring = { package = "substrate-keyring", path = "../../../client/keyring" } -client_db = { package = "substrate-client-db", path = "../../../client/client/db", default-features = false } +client_db = { package = "substrate-client-db", path = "../../../client//db", default-features = false } offchain = { package = "substrate-offchain", path = "../../../client/offchain" } substrate-rpc = { package = "substrate-rpc", path = "../../../client/rpc" } substrate-basic-authorship = { path = "../../../client/basic-authorship" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 323dd94496924..56559aa37dafd 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } jsonrpc-core = "14.0.3" node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index 56cfd3a288eb6..62df32ff879b9 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -22,7 +22,7 @@ sr-primitives = { path = "../../../primitives/sr-primitives", default-features = sr-staking-primitives = { path = "../../../primitives/sr-staking-primitives", default-features = false } # core dependencies -client = { package = "substrate-client", path = "../../../client/client", default-features = false } +client = { package = "substrate-client", path = "../../../client/", default-features = false } rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } substrate-session = { path = "../../../primitives/session", default-features = false } diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index bc476b847baf3..cdb35b6251920 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] balances = { package = "srml-balances", path = "../../../paint/balances" } -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } contracts = { package = "srml-contracts", path = "../../../paint/contracts" } grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa" } indices = { package = "srml-indices", path = "../../../paint/indices" } diff --git a/client/client/Cargo.toml b/client/Cargo.toml similarity index 53% rename from client/client/Cargo.toml rename to client/Cargo.toml index 9b1b81f3b6331..22cf177c540ce 100644 --- a/client/client/Cargo.toml +++ b/client/Cargo.toml @@ -5,36 +5,36 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -block-builder = { package = "substrate-block-builder", path = "../../client/block-builder" } +block-builder = { package = "substrate-block-builder", path = "block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common", optional = true } +consensus = { package = "substrate-consensus-common", path = "../primitives/consensus/common", optional = true } derive_more = { version = "0.15.0", optional = true } -executor = { package = "substrate-executor", path = "../executor", optional = true } +executor = { package = "substrate-executor", path = "executor", optional = true } fnv = { version = "1.0.6", optional = true } futures = { version = "0.1.29", optional = true } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"], optional = true } hash-db = { version = "0.15.2", default-features = false } header-metadata = { package = "substrate-header-metadata", path = "header-metadata", optional = true } hex-literal = { version = "0.2.1", optional = true } -inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } -keyring = { package = "substrate-keyring", path = "../keyring", optional = true } +inherents = { package = "substrate-inherents", path = "../primitives/inherents", default-features = false } +keyring = { package = "substrate-keyring", path = "keyring", optional = true } kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } log = { version = "0.4.8", optional = true } parking_lot = { version = "0.9.0", optional = true } -primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } -runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } -sr-api = { path = "../../primitives/sr-api" } -sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../state-machine", optional = true } -substrate-telemetry = { path = "../telemetry", optional = true } -trie = { package = "substrate-trie", path = "../trie", optional = true } +primitives = { package = "substrate-primitives", path = "../primitives/core", default-features = false } +rstd = { package = "sr-std", path = "../primitives/sr-std", default-features = false } +runtime-version = { package = "sr-version", path = "../primitives/sr-version", default-features = false } +sr-api = { path = "../primitives/sr-api" } +sr-primitives = { path = "../primitives/sr-primitives", default-features = false } +state-machine = { package = "substrate-state-machine", path = "state-machine", optional = true } +substrate-telemetry = { path = "telemetry", optional = true } +trie = { package = "substrate-trie", path = "trie", optional = true } [dev-dependencies] env_logger = "0.7.0" tempfile = "3.1.0" client-db = { package = "substrate-client-db", path = "./db", features = ["kvdb-rocksdb"] } -test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } +test-client = { package = "substrate-test-runtime-client", path = "../test/utils/runtime/client" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } -panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } +panic-handler = { package = "substrate-panic-handler", path = "panic-handler" } diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index ccc6c54246663..a4e7059543b8b 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -11,7 +11,7 @@ prost-build = "0.5.0" [dependencies] authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../primitives/authority-discovery" } bytes = "0.4.12" -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../" } codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } derive_more = "0.15.0" futures-preview = "0.3.0-alpha.19" diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index c7d36b4fd6e1e..50c9eb9eec47d 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -10,7 +10,7 @@ futures-preview = "0.3.0-alpha.19" codec = { package = "parity-scale-codec", version = "1.0.0" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../" } consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } substrate-telemetry = { path = "../telemetry" } diff --git a/client/block-builder/Cargo.toml b/client/block-builder/Cargo.toml index 27ddf27049fa6..91f3135f75b84 100644 --- a/client/block-builder/Cargo.toml +++ b/client/block-builder/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -state-machine = { package = "substrate-state-machine", path = "../../client/state-machine" } +state-machine = { package = "substrate-state-machine", path = "../state-machine" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } codec = { package = "parity-scale-codec", version = "1.0.6", features = ["derive"] } diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index ed0f33ef59e73..ca9a8d195001e 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -23,8 +23,8 @@ fdlimit = "0.1.1" exit-future = "0.1.4" serde_json = "1.0.41" panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } -client = { package = "substrate-client", path = "../client" } -header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } +client = { package = "substrate-client", path = "../" } +header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } network = { package = "substrate-network", path = "../network" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index f8df37a1af642..0894ec22b9fa5 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto" } aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } codec = { package = "parity-scale-codec", version = "1.0.0" } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } derive_more = "0.15.0" diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index fb4a0c455550c..c7fc25de899e0 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -20,10 +20,10 @@ inherents = { package = "substrate-inherents", path = "../../../primitives/inher substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } srml-babe = { path = "../../../paint/babe" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } sr-api = { path = "../../../primitives/sr-api" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } -header-metadata = { package = "substrate-header-metadata", path = "../../client/header-metadata" } +header-metadata = { package = "substrate-header-metadata", path = "../../header-metadata" } consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } uncles = { package = "substrate-consensus-uncles", path = "../uncles" } slots = { package = "substrate-consensus-slots", path = "../slots" } @@ -46,7 +46,7 @@ substrate-executor = { path = "../../executor" } network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]} service = { package = "substrate-service", path = "../../service" } test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } -block-builder = { package = "substrate-block-builder", path = "../../../client/block-builder" } +block-builder = { package = "substrate-block-builder", path = "../../block-builder" } tokio = "0.1.22" env_logger = "0.7.0" tempfile = "3.1.0" diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index 68c74a61027d2..06501fe36492f 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } srml-timestamp = { path = "../../../paint/timestamp" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 5e7de3148cebd..08324ce8c921c 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } substrate-telemetry = { path = "../../telemetry" } diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index ee831dce08bb2..927d22302b11f 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -6,7 +6,7 @@ description = "Generic uncle inclusion utilities for consensus" edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-authorship = { path = "../../../paint/authorship" } diff --git a/client/client/db/Cargo.toml b/client/db/Cargo.toml similarity index 70% rename from client/client/db/Cargo.toml rename to client/db/Cargo.toml index 798436a049929..c85f78ee5279a 100644 --- a/client/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -13,20 +13,20 @@ kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317 kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } linked-hash-map = "0.5.2" hash-db = "0.15.2" -primitives = { package = "substrate-primitives", path = "../../../primitives/core" } -sr-primitives = { path = "../../../primitives/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives/core" } +sr-primitives = { path = "../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../" } -state-machine = { package = "substrate-state-machine", path = "../../state-machine" } +state-machine = { package = "substrate-state-machine", path = "../state-machine" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -executor = { package = "substrate-executor", path = "../../executor" } -state_db = { package = "substrate-state-db", path = "../../state-db" } -trie = { package = "substrate-trie", path = "../../trie" } -consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } +executor = { package = "substrate-executor", path = "../executor" } +state_db = { package = "substrate-state-db", path = "../state-db" } +trie = { package = "substrate-trie", path = "../trie" } +consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" } [dev-dependencies] -substrate-keyring = { path = "../../keyring" } -test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } +substrate-keyring = { path = "../keyring" } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } env_logger = "0.7.0" [features] diff --git a/client/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs similarity index 100% rename from client/client/db/src/cache/list_cache.rs rename to client/db/src/cache/list_cache.rs diff --git a/client/client/db/src/cache/list_entry.rs b/client/db/src/cache/list_entry.rs similarity index 100% rename from client/client/db/src/cache/list_entry.rs rename to client/db/src/cache/list_entry.rs diff --git a/client/client/db/src/cache/list_storage.rs b/client/db/src/cache/list_storage.rs similarity index 100% rename from client/client/db/src/cache/list_storage.rs rename to client/db/src/cache/list_storage.rs diff --git a/client/client/db/src/cache/mod.rs b/client/db/src/cache/mod.rs similarity index 100% rename from client/client/db/src/cache/mod.rs rename to client/db/src/cache/mod.rs diff --git a/client/client/db/src/lib.rs b/client/db/src/lib.rs similarity index 100% rename from client/client/db/src/lib.rs rename to client/db/src/lib.rs diff --git a/client/client/db/src/light.rs b/client/db/src/light.rs similarity index 100% rename from client/client/db/src/light.rs rename to client/db/src/light.rs diff --git a/client/client/db/src/offchain.rs b/client/db/src/offchain.rs similarity index 100% rename from client/client/db/src/offchain.rs rename to client/db/src/offchain.rs diff --git a/client/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs similarity index 100% rename from client/client/db/src/storage_cache.rs rename to client/db/src/storage_cache.rs diff --git a/client/client/db/src/utils.rs b/client/db/src/utils.rs similarity index 100% rename from client/client/db/src/utils.rs rename to client/db/src/utils.rs diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index e5363832ddba1..879a7e987a083 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -38,7 +38,7 @@ assert_matches = "1.3.0" wabt = "0.9.2" hex-literal = "0.2.1" runtime-test = { package = "substrate-runtime-test", path = "runtime-test" } -substrate-client = { path = "../client" } +substrate-client = { path = "../" } substrate-offchain = { path = "../offchain/" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } test-case = "0.3.3" diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 2db5fc1463752..d3ac5f9a29d33 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -20,8 +20,8 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" substrate-telemetry = { path = "../telemetry" } keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" -client = { package = "substrate-client", path = "../client" } -header-metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } +client = { package = "substrate-client", path = "../" } +header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } network = { package = "substrate-network", path = "../network" } srml-finality-tracker = { path = "../../paint/finality-tracker" } diff --git a/client/client/header-metadata/Cargo.toml b/client/header-metadata/Cargo.toml similarity index 77% rename from client/client/header-metadata/Cargo.toml rename to client/header-metadata/Cargo.toml index d2b9f7ede4408..d9917c93f1178 100644 --- a/client/client/header-metadata/Cargo.toml +++ b/client/header-metadata/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" [dependencies] lru-cache = { version = "0.1.2" } parking_lot = { version = "0.9.0" } -sr-primitives = { path = "../../../primitives/sr-primitives" } +sr-primitives = { path = "../../primitives/sr-primitives" } diff --git a/client/client/header-metadata/src/lib.rs b/client/header-metadata/src/lib.rs similarity index 100% rename from client/client/header-metadata/src/lib.rs rename to client/header-metadata/src/lib.rs diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 0fd005d83b349..49240a8f298a8 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -25,11 +25,11 @@ rand = "0.7.2" libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-websocket"] } fork-tree = { path = "../utils/fork-tree" } consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } -client = { package = "substrate-client", path = "../client" } -header_metadata = { package = "substrate-header-metadata", path = "../client/header-metadata" } +client = { package = "substrate-client", path = "../" } +header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } -block-builder = { package = "substrate-block-builder", path = "../../client/block-builder" } +block-builder = { package = "substrate-block-builder", path = "../block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } peerset = { package = "substrate-peerset", path = "../../primitives/peerset" } serde = { version = "1.0.101", features = ["derive"] } diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index 7c9617409049e..d19930f5ea174 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] bytes = "0.4.12" -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../" } sr-api = { path = "../../primitives/sr-api" } fnv = "1.0.6" futures01 = { package = "futures", version = "0.1" } @@ -33,7 +33,7 @@ hyper-rustls = "0.17.1" [dev-dependencies] env_logger = "0.7.0" -client-db = { package = "substrate-client-db", path = "../client/db/", default-features = true } +client-db = { package = "substrate-client-db", path = "../db/", default-features = true } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 7b46f3a4f9b9a..22de124594f05 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] api = { package = "substrate-rpc-api", path = "./api" } -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../" } sr-api = { path = "../../primitives/sr-api" } codec = { package = "parity-scale-codec", version = "1.0.0" } futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 5ed1fd89a9d89..55b5243bc9cbd 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -37,10 +37,10 @@ app-crypto = { package = "substrate-application-crypto", path = "../../primitive consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } network = { package = "substrate-network", path = "../network" } chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" } -client = { package = "substrate-client", path = "../client" } +client = { package = "substrate-client", path = "../" } sr-api = { path = "../../primitives/sr-api" } tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../primitives/transaction-pool/runtime-api" } -client_db = { package = "substrate-client-db", path = "../client/db" } +client_db = { package = "substrate-client-db", path = "../db" } codec = { package = "parity-scale-codec", version = "1.0.0" } substrate-executor = { path = "../executor" } transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml index 8d379a0e46b45..82b39ce767e38 100644 --- a/client/service/test/Cargo.toml +++ b/client/service/test/Cargo.toml @@ -15,6 +15,6 @@ futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features service = { package = "substrate-service", path = "../../service", default-features = false } network = { package = "substrate-network", path = "../../network" } consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } -client = { package = "substrate-client", path = "../../client" } +client = { package = "substrate-client", path = "../../" } sr-primitives = { path = "../../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } diff --git a/client/client/src/backend.rs b/client/src/backend.rs similarity index 100% rename from client/client/src/backend.rs rename to client/src/backend.rs diff --git a/client/client/src/blockchain.rs b/client/src/blockchain.rs similarity index 100% rename from client/client/src/blockchain.rs rename to client/src/blockchain.rs diff --git a/client/client/src/call_executor.rs b/client/src/call_executor.rs similarity index 100% rename from client/client/src/call_executor.rs rename to client/src/call_executor.rs diff --git a/client/client/src/children.rs b/client/src/children.rs similarity index 100% rename from client/client/src/children.rs rename to client/src/children.rs diff --git a/client/client/src/cht.rs b/client/src/cht.rs similarity index 100% rename from client/client/src/cht.rs rename to client/src/cht.rs diff --git a/client/client/src/client.rs b/client/src/client.rs similarity index 100% rename from client/client/src/client.rs rename to client/src/client.rs diff --git a/client/client/src/error.rs b/client/src/error.rs similarity index 100% rename from client/client/src/error.rs rename to client/src/error.rs diff --git a/client/client/src/genesis.rs b/client/src/genesis.rs similarity index 100% rename from client/client/src/genesis.rs rename to client/src/genesis.rs diff --git a/client/client/src/in_mem.rs b/client/src/in_mem.rs similarity index 100% rename from client/client/src/in_mem.rs rename to client/src/in_mem.rs diff --git a/client/client/src/leaves.rs b/client/src/leaves.rs similarity index 100% rename from client/client/src/leaves.rs rename to client/src/leaves.rs diff --git a/client/client/src/lib.rs b/client/src/lib.rs similarity index 100% rename from client/client/src/lib.rs rename to client/src/lib.rs diff --git a/client/client/src/light/backend.rs b/client/src/light/backend.rs similarity index 100% rename from client/client/src/light/backend.rs rename to client/src/light/backend.rs diff --git a/client/client/src/light/blockchain.rs b/client/src/light/blockchain.rs similarity index 100% rename from client/client/src/light/blockchain.rs rename to client/src/light/blockchain.rs diff --git a/client/client/src/light/call_executor.rs b/client/src/light/call_executor.rs similarity index 100% rename from client/client/src/light/call_executor.rs rename to client/src/light/call_executor.rs diff --git a/client/client/src/light/fetcher.rs b/client/src/light/fetcher.rs similarity index 100% rename from client/client/src/light/fetcher.rs rename to client/src/light/fetcher.rs diff --git a/client/client/src/light/mod.rs b/client/src/light/mod.rs similarity index 100% rename from client/client/src/light/mod.rs rename to client/src/light/mod.rs diff --git a/client/client/src/notifications.rs b/client/src/notifications.rs similarity index 100% rename from client/client/src/notifications.rs rename to client/src/notifications.rs diff --git a/paint/contracts/rpc/Cargo.toml b/paint/contracts/rpc/Cargo.toml index 935634113d753..1788e3214813e 100644 --- a/paint/contracts/rpc/Cargo.toml +++ b/paint/contracts/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" diff --git a/paint/system/rpc/Cargo.toml b/paint/system/rpc/Cargo.toml index 4b6f3669081f6..fb30935618929 100644 --- a/paint/system/rpc/Cargo.toml +++ b/paint/system/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" diff --git a/paint/transaction-payment/rpc/Cargo.toml b/paint/transaction-payment/rpc/Cargo.toml index cda6ccd05790b..8503bcd4cfd82 100644 --- a/paint/transaction-payment/rpc/Cargo.toml +++ b/paint/transaction-payment/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } codec = { package = "parity-scale-codec", version = "1.0.0" } jsonrpc-core = "14.0.3" jsonrpc-core-client = "14.0.3" diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index 6b01e1849715c..45cc5e29367bb 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../../client/client" } -client-db = { package = "substrate-client-db", path = "../../../client/client/db", features = ["test-helpers"] } +client = { package = "substrate-client", path = "../../../client/" } +client-db = { package = "substrate-client-db", path = "../../../client//db", features = ["test-helpers"] } consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } executor = { package = "substrate-executor", path = "../../../client/executor" } futures-preview = "0.3.0-alpha.19" diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 02237911d7afd..f2422cad42aa2 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -10,7 +10,7 @@ log = { version = "0.4.8", optional = true } serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } keyring = { package = "substrate-keyring", path = "../../../client/keyring", optional = true } -substrate-client = { path = "../../../client/client", default-features = false } +substrate-client = { path = "../../../client/", default-features = false } primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto", default-features = false } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index 7f2bdbd8bb73f..99eeb72bfdc56 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] cli = { package = "substrate-cli", path = "../../../client/cli" } -client = { package = "substrate-client", path = "../../../client/client" } +client = { package = "substrate-client", path = "../../../client/" } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } From 1b28184ad71a149da31c233e0b56fb5a2a32101e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 20:00:42 +0100 Subject: [PATCH 26/61] Fix after merge. --- .maintain/ensure-deps.sh | 6 +- Cargo.lock | 18 ++++- bin/node-template/runtime/Cargo.toml | 75 +++++++++++---------- bin/node/runtime/Cargo.toml | 25 ++++--- client/client/Cargo.toml | 44 ++++++------ primitives/consensus/aura/Cargo.toml | 4 +- primitives/consensus/babe/Cargo.toml | 18 ++--- primitives/finality-grandpa/Cargo.toml | 8 ++- test/utils/runtime/Cargo.toml | 81 ++++++++++++----------- test/utils/runtime/client/Cargo.toml | 1 + test/utils/transaction-factory/Cargo.toml | 14 ++-- 11 files changed, 164 insertions(+), 130 deletions(-) diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh index 188b1f1d319cc..49384580bd99a 100755 --- a/.maintain/ensure-deps.sh +++ b/.maintain/ensure-deps.sh @@ -6,7 +6,7 @@ # [top-lvl-dir]<[crate-name-prefix] # For instance no crate within `./client` directory -# is allowed to import any crate with a name starting with `srml`. +# is allowed to import any crate with a directory path containing `srml`. # Such rule is just: `client"] edition = "2018" [dependencies] +block-builder = { package = "substrate-block-builder", path = "../../../../client/block-builder" } generic-test-client = { package = "substrate-test-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../../../primitives/core" } runtime = { package = "substrate-test-runtime", path = "../../runtime" } diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index 7f2bdbd8bb73f..79e00f1a94ddb 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -5,18 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] +block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } cli = { package = "substrate-cli", path = "../../../client/cli" } client = { package = "substrate-client", path = "../../../client/client" } +codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } log = "0.4.8" -codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } -sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives/core" } +sr-api = { path = "../../../primitives/sr-api" } +sr-primitives = { path = "../../../primitives/sr-primitives" } substrate-service = { path = "../../../client/service" } -[features] -default = ["std"] -std = [ - "codec/std", - "sr-primitives/std", -] From 1a64595306c09bac111246ff5105871738f9c1b0 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 20:07:54 +0100 Subject: [PATCH 27/61] start splitting out client interfaces --- Cargo.lock | 37 +++++++++++++++++++++++++ Cargo.toml | 5 ++-- client/Cargo.toml | 1 + client/interfaces/Cargo.toml | 40 ++++++++++++++++++++++++++++ client/{ => interfaces}/src/error.rs | 0 client/interfaces/src/lib.rs | 1 + client/src/backend.rs | 2 +- client/src/blockchain.rs | 2 +- client/src/call_executor.rs | 2 +- client/src/children.rs | 2 +- client/src/cht.rs | 2 +- client/src/client.rs | 2 +- client/src/in_mem.rs | 4 +-- client/src/leaves.rs | 2 +- client/src/lib.rs | 3 +-- client/src/light/backend.rs | 2 +- client/src/light/blockchain.rs | 2 +- client/src/light/call_executor.rs | 4 +-- client/src/light/fetcher.rs | 4 +-- client/src/light/mod.rs | 2 +- 20 files changed, 99 insertions(+), 20 deletions(-) create mode 100644 client/interfaces/Cargo.toml rename client/{ => interfaces}/src/error.rs (100%) create mode 100644 client/interfaces/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index eff824dde676a..3309f2ebacb60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5349,6 +5349,7 @@ dependencies = [ "sr-version 2.0.0", "substrate-block-builder 2.0.0", "substrate-client-db 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-executor 2.0.0", "substrate-header-metadata 2.0.0", @@ -5389,6 +5390,42 @@ dependencies = [ "substrate-trie 2.0.0", ] +[[package]] +name = "substrate-client-interfaces" +version = "2.0.0" +dependencies = [ + "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-api 2.0.0", + "sr-primitives 2.0.0", + "sr-std 2.0.0", + "sr-version 2.0.0", + "substrate-block-builder 2.0.0", + "substrate-client-db 2.0.0", + "substrate-consensus-common 2.0.0", + "substrate-executor 2.0.0", + "substrate-header-metadata 2.0.0", + "substrate-inherents 2.0.0", + "substrate-keyring 2.0.0", + "substrate-panic-handler 2.0.0", + "substrate-primitives 2.0.0", + "substrate-state-machine 2.0.0", + "substrate-telemetry 2.0.0", + "substrate-test-runtime-client 2.0.0", + "substrate-trie 2.0.0", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "substrate-consensus-aura" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index 7da3b84fab38e..076c176c331ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,9 @@ members = [ "client/chain-spec/derive", "client/cli", "client/", - "client//db", - "client//header-metadata", + "client/db", + "client/header-metadata", + "client/interfaces", "client/executor", "client/executor/runtime-test", "client/finality-grandpa", diff --git a/client/Cargo.toml b/client/Cargo.toml index 22cf177c540ce..54e171f36642a 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] +interfaces = { package = "substrate-client-interfaces", path = "interfaces" } block-builder = { package = "substrate-block-builder", path = "block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } consensus = { package = "substrate-consensus-common", path = "../primitives/consensus/common", optional = true } diff --git a/client/interfaces/Cargo.toml b/client/interfaces/Cargo.toml new file mode 100644 index 0000000000000..b6627a6b80e2c --- /dev/null +++ b/client/interfaces/Cargo.toml @@ -0,0 +1,40 @@ +[package] +name = "substrate-client-interfaces" +version = "2.0.0" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +block-builder = { package = "substrate-block-builder", path = "../block-builder" } +codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } +consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common", optional = true } +derive_more = { version = "0.15.0", optional = true } +executor = { package = "substrate-executor", path = "../executor", optional = true } +fnv = { version = "1.0.6", optional = true } +futures = { version = "0.1.29", optional = true } +futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"], optional = true } +hash-db = { version = "0.15.2", default-features = false } +header-metadata = { package = "substrate-header-metadata", path = "../header-metadata", optional = true } +hex-literal = { version = "0.2.1", optional = true } +inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } +keyring = { package = "substrate-keyring", path = "../keyring", optional = true } +kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } +log = { version = "0.4.8", optional = true } +parking_lot = { version = "0.9.0", optional = true } +primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } +rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } +sr-api = { path = "../../primitives/sr-api" } +sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } +state-machine = { package = "substrate-state-machine", path = "../state-machine", optional = true } +substrate-telemetry = { path = "../telemetry", optional = true } +trie = { package = "substrate-trie", path = "../trie", optional = true } + +[dev-dependencies] +env_logger = "0.7.0" +tempfile = "3.1.0" +client-db = { package = "substrate-client-db", path = ".././db", features = ["kvdb-rocksdb"] } +test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } +panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } + diff --git a/client/src/error.rs b/client/interfaces/src/error.rs similarity index 100% rename from client/src/error.rs rename to client/interfaces/src/error.rs diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs new file mode 100644 index 0000000000000..18e02b2ad4cdd --- /dev/null +++ b/client/interfaces/src/lib.rs @@ -0,0 +1 @@ +pub mod errors; \ No newline at end of file diff --git a/client/src/backend.rs b/client/src/backend.rs index dc0f0e5d4c301..b081d8e5e5ed4 100644 --- a/client/src/backend.rs +++ b/client/src/backend.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use std::collections::HashMap; -use crate::error; +use interfaces::error; use crate::light::blockchain::RemoteBlockchain; use primitives::ChangesTrieConfiguration; use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; diff --git a/client/src/blockchain.rs b/client/src/blockchain.rs index 73b7c138d020e..a137113711514 100644 --- a/client/src/blockchain.rs +++ b/client/src/blockchain.rs @@ -26,7 +26,7 @@ use parking_lot::Mutex; use header_metadata::HeaderMetadata; -use crate::error::{Error, Result}; +use interfaces::error::{Error, Result}; /// Blockchain database header backend. Does not perform any validation. pub trait HeaderBackend: Send + Sync { diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs index e25b9e36bb5c4..a6e83d6ddb4e1 100644 --- a/client/src/call_executor.rs +++ b/client/src/call_executor.rs @@ -32,7 +32,7 @@ use primitives::{ use sr_api::{ProofRecorder, InitializeBlock}; use crate::backend; -use crate::error; +use interfaces::error; /// Method call executor. pub trait CallExecutor diff --git a/client/src/children.rs b/client/src/children.rs index 3128f860869ce..66465c4ebf93c 100644 --- a/client/src/children.rs +++ b/client/src/children.rs @@ -18,7 +18,7 @@ use kvdb::{KeyValueDB, DBTransaction}; use codec::{Encode, Decode}; -use crate::error; +use interfaces::error; use std::hash::Hash; diff --git a/client/src/cht.rs b/client/src/cht.rs index aff875032d357..2dc72f189c3af 100644 --- a/client/src/cht.rs +++ b/client/src/cht.rs @@ -33,7 +33,7 @@ use state_machine::backend::InMemory as InMemoryState; use state_machine::{MemoryDB, TrieBackend, Backend as StateBackend, StorageProof, prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend}; -use crate::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; /// The size of each CHT. This value is passed to every CHT-related function from /// production code. Other values are passed from tests. diff --git a/client/src/client.rs b/client/src/client.rs index ac20b8ad39d1a..3ac1f57113c75 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -1863,7 +1863,7 @@ where /// Utility methods for the client. pub mod utils { use super::*; - use crate::error; + use interfaces::error; use primitives::H256; use std::borrow::Borrow; diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs index 5c35400d7743c..5e58c1069bf90 100644 --- a/client/src/in_mem.rs +++ b/client/src/in_mem.rs @@ -29,7 +29,7 @@ use hash_db::{Hasher, Prefix}; use trie::MemoryDB; use header_metadata::{CachedHeaderMetadata, HeaderMetadata}; -use crate::error; +use interfaces::error; use crate::backend::{self, NewBlockState, StorageCollection, ChildStorageCollection}; use crate::light; use crate::leaves::LeafSet; @@ -154,7 +154,7 @@ impl Blockchain { justification: Option, body: Option::Extrinsic>>, new_state: NewBlockState, - ) -> crate::error::Result<()> { + ) -> interfaces::error::Result<()> { let number = header.number().clone(); if new_state.is_best() { self.apply_head(&header)?; diff --git a/client/src/leaves.rs b/client/src/leaves.rs index 825c1bf7c0bb5..a3e619b51f6a6 100644 --- a/client/src/leaves.rs +++ b/client/src/leaves.rs @@ -21,7 +21,7 @@ use std::cmp::Reverse; use kvdb::{KeyValueDB, DBTransaction}; use sr_primitives::traits::SimpleArithmetic; use codec::{Encode, Decode}; -use crate::error; +use interfaces::error; #[derive(Debug, Clone, PartialEq, Eq)] struct LeafSetItem { diff --git a/client/src/lib.rs b/client/src/lib.rs index 048af17952c41..3a00f5899a4b1 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -76,7 +76,6 @@ #![warn(missing_docs)] #![recursion_limit="128"] -pub mod error; pub mod blockchain; pub mod backend; pub mod cht; @@ -89,7 +88,7 @@ mod call_executor; mod client; mod notifications; - +pub use interfaces::error; pub use crate::blockchain::Info as ChainInfo; pub use crate::call_executor::{CallExecutor, LocalCallExecutor}; pub use crate::client::{ diff --git a/client/src/light/backend.rs b/client/src/light/backend.rs index 300d140630d85..8c3b06e11261f 100644 --- a/client/src/light/backend.rs +++ b/client/src/light/backend.rs @@ -30,7 +30,7 @@ use crate::backend::{ StorageCollection, ChildStorageCollection, }; use crate::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys}; -use crate::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; use hash_db::Hasher; use trie::MemoryDB; diff --git a/client/src/light/blockchain.rs b/client/src/light/blockchain.rs index 202f94cd74fed..ada75251a120d 100644 --- a/client/src/light/blockchain.rs +++ b/client/src/light/blockchain.rs @@ -32,7 +32,7 @@ use crate::blockchain::{ well_known_cache_keys }; use crate::cht; -use crate::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::fetcher::{Fetcher, RemoteHeaderRequest}; /// Light client blockchain storage. diff --git a/client/src/light/call_executor.rs b/client/src/light/call_executor.rs index 5544e88e224fa..8f2a450da2eaa 100644 --- a/client/src/light/call_executor.rs +++ b/client/src/light/call_executor.rs @@ -37,7 +37,7 @@ use sr_api::{ProofRecorder, InitializeBlock}; use crate::backend::RemoteBackend; use crate::call_executor::CallExecutor; -use crate::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::fetcher::RemoteCallRequest; use executor::{RuntimeVersion, NativeVersion}; @@ -450,7 +450,7 @@ mod tests { ), ); match execution_result { - Err(crate::error::Error::Execution(_)) => (), + Err(interfaces::error::Error::Execution(_)) => (), _ => panic!("Unexpected execution result: {:?}", execution_result), } } diff --git a/client/src/light/fetcher.rs b/client/src/light/fetcher.rs index 6ae28b748c527..3ab580e1e12b0 100644 --- a/client/src/light/fetcher.rs +++ b/client/src/light/fetcher.rs @@ -36,7 +36,7 @@ use state_machine::{ pub use state_machine::StorageProof; use crate::cht; -use crate::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; use crate::light::call_executor::check_execution_proof; @@ -504,7 +504,7 @@ pub mod tests { use codec::Decode; use crate::client::tests::prepare_client_with_key_changes; use executor::{NativeExecutor, WasmExecutionMethod}; - use crate::error::Error as ClientError; + use interfaces::error::Error as ClientError; use test_client::{ self, ClientExt, blockchain::HeaderBackend, AccountKeyring, runtime::{self, Hash, Block, Header, Extrinsic} diff --git a/client/src/light/mod.rs b/client/src/light/mod.rs index d06a9ae9dd93c..6491ff4a21f06 100644 --- a/client/src/light/mod.rs +++ b/client/src/light/mod.rs @@ -30,7 +30,7 @@ use sr_primitives::traits::Block as BlockT; use crate::call_executor::LocalCallExecutor; use crate::client::Client; -use crate::error::Result as ClientResult; +use interfaces::error::Result as ClientResult; use crate::light::backend::Backend; use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; use crate::light::call_executor::GenesisCallExecutor; From c103b78f966e8643b25d7461ce2360d0f4d610ed Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 21:20:27 +0100 Subject: [PATCH 28/61] move children and blockchain interfaces --- Cargo.lock | 943 +++++++++++----------- client/Cargo.toml | 1 - client/authority-discovery/Cargo.toml | 2 +- client/authority-discovery/src/error.rs | 2 +- client/authority-discovery/src/lib.rs | 36 +- client/db/Cargo.toml | 1 + client/{ => db}/src/children.rs | 0 client/db/src/lib.rs | 2 +- client/{ => interfaces}/src/blockchain.rs | 2 +- client/interfaces/src/lib.rs | 3 +- client/src/backend.rs | 4 +- client/src/in_mem.rs | 2 +- client/src/lib.rs | 7 +- client/src/light/backend.rs | 2 +- client/src/light/blockchain.rs | 4 +- 15 files changed, 510 insertions(+), 501 deletions(-) rename client/{ => db}/src/children.rs (100%) rename client/{ => interfaces}/src/blockchain.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index 9a6b89acb40bb..d253c23ec079c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,7 +47,7 @@ dependencies = [ [[package]] name = "ahash" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -77,6 +77,11 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "anyhow" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "app_dirs" version = "1.2.1" @@ -90,7 +95,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.3.11" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -138,33 +143,33 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "autocfg" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.38" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -178,7 +183,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -194,7 +199,7 @@ name = "bincode" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -204,8 +209,8 @@ name = "bindgen" version = "0.47.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -222,7 +227,7 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -257,11 +262,11 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -270,7 +275,7 @@ name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -286,7 +291,7 @@ dependencies = [ [[package]] name = "block-padding" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -323,7 +328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byte-slice-cast" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -353,11 +358,10 @@ dependencies = [ [[package]] name = "c2-chacha" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -372,7 +376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -383,16 +387,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.45" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cexpr" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -410,7 +414,7 @@ dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "node-cli 2.0.0", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-keystore 2.0.0", "substrate-primitives 2.0.0", ] @@ -420,7 +424,7 @@ name = "chrono" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -432,7 +436,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -443,7 +447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -456,7 +460,7 @@ name = "clear_on_drop" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -464,7 +468,7 @@ name = "cloudabi" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -472,7 +476,7 @@ name = "cmake" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -481,7 +485,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -490,7 +494,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -499,7 +503,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -507,7 +511,7 @@ name = "const-random-macro" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -522,7 +526,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -551,7 +555,7 @@ dependencies = [ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -584,7 +588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -631,9 +635,9 @@ dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -641,7 +645,7 @@ dependencies = [ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -657,7 +661,7 @@ dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -665,7 +669,7 @@ dependencies = [ "rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -678,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -687,7 +691,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -700,23 +704,23 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -737,6 +741,16 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam-utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -759,7 +773,7 @@ dependencies = [ "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -873,7 +887,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -943,7 +957,7 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -972,7 +986,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -982,7 +996,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1042,7 +1056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1054,7 +1068,7 @@ name = "failure" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1066,7 +1080,7 @@ dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1084,7 +1098,7 @@ name = "fdlimit" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1098,11 +1112,11 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "hashmap_core 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1111,14 +1125,14 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1128,15 +1142,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "flate2" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1171,7 +1185,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1181,7 +1195,7 @@ name = "fs2" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1195,7 +1209,7 @@ name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1211,25 +1225,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "futures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-executor 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-io 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-task 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "futures-channel" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1243,7 +1257,7 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1257,18 +1271,18 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "futures-executor" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-task 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1278,12 +1292,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "futures-io" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1293,10 +1307,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "futures-macro" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1317,7 +1331,7 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1327,7 +1341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "futures-task" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1342,19 +1356,19 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-io 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-macro 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-task 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1394,7 +1408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1404,18 +1418,18 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "getrandom" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1426,7 +1440,7 @@ dependencies = [ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1471,8 +1485,8 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1503,18 +1517,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "ahash 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "hashmap_core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "heapsize" version = "0.4.2" @@ -1528,7 +1537,15 @@ name = "heck" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hermit-abi" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1547,7 +1564,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hex-literal-impl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1555,7 +1572,7 @@ name = "hex-literal-impl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1579,7 +1596,7 @@ dependencies = [ [[package]] name = "http" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1594,7 +1611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1621,7 +1638,7 @@ dependencies = [ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1638,7 +1655,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1693,7 +1710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1703,12 +1720,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "impl-codec" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1742,8 +1759,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "integer-sqrt" @@ -1760,17 +1780,17 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ipnet" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "itertools" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1786,17 +1806,17 @@ name = "jobserver" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "js-sys" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1826,7 +1846,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1899,7 +1919,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1954,7 +1974,7 @@ dependencies = [ "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1977,7 +1997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.62" +version = "0.2.65" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1985,7 +2005,7 @@ name = "libloading" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2019,7 +2039,7 @@ dependencies = [ "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2039,7 +2059,7 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "multistream-select 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2051,7 +2071,7 @@ dependencies = [ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)", "rw-stream-sink 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2075,7 +2095,7 @@ name = "libp2p-deflate" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2106,7 +2126,7 @@ dependencies = [ "libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2122,7 +2142,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2147,10 +2167,10 @@ dependencies = [ "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "uint 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "uint 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-timer 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2170,7 +2190,7 @@ dependencies = [ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2256,7 +2276,7 @@ dependencies = [ "ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2270,9 +2290,9 @@ dependencies = [ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "twofish 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2282,7 +2302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-timer 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2296,7 +2316,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ipnet 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ipnet 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2321,11 +2341,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2356,7 +2376,7 @@ dependencies = [ "libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "yamux 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "yamux 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2365,14 +2385,14 @@ version = "5.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.47.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libsecp256k1" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2389,9 +2409,9 @@ name = "libz-sys" version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2462,17 +2482,17 @@ name = "mach" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "malloc_size_of_derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2480,17 +2500,22 @@ name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "memchr" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2502,8 +2527,8 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-util-mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2532,7 +2557,7 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2547,7 +2572,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2572,7 +2597,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2600,7 +2625,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2619,14 +2644,14 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2636,7 +2661,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2645,10 +2670,10 @@ name = "nix" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2664,7 +2689,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2688,7 +2713,7 @@ dependencies = [ "srml-system 2.0.0", "srml-timestamp 2.0.0", "srml-transaction-payment 2.0.0", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-basic-authorship 2.0.0", "substrate-build-script-utils 2.0.0", "substrate-chain-spec 2.0.0", @@ -2715,7 +2740,7 @@ dependencies = [ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "transaction-factory 0.0.1", "vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2778,7 +2803,7 @@ dependencies = [ name = "node-rpc-client" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2962,7 +2987,7 @@ name = "num-bigint" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2972,7 +2997,7 @@ name = "num-integer" version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2981,7 +3006,7 @@ name = "num-rational" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2992,15 +3017,16 @@ name = "num-traits" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3035,12 +3061,12 @@ name = "openssl" version = "0.10.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3050,13 +3076,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl-sys" -version = "0.9.51" +version = "0.9.52" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3119,7 +3145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byte-slice-cast 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-slice-cast 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec-derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3142,11 +3168,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-util-mem" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3206,10 +3232,10 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3218,10 +3244,10 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3232,11 +3258,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3247,10 +3273,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3260,7 +3286,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3268,7 +3294,7 @@ name = "paste-impl" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3318,7 +3344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pkg-config" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3328,7 +3354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ppv-lite86" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3347,11 +3373,11 @@ name = "primitive-types" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "fixed-hash 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-codec 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fixed-hash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-rlp 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "uint 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "uint 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3359,7 +3385,7 @@ name = "proc-macro-crate" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3374,7 +3400,7 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3420,7 +3446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "multimap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3436,7 +3462,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3466,11 +3492,6 @@ dependencies = [ "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "quick-error" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "quick-error" version = "1.2.2" @@ -3508,7 +3529,7 @@ name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3518,7 +3539,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3531,7 +3552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3541,8 +3562,8 @@ name = "rand" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3559,8 +3580,8 @@ name = "rand" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3571,7 +3592,7 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3580,7 +3601,7 @@ name = "rand_chacha" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3602,7 +3623,7 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3634,7 +3655,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3646,10 +3667,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3658,7 +3679,7 @@ name = "rand_os" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3667,7 +3688,7 @@ name = "rand_pcg" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3701,8 +3722,8 @@ name = "raw-cpuid" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3711,7 +3732,7 @@ name = "rayon" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3721,11 +3742,11 @@ name = "rayon-core" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3786,8 +3807,8 @@ name = "region" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3805,12 +3826,12 @@ name = "ring" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3827,7 +3848,7 @@ name = "rocksdb" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3836,7 +3857,7 @@ name = "rpassword" version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3846,7 +3867,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", + "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3902,7 +3923,7 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3915,7 +3936,7 @@ dependencies = [ [[package]] name = "safemem" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3991,18 +4012,18 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "security-framework-sys" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4040,12 +4061,12 @@ name = "serde" version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4059,7 +4080,7 @@ version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4149,10 +4170,10 @@ dependencies = [ [[package]] name = "slog-scope" -version = "4.1.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4169,8 +4190,11 @@ dependencies = [ [[package]] name = "smallvec" -version = "0.6.10" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "snow" @@ -4191,14 +4215,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4263,7 +4287,7 @@ name = "sr-io" version = "2.0.0" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 2.0.0", @@ -4907,7 +4931,7 @@ dependencies = [ name = "srml-support-rpc" version = "2.0.0" dependencies = [ - "futures 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4956,7 +4980,7 @@ dependencies = [ name = "srml-system-rpc" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5075,12 +5099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "static_assertions" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -5114,16 +5133,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "structopt" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "structopt-derive" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5201,7 +5220,7 @@ dependencies = [ "sr-api 2.0.0", "sr-primitives 2.0.0", "substrate-authority-discovery-primitives 2.0.0", - "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-network 2.0.0", "substrate-peerset 2.0.0", "substrate-primitives 2.0.0", @@ -5306,7 +5325,7 @@ dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5318,7 +5337,7 @@ dependencies = [ "rpassword 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-client 2.0.0", "substrate-header-metadata 2.0.0", "substrate-keyring 2.0.0", @@ -5338,13 +5357,12 @@ name = "substrate-client" version = "2.0.0" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5374,7 +5392,7 @@ dependencies = [ name = "substrate-client-db" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", @@ -5385,6 +5403,7 @@ dependencies = [ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-executor 2.0.0", "substrate-header-metadata 2.0.0", @@ -5401,7 +5420,7 @@ name = "substrate-client-interfaces" version = "2.0.0" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5437,7 +5456,7 @@ name = "substrate-consensus-aura" version = "2.0.0" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5485,7 +5504,7 @@ name = "substrate-consensus-babe" version = "2.0.0" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5613,7 +5632,7 @@ dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5654,8 +5673,8 @@ dependencies = [ name = "substrate-finality-grandpa" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "finality-grandpa 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5748,11 +5767,11 @@ dependencies = [ name = "substrate-network" version = "2.0.0" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0", @@ -5773,7 +5792,7 @@ dependencies = [ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "substrate-block-builder 2.0.0", "substrate-client 2.0.0", @@ -5799,7 +5818,7 @@ name = "substrate-offchain" version = "2.0.0" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5807,7 +5826,7 @@ dependencies = [ "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5837,7 +5856,7 @@ dependencies = [ name = "substrate-panic-handler" version = "2.0.0" dependencies = [ - "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5881,7 +5900,7 @@ dependencies = [ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6003,7 +6022,7 @@ dependencies = [ "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0", "sr-std 2.0.0", - "static_assertions 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-executor 2.0.0", "substrate-externalities 2.0.0", "substrate-primitives 2.0.0", @@ -6102,7 +6121,7 @@ dependencies = [ "substrate-test-runtime-client 2.0.0", "substrate-transaction-pool 2.0.0", "substrate-transaction-pool-runtime-api 2.0.0", - "sysinfo 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "sysinfo 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6113,7 +6132,7 @@ dependencies = [ name = "substrate-service-test" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6141,7 +6160,7 @@ dependencies = [ name = "substrate-state-db" version = "2.0.0" dependencies = [ - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6183,7 +6202,7 @@ dependencies = [ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "slog-async 2.3.0 (git+https://github.com/paritytech/slog-async)", "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-scope 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "slog-scope 4.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6264,7 +6283,7 @@ dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6280,7 +6299,7 @@ name = "substrate-transaction-pool" version = "2.0.0" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6329,7 +6348,7 @@ dependencies = [ "cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-gc-api 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6383,18 +6402,7 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "synstructure" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6405,12 +6413,12 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6450,7 +6458,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6498,7 +6506,7 @@ name = "threadpool" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6506,7 +6514,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6550,7 +6558,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6644,7 +6652,7 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6692,13 +6700,13 @@ name = "tokio-threadpool" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6746,7 +6754,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6757,7 +6765,7 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6806,7 +6814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6843,7 +6851,7 @@ dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6876,12 +6884,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "uint" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6910,15 +6919,15 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-segmentation" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -6985,7 +6994,7 @@ name = "vergen" version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7011,7 +7020,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "wabt-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7021,7 +7030,7 @@ name = "wabt-sys" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7053,16 +7062,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wasm-bindgen" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-macro 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7071,7 +7080,7 @@ dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-shared 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7081,49 +7090,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-macro-support 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro-support 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-backend 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-shared 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-backend 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wasm-bindgen-webidl" -version = "0.2.51" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-backend 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-backend 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7143,11 +7152,11 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "send_wrapper 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", - "web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7155,7 +7164,7 @@ name = "wasmi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7208,15 +7217,15 @@ dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "zstd 0.4.28+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7245,16 +7254,16 @@ name = "wasmtime-runtime" version = "0.2.0" source = "git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6#71dd73d672deb325664e3c9cd4ee7acebed5fb95" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-wasm 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wasmtime-environ 0.2.0 (git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7262,14 +7271,14 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)", "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen-webidl 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-webidl 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7303,7 +7312,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7334,7 +7343,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7385,7 +7394,7 @@ dependencies = [ [[package]] name = "ws" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7394,7 +7403,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7431,16 +7440,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "yamux" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nohash-hasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7473,7 +7482,7 @@ name = "zstd-safe" version = "1.4.13+zstd.1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "zstd-sys 1.4.13+zstd.1.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7482,9 +7491,9 @@ name = "zstd-sys" version = "1.4.13+zstd.1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] @@ -7493,12 +7502,13 @@ dependencies = [ "checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" "checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" "checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -"checksum ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "b35dfc96a657c1842b4eb73180b65e37152d4b94d0eb5cb51708aee7826950b4" +"checksum ahash 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "2f00e10d4814aa20900e7948174384f79f1317f24f0ba7494e735111653fc330" "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d" "checksum app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -"checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841" +"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" @@ -7506,38 +7516,38 @@ dependencies = [ "checksum asn1_der_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" "checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" -"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5" -"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" +"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" "checksum base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" "checksum bindgen 0.47.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df683a55b54b41d5ea8ebfaebb5aa7e6b84e3f3006a78f010dadc9ca88469260" -"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" "checksum bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9633b74910e1870f50f5af189b08487195cdb83c0e27a71d6f64d5e09dd0538b" "checksum blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" +"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" +"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" "checksum bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae" "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" "checksum build-helper 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdce191bf3fa4995ce948c8c83b4640a1745457a149e73c6db75b4ffe36aad5f" "checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" -"checksum byte-slice-cast 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7cbcbf18128ec71d8d4a0d054461ec59fff5b75b7d10a4c9b7c7cb1a379c3e77" +"checksum byte-slice-cast 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f6209f3b2c1edea170002e016d5ead6903d3bb0a846477f53bbeb614967a52a9" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" +"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" "checksum c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" "checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d" "checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" -"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" +"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" "checksum clang-sys 0.26.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ef0c1bcf2e99c649104bd7a7012d8f8802684400e03db0ec0af48583c6fa0e4" @@ -7566,10 +7576,11 @@ dependencies = [ "checksum criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" "checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2" "checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" +"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" "checksum crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d" @@ -7593,7 +7604,7 @@ dependencies = [ "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "073be79b6538296faf81c631872676600616073817dd9a440c477ad09b408983" "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -"checksum env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39ecdb7dd54465526f0a56d666e3b2dd5f3a218665a030b6e4ad9e70fa95d8fa" +"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" "checksum environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34f8467a0284de039e6bd0e25c14519538462ba5beb548bb1f03e645097837a8" "checksum erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3beee4bc16478a1b26f2e80ad819a52d24745e292f521a63c16eea5f74b7eb60" "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" @@ -7610,10 +7621,10 @@ dependencies = [ "checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" "checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa" "checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" -"checksum finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9681c1f75941ea47584573dd2bc10558b2067d460612945887e00744e43393be" -"checksum fixed-hash 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6357b15872f8126e4ea7cf79d579473f132ccd2de239494ad1bf4aa892faea68" +"checksum finality-grandpa 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34754852da8d86bc509715292c73140a5b678656d0b16132acd6737bdb5fd5f8" +"checksum fixed-hash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72fe7539e2c5692c6989f2f9c0457e42f1e5768f96b85c87d273574670ae459f" "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" -"checksum flate2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ad3c5233c9a940c8719031b423d7e6c16af66e031cb0420b0896f5245bf181d3" +"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" @@ -7623,29 +7634,29 @@ dependencies = [ "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" -"checksum futures 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98fcd817da24593c8e88e1be8a8d7371d87f777285b9324634e4f05d2c1dc266" -"checksum futures-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f9d78ee44e3067fa297c8c2c2313b98d014be8a3783387c500b50d7b769603" +"checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" +"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" "checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" -"checksum futures-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30f0ab78f035d7ed5d52689f4b05a56c15ad80097f1d860e644bdc9dba3831f2" +"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" "checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -"checksum futures-executor 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e36969e0468b1725a2db2930039be052459f40a8aa00070c02de8ceb3673c100" +"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" "checksum futures-executor-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "75236e88bd9fe88e5e8bfcd175b665d0528fe03ca4c5207fabc028c8f9d93e98" -"checksum futures-io 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3376fa54783931f5d59e44ff3b95ff9762ba191674bf23c0e16cdcf1faf49b99" +"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" "checksum futures-io-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda" -"checksum futures-macro 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c97ef88dd44b07643c0667d3cfdac3bb6d8ca96940df755934e0c94047d1ac" +"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" "checksum futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "3b1dce2a0267ada5c6ff75a8ba864b4e679a9e2aa44262af7a3b5516d530d76e" -"checksum futures-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "346db18b3daf3e81f94023cd628230a01f34b1e64c5849f2a8308e678e1a21de" +"checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16" "checksum futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec" -"checksum futures-task 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4ace133f7db73ad31e358cf07b495e45dd767c552f321602b8158da059359a2" +"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" "checksum futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "878f1d2fc31355fa02ed2372e741b0c17e58373341e6a122569b4623a14a7d33" -"checksum futures-util 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef4c1d6c4ceb5fcff9e8d84d76bc20ed918c61d64fe68325c0c3b611b3d9cffe" +"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" "checksum futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" "checksum get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" -"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" +"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" "checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" @@ -7655,17 +7666,17 @@ dependencies = [ "checksum hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" "checksum hash256-std-hasher 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" -"checksum hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6587d09be37fb98a11cb08b9000a3f592451c1b1b613ca69d949160e313a430a" -"checksum hashmap_core 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6852e5a86250521973b0c1d39677166d8a9c0047c908d7e04f1aa04177973c" +"checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" "checksum hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "961de220ec9a91af2e1e5bd80d02109155695e516771762381ef8581317066e0" "checksum hex-literal-impl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9d4c5c844e2fee0bf673d54c2c177f1713b3d2af2ff6e666b49cb7572e6cf42d" "checksum hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" "checksum hmac-drbg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" -"checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" +"checksum http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e06e336150b178206af098a055e3621e8336027e2b4d126bda0bc64824baaf" "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" @@ -7675,19 +7686,19 @@ dependencies = [ "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -"checksum impl-codec 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3fa0086251524c50fd53b32e7b05eb6d79e2f97221eaf0c53c0ca9c3096f21d3" +"checksum impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" "checksum impl-rlp 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" "checksum impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" "checksum impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" -"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3" +"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" "checksum integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea155abb3ba6f382a75f1418988c05fe82959ed9ce727de427f9cfd425b0c903" "checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -"checksum ipnet 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc15ac2e0886d62ba078989ef6920ab23997ab0b04ca5687f1a9a7484296a48" -"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" +"checksum ipnet 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f4b06b21db0228860c8dfd17d2106c49c7c6bd07477a4036985347d84def04" +"checksum itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" "checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" -"checksum js-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)" = "2cc9a97d7cec30128fd8b28a7c1f9df1c001ceb9b441e2b755e24130a6b43c79" +"checksum js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d8657b7ca06a6044ece477f6900bf7670f8b5fd0cce177a1d7094eef51e0adf4" "checksum jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d389a085cb2184604dff060390cadb8cba1f063c7fd0ad710272c163c88b9f20" "checksum jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "34651edf3417637cc45e70ed0182ecfa9ced0b7e8131805fccf7400d989845ca" "checksum jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbaec1d57271ff952f24ca79d37d716cfd749c855b058d9aa5f053a6b8ae4ef" @@ -7705,7 +7716,7 @@ dependencies = [ "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9aa3d728b96c06763b2e919b4c99a334d698303c49489671b5ffe3a4b0fd4c9c" "checksum libp2p-core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07759706a4cb4a90903c67d92cb9575acd8df90f583dfdc46d57afdeaead4c82" @@ -7728,7 +7739,7 @@ dependencies = [ "checksum libp2p-websocket 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d74d4fc229ad7e8d1a973178786bdcd5dadbdd7b9822c4477c8687df6f82f66" "checksum libp2p-yamux 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1913eb7dd6eb5515957b6f1770296f6921968db87bc9b985f0e974b6657e1003" "checksum librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d19778314deaa7048f2ea7d07b8aa12e1c227acebe975a37eeab6d2f8c74e41b" -"checksum libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63cc09b49bf0cc55885982347b174ad89855e97a12284d2c9dcc6da2e20c28f5" +"checksum libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd9a7c16c9487e710536b699c962f022266347c94201174aa0a7eb0546051aa" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7c91c4c7bbeb4f2f7c4e5be11e6a05bd6830bc37249c47ce1ad86ad453ff9c" @@ -7739,15 +7750,16 @@ dependencies = [ "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -"checksum malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35adee9ed962cf7d07d62cb58bc45029f3227f5b5b86246caa8632f06c187bc3" +"checksum malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" +"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ef49315991403ba5fa225a70399df5e115f57b274cb0b1b4bcd6e734fa5bd783" "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" "checksum merlin 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "de2d16d3b15fec5943d1144f861f61f279d165fdd60998ca262913b9bf1c8adb" "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -"checksum miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "304f66c19be2afa56530fa7c39796192eef38618da8d19df725ad7c6d6b2aaae" +"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" @@ -7765,14 +7777,14 @@ dependencies = [ "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" "checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +"checksum num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "155394f924cdddf08149da25bfb932d226b4a593ca7468b08191ff6335941af5" "checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" "checksum once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" "checksum once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e" "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" "checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)" = "ba24190c8f0805d3bd2ce028f439fe5af1d55882bbe6261bed1dbc93b50dd6b1" +"checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" "checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" @@ -7781,7 +7793,7 @@ dependencies = [ "checksum parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "001fbbb956d8593f321c7a784f64d16b2c99b2657823976eea729006ad2c3668" "checksum parity-scale-codec-derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42af752f59119656fa3cb31e8852ed24e895b968c0bdb41847da7f0cea6d155f" "checksum parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -"checksum parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2005637ccf93dbb60c85081ccaaf3f945f573da48dcc79f27f9646caa3ec1dc" +"checksum parity-util-mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" "checksum parity-wasm 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac" "checksum parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" @@ -7801,14 +7813,14 @@ dependencies = [ "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" -"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" +"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" "checksum primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a0253db64c26d8b4e7896dd2063b516d2a1b9e0a5da26b5b78335f236d1e9522" "checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" -"checksum proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "114cdf1f426eb7f550f01af5f53a33c0946156f6814aec939b3bd77e844f9a9d" +"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" "checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" @@ -7818,7 +7830,6 @@ dependencies = [ "checksum prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f" "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20" "checksum pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d473123ba135028544926f7aa6f34058d8bc6f120c4fcd3777f84af724280b3" -"checksum quick-error 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb6ccf8db7bbcb9c2eae558db5ab4f3da1c2a87e4e597ed394726bc8ea6ca1d" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" @@ -7866,9 +7877,9 @@ dependencies = [ "checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" "checksum rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c48f91977f4ef3be5358c15d131d3f663f6b4d7a112555bf3bf52ad23b6659e5" "checksum rw-stream-sink 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9cbe61c20455d3015b2bb7be39e1872310283b8e5a52f5b242b0ac7581fe78" -"checksum ryu 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19d2271fa48eaf61e53cc88b4ad9adcbafa2d512c531e7fadb6dc11a4d3656c5" +"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" "checksum safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f7bf422d23a88c16d5090d455f182bc99c60af4df6a345c63428acf5129e347" -"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" +"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" "checksum schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" @@ -7877,14 +7888,14 @@ dependencies = [ "checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" "checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" "checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" -"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" -"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" +"checksum security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" +"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum send_wrapper 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4" "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" -"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" +"checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" @@ -7895,22 +7906,21 @@ dependencies = [ "checksum slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99" "checksum slog-async 2.3.0 (git+https://github.com/paritytech/slog-async)" = "" "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a" -"checksum slog-scope 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d1d3ec6214d46e57a7ec87c1972bbca66c59172a0cfffa5233c54726afb946bf" +"checksum slog-scope 4.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6" "checksum slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eff3b513cf2e0d1a60e1aba152dc72bedc5b05585722bb3cebd7bcb1e31b98f" -"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum snow 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91eecae35b461ed26bda7a76bea2cc5bda2bf4b8dd06761879f19e6fdd50c2dd" "checksum soketto 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bceb1a3a15232d013d9a3b7cac9e5ce8e2313f348f01d4bc1097e5e53aa07095" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -"checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" -"checksum static_assertions 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fa13613355688665b68639b1c378a62dbedea78aff0fc59a4fa656cbbdec657" +"checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" "checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" "checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" -"checksum structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" +"checksum structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c167b61c7d4c126927f5346a4327ce20abf8a186b8041bbeb1ce49e5db49587b" +"checksum structopt-derive 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "519621841414165d2ad0d4c92be8f41844203f2b67e245f9345a5a12d40c69d7" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" @@ -7919,9 +7929,8 @@ dependencies = [ "checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" -"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" -"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" -"checksum sysinfo 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bd3b813d94552a8033c650691645f8dd5a63d614dddd62428a95d3931ef7b6" +"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +"checksum sysinfo 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4b2468c629cffba39c0a4425849ab3cdb03d9dfacba69684609aea04d08ff9" "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" "checksum target-lexicon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a" "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" @@ -7953,7 +7962,7 @@ dependencies = [ "checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" "checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" -"checksum toml 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04dffffeac90885436d23c692517bb5b8b3f8863e4afc15023628d067d667b7" +"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" "checksum trie-bench 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3073600c543ed001319d7e092c46dfd8c245af1a218ec5c75eb01582660a2b3e" "checksum trie-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" @@ -7965,12 +7974,12 @@ dependencies = [ "checksum twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -"checksum uint 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8f0f47ed099f0db671ce82c66548c5de012e3c0cba3963514d1db15c7588701" +"checksum uint 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" "checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" +"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" "checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" @@ -7989,13 +7998,13 @@ dependencies = [ "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -"checksum wasm-bindgen 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "cd34c5ba0d228317ce388e87724633c57edca3e7531feb4e25e35aaa07a656af" -"checksum wasm-bindgen-backend 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "927196b315c23eed2748442ba675a4c54a1a079d90d9bdc5ad16ce31cf90b15b" +"checksum wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c4568ae1b4e07ca907b1a4de41174eaa3e5be4066c024475586b7842725f69a9" +"checksum wasm-bindgen-backend 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5a00cfdce37367770062065fd3abb9278cbae86a0d918cacd0978a7acd51b481" "checksum wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "83420b37346c311b9ed822af41ec2e82839bfe99867ec6c54e2da43b7538771c" -"checksum wasm-bindgen-macro 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "92c2442bf04d89792816650820c3fb407af8da987a9f10028d5317f5b04c2b4a" -"checksum wasm-bindgen-macro-support 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "9c075d27b7991c68ca0f77fe628c3513e64f8c477d422b859e03f28751b46fc5" -"checksum wasm-bindgen-shared 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "83d61fe986a7af038dd8b5ec660e5849cbd9f38e7492b9404cc48b2b4df731d1" -"checksum wasm-bindgen-webidl 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "9b979afb0535fe4749906a674082db1211de8aef466331d43232f63accb7c07c" +"checksum wasm-bindgen-macro 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7c568f4d3cf6d7c1d72b165daf778fb0d6e09a24f96ac14fc8c4f66a96e86b72" +"checksum wasm-bindgen-macro-support 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "430d12539ae324d16097b399e9d07a6d5ce0173b2a61a2d02346ca7c198daffe" +"checksum wasm-bindgen-shared 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "8ae7167f0bbffd7fac2b12da0fa1f834c1d84671a1ae3c93ac8bde2e97179c39" +"checksum wasm-bindgen-webidl 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "3021567c515a746a64ad0b269d120d46e687c0c95702a4750623db935ae6b5e7" "checksum wasm-gc-api 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9" "checksum wasm-timer 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aa3e01d234bb71760e685cfafa5e2c96f8ad877c161a721646356651069e26ac" "checksum wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f31d26deb2d9a37e6cfed420edce3ed604eab49735ba89035e13c98f9a528313" @@ -8005,7 +8014,7 @@ dependencies = [ "checksum wasmtime-environ 0.2.0 (git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6)" = "" "checksum wasmtime-jit 0.2.0 (git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6)" = "" "checksum wasmtime-runtime 0.2.0 (git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6)" = "" -"checksum web-sys 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)" = "c84440699cd02ca23bed6f045ffb1497bc18a3c2628bd13e2093186faaaacf6b" +"checksum web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)" = "ce8e893e021539beb87de8f06e77bdb390a3ab0db4cfeb569c4e377b55ed20de" "checksum webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e664e770ac0110e2384769bcc59ed19e329d81f555916a6e072714957b81b4" "checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" "checksum webpki-roots 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" @@ -8019,12 +8028,12 @@ dependencies = [ "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -"checksum ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631" +"checksum ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538" "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" "checksum yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" -"checksum yamux 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "01bd67889938c48f0049fc60a77341039e6c3eaf16cb7693e6ead7c0ba701295" +"checksum yamux 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2758f29014c1cb7a6e74c1b1160ac8c8203be342d35b73462fc6a13cc6385423" "checksum zeroize 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" "checksum zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" "checksum zeroize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdc979d9b5ead18184c357c4d8a3f81b579aae264e32507223032e64715462d3" diff --git a/client/Cargo.toml b/client/Cargo.toml index 0af92ad5a24a3..33371441ebdb1 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,7 +19,6 @@ header-metadata = { package = "substrate-header-metadata", path = "header-metada hex-literal = { version = "0.2.1" } inherents = { package = "substrate-inherents", path = "../primitives/inherents" } keyring = { package = "substrate-keyring", path = "keyring" } -kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } log = { version = "0.4.8" } parking_lot = { version = "0.9.0" } primitives = { package = "substrate-primitives", path = "../primitives/core" } diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index a4e7059543b8b..4702744c91e88 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -11,7 +11,7 @@ prost-build = "0.5.0" [dependencies] authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../primitives/authority-discovery" } bytes = "0.4.12" -client = { package = "substrate-client", path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" } derive_more = "0.15.0" futures-preview = "0.3.0-alpha.19" diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs index dca50cc0beb9e..894edec5922bb 100644 --- a/client/authority-discovery/src/error.rs +++ b/client/authority-discovery/src/error.rs @@ -27,7 +27,7 @@ pub enum Error { /// Failed to hash the authority id to be used as a dht key. HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError), /// Failed calling into the Substrate runtime. - CallingRuntime(client::error::Error), + CallingRuntime(interfaces::error::Error), /// Failed signing the dht payload via the Substrate runtime. SigningDhtPayload, /// From the Dht we only get the hashed authority id. In order to retrieve the actual authority id and to ensure it diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs index 13831be76f8ef..59f01185e7b27 100644 --- a/client/authority-discovery/src/lib.rs +++ b/client/authority-discovery/src/lib.rs @@ -57,7 +57,7 @@ use futures::Future; use futures_timer::Interval; use authority_discovery_primitives::{AuthorityDiscoveryApi, AuthorityId, Signature}; -use client::blockchain::HeaderBackend; +use interfaces::blockchain::HeaderBackend; use error::{Error, Result}; use log::{debug, error, log_enabled, warn}; use network::specialization::NetworkSpecialization; @@ -105,7 +105,7 @@ where Block: BlockT + Unpin + 'static, Network: NetworkProvider, Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend, - ::Api: AuthorityDiscoveryApi, + ::Api: AuthorityDiscoveryApi, Self: Future, { /// Return a new authority discovery. @@ -303,7 +303,7 @@ where Block: BlockT + Unpin + 'static, Network: NetworkProvider, Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend, - ::Api: AuthorityDiscoveryApi, + ::Api: AuthorityDiscoveryApi, { type Output = (); @@ -430,12 +430,12 @@ mod tests { fn header( &self, _id: BlockId, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { Ok(None) } - fn info(&self) -> client::blockchain::Info { - client::blockchain::Info { + fn info(&self) -> interfaces::blockchain::Info { + interfaces::blockchain::Info { best_hash: Default::default(), best_number: Zero::zero(), finalized_hash: Default::default(), @@ -447,21 +447,21 @@ mod tests { fn status( &self, _id: BlockId, - ) -> std::result::Result { - Ok(client::blockchain::BlockStatus::Unknown) + ) -> std::result::Result { + Ok(interfaces::blockchain::BlockStatus::Unknown) } fn number( &self, _hash: Block::Hash, - ) -> std::result::Result>, client::error::Error> { + ) -> std::result::Result>, interfaces::error::Error> { Ok(None) } fn hash( &self, _number: NumberFor, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { Ok(None) } } @@ -475,7 +475,7 @@ mod tests { _: ExecutionContext, _: Option<()>, _: Vec, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { unimplemented!("Not required for testing!") } @@ -485,7 +485,7 @@ mod tests { _: ExecutionContext, _: Option<(Block)>, _: Vec, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { unimplemented!("Not required for testing!") } @@ -495,13 +495,13 @@ mod tests { _: ExecutionContext, _: Option<&::Header>, _: Vec, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { unimplemented!("Not required for testing!") } } impl ApiExt for RuntimeApi { - type Error = client::error::Error; + type Error = interfaces::error::Error; fn map_api_result std::result::Result, R, E>( &self, @@ -513,7 +513,7 @@ mod tests { fn runtime_version_at( &self, _: &BlockId, - ) -> std::result::Result { + ) -> std::result::Result { unimplemented!("Not required for testing!") } @@ -533,7 +533,7 @@ mod tests { _: ExecutionContext, _: Option<()>, _: Vec, - ) -> std::result::Result>, client::error::Error> { + ) -> std::result::Result>, interfaces::error::Error> { return Ok(NativeOrEncoded::Native(vec![ AuthorityId("test-authority-id-1".as_bytes().to_vec()), AuthorityId("test-authority-id-2".as_bytes().to_vec()), @@ -547,7 +547,7 @@ mod tests { _: Vec, ) -> std::result::Result< NativeOrEncoded>, - client::error::Error, + interfaces::error::Error, > { return Ok(NativeOrEncoded::Native(Some(( Signature("test-signature-1".as_bytes().to_vec()), @@ -560,7 +560,7 @@ mod tests { _: ExecutionContext, args: Option<(&Vec, &Signature, &AuthorityId)>, _: Vec, - ) -> std::result::Result, client::error::Error> { + ) -> std::result::Result, interfaces::error::Error> { if *args.unwrap().1 == Signature("test-signature-1".as_bytes().to_vec()) { return Ok(NativeOrEncoded::Native(true)); } diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index c85f78ee5279a..0c424a139e844 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -13,6 +13,7 @@ kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317 kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } linked-hash-map = "0.5.2" hash-db = "0.15.2" +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } sr-primitives = { path = "../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../" } diff --git a/client/src/children.rs b/client/db/src/children.rs similarity index 100% rename from client/src/children.rs rename to client/db/src/children.rs diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs index 5902afff0de93..ac09fe0ef346a 100644 --- a/client/db/src/lib.rs +++ b/client/db/src/lib.rs @@ -29,6 +29,7 @@ pub mod light; pub mod offchain; +mod children; mod cache; mod storage_cache; mod utils; @@ -64,7 +65,6 @@ use state_machine::{ }; use crate::utils::{Meta, db_err, meta_keys, read_db, read_meta}; use client::leaves::{LeafSet, FinalizationDisplaced}; -use client::children; use state_db::StateDb; use header_metadata::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache}; use crate::storage_cache::{CachingState, SharedCache, new_shared_cache}; diff --git a/client/src/blockchain.rs b/client/interfaces/src/blockchain.rs similarity index 99% rename from client/src/blockchain.rs rename to client/interfaces/src/blockchain.rs index a137113711514..73b7c138d020e 100644 --- a/client/src/blockchain.rs +++ b/client/interfaces/src/blockchain.rs @@ -26,7 +26,7 @@ use parking_lot::Mutex; use header_metadata::HeaderMetadata; -use interfaces::error::{Error, Result}; +use crate::error::{Error, Result}; /// Blockchain database header backend. Does not perform any validation. pub trait HeaderBackend: Send + Sync { diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 18e02b2ad4cdd..4036d8c67de42 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1 +1,2 @@ -pub mod errors; \ No newline at end of file +pub mod errors; +pub mod blockchain; \ No newline at end of file diff --git a/client/src/backend.rs b/client/src/backend.rs index b081d8e5e5ed4..5638939ad3c62 100644 --- a/client/src/backend.rs +++ b/client/src/backend.rs @@ -25,7 +25,7 @@ use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenSto use sr_primitives::traits::{Block as BlockT, NumberFor}; use state_machine::backend::Backend as StateBackend; use state_machine::{ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction}; -use crate::blockchain::well_known_cache_keys; +use interfaces::blockchain::well_known_cache_keys; use consensus::BlockOrigin; use hash_db::Hasher; use parking_lot::Mutex; @@ -216,7 +216,7 @@ pub trait Backend: AuxStore + Send + Sync where /// Associated block insertion operation type. type BlockImportOperation: BlockImportOperation; /// Associated blockchain backend type. - type Blockchain: crate::blockchain::Backend; + type Blockchain: interfaces::blockchain::Backend; /// Associated state backend type. type State: StateBackend; /// Changes trie storage. diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs index 5e58c1069bf90..6fd13decefe08 100644 --- a/client/src/in_mem.rs +++ b/client/src/in_mem.rs @@ -33,7 +33,7 @@ use interfaces::error; use crate::backend::{self, NewBlockState, StorageCollection, ChildStorageCollection}; use crate::light; use crate::leaves::LeafSet; -use crate::blockchain::{ +use interfaces::blockchain::{ self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId }; diff --git a/client/src/lib.rs b/client/src/lib.rs index 3a00f5899a4b1..4e6c654f1f5fd 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -76,20 +76,19 @@ #![warn(missing_docs)] #![recursion_limit="128"] -pub mod blockchain; pub mod backend; pub mod cht; pub mod in_mem; pub mod genesis; pub mod light; pub mod leaves; -pub mod children; mod call_executor; mod client; mod notifications; pub use interfaces::error; -pub use crate::blockchain::Info as ChainInfo; +pub use interfaces::blockchain; +pub use interfaces::blockchain::Info as ChainInfo; pub use crate::call_executor::{CallExecutor, LocalCallExecutor}; pub use crate::client::{ new_with_backend, @@ -102,4 +101,4 @@ pub use crate::client::{ pub use crate::notifications::{StorageEventStream, StorageChangeSet}; pub use state_machine::{ExecutionStrategy, StorageProof}; pub use crate::leaves::LeafSet; -pub use crate::blockchain::well_known_cache_keys; +pub use interfaces::blockchain::well_known_cache_keys; diff --git a/client/src/light/backend.rs b/client/src/light/backend.rs index 8c3b06e11261f..95ca7127d3d61 100644 --- a/client/src/light/backend.rs +++ b/client/src/light/backend.rs @@ -29,7 +29,7 @@ use crate::backend::{ AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState, StorageCollection, ChildStorageCollection, }; -use crate::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys}; +use interfaces::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys}; use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; use hash_db::Hasher; diff --git a/client/src/light/blockchain.rs b/client/src/light/blockchain.rs index ada75251a120d..9242821aa43c3 100644 --- a/client/src/light/blockchain.rs +++ b/client/src/light/blockchain.rs @@ -26,7 +26,7 @@ use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero} use header_metadata::{HeaderMetadata, CachedHeaderMetadata}; use crate::backend::{AuxStore, NewBlockState}; -use crate::blockchain::{ +use interfaces::blockchain::{ Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache, HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, ProvideCache, well_known_cache_keys @@ -250,7 +250,7 @@ pub mod tests { use std::collections::HashMap; use parking_lot::Mutex; use test_client::runtime::{Hash, Block, Header}; - use crate::blockchain::Info; + use interfaces::blockchain::Info; use super::*; pub type DummyBlockchain = Blockchain; From a60c53757c4a73be39a68d37196c767f393a162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 21:31:52 +0100 Subject: [PATCH 29/61] Move trie and state-machine to primitives. --- .maintain/ensure-deps.sh | 4 ++-- Cargo.toml | 12 ++++++------ bin/node/executor/Cargo.toml | 4 ++-- client/Cargo.toml | 6 +++--- client/block-builder/Cargo.toml | 2 +- client/cli/Cargo.toml | 4 ++-- client/db/Cargo.toml | 4 ++-- client/executor/Cargo.toml | 6 +++--- client/finality-grandpa/Cargo.toml | 2 +- client/interfaces/Cargo.toml | 6 +++--- client/interfaces/src/lib.rs | 2 +- client/rpc/Cargo.toml | 2 +- paint/session/Cargo.toml | 2 +- paint/support/Cargo.toml | 2 +- paint/support/test/Cargo.toml | 2 +- {client => primitives}/panic-handler/Cargo.toml | 0 {client => primitives}/panic-handler/src/lib.rs | 0 primitives/runtime-interface/Cargo.toml | 2 +- primitives/sr-api/Cargo.toml | 2 +- primitives/sr-api/test/Cargo.toml | 2 +- primitives/sr-io/Cargo.toml | 4 ++-- {client => primitives}/state-machine/Cargo.toml | 4 ++-- {client => primitives}/state-machine/src/backend.rs | 0 {client => primitives}/state-machine/src/basic.rs | 0 .../state-machine/src/changes_trie/build.rs | 0 .../state-machine/src/changes_trie/build_cache.rs | 0 .../state-machine/src/changes_trie/build_iterator.rs | 0 .../src/changes_trie/changes_iterator.rs | 0 .../state-machine/src/changes_trie/input.rs | 0 .../state-machine/src/changes_trie/mod.rs | 0 .../state-machine/src/changes_trie/prune.rs | 0 .../state-machine/src/changes_trie/storage.rs | 0 .../src/changes_trie/surface_iterator.rs | 0 {client => primitives}/state-machine/src/error.rs | 0 {client => primitives}/state-machine/src/ext.rs | 0 {client => primitives}/state-machine/src/lib.rs | 0 .../state-machine/src/overlayed_changes.rs | 0 .../state-machine/src/proving_backend.rs | 0 {client => primitives}/state-machine/src/testing.rs | 0 .../state-machine/src/trie_backend.rs | 0 .../state-machine/src/trie_backend_essence.rs | 0 {client => primitives}/trie/Cargo.toml | 4 ++-- {client => primitives}/trie/benches/bench.rs | 0 {client => primitives}/trie/src/error.rs | 0 {client => primitives}/trie/src/lib.rs | 0 {client => primitives}/trie/src/node_codec.rs | 0 {client => primitives}/trie/src/node_header.rs | 0 {client => primitives}/trie/src/trie_stream.rs | 0 test/utils/client/Cargo.toml | 2 +- test/utils/runtime/Cargo.toml | 4 ++-- 50 files changed, 42 insertions(+), 42 deletions(-) rename {client => primitives}/panic-handler/Cargo.toml (100%) rename {client => primitives}/panic-handler/src/lib.rs (100%) rename {client => primitives}/state-machine/Cargo.toml (84%) rename {client => primitives}/state-machine/src/backend.rs (100%) rename {client => primitives}/state-machine/src/basic.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/build.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/build_cache.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/build_iterator.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/changes_iterator.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/input.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/mod.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/prune.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/storage.rs (100%) rename {client => primitives}/state-machine/src/changes_trie/surface_iterator.rs (100%) rename {client => primitives}/state-machine/src/error.rs (100%) rename {client => primitives}/state-machine/src/ext.rs (100%) rename {client => primitives}/state-machine/src/lib.rs (100%) rename {client => primitives}/state-machine/src/overlayed_changes.rs (100%) rename {client => primitives}/state-machine/src/proving_backend.rs (100%) rename {client => primitives}/state-machine/src/testing.rs (100%) rename {client => primitives}/state-machine/src/trie_backend.rs (100%) rename {client => primitives}/state-machine/src/trie_backend_essence.rs (100%) rename {client => primitives}/trie/Cargo.toml (82%) rename {client => primitives}/trie/benches/bench.rs (100%) rename {client => primitives}/trie/src/error.rs (100%) rename {client => primitives}/trie/src/lib.rs (100%) rename {client => primitives}/trie/src/node_codec.rs (100%) rename {client => primitives}/trie/src/node_header.rs (100%) rename {client => primitives}/trie/src/trie_stream.rs (100%) diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh index 49384580bd99a..ad168a675209c 100755 --- a/.maintain/ensure-deps.sh +++ b/.maintain/ensure-deps.sh @@ -17,9 +17,9 @@ PLEASE_DONT=( "client"] edition = "2018" [dependencies] -state-machine = { package = "substrate-state-machine", path = "../state-machine" } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } codec = { package = "parity-scale-codec", version = "1.0.6", features = ["derive"] } diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index ca9a8d195001e..fa99c05f7aa75 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -22,14 +22,14 @@ futures03 = { package = "futures-preview", version = "=0.3.0-alpha.19", features fdlimit = "0.1.1" exit-future = "0.1.4" serde_json = "1.0.41" -panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } +panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" } client = { package = "substrate-client", path = "../" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } network = { package = "substrate-network", path = "../network" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } service = { package = "substrate-service", path = "../service", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../state-machine" } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } substrate-telemetry = { path = "../telemetry" } keyring = { package = "substrate-keyring", path = "../keyring" } names = "0.11.0" diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index 0c424a139e844..afad576ff32eb 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -17,11 +17,11 @@ interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } sr-primitives = { path = "../../primitives/sr-primitives" } client = { package = "substrate-client", path = "../" } -state-machine = { package = "substrate-state-machine", path = "../state-machine" } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } executor = { package = "substrate-executor", path = "../executor" } state_db = { package = "substrate-state-db", path = "../state-db" } -trie = { package = "substrate-trie", path = "../trie" } +trie = { package = "substrate-trie", path = "../../primitives/trie" } consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" } diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index 879a7e987a083..fa7e6911c63a1 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -9,10 +9,10 @@ derive_more = "0.15.0" codec = { package = "parity-scale-codec", version = "1.0.0" } runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } -trie = { package = "substrate-trie", path = "../trie" } +trie = { package = "substrate-trie", path = "../../primitives/trie" } serializer = { package = "substrate-serializer", path = "../../primitives/serializer" } runtime_version = { package = "sr-version", path = "../../primitives/sr-version" } -panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } +panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" } wasmi = "0.5.1" parity-wasm = "0.40.3" lazy_static = "1.4.0" @@ -40,7 +40,7 @@ hex-literal = "0.2.1" runtime-test = { package = "substrate-runtime-test", path = "runtime-test" } substrate-client = { path = "../" } substrate-offchain = { path = "../offchain/" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } test-case = "0.3.3" [features] diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index d3ac5f9a29d33..2f0238e120f2b 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -34,7 +34,7 @@ network = { package = "substrate-network", path = "../network", features = ["tes keyring = { package = "substrate-keyring", path = "../keyring" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client"} babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } env_logger = "0.7.0" tokio = "0.1.22" tempfile = "3.1.0" diff --git a/client/interfaces/Cargo.toml b/client/interfaces/Cargo.toml index b6627a6b80e2c..59142c3d88a97 100644 --- a/client/interfaces/Cargo.toml +++ b/client/interfaces/Cargo.toml @@ -26,9 +26,9 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } sr-api = { path = "../../primitives/sr-api" } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../state-machine", optional = true } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true } substrate-telemetry = { path = "../telemetry", optional = true } -trie = { package = "substrate-trie", path = "../trie", optional = true } +trie = { package = "substrate-trie", path = "../../primitives/trie", optional = true } [dev-dependencies] env_logger = "0.7.0" @@ -36,5 +36,5 @@ tempfile = "3.1.0" client-db = { package = "substrate-client-db", path = ".././db", features = ["kvdb-rocksdb"] } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } -panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } +panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" } diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 4036d8c67de42..e9b27d4907b0c 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1,2 +1,2 @@ pub mod errors; -pub mod blockchain; \ No newline at end of file +pub mod blockchain; diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 22de124594f05..f30c78741cb00 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "1.0.41" session = { package = "substrate-session", path = "../../primitives/session" } sr-primitives = { path = "../../primitives/sr-primitives" } rpc-primitives = { package = "substrate-rpc-primitives", path = "../../primitives/rpc" } -state_machine = { package = "substrate-state-machine", path = "../state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } substrate-executor = { path = "../executor" } substrate-keystore = { path = "../keystore" } transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } diff --git a/paint/session/Cargo.toml b/paint/session/Cargo.toml index b1dbbded8c5ae..6c029dd586336 100644 --- a/paint/session/Cargo.toml +++ b/paint/session/Cargo.toml @@ -14,7 +14,7 @@ sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", defau support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } -substrate-trie = { path = "../../client/trie", default-features = false, optional = true } +substrate-trie = { path = "../../primitives/trie", default-features = false, optional = true } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/paint/support/Cargo.toml b/paint/support/Cargo.toml index 4191b033cfea1..957323995c5aa 100644 --- a/paint/support/Cargo.toml +++ b/paint/support/Cargo.toml @@ -17,7 +17,7 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" } paste = "0.1.6" once_cell = { version = "0.2.4", default-features = false, optional = true } -state-machine = { package = "substrate-state-machine", path = "../../client/state-machine", optional = true } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true } bitmask = { version = "0.5.0", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/paint/support/test/Cargo.toml b/paint/support/test/Cargo.toml index 9aa58a25fa163..cb791f58d3e39 100644 --- a/paint/support/test/Cargo.toml +++ b/paint/support/test/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = { version = "1.0.101", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } runtime-io ={ package = "sr-io", path = "../../../primitives/sr-io", default-features = false } -state-machine ={ package = "substrate-state-machine", path = "../../../client/state-machine", optional = true } +state-machine ={ package = "substrate-state-machine", path = "../../../primitives/state-machine", optional = true } support = { package = "srml-support", version = "2", path = "../", default-features = false } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false } diff --git a/client/panic-handler/Cargo.toml b/primitives/panic-handler/Cargo.toml similarity index 100% rename from client/panic-handler/Cargo.toml rename to primitives/panic-handler/Cargo.toml diff --git a/client/panic-handler/src/lib.rs b/primitives/panic-handler/src/lib.rs similarity index 100% rename from client/panic-handler/src/lib.rs rename to primitives/panic-handler/src/lib.rs diff --git a/primitives/runtime-interface/Cargo.toml b/primitives/runtime-interface/Cargo.toml index 5e98cb3d9bcd3..7af9b8b0887e5 100644 --- a/primitives/runtime-interface/Cargo.toml +++ b/primitives/runtime-interface/Cargo.toml @@ -17,7 +17,7 @@ primitive-types = { version = "0.6.1", default-features = false } [dev-dependencies] executor = { package = "substrate-executor", path = "../../client/executor" } test-wasm = { package = "substrate-runtime-interface-test-wasm", path = "test-wasm" } -state_machine = { package = "substrate-state-machine", path = "../../client/state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } primitives = { package = "substrate-primitives", path = "../core" } runtime-io = { package = "sr-io", path = "../sr-io" } diff --git a/primitives/sr-api/Cargo.toml b/primitives/sr-api/Cargo.toml index fb46f08f22ef9..a23a36284d8cb 100644 --- a/primitives/sr-api/Cargo.toml +++ b/primitives/sr-api/Cargo.toml @@ -11,7 +11,7 @@ primitives = { package = "substrate-primitives", path = "../core", default-featu rstd = { package = "sr-std", path = "../sr-std", default-features = false } sr-primitives = { path = "../sr-primitives", default-features = false } sr-version = { path = "../sr-version", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../../client/state-machine", optional = true } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true } [dev-dependencies] criterion = "0.3.0" diff --git a/primitives/sr-api/test/Cargo.toml b/primitives/sr-api/test/Cargo.toml index d62463927301d..e9ae309b6986c 100644 --- a/primitives/sr-api/test/Cargo.toml +++ b/primitives/sr-api/test/Cargo.toml @@ -11,7 +11,7 @@ sr-version = { path = "../../sr-version" } sr-primitives = { path = "../../sr-primitives" } consensus_common = { package = "substrate-consensus-common", path = "../../../client/consensus/common" } codec = { package = "parity-scale-codec", version = "1.0.0" } -state-machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } +state-machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" } trybuild = "1.0.17" rustversion = "1.0.0" diff --git a/primitives/sr-io/Cargo.toml b/primitives/sr-io/Cargo.toml index 1a0276be8d095..453241600ffd4 100644 --- a/primitives/sr-io/Cargo.toml +++ b/primitives/sr-io/Cargo.toml @@ -11,9 +11,9 @@ primitives = { package = "substrate-primitives", path = "../core", default-featu rstd = { package = "sr-std", path = "../sr-std", default-features = false } libsecp256k1 = { version = "0.3.0", optional = true } tiny-keccak = { version = "1.5.0", optional = true } -substrate-state-machine = { path = "../../client/state-machine", optional = true } +substrate-state-machine = { path = "../../primitives/state-machine", optional = true } runtime-interface = { package = "substrate-runtime-interface", path = "../runtime-interface", default-features = false } -trie = { package = "substrate-trie", path = "../../client/trie", optional = true } +trie = { package = "substrate-trie", path = "../../primitives/trie", optional = true } externalities = { package = "substrate-externalities", path = "../externalities", optional = true } log = { version = "0.4.8", optional = true } diff --git a/client/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml similarity index 84% rename from client/state-machine/Cargo.toml rename to primitives/state-machine/Cargo.toml index dfd73e8d7c9e4..3f02056647a00 100644 --- a/client/state-machine/Cargo.toml +++ b/primitives/state-machine/Cargo.toml @@ -12,12 +12,12 @@ hash-db = "0.15.2" trie-db = "0.15.2" trie-root = "0.15.2" trie = { package = "substrate-trie", path = "../trie" } -primitives = { package = "substrate-primitives", path = "../../primitives/core" } +primitives = { package = "substrate-primitives", path = "../core" } panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" } codec = { package = "parity-scale-codec", version = "1.0.0" } num-traits = "0.2.8" rand = "0.7.2" -externalities = { package = "substrate-externalities", path = "../../primitives/externalities" } +externalities = { package = "substrate-externalities", path = "../externalities" } [dev-dependencies] hex-literal = "0.2.1" diff --git a/client/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs similarity index 100% rename from client/state-machine/src/backend.rs rename to primitives/state-machine/src/backend.rs diff --git a/client/state-machine/src/basic.rs b/primitives/state-machine/src/basic.rs similarity index 100% rename from client/state-machine/src/basic.rs rename to primitives/state-machine/src/basic.rs diff --git a/client/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs similarity index 100% rename from client/state-machine/src/changes_trie/build.rs rename to primitives/state-machine/src/changes_trie/build.rs diff --git a/client/state-machine/src/changes_trie/build_cache.rs b/primitives/state-machine/src/changes_trie/build_cache.rs similarity index 100% rename from client/state-machine/src/changes_trie/build_cache.rs rename to primitives/state-machine/src/changes_trie/build_cache.rs diff --git a/client/state-machine/src/changes_trie/build_iterator.rs b/primitives/state-machine/src/changes_trie/build_iterator.rs similarity index 100% rename from client/state-machine/src/changes_trie/build_iterator.rs rename to primitives/state-machine/src/changes_trie/build_iterator.rs diff --git a/client/state-machine/src/changes_trie/changes_iterator.rs b/primitives/state-machine/src/changes_trie/changes_iterator.rs similarity index 100% rename from client/state-machine/src/changes_trie/changes_iterator.rs rename to primitives/state-machine/src/changes_trie/changes_iterator.rs diff --git a/client/state-machine/src/changes_trie/input.rs b/primitives/state-machine/src/changes_trie/input.rs similarity index 100% rename from client/state-machine/src/changes_trie/input.rs rename to primitives/state-machine/src/changes_trie/input.rs diff --git a/client/state-machine/src/changes_trie/mod.rs b/primitives/state-machine/src/changes_trie/mod.rs similarity index 100% rename from client/state-machine/src/changes_trie/mod.rs rename to primitives/state-machine/src/changes_trie/mod.rs diff --git a/client/state-machine/src/changes_trie/prune.rs b/primitives/state-machine/src/changes_trie/prune.rs similarity index 100% rename from client/state-machine/src/changes_trie/prune.rs rename to primitives/state-machine/src/changes_trie/prune.rs diff --git a/client/state-machine/src/changes_trie/storage.rs b/primitives/state-machine/src/changes_trie/storage.rs similarity index 100% rename from client/state-machine/src/changes_trie/storage.rs rename to primitives/state-machine/src/changes_trie/storage.rs diff --git a/client/state-machine/src/changes_trie/surface_iterator.rs b/primitives/state-machine/src/changes_trie/surface_iterator.rs similarity index 100% rename from client/state-machine/src/changes_trie/surface_iterator.rs rename to primitives/state-machine/src/changes_trie/surface_iterator.rs diff --git a/client/state-machine/src/error.rs b/primitives/state-machine/src/error.rs similarity index 100% rename from client/state-machine/src/error.rs rename to primitives/state-machine/src/error.rs diff --git a/client/state-machine/src/ext.rs b/primitives/state-machine/src/ext.rs similarity index 100% rename from client/state-machine/src/ext.rs rename to primitives/state-machine/src/ext.rs diff --git a/client/state-machine/src/lib.rs b/primitives/state-machine/src/lib.rs similarity index 100% rename from client/state-machine/src/lib.rs rename to primitives/state-machine/src/lib.rs diff --git a/client/state-machine/src/overlayed_changes.rs b/primitives/state-machine/src/overlayed_changes.rs similarity index 100% rename from client/state-machine/src/overlayed_changes.rs rename to primitives/state-machine/src/overlayed_changes.rs diff --git a/client/state-machine/src/proving_backend.rs b/primitives/state-machine/src/proving_backend.rs similarity index 100% rename from client/state-machine/src/proving_backend.rs rename to primitives/state-machine/src/proving_backend.rs diff --git a/client/state-machine/src/testing.rs b/primitives/state-machine/src/testing.rs similarity index 100% rename from client/state-machine/src/testing.rs rename to primitives/state-machine/src/testing.rs diff --git a/client/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs similarity index 100% rename from client/state-machine/src/trie_backend.rs rename to primitives/state-machine/src/trie_backend.rs diff --git a/client/state-machine/src/trie_backend_essence.rs b/primitives/state-machine/src/trie_backend_essence.rs similarity index 100% rename from client/state-machine/src/trie_backend_essence.rs rename to primitives/state-machine/src/trie_backend_essence.rs diff --git a/client/trie/Cargo.toml b/primitives/trie/Cargo.toml similarity index 82% rename from client/trie/Cargo.toml rename to primitives/trie/Cargo.toml index 273433320c36f..30e745b68504c 100644 --- a/client/trie/Cargo.toml +++ b/primitives/trie/Cargo.toml @@ -13,12 +13,12 @@ harness = false [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } +rstd = { package = "sr-std", path = "../sr-std", default-features = false } hash-db = { version = "0.15.2", default-features = false } trie-db = { version = "0.15.2", default-features = false } trie-root = { version = "0.15.2", default-features = false } memory-db = { version = "0.15.2", default-features = false } -primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } +primitives = { package = "substrate-primitives", path = "../core", default-features = false } [dev-dependencies] trie-bench = "0.16.2" diff --git a/client/trie/benches/bench.rs b/primitives/trie/benches/bench.rs similarity index 100% rename from client/trie/benches/bench.rs rename to primitives/trie/benches/bench.rs diff --git a/client/trie/src/error.rs b/primitives/trie/src/error.rs similarity index 100% rename from client/trie/src/error.rs rename to primitives/trie/src/error.rs diff --git a/client/trie/src/lib.rs b/primitives/trie/src/lib.rs similarity index 100% rename from client/trie/src/lib.rs rename to primitives/trie/src/lib.rs diff --git a/client/trie/src/node_codec.rs b/primitives/trie/src/node_codec.rs similarity index 100% rename from client/trie/src/node_codec.rs rename to primitives/trie/src/node_codec.rs diff --git a/client/trie/src/node_header.rs b/primitives/trie/src/node_header.rs similarity index 100% rename from client/trie/src/node_header.rs rename to primitives/trie/src/node_header.rs diff --git a/client/trie/src/trie_stream.rs b/primitives/trie/src/trie_stream.rs similarity index 100% rename from client/trie/src/trie_stream.rs rename to primitives/trie/src/trie_stream.rs diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index 45cc5e29367bb..79f59a70d6017 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -15,4 +15,4 @@ keyring = { package = "substrate-keyring", path = "../../../client/keyring" } codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } -state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" } diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index eee08eb20fe33..c622ca49879d7 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -33,14 +33,14 @@ srml-system = { path = "../../../paint/system", default-features = false } srml-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false } srml-timestamp = { path = "../../../paint/timestamp", default-features = false } substrate-client = { path = "../../../client", optional = true } -substrate-trie = { path = "../../../client/trie", default-features = false } +substrate-trie = { path = "../../../primitives/trie", default-features = false } transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false } trie-db = { version = "0.15.2", default-features = false } [dev-dependencies] substrate-executor = { path = "../../../client/executor" } substrate-test-runtime-client = { path = "./client" } -state_machine = { package = "substrate-state-machine", path = "../../../client/state-machine" } +state_machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } From a1984def1551c9d23102d01f90e44ed03c7ac1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 11 Nov 2019 21:39:36 +0100 Subject: [PATCH 30/61] Fix WASM builds. --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff81eee6a8256..063e7c7232ae8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,7 @@ test-dependency-rules: &test-linux script: - .maintain/ensure-deps.sh -test-srml-staking: &test-srml-staking +test-paint-staking: &test-paint-staking stage: test <<: *docker-env variables: @@ -166,7 +166,7 @@ test-srml-staking: &test-srml-staking variables: - $DEPLOY_TAG script: - - cd srml/staking/ + - cd paint/staking/ - WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --no-default-features --features std - sccache -s @@ -182,7 +182,7 @@ test-wasmtime: &test-wasmtime variables: - $DEPLOY_TAG script: - - cd core/executor + - cd client/executor - WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --features wasmtime - sccache -s @@ -227,7 +227,7 @@ check-web-wasm: - time cargo web build -p substrate-consensus-common - time cargo web build -p substrate-telemetry # Note: the command below is a bit weird because several Cargo issues prevent us from compiling the node in a more straight-forward way. - - time cargo build --manifest-path=node/cli/Cargo.toml --no-default-features --features "browser" --target=wasm32-unknown-unknown + - time cargo build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features "browser" --target=wasm32-unknown-unknown - sccache -s node-exits: @@ -251,7 +251,7 @@ test-full-crypto-feature: &test-full-crypto-feature variables: - $DEPLOY_TAG script: - - cd core/primitives/ + - cd primitives/core/ - time cargo +nightly build --verbose --no-default-features --features full_crypto - cd ../application-crypto - time cargo +nightly build --verbose --no-default-features --features full_crypto From 1ab7ac73cf47533cbf30752abdfbccab1cba9f1a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 23:06:28 +0100 Subject: [PATCH 31/61] fixing broken imports --- Cargo.lock | 1 + client/Cargo.toml | 1 + client/interfaces/Cargo.toml | 30 +++++++++++++++--------------- client/interfaces/src/lib.rs | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d253c23ec079c..7fb9578ba3d91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5363,6 +5363,7 @@ dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/client/Cargo.toml b/client/Cargo.toml index 9e8cfd1434c3f..312fe62a616e5 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -9,6 +9,7 @@ interfaces = { package = "substrate-client-interfaces", path = "interfaces" } block-builder = { package = "substrate-block-builder", path = "block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } consensus = { package = "substrate-consensus-common", path = "../primitives/consensus/common" } +kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } derive_more = { version = "0.15.0" } executor = { package = "substrate-executor", path = "executor" } fnv = { version = "1.0.6" } diff --git a/client/interfaces/Cargo.toml b/client/interfaces/Cargo.toml index 59142c3d88a97..c526de46739c9 100644 --- a/client/interfaces/Cargo.toml +++ b/client/interfaces/Cargo.toml @@ -7,28 +7,28 @@ edition = "2018" [dependencies] block-builder = { package = "substrate-block-builder", path = "../block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } -consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common", optional = true } -derive_more = { version = "0.15.0", optional = true } -executor = { package = "substrate-executor", path = "../executor", optional = true } -fnv = { version = "1.0.6", optional = true } -futures = { version = "0.1.29", optional = true } -futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"], optional = true } +consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } +derive_more = { version = "0.15.0" } +executor = { package = "substrate-executor", path = "../executor" } +fnv = { version = "1.0.6" } +futures = { version = "0.1.29" } +futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } hash-db = { version = "0.15.2", default-features = false } -header-metadata = { package = "substrate-header-metadata", path = "../header-metadata", optional = true } -hex-literal = { version = "0.2.1", optional = true } +header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } +hex-literal = { version = "0.2.1" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } -keyring = { package = "substrate-keyring", path = "../keyring", optional = true } -kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } -log = { version = "0.4.8", optional = true } -parking_lot = { version = "0.9.0", optional = true } +keyring = { package = "substrate-keyring", path = "../keyring" } +kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } +log = { version = "0.4.8" } +parking_lot = { version = "0.9.0" } primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-version = { package = "sr-version", path = "../../primitives/sr-version", default-features = false } sr-api = { path = "../../primitives/sr-api" } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true } -substrate-telemetry = { path = "../telemetry", optional = true } -trie = { package = "substrate-trie", path = "../../primitives/trie", optional = true } +state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } +substrate-telemetry = { path = "../telemetry" } +trie = { package = "substrate-trie", path = "../../primitives/trie" } [dev-dependencies] env_logger = "0.7.0" diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index e9b27d4907b0c..70d7db43eba0a 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1,2 +1,2 @@ -pub mod errors; +pub mod error; pub mod blockchain; From bc02c3522a762e0c130677ba56321bb355a6c549 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Mon, 11 Nov 2019 23:27:28 +0100 Subject: [PATCH 32/61] more interface moves --- client/interfaces/src/lib.rs | 1 + client/{ => interfaces}/src/notifications.rs | 0 client/src/client.rs | 5 ++++- client/src/lib.rs | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) rename client/{ => interfaces}/src/notifications.rs (100%) diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 70d7db43eba0a..029fc7d3ce47f 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1,2 +1,3 @@ pub mod error; pub mod blockchain; +pub mod notifications; diff --git a/client/src/notifications.rs b/client/interfaces/src/notifications.rs similarity index 100% rename from client/src/notifications.rs rename to client/interfaces/src/notifications.rs diff --git a/client/src/client.rs b/client/src/client.rs index 3ac1f57113c75..2523a98973aa0 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -56,6 +56,10 @@ use header_metadata::{HeaderMetadata, CachedHeaderMetadata}; use sr_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock}; use block_builder::BlockBuilderApi; +use interfaces::{ + notifications::{StorageNotifications, StorageEventStream}, +}; + use crate::{ backend::{ self, BlockImportOperation, PrunableStateChangesTrieStorage, @@ -67,7 +71,6 @@ use crate::{ well_known_cache_keys::Id as CacheKeyId, }, call_executor::{CallExecutor, LocalCallExecutor}, - notifications::{StorageNotifications, StorageEventStream}, light::{call_executor::prove_execution, fetcher::ChangesProof}, error::Error, cht, error, in_mem, genesis }; diff --git a/client/src/lib.rs b/client/src/lib.rs index 4e6c654f1f5fd..5e977b5452d93 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -84,7 +84,6 @@ pub mod light; pub mod leaves; mod call_executor; mod client; -mod notifications; pub use interfaces::error; pub use interfaces::blockchain; @@ -98,7 +97,7 @@ pub use crate::client::{ LongestChain, BlockOf, ProvideUncles, ForkBlocks, utils, apply_aux, }; -pub use crate::notifications::{StorageEventStream, StorageChangeSet}; +pub use interfaces::notifications::{StorageEventStream, StorageChangeSet}; pub use state_machine::{ExecutionStrategy, StorageProof}; pub use crate::leaves::LeafSet; pub use interfaces::blockchain::well_known_cache_keys; From f75cfba99b7dca1a8a1569220eac6e0a51d5266a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 01:15:09 +0100 Subject: [PATCH 33/61] move backend and light to interfaces --- Cargo.lock | 8 + client/basic-authorship/Cargo.toml | 1 + .../basic-authorship/src/basic_authorship.rs | 6 +- client/consensus/aura/Cargo.toml | 1 + client/consensus/aura/src/lib.rs | 7 +- client/consensus/babe/Cargo.toml | 1 + client/consensus/babe/src/aux_schema.rs | 6 +- client/consensus/babe/src/lib.rs | 8 +- client/consensus/slots/Cargo.toml | 1 + client/consensus/slots/src/aux_schema.rs | 4 +- client/consensus/slots/src/lib.rs | 2 +- client/db/src/lib.rs | 20 +- client/db/src/light.rs | 2 +- client/db/src/offchain.rs | 2 +- client/db/src/storage_cache.rs | 2 +- client/finality-grandpa/src/import.rs | 2 +- client/finality-grandpa/src/justification.rs | 2 +- client/{ => interfaces}/src/backend.rs | 32 +- client/interfaces/src/lib.rs | 2 + client/interfaces/src/light.rs | 283 ++++++++++++++++++ client/network/src/chain.rs | 2 +- client/rpc/Cargo.toml | 1 + client/rpc/src/author/mod.rs | 2 +- client/rpc/src/chain/chain_full.rs | 3 +- client/rpc/src/chain/chain_light.rs | 2 +- client/rpc/src/chain/mod.rs | 10 +- client/rpc/src/state/mod.rs | 8 +- client/rpc/src/state/state_full.rs | 3 +- client/rpc/src/state/state_light.rs | 3 +- client/service/src/builder.rs | 10 +- client/service/src/lib.rs | 4 +- client/src/call_executor.rs | 5 +- client/src/client.rs | 24 +- client/src/in_mem.rs | 15 +- client/src/lib.rs | 13 +- client/src/light/backend.rs | 21 +- client/src/light/blockchain.rs | 86 +----- client/src/light/call_executor.rs | 10 +- client/src/light/fetcher.rs | 206 ++----------- client/src/light/mod.rs | 7 +- test/utils/client/Cargo.toml | 1 + test/utils/client/src/client_ext.rs | 5 +- test/utils/client/src/lib.rs | 6 +- test/utils/runtime/Cargo.toml | 1 + test/utils/runtime/client/src/lib.rs | 2 +- test/utils/transaction-factory/Cargo.toml | 1 + .../transaction-factory/src/complex_mode.rs | 2 +- test/utils/transaction-factory/src/lib.rs | 6 +- .../transaction-factory/src/simple_modes.rs | 2 +- 49 files changed, 480 insertions(+), 373 deletions(-) rename client/{ => interfaces}/src/backend.rs (94%) create mode 100644 client/interfaces/src/light.rs diff --git a/Cargo.lock b/Cargo.lock index 7fb9578ba3d91..28210080d4c5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5247,6 +5247,7 @@ dependencies = [ "sr-primitives 2.0.0", "substrate-block-builder 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-inherents 2.0.0", "substrate-primitives 2.0.0", @@ -5473,6 +5474,7 @@ dependencies = [ "substrate-application-crypto 2.0.0", "substrate-block-builder-runtime-api 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-aura-primitives 2.0.0", "substrate-consensus-common 2.0.0", "substrate-consensus-slots 2.0.0", @@ -5530,6 +5532,7 @@ dependencies = [ "substrate-block-builder 2.0.0", "substrate-block-builder-runtime-api 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", "substrate-consensus-slots 2.0.0", @@ -5591,6 +5594,7 @@ dependencies = [ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-inherents 2.0.0", "substrate-primitives 2.0.0", @@ -5958,6 +5962,7 @@ dependencies = [ "sr-primitives 2.0.0", "sr-version 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-executor 2.0.0", "substrate-keystore 2.0.0", "substrate-network 2.0.0", @@ -6218,6 +6223,7 @@ dependencies = [ "sr-primitives 2.0.0", "substrate-client 2.0.0", "substrate-client-db 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-executor 2.0.0", "substrate-keyring 2.0.0", @@ -6248,6 +6254,7 @@ dependencies = [ "substrate-application-crypto 2.0.0", "substrate-block-builder-runtime-api 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-aura-primitives 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-executor 2.0.0", @@ -6788,6 +6795,7 @@ dependencies = [ "substrate-block-builder-runtime-api 2.0.0", "substrate-cli 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-primitives 2.0.0", "substrate-service 2.0.0", diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index 50c9eb9eec47d..50b11ce7d24ab 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -11,6 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } sr-primitives = { path = "../../primitives/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } client = { package = "substrate-client", path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } substrate-telemetry = { path = "../telemetry" } diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs index a54c5b52ae9e0..ff85795c07cd9 100644 --- a/client/basic-authorship/src/basic_authorship.rs +++ b/client/basic-authorship/src/basic_authorship.rs @@ -48,7 +48,7 @@ impl consensus_common::Environment for ProposerFactory, A> where A: txpool::ChainApi, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + Clone + 'static, Block: BlockT, RA: Send + Sync + 'static, @@ -96,7 +96,7 @@ impl consensus_common::Proposer for Proposer, A> where A: txpool::ChainApi, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + Clone + 'static, Block: BlockT, RA: Send + Sync + 'static, @@ -121,7 +121,7 @@ where impl Proposer, A> where A: txpool::ChainApi, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + Clone + 'static, Block: BlockT, RA: Send + Sync + 'static, diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index 0894ec22b9fa5..f749256843047 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -10,6 +10,7 @@ app-crypto = { package = "substrate-application-crypto", path = "../../../primit aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } client = { package = "substrate-client", path = "../../" } +interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } codec = { package = "parity-scale-codec", version = "1.0.0" } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } derive_more = "0.15.0" diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs index 0953ea6c973a3..1fed91d595dbb 100644 --- a/client/consensus/aura/src/lib.rs +++ b/client/consensus/aura/src/lib.rs @@ -38,8 +38,9 @@ use consensus_common::{self, BlockImport, Environment, Proposer, use consensus_common::import_queue::{ Verifier, BasicQueue, BoxBlockImport, BoxJustificationImport, BoxFinalityProofImport, }; +use interfaces::{ error::Result as CResult, backend::AuxStore }; use client::{ - blockchain::ProvideCache, error::Result as CResult, backend::AuxStore, BlockOf, + blockchain::ProvideCache, BlockOf, well_known_cache_keys::{self, Id as CacheKeyId}, }; @@ -372,7 +373,7 @@ fn check_header( ) -> Result)>, Error> where DigestItemFor: CompatibleDigestItem

, P::Signature: Decode, - C: client::backend::AuxStore, + C: interfaces::backend::AuxStore, P::Public: Encode + Decode + PartialEq + Clone, T: Send + Sync + 'static, { @@ -487,7 +488,7 @@ impl AuraVerifier #[forbid(deprecated)] impl Verifier for AuraVerifier where - C: ProvideRuntimeApi + Send + Sync + client::backend::AuxStore + ProvideCache + BlockOf, + C: ProvideRuntimeApi + Send + Sync + interfaces::backend::AuxStore + ProvideCache + BlockOf, C::Api: BlockBuilderApi + AuraApi> + ApiExt, DigestItemFor: CompatibleDigestItem

, P: Pair + Send + Sync + 'static, diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index c7fc25de899e0..91c4e92c57754 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -20,6 +20,7 @@ inherents = { package = "substrate-inherents", path = "../../../primitives/inher substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } srml-babe = { path = "../../../paint/babe" } +interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } client = { package = "substrate-client", path = "../../" } sr-api = { path = "../../../primitives/sr-api" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs index 6290d5cf31643..093ff14f46def 100644 --- a/client/consensus/babe/src/aux_schema.rs +++ b/client/consensus/babe/src/aux_schema.rs @@ -19,8 +19,10 @@ use log::info; use codec::{Decode, Encode}; -use client::backend::AuxStore; -use client::error::{Result as ClientResult, Error as ClientError}; +use interfaces::{ + backend::AuxStore, + error::{Result as ClientResult, Error as ClientError}, +}; use sr_primitives::traits::Block as BlockT; use babe_primitives::BabeBlockWeight; diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs index 04d0f5930589a..f7617e495be23 100644 --- a/client/consensus/babe/src/lib.rs +++ b/client/consensus/babe/src/lib.rs @@ -86,10 +86,12 @@ use srml_babe::{ }; use consensus_common::SelectChain; use consensus_common::import_queue::{Verifier, BasicQueue, CacheKeyId}; +use interfaces::{ + backend::{AuxStore, Backend}, + error::{Result as ClientResult, Error as ClientError} +}; use client::{ - blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, CallExecutor, Client, - error::Result as ClientResult, error::Error as ClientError, backend::{AuxStore, Backend}, - ProvideUncles, + blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, CallExecutor, Client, ProvideUncles, }; use block_builder_api::BlockBuilder as BlockBuilderApi; diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 08324ce8c921c..6f0e6bf5d0ed3 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -8,6 +8,7 @@ build = "build.rs" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } +interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } client = { package = "substrate-client", path = "../../" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs index 186288c174432..cf7f83adee576 100644 --- a/client/consensus/slots/src/aux_schema.rs +++ b/client/consensus/slots/src/aux_schema.rs @@ -17,8 +17,8 @@ //! Schema for slots in the aux-db. use codec::{Encode, Decode}; -use client::backend::AuxStore; -use client::error::{Result as ClientResult, Error as ClientError}; +use interfaces::backend::AuxStore; +use interfaces::error::{Result as ClientResult, Error as ClientError}; use sr_primitives::traits::Header; const SLOT_HEADER_MAP_KEY: &[u8] = b"slot_header_map"; diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs index ebcd3351bc569..921f23fd45e8e 100644 --- a/client/consensus/slots/src/lib.rs +++ b/client/consensus/slots/src/lib.rs @@ -390,7 +390,7 @@ impl SlotDuration { /// `slot_key` is marked as `'static`, as it should really be a /// compile-time constant. pub fn get_or_compute(client: &C, cb: CB) -> ::client::error::Result where - C: client::backend::AuxStore, + C: interfaces::backend::AuxStore, C: ProvideRuntimeApi, CB: FnOnce(ApiRef, &BlockId) -> ::client::error::Result, T: SlotData + Encode + Decode + Debug, diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs index ac09fe0ef346a..717ab78f9e66c 100644 --- a/client/db/src/lib.rs +++ b/client/db/src/lib.rs @@ -39,10 +39,10 @@ use std::path::PathBuf; use std::io; use std::collections::{HashMap, HashSet}; -use client::backend::NewBlockState; +use interfaces::backend::NewBlockState; use client::blockchain::{well_known_cache_keys, HeaderBackend}; use client::{ForkBlocks, ExecutionStrategies}; -use client::backend::{StorageCollection, ChildStorageCollection}; +use interfaces::backend::{StorageCollection, ChildStorageCollection}; use client::error::{Result as ClientResult, Error as ClientError}; use codec::{Decode, Encode}; use hash_db::{Hasher, Prefix}; @@ -471,7 +471,7 @@ impl BlockImportOperation { } } -impl client::backend::BlockImportOperation +impl interfaces::backend::BlockImportOperation for BlockImportOperation where Block: BlockT, { type State = CachingState, Block>; @@ -661,7 +661,7 @@ impl> DbChangesTrieStorage { } } -impl client::backend::PrunableStateChangesTrieStorage +impl interfaces::backend::PrunableStateChangesTrieStorage for DbChangesTrieStorage where Block: BlockT, @@ -853,7 +853,7 @@ impl> Backend { /// Returns in-memory blockchain that contains the same set of blocks that the self. #[cfg(feature = "test-helpers")] pub fn as_in_memory(&self) -> InMemoryBackend { - use client::backend::{Backend as ClientBackend, BlockImportOperation}; + use interfaces::backend::{Backend as ClientBackend, BlockImportOperation}; use client::blockchain::Backend as BlockchainBackend; let inmem = InMemoryBackend::::new(); @@ -913,7 +913,7 @@ impl> Backend { match cached_changes_trie_config.clone() { Some(cached_changes_trie_config) => Ok(cached_changes_trie_config), None => { - use client::backend::Backend; + use interfaces::backend::Backend; let changes_trie_config = self .state_at(BlockId::Hash(block))? .storage(well_known_keys::CHANGES_TRIE_CONFIG)? @@ -1318,7 +1318,7 @@ fn apply_state_commit(transaction: &mut DBTransaction, commit: state_db::CommitS } } -impl client::backend::AuxStore for Backend where Block: BlockT { +impl interfaces::backend::AuxStore for Backend where Block: BlockT { fn insert_aux< 'a, 'b: 'a, @@ -1342,7 +1342,7 @@ impl client::backend::AuxStore for Backend where Block: BlockT client::backend::Backend for Backend where Block: BlockT { +impl interfaces::backend::Backend for Backend where Block: BlockT { type BlockImportOperation = BlockImportOperation; type Blockchain = BlockchainDb; type State = CachingState, Block>; @@ -1538,7 +1538,7 @@ impl client::backend::Backend for Backend whe } } -impl client::backend::LocalBackend for Backend +impl interfaces::backend::LocalBackend for Backend where Block: BlockT {} /// TODO: remove me in #3201 @@ -1552,7 +1552,7 @@ mod tests { use hash_db::{HashDB, EMPTY_PREFIX}; use super::*; use crate::columns; - use client::backend::Backend as BTrait; + use interfaces::backend::Backend as BTrait; use client::blockchain::Backend as BLBTrait; use client::backend::BlockImportOperation as Op; use sr_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; diff --git a/client/db/src/light.rs b/client/db/src/light.rs index 6e71b88ae73f9..5079a995dc5a0 100644 --- a/client/db/src/light.rs +++ b/client/db/src/light.rs @@ -22,7 +22,7 @@ use parking_lot::RwLock; use kvdb::{KeyValueDB, DBTransaction}; -use client::backend::{AuxStore, NewBlockState}; +use interfaces::backend::{AuxStore, NewBlockState}; use client::blockchain::{ BlockStatus, Cache as BlockchainCache, HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs index 0640fb6c29bd6..86bc7357ab018 100644 --- a/client/db/src/offchain.rs +++ b/client/db/src/offchain.rs @@ -56,7 +56,7 @@ impl LocalStorage { } } -impl client::backend::OffchainStorage for LocalStorage { +impl interfaces::backend::OffchainStorage for LocalStorage { fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) { let key: Vec = prefix.iter().chain(key).cloned().collect(); let mut tx = self.db.transaction(); diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs index e1ad6f493aa7b..e96705c03495a 100644 --- a/client/db/src/storage_cache.rs +++ b/client/db/src/storage_cache.rs @@ -25,7 +25,7 @@ use sr_primitives::traits::{Block as BlockT, Header}; use primitives::hexdisplay::HexDisplay; use state_machine::{backend::Backend as StateBackend, TrieBackend}; use log::trace; -use super::{StorageCollection, ChildStorageCollection}; +use interfaces::backend::{StorageCollection, ChildStorageCollection}; use std::hash::Hash as StdHash; const STATE_CACHE_BLOCKS: usize = 12; diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs index 32501ec986b21..197acd748071f 100644 --- a/client/finality-grandpa/src/import.rs +++ b/client/finality-grandpa/src/import.rs @@ -23,7 +23,7 @@ use parking_lot::RwLockWriteGuard; use client::{blockchain, CallExecutor, Client, well_known_cache_keys}; use client::blockchain::HeaderBackend; -use client::backend::Backend; +use interfaces::backend::Backend; use client::utils::is_descendent_of; use consensus_common::{ BlockImport, Error as ConsensusError, diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs index f5965df3e1228..a386f89db7a82 100644 --- a/client/finality-grandpa/src/justification.rs +++ b/client/finality-grandpa/src/justification.rs @@ -17,7 +17,7 @@ use std::collections::{HashMap, HashSet}; use client::{CallExecutor, Client}; -use client::backend::Backend; +use interfaces::backend::Backend; use client::error::Error as ClientError; use codec::{Encode, Decode}; use grandpa::voter_set::VoterSet; diff --git a/client/src/backend.rs b/client/interfaces/src/backend.rs similarity index 94% rename from client/src/backend.rs rename to client/interfaces/src/backend.rs index 5638939ad3c62..34e0d05ad89ea 100644 --- a/client/src/backend.rs +++ b/client/interfaces/src/backend.rs @@ -18,14 +18,18 @@ use std::sync::Arc; use std::collections::HashMap; -use interfaces::error; -use crate::light::blockchain::RemoteBlockchain; use primitives::ChangesTrieConfiguration; use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; use sr_primitives::traits::{Block as BlockT, NumberFor}; use state_machine::backend::Backend as StateBackend; use state_machine::{ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction}; -use interfaces::blockchain::well_known_cache_keys; +use crate::{ + blockchain::{ + Backend as BlockchainBackend, well_known_cache_keys + }, + error, + light::RemoteBlockchain, +}; use consensus::BlockOrigin; use hash_db::Hasher; use parking_lot::Mutex; @@ -36,13 +40,13 @@ pub type StorageCollection = Vec<(Vec, Option>)>; /// In memory arrays of storage values for multiple child tries. pub type ChildStorageCollection = Vec<(Vec, StorageCollection)>; -pub(crate) struct ImportSummary { - pub(crate) hash: Block::Hash, - pub(crate) origin: BlockOrigin, - pub(crate) header: Block::Header, - pub(crate) is_new_best: bool, - pub(crate) storage_changes: Option<(StorageCollection, ChildStorageCollection)>, - pub(crate) retracted: Vec, +pub struct ImportSummary { + pub hash: Block::Hash, + pub origin: BlockOrigin, + pub header: Block::Header, + pub is_new_best: bool, + pub storage_changes: Option<(StorageCollection, ChildStorageCollection)>, + pub retracted: Vec, } /// Import operation wrapper @@ -51,9 +55,9 @@ pub struct ClientImportOperation< H: Hasher, B: Backend, > { - pub(crate) op: B::BlockImportOperation, - pub(crate) notify_imported: Option>, - pub(crate) notify_finalized: Vec, + pub op: B::BlockImportOperation, + pub notify_imported: Option>, + pub notify_finalized: Vec, } /// State of a new block. @@ -216,7 +220,7 @@ pub trait Backend: AuxStore + Send + Sync where /// Associated block insertion operation type. type BlockImportOperation: BlockImportOperation; /// Associated blockchain backend type. - type Blockchain: interfaces::blockchain::Backend; + type Blockchain: BlockchainBackend; /// Associated state backend type. type State: StateBackend; /// Changes trie storage. diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 029fc7d3ce47f..70664ebb4655e 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1,3 +1,5 @@ pub mod error; +pub mod backend; pub mod blockchain; +pub mod light; pub mod notifications; diff --git a/client/interfaces/src/light.rs b/client/interfaces/src/light.rs new file mode 100644 index 0000000000000..0a610b0448fd3 --- /dev/null +++ b/client/interfaces/src/light.rs @@ -0,0 +1,283 @@ +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +//! Substrate light client interfaces + +use std::sync::Arc; +use std::collections::{BTreeMap, HashMap}; +use std::future::Future; + +use sr_primitives::{ + traits::{ + Block as BlockT, Header as HeaderT, NumberFor, + }, + generic::BlockId +}; +use primitives::{ChangesTrieConfiguration}; +use state_machine::StorageProof; +use header_metadata::HeaderMetadata; +use crate::{ + backend::{ + AuxStore, NewBlockState, + }, + blockchain::{ + well_known_cache_keys, HeaderBackend, Cache as BlockchainCache, + }, + error::{ Error as ClientError, Result as ClientResult }, +}; +/// Remote call request. +#[derive(Clone, Debug, PartialEq, Eq, Hash)] +pub struct RemoteCallRequest { + /// Call at state of given block. + pub block: Header::Hash, + /// Header of block at which call is performed. + pub header: Header, + /// Method to call. + pub method: String, + /// Call data. + pub call_data: Vec, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Remote canonical header request. +#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)] +pub struct RemoteHeaderRequest { + /// The root of CHT this block is included in. + pub cht_root: Header::Hash, + /// Number of the header to query. + pub block: Header::Number, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Remote storage read request. +#[derive(Clone, Debug, PartialEq, Eq, Hash)] +pub struct RemoteReadRequest { + /// Read at state of given block. + pub block: Header::Hash, + /// Header of block at which read is performed. + pub header: Header, + /// Storage key to read. + pub keys: Vec>, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Remote storage read child request. +#[derive(Clone, Debug, PartialEq, Eq, Hash)] +pub struct RemoteReadChildRequest { + /// Read at state of given block. + pub block: Header::Hash, + /// Header of block at which read is performed. + pub header: Header, + /// Storage key for child. + pub storage_key: Vec, + /// Child storage key to read. + pub keys: Vec>, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Remote key changes read request. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct RemoteChangesRequest { + /// Changes trie configuration. + pub changes_trie_config: ChangesTrieConfiguration, + /// Query changes from range of blocks, starting (and including) with this hash... + pub first_block: (Header::Number, Header::Hash), + /// ...ending (and including) with this hash. Should come after first_block and + /// be the part of the same fork. + pub last_block: (Header::Number, Header::Hash), + /// Only use digests from blocks up to this hash. Should be last_block OR come + /// after this block and be the part of the same fork. + pub max_block: (Header::Number, Header::Hash), + /// Known changes trie roots for the range of blocks [tries_roots.0..max_block]. + /// Proofs for roots of ascendants of tries_roots.0 are provided by the remote node. + pub tries_roots: (Header::Number, Header::Hash, Vec), + /// Optional Child Storage key to read. + pub storage_key: Option>, + /// Storage key to read. + pub key: Vec, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Key changes read proof. +#[derive(Debug, PartialEq, Eq)] +pub struct ChangesProof { + /// Max block that has been used in changes query. + pub max_block: Header::Number, + /// All touched nodes of all changes tries. + pub proof: Vec>, + /// All changes tries roots that have been touched AND are missing from + /// the requester' node. It is a map of block number => changes trie root. + pub roots: BTreeMap, + /// The proofs for all changes tries roots that have been touched AND are + /// missing from the requester' node. It is a map of CHT number => proof. + pub roots_proof: StorageProof, +} + +/// Remote block body request +#[derive(Clone, Default, Debug, PartialEq, Eq, Hash)] +pub struct RemoteBodyRequest { + /// Header of the requested block body + pub header: Header, + /// Number of times to retry request. None means that default RETRY_COUNT is used. + pub retry_count: Option, +} + +/// Light client data fetcher. Implementations of this trait must check if remote data +/// is correct (see FetchedDataChecker) and return already checked data. +pub trait Fetcher: Send + Sync { + /// Remote header future. + type RemoteHeaderResult: Future> + Send + 'static; + /// Remote storage read future. + type RemoteReadResult: Future, Option>>, ClientError>> + Send + 'static; + /// Remote call result future. + type RemoteCallResult: Future, ClientError>> + Send + 'static; + /// Remote changes result future. + type RemoteChangesResult: Future, u32)>, ClientError>> + Send + 'static; + /// Remote block body result future. + type RemoteBodyResult: Future, ClientError>> + Send + 'static; + + /// Fetch remote header. + fn remote_header(&self, request: RemoteHeaderRequest) -> Self::RemoteHeaderResult; + /// Fetch remote storage value. + fn remote_read( + &self, + request: RemoteReadRequest + ) -> Self::RemoteReadResult; + /// Fetch remote storage child value. + fn remote_read_child( + &self, + request: RemoteReadChildRequest + ) -> Self::RemoteReadResult; + /// Fetch remote call result. + fn remote_call(&self, request: RemoteCallRequest) -> Self::RemoteCallResult; + /// Fetch remote changes ((block number, extrinsic index)) where given key has been changed + /// at a given blocks range. + fn remote_changes(&self, request: RemoteChangesRequest) -> Self::RemoteChangesResult; + /// Fetch remote block body + fn remote_body(&self, request: RemoteBodyRequest) -> Self::RemoteBodyResult; +} + +/// Light client remote data checker. +/// +/// Implementations of this trait should not use any prunable blockchain data +/// except that is passed to its methods. +pub trait FetchChecker: Send + Sync { + /// Check remote header proof. + fn check_header_proof( + &self, + request: &RemoteHeaderRequest, + header: Option, + remote_proof: StorageProof, + ) -> ClientResult; + /// Check remote storage read proof. + fn check_read_proof( + &self, + request: &RemoteReadRequest, + remote_proof: StorageProof, + ) -> ClientResult, Option>>>; + /// Check remote storage read proof. + fn check_read_child_proof( + &self, + request: &RemoteReadChildRequest, + remote_proof: StorageProof, + ) -> ClientResult, Option>>>; + /// Check remote method execution proof. + fn check_execution_proof( + &self, + request: &RemoteCallRequest, + remote_proof: StorageProof, + ) -> ClientResult>; + /// Check remote changes query proof. + fn check_changes_proof( + &self, + request: &RemoteChangesRequest, + proof: ChangesProof + ) -> ClientResult, u32)>>; + /// Check remote body proof. + fn check_body_proof( + &self, + request: &RemoteBodyRequest, + body: Vec + ) -> ClientResult>; +} + + +/// Light client blockchain storage. +pub trait Storage: AuxStore + HeaderBackend + HeaderMetadata { + /// Store new header. Should refuse to revert any finalized blocks. + /// + /// Takes new authorities, the leaf state of the new block, and + /// any auxiliary storage updates to place in the same operation. + fn import_header( + &self, + header: Block::Header, + cache: HashMap>, + state: NewBlockState, + aux_ops: Vec<(Vec, Option>)>, + ) -> ClientResult<()>; + + /// Set an existing block as new best block. + fn set_head(&self, block: BlockId) -> ClientResult<()>; + + /// Mark historic header as finalized. + fn finalize_header(&self, block: BlockId) -> ClientResult<()>; + + /// Get last finalized header. + fn last_finalized(&self) -> ClientResult; + + /// Get headers CHT root for given block. Fails if the block is not pruned (not a part of any CHT). + fn header_cht_root( + &self, + cht_size: NumberFor, + block: NumberFor, + ) -> ClientResult; + + /// Get changes trie CHT root for given block. Fails if the block is not pruned (not a part of any CHT). + fn changes_trie_cht_root( + &self, + cht_size: NumberFor, + block: NumberFor, + ) -> ClientResult; + + /// Get storage cache. + fn cache(&self) -> Option>>; +} + +/// Remote header. +#[derive(Debug)] +pub enum LocalOrRemote { + /// When data is available locally, it is returned. + Local(Data), + /// When data is unavailable locally, the request to fetch it from remote node is returned. + Remote(Request), + /// When data is unknown. + Unknown, +} + +/// Futures-based blockchain backend that either resolves blockchain data +/// locally, or fetches required data from remote node. +pub trait RemoteBlockchain: Send + Sync { + /// Get block header. + fn header(&self, id: BlockId) -> ClientResult, + >>; +} diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs index 2b32c07009fc7..637b05ade8d93 100644 --- a/client/network/src/chain.rs +++ b/client/network/src/chain.rs @@ -91,7 +91,7 @@ impl FinalityProofProvider for () { } impl Client for SubstrateClient where - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + 'static, Self: BlockImport, Block: BlockT, diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index f30c78741cb00..613c61eea184b 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -6,6 +6,7 @@ edition = "2018" [dependencies] api = { package = "substrate-rpc-api", path = "./api" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } client = { package = "substrate-client", path = "../" } sr-api = { path = "../../primitives/sr-api" } codec = { package = "parity-scale-codec", version = "1.0.0" } diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs index 790576710ca18..ccfe114402725 100644 --- a/client/rpc/src/author/mod.rs +++ b/client/rpc/src/author/mod.rs @@ -81,7 +81,7 @@ impl Author where P: PoolChainApi + Sync + Send + 'sta } impl AuthorApi, BlockHash

> for Author where - B: client::backend::Backend<

::Block, Blake2Hasher> + Send + Sync + 'static, + B: interfaces::backend::Backend<

::Block, Blake2Hasher> + Send + Sync + 'static, E: client::CallExecutor<

::Block, Blake2Hasher> + Send + Sync + 'static, P: PoolChainApi + Sync + Send + 'static, P::Block: traits::Block, diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs index ad359a9300cdd..c5e18db614a81 100644 --- a/client/rpc/src/chain/chain_full.rs +++ b/client/rpc/src/chain/chain_full.rs @@ -20,7 +20,8 @@ use std::sync::Arc; use rpc::futures::future::result; use api::Subscriptions; -use client::{backend::Backend, CallExecutor, Client}; +use interfaces::backend::Backend; +use client::{CallExecutor, Client}; use primitives::{H256, Blake2Hasher}; use sr_primitives::{ generic::{BlockId, SignedBlock}, diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs index d969d6ca93702..2138bcc20d83d 100644 --- a/client/rpc/src/chain/chain_light.rs +++ b/client/rpc/src/chain/chain_light.rs @@ -68,7 +68,7 @@ impl> LightChain impl ChainBackend for LightChain where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static, RA: Send + Sync + 'static, F: Fetcher + Send + Sync + 'static, diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs index 61ecf96711383..19d6d055e946c 100644 --- a/client/rpc/src/chain/mod.rs +++ b/client/rpc/src/chain/mod.rs @@ -51,7 +51,7 @@ pub use api::chain::*; trait ChainBackend: Send + Sync + 'static where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static, { /// Get client reference. @@ -156,7 +156,7 @@ pub fn new_full( ) -> Chain where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static + Clone, RA: Send + Sync + 'static, { @@ -174,7 +174,7 @@ pub fn new_light>( ) -> Chain where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static + Clone, RA: Send + Sync + 'static, F: Send + Sync + 'static, @@ -196,7 +196,7 @@ pub struct Chain { impl ChainApi, Block::Hash, Block::Header, SignedBlock> for Chain where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static, RA: Send + Sync + 'static { @@ -245,7 +245,7 @@ fn subscribe_headers( stream: F, ) where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static, F: FnOnce() -> S, G: FnOnce() -> Block::Hash, diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs index 91e10c18b32d4..9838f0bf92ab6 100644 --- a/client/rpc/src/state/mod.rs +++ b/client/rpc/src/state/mod.rs @@ -47,7 +47,7 @@ pub use api::state::*; pub trait StateBackend: Send + Sync + 'static where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: client::CallExecutor + Send + Sync + 'static, RA: Send + Sync + 'static, { @@ -179,7 +179,7 @@ pub fn new_full( ) -> State where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + 'static + Clone, RA: Send + Sync + 'static, Client: ProvideRuntimeApi, @@ -200,7 +200,7 @@ pub fn new_light>( ) -> State where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + 'static + Clone, RA: Send + Sync + 'static, F: Send + Sync + 'static, @@ -223,7 +223,7 @@ pub struct State { impl StateApi for State where Block: BlockT + 'static, - B: client::backend::Backend + Send + Sync + 'static, + B: interfaces::backend::Backend + Send + Sync + 'static, E: CallExecutor + Send + Sync + 'static + Clone, RA: Send + Sync + 'static, { diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs index d91a2288954e3..62cb3ad444001 100644 --- a/client/rpc/src/state/state_full.rs +++ b/client/rpc/src/state/state_full.rs @@ -28,8 +28,9 @@ use rpc::{ }; use api::Subscriptions; +use interfaces::{backend::Backend, error::Result as ClientResult}; use client::{ - Client, CallExecutor, BlockchainEvents, backend::Backend, error::Result as ClientResult, + Client, CallExecutor, BlockchainEvents, }; use primitives::{ H256, Blake2Hasher, Bytes, storage::{well_known_keys, StorageKey, StorageData, StorageChangeSet}, diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs index 3d0c7979e3995..5b336aaf1a501 100644 --- a/client/rpc/src/state/state_light.rs +++ b/client/rpc/src/state/state_light.rs @@ -39,8 +39,9 @@ use rpc::{ }; use api::Subscriptions; +use interfaces::backend::Backend; use client::{ - BlockchainEvents, Client, CallExecutor, backend::Backend, + BlockchainEvents, Client, CallExecutor, error::Error as ClientError, light::{ blockchain::{future_header, RemoteBlockchain}, diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs index f188f77a4acf6..f79eec1da0df7 100644 --- a/client/service/src/builder.rs +++ b/client/service/src/builder.rs @@ -677,7 +677,7 @@ impl< TFchr, TSc, TImpQu, TFprb, TFpp, TNetP, TExPool, TRpc, Backend > where TBl: BlockT::Out>, - TBackend: 'static + client::backend::Backend + Send, + TBackend: 'static + interfaces::backend::Backend + Send, TExec: 'static + client::CallExecutor + Send + Sync + Clone, TImpQu: 'static + ImportQueue, TRtApi: 'static + Send + Sync, @@ -699,7 +699,7 @@ impl where TBl: BlockT::Out>, - TBackend: 'static + client::backend::Backend + Send, + TBackend: 'static + interfaces::backend::Backend + Send, TExec: 'static + client::CallExecutor + Send + Sync + Clone { type Block = TBl; @@ -722,7 +722,7 @@ impl where TBl: BlockT::Out>, - TBackend: 'static + client::backend::Backend + Send, + TBackend: 'static + interfaces::backend::Backend + Send, TExec: 'static + client::CallExecutor + Send + Sync + Clone { type Block = TBl; @@ -766,7 +766,7 @@ ServiceBuilder< TCfg: Default, TGen: RuntimeGenesis, TCSExt: Extension, - TBackend: 'static + client::backend::Backend + Send, + TBackend: 'static + interfaces::backend::Backend + Send, TExec: 'static + client::CallExecutor + Send + Sync + Clone, TSc: Clone, TImpQu: 'static + ImportQueue, @@ -1161,7 +1161,7 @@ pub(crate) fn maintain_transaction_pool( retracted: &[Block::Hash], ) -> error::Result + Send>> where Block: BlockT::Out>, - Backend: 'static + client::backend::Backend, + Backend: 'static + interfaces::backend::Backend, Client: ProvideRuntimeApi, as ProvideRuntimeApi>::Api: tx_pool_api::TaggedTransactionQueue, diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs index f5ac66b9b6658..b61e142d725eb 100644 --- a/client/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -136,7 +136,7 @@ pub trait AbstractService: 'static + Future + /// Type of block of this chain. type Block: BlockT; /// Backend storage for the client. - type Backend: 'static + client::backend::Backend; + type Backend: 'static + interfaces::backend::Backend; /// How to execute calls towards the runtime. type CallExecutor: 'static + client::CallExecutor + Send + Sync + Clone; /// API that the runtime provides. @@ -203,7 +203,7 @@ impl AbstractServi NetworkService, TransactionPool, TOc> where TBl: BlockT, - TBackend: 'static + client::backend::Backend, + TBackend: 'static + interfaces::backend::Backend, TExec: 'static + client::CallExecutor + Send + Sync + Clone, TRtApi: 'static + Send + Sync, TSc: consensus_common::SelectChain + 'static + Clone + Send, diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs index a6e83d6ddb4e1..4fe695c354bae 100644 --- a/client/src/call_executor.rs +++ b/client/src/call_executor.rs @@ -31,8 +31,9 @@ use primitives::{ }; use sr_api::{ProofRecorder, InitializeBlock}; -use crate::backend; -use interfaces::error; +use interfaces::{ + error, backend +}; /// Method call executor. pub trait CallExecutor diff --git a/client/src/client.rs b/client/src/client.rs index 2523a98973aa0..b1305057cdd75 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -57,22 +57,24 @@ use sr_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, use block_builder::BlockBuilderApi; use interfaces::{ - notifications::{StorageNotifications, StorageEventStream}, -}; - -use crate::{ backend::{ self, BlockImportOperation, PrunableStateChangesTrieStorage, - ClientImportOperation, Finalizer, ImportSummary, + ClientImportOperation, Finalizer, ImportSummary, NewBlockState, }, blockchain::{ self, Info as ChainInfo, Backend as ChainBackend, HeaderBackend as ChainHeaderBackend, ProvideCache, Cache, well_known_cache_keys::Id as CacheKeyId, }, + notifications::{StorageNotifications, StorageEventStream}, + error::Error, + error, +}; + +use crate::{ call_executor::{CallExecutor, LocalCallExecutor}, light::{call_executor::prove_execution, fetcher::ChangesProof}, - error::Error, cht, error, in_mem, genesis + in_mem, genesis, cht, }; /// Type that implements `futures::Stream` of block import events. @@ -314,7 +316,7 @@ impl Client where genesis_block.deconstruct().0, Some(vec![]), None, - crate::backend::NewBlockState::Final + NewBlockState::Final )?; backend.commit_operation(op)?; } @@ -995,11 +997,11 @@ impl Client where }; let leaf_state = if finalized { - crate::backend::NewBlockState::Final + NewBlockState::Final } else if is_new_best { - crate::backend::NewBlockState::Best + NewBlockState::Best } else { - crate::backend::NewBlockState::Normal + NewBlockState::Normal }; let retracted = if is_new_best { @@ -1816,7 +1818,7 @@ impl backend::AuxStore for Client } /// Query auxiliary data from key-value store. fn get_aux(&self, key: &[u8]) -> error::Result>> { - crate::backend::AuxStore::get_aux(&*self.backend, key) + backend::AuxStore::get_aux(&*self.backend, key) } } diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs index 6fd13decefe08..ae4eba651bdd0 100644 --- a/client/src/in_mem.rs +++ b/client/src/in_mem.rs @@ -29,13 +29,14 @@ use hash_db::{Hasher, Prefix}; use trie::MemoryDB; use header_metadata::{CachedHeaderMetadata, HeaderMetadata}; -use interfaces::error; -use crate::backend::{self, NewBlockState, StorageCollection, ChildStorageCollection}; -use crate::light; -use crate::leaves::LeafSet; -use interfaces::blockchain::{ - self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId +use interfaces::{ + error, + backend::{self, NewBlockState, StorageCollection, ChildStorageCollection}, + blockchain::{ + self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId + }, }; +use crate::leaves::LeafSet; struct PendingBlock { block: StoredBlock, @@ -395,7 +396,7 @@ impl backend::AuxStore for Blockchain { } } -impl light::blockchain::Storage for Blockchain +impl interfaces::light::Storage for Blockchain where Block::Hash: From<[u8; 32]>, { diff --git a/client/src/lib.rs b/client/src/lib.rs index 5e977b5452d93..ef411d5e75677 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -76,7 +76,6 @@ #![warn(missing_docs)] #![recursion_limit="128"] -pub mod backend; pub mod cht; pub mod in_mem; pub mod genesis; @@ -85,9 +84,13 @@ pub mod leaves; mod call_executor; mod client; -pub use interfaces::error; -pub use interfaces::blockchain; -pub use interfaces::blockchain::Info as ChainInfo; +pub use interfaces::{ + error, + blockchain, + blockchain::well_known_cache_keys, + blockchain::Info as ChainInfo, + notifications::{StorageEventStream, StorageChangeSet}, +}; pub use crate::call_executor::{CallExecutor, LocalCallExecutor}; pub use crate::client::{ new_with_backend, @@ -97,7 +100,5 @@ pub use crate::client::{ LongestChain, BlockOf, ProvideUncles, ForkBlocks, utils, apply_aux, }; -pub use interfaces::notifications::{StorageEventStream, StorageChangeSet}; pub use state_machine::{ExecutionStrategy, StorageProof}; pub use crate::leaves::LeafSet; -pub use interfaces::blockchain::well_known_cache_keys; diff --git a/client/src/light/backend.rs b/client/src/light/backend.rs index 95ca7127d3d61..dbfe434ff0dd2 100644 --- a/client/src/light/backend.rs +++ b/client/src/light/backend.rs @@ -25,13 +25,20 @@ use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenSto use state_machine::{Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState, ChangesTrieTransaction}; use sr_primitives::traits::{Block as BlockT, NumberFor, Zero, Header}; use crate::in_mem::{self, check_genesis_storage}; -use crate::backend::{ - AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState, - StorageCollection, ChildStorageCollection, +use interfaces::{ + backend::{ + AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState, + StorageCollection, ChildStorageCollection, + }, + blockchain::{ + HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys, + }, + error::{ + Error as ClientError, Result as ClientResult + }, + light::Storage as BlockchainStorage, }; -use interfaces::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys}; -use interfaces::error::{Error as ClientError, Result as ClientResult}; -use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; +use crate::light::blockchain::{Blockchain}; use hash_db::Hasher; use trie::MemoryDB; @@ -442,7 +449,7 @@ impl StateBackend for GenesisOrUnavailableState mod tests { use primitives::Blake2Hasher; use test_client::{self, runtime::Block}; - use crate::backend::NewBlockState; + use interfaces::backend::NewBlockState; use crate::light::blockchain::tests::{DummyBlockchain, DummyStorage}; use super::*; diff --git a/client/src/light/blockchain.rs b/client/src/light/blockchain.rs index 9242821aa43c3..77796f59bf4d2 100644 --- a/client/src/light/blockchain.rs +++ b/client/src/light/blockchain.rs @@ -18,85 +18,31 @@ //! blocks. CHT roots are stored for headers of ancient blocks. use std::future::Future; -use std::{sync::Arc, collections::HashMap}; +use std::sync::Arc; use sr_primitives::{Justification, generic::BlockId}; use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; use header_metadata::{HeaderMetadata, CachedHeaderMetadata}; - -use crate::backend::{AuxStore, NewBlockState}; -use interfaces::blockchain::{ - Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache, - HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, ProvideCache, - well_known_cache_keys +pub use interfaces::{ + backend::{ + AuxStore, NewBlockState + }, + blockchain::{ + Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache, + HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, ProvideCache, + well_known_cache_keys, + }, + error::{ + Error as ClientError, Result as ClientResult + }, + light::{ + RemoteBlockchain, LocalOrRemote, Storage + } }; use crate::cht; -use interfaces::error::{Error as ClientError, Result as ClientResult}; use crate::light::fetcher::{Fetcher, RemoteHeaderRequest}; -/// Light client blockchain storage. -pub trait Storage: AuxStore + BlockchainHeaderBackend + HeaderMetadata { - /// Store new header. Should refuse to revert any finalized blocks. - /// - /// Takes new authorities, the leaf state of the new block, and - /// any auxiliary storage updates to place in the same operation. - fn import_header( - &self, - header: Block::Header, - cache: HashMap>, - state: NewBlockState, - aux_ops: Vec<(Vec, Option>)>, - ) -> ClientResult<()>; - - /// Set an existing block as new best block. - fn set_head(&self, block: BlockId) -> ClientResult<()>; - - /// Mark historic header as finalized. - fn finalize_header(&self, block: BlockId) -> ClientResult<()>; - - /// Get last finalized header. - fn last_finalized(&self) -> ClientResult; - - /// Get headers CHT root for given block. Fails if the block is not pruned (not a part of any CHT). - fn header_cht_root( - &self, - cht_size: NumberFor, - block: NumberFor, - ) -> ClientResult; - - /// Get changes trie CHT root for given block. Fails if the block is not pruned (not a part of any CHT). - fn changes_trie_cht_root( - &self, - cht_size: NumberFor, - block: NumberFor, - ) -> ClientResult; - - /// Get storage cache. - fn cache(&self) -> Option>>; -} - -/// Remote header. -#[derive(Debug)] -pub enum LocalOrRemote { - /// When data is available locally, it is returned. - Local(Data), - /// When data is unavailable locally, the request to fetch it from remote node is returned. - Remote(Request), - /// When data is unknown. - Unknown, -} - -/// Futures-based blockchain backend that either resolves blockchain data -/// locally, or fetches required data from remote node. -pub trait RemoteBlockchain: Send + Sync { - /// Get block header. - fn header(&self, id: BlockId) -> ClientResult, - >>; -} - /// Light client blockchain. pub struct Blockchain { storage: S, diff --git a/client/src/light/call_executor.rs b/client/src/light/call_executor.rs index 8f2a450da2eaa..98c8411eff525 100644 --- a/client/src/light/call_executor.rs +++ b/client/src/light/call_executor.rs @@ -35,10 +35,12 @@ use hash_db::Hasher; use sr_api::{ProofRecorder, InitializeBlock}; -use crate::backend::RemoteBackend; use crate::call_executor::CallExecutor; -use interfaces::error::{Error as ClientError, Result as ClientResult}; -use crate::light::fetcher::RemoteCallRequest; +use interfaces::{ + backend::RemoteBackend, + error::{Error as ClientError, Result as ClientResult}, + light::RemoteCallRequest +}; use executor::{RuntimeVersion, NativeVersion}; /// Call executor that is able to execute calls only on genesis state. @@ -295,7 +297,7 @@ mod tests { use test_client::{self, runtime::{Header, Digest, Block}, ClientExt, TestClient}; use executor::{NativeExecutor, WasmExecutionMethod}; use primitives::Blake2Hasher; - use crate::backend::{Backend, NewBlockState}; + use interfaces::backend::{Backend, NewBlockState}; use crate::in_mem::Backend as InMemBackend; struct DummyCallExecutor; diff --git a/client/src/light/fetcher.rs b/client/src/light/fetcher.rs index 3ab580e1e12b0..1ef183251e836 100644 --- a/client/src/light/fetcher.rs +++ b/client/src/light/fetcher.rs @@ -19,11 +19,10 @@ use std::sync::Arc; use std::collections::{BTreeMap, HashMap}; use std::marker::PhantomData; -use std::future::Future; use hash_db::{HashDB, Hasher, EMPTY_PREFIX}; use codec::{Decode, Encode}; -use primitives::{ChangesTrieConfiguration, convert_hash, traits::CodeExecutor, H256}; +use primitives::{convert_hash, traits::CodeExecutor, H256}; use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, Hash, HashFor, NumberFor, SimpleArithmetic, CheckedConversion, Zero, @@ -36,191 +35,19 @@ use state_machine::{ pub use state_machine::StorageProof; use crate::cht; -use interfaces::error::{Error as ClientError, Result as ClientResult}; -use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; +pub use interfaces::{ + error::{ + Error as ClientError, Result as ClientResult + }, + light::{ + RemoteCallRequest, RemoteHeaderRequest, RemoteReadRequest, RemoteReadChildRequest, + RemoteChangesRequest, ChangesProof, RemoteBodyRequest, Fetcher, FetchChecker, + Storage as BlockchainStorage, + }, +}; +use crate::light::blockchain::{Blockchain}; use crate::light::call_executor::check_execution_proof; -/// Remote call request. -#[derive(Clone, Debug, PartialEq, Eq, Hash)] -pub struct RemoteCallRequest { - /// Call at state of given block. - pub block: Header::Hash, - /// Header of block at which call is performed. - pub header: Header, - /// Method to call. - pub method: String, - /// Call data. - pub call_data: Vec, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Remote canonical header request. -#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)] -pub struct RemoteHeaderRequest { - /// The root of CHT this block is included in. - pub cht_root: Header::Hash, - /// Number of the header to query. - pub block: Header::Number, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Remote storage read request. -#[derive(Clone, Debug, PartialEq, Eq, Hash)] -pub struct RemoteReadRequest { - /// Read at state of given block. - pub block: Header::Hash, - /// Header of block at which read is performed. - pub header: Header, - /// Storage key to read. - pub keys: Vec>, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Remote storage read child request. -#[derive(Clone, Debug, PartialEq, Eq, Hash)] -pub struct RemoteReadChildRequest { - /// Read at state of given block. - pub block: Header::Hash, - /// Header of block at which read is performed. - pub header: Header, - /// Storage key for child. - pub storage_key: Vec, - /// Child storage key to read. - pub keys: Vec>, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Remote key changes read request. -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct RemoteChangesRequest { - /// Changes trie configuration. - pub changes_trie_config: ChangesTrieConfiguration, - /// Query changes from range of blocks, starting (and including) with this hash... - pub first_block: (Header::Number, Header::Hash), - /// ...ending (and including) with this hash. Should come after first_block and - /// be the part of the same fork. - pub last_block: (Header::Number, Header::Hash), - /// Only use digests from blocks up to this hash. Should be last_block OR come - /// after this block and be the part of the same fork. - pub max_block: (Header::Number, Header::Hash), - /// Known changes trie roots for the range of blocks [tries_roots.0..max_block]. - /// Proofs for roots of ascendants of tries_roots.0 are provided by the remote node. - pub tries_roots: (Header::Number, Header::Hash, Vec), - /// Optional Child Storage key to read. - pub storage_key: Option>, - /// Storage key to read. - pub key: Vec, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Key changes read proof. -#[derive(Debug, PartialEq, Eq)] -pub struct ChangesProof { - /// Max block that has been used in changes query. - pub max_block: Header::Number, - /// All touched nodes of all changes tries. - pub proof: Vec>, - /// All changes tries roots that have been touched AND are missing from - /// the requester' node. It is a map of block number => changes trie root. - pub roots: BTreeMap, - /// The proofs for all changes tries roots that have been touched AND are - /// missing from the requester' node. It is a map of CHT number => proof. - pub roots_proof: StorageProof, -} - -/// Remote block body request -#[derive(Clone, Default, Debug, PartialEq, Eq, Hash)] -pub struct RemoteBodyRequest { - /// Header of the requested block body - pub header: Header, - /// Number of times to retry request. None means that default RETRY_COUNT is used. - pub retry_count: Option, -} - -/// Light client data fetcher. Implementations of this trait must check if remote data -/// is correct (see FetchedDataChecker) and return already checked data. -pub trait Fetcher: Send + Sync { - /// Remote header future. - type RemoteHeaderResult: Future> + Send + 'static; - /// Remote storage read future. - type RemoteReadResult: Future, Option>>, ClientError>> + Send + 'static; - /// Remote call result future. - type RemoteCallResult: Future, ClientError>> + Send + 'static; - /// Remote changes result future. - type RemoteChangesResult: Future, u32)>, ClientError>> + Send + 'static; - /// Remote block body result future. - type RemoteBodyResult: Future, ClientError>> + Send + 'static; - - /// Fetch remote header. - fn remote_header(&self, request: RemoteHeaderRequest) -> Self::RemoteHeaderResult; - /// Fetch remote storage value. - fn remote_read( - &self, - request: RemoteReadRequest - ) -> Self::RemoteReadResult; - /// Fetch remote storage child value. - fn remote_read_child( - &self, - request: RemoteReadChildRequest - ) -> Self::RemoteReadResult; - /// Fetch remote call result. - fn remote_call(&self, request: RemoteCallRequest) -> Self::RemoteCallResult; - /// Fetch remote changes ((block number, extrinsic index)) where given key has been changed - /// at a given blocks range. - fn remote_changes(&self, request: RemoteChangesRequest) -> Self::RemoteChangesResult; - /// Fetch remote block body - fn remote_body(&self, request: RemoteBodyRequest) -> Self::RemoteBodyResult; -} - -/// Light client remote data checker. -/// -/// Implementations of this trait should not use any prunable blockchain data -/// except that is passed to its methods. -pub trait FetchChecker: Send + Sync { - /// Check remote header proof. - fn check_header_proof( - &self, - request: &RemoteHeaderRequest, - header: Option, - remote_proof: StorageProof, - ) -> ClientResult; - /// Check remote storage read proof. - fn check_read_proof( - &self, - request: &RemoteReadRequest, - remote_proof: StorageProof, - ) -> ClientResult, Option>>>; - /// Check remote storage read proof. - fn check_read_child_proof( - &self, - request: &RemoteReadChildRequest, - remote_proof: StorageProof, - ) -> ClientResult, Option>>>; - /// Check remote method execution proof. - fn check_execution_proof( - &self, - request: &RemoteCallRequest, - remote_proof: StorageProof, - ) -> ClientResult>; - /// Check remote changes query proof. - fn check_changes_proof( - &self, - request: &RemoteChangesRequest, - proof: ChangesProof - ) -> ClientResult, u32)>>; - /// Check remote body proof. - fn check_body_proof( - &self, - request: &RemoteBodyRequest, - body: Vec - ) -> ClientResult>; -} - /// Remote data checker. pub struct LightDataChecker> { blockchain: Arc>, @@ -504,7 +331,10 @@ pub mod tests { use codec::Decode; use crate::client::tests::prepare_client_with_key_changes; use executor::{NativeExecutor, WasmExecutionMethod}; - use interfaces::error::Error as ClientError; + use interfaces::{ + backend::NewBlockState, + error::Error as ClientError + }; use test_client::{ self, ClientExt, blockchain::HeaderBackend, AccountKeyring, runtime::{self, Hash, Block, Header, Extrinsic} @@ -598,7 +428,7 @@ pub mod tests { remote_block_header.clone(), None, None, - crate::backend::NewBlockState::Final, + NewBlockState::Final, ).unwrap(); let local_checker = LightDataChecker::new( Arc::new(DummyBlockchain::new(DummyStorage::new())), @@ -640,7 +470,7 @@ pub mod tests { remote_block_header.clone(), None, None, - crate::backend::NewBlockState::Final, + NewBlockState::Final, ).unwrap(); let local_checker = LightDataChecker::new( Arc::new(DummyBlockchain::new(DummyStorage::new())), diff --git a/client/src/light/mod.rs b/client/src/light/mod.rs index 6491ff4a21f06..2c35924ca17f6 100644 --- a/client/src/light/mod.rs +++ b/client/src/light/mod.rs @@ -30,9 +30,12 @@ use sr_primitives::traits::Block as BlockT; use crate::call_executor::LocalCallExecutor; use crate::client::Client; -use interfaces::error::Result as ClientResult; +use interfaces::{ + error::Result as ClientResult, + light::Storage as BlockchainStorage, +}; use crate::light::backend::Backend; -use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage}; +use crate::light::blockchain::Blockchain; use crate::light::call_executor::GenesisCallExecutor; use crate::light::fetcher::LightDataChecker; diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml index 79f59a70d6017..b4817406c4594 100644 --- a/test/utils/client/Cargo.toml +++ b/test/utils/client/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] +interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" } client = { package = "substrate-client", path = "../../../client/" } client-db = { package = "substrate-client-db", path = "../../../client//db", features = ["test-helpers"] } consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } diff --git a/test/utils/client/src/client_ext.rs b/test/utils/client/src/client_ext.rs index b3bc702afb0a6..1d9bbf3e00b5a 100644 --- a/test/utils/client/src/client_ext.rs +++ b/test/utils/client/src/client_ext.rs @@ -16,7 +16,8 @@ //! Client extension for tests. -use client::{self, Client, backend::Finalizer}; +use client::{self, Client}; +use interfaces::backend::Finalizer; use consensus::{ BlockImportParams, BlockImport, BlockOrigin, Error as ConsensusError, ForkChoiceStrategy, @@ -59,7 +60,7 @@ pub trait ClientExt: Sized { impl ClientExt for Client where - B: client::backend::Backend, + B: interfaces::backend::Backend, E: client::CallExecutor, for<'r> &'r Self: BlockImport, Block: BlockT::Out>, diff --git a/test/utils/client/src/lib.rs b/test/utils/client/src/lib.rs index a075caec3143d..a1e9e5777fdec 100644 --- a/test/utils/client/src/lib.rs +++ b/test/utils/client/src/lib.rs @@ -20,7 +20,7 @@ pub mod client_ext; -pub use client::{ExecutionStrategies, blockchain, backend, self}; +pub use client::{ExecutionStrategies, blockchain, self}; pub use client_db::{Backend, self}; pub use client_ext::ClientExt; pub use consensus; @@ -171,7 +171,7 @@ impl TestClientBuilder client::LongestChain, ) where Executor: client::CallExecutor, - Backend: client::backend::Backend, + Backend: interfaces::backend::Backend, Block: BlockT::Out>, { @@ -223,7 +223,7 @@ impl TestClientBuilder< ) where I: Into>>, E: executor::NativeExecutionDispatch, - Backend: client::backend::Backend, + Backend: interfaces::backend::Backend, Block: BlockT::Out>, { let executor = executor.into().unwrap_or_else(|| diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index c622ca49879d7..32198edec2923 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -11,6 +11,7 @@ aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe", default-features = false } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false } cfg-if = "0.1.10" +interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } diff --git a/test/utils/runtime/client/src/lib.rs b/test/utils/runtime/client/src/lib.rs index affbae62c22e7..508eaa6865666 100644 --- a/test/utils/runtime/client/src/lib.rs +++ b/test/utils/runtime/client/src/lib.rs @@ -205,7 +205,7 @@ impl TestClientBuilderExt for TestClientBuilder< client::LocalCallExecutor>, B > where - B: client::backend::Backend, + B: interfaces::backend::Backend, { fn set_heap_pages(mut self, heap_pages: u64) -> Self { self.genesis_init_mut().heap_pages_override = Some(heap_pages); diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index 3f0e271e07a58..fb09761b4761a 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -7,6 +7,7 @@ edition = "2018" [dependencies] block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } cli = { package = "substrate-cli", path = "../../../client/cli" } +interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" } client = { package = "substrate-client", path = "../../../client" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } diff --git a/test/utils/transaction-factory/src/complex_mode.rs b/test/utils/transaction-factory/src/complex_mode.rs index 5e68a05c7ddbf..86bd3b75c2a29 100644 --- a/test/utils/transaction-factory/src/complex_mode.rs +++ b/test/utils/transaction-factory/src/complex_mode.rs @@ -61,7 +61,7 @@ pub fn next( where Block: BlockT::Out>, Exec: client::CallExecutor + Send + Sync + Clone, - Backend: client::backend::Backend + Send, + Backend: interfaces::backend::Backend + Send, Client: ProvideRuntimeApi, as ProvideRuntimeApi>::Api: BlockBuilder, diff --git a/test/utils/transaction-factory/src/lib.rs b/test/utils/transaction-factory/src/lib.rs index 93ee0d608b734..05d0ed5aee4fd 100644 --- a/test/utils/transaction-factory/src/lib.rs +++ b/test/utils/transaction-factory/src/lib.rs @@ -102,7 +102,7 @@ pub fn factory( where Block: BlockT::Out>, Exec: client::CallExecutor + Send + Sync + Clone, - Backend: client::backend::Backend + Send, + Backend: interfaces::backend::Backend + Send, Client: ProvideRuntimeApi, as ProvideRuntimeApi>::Api: BlockBuilder, @@ -161,7 +161,7 @@ pub fn create_block( where Block: BlockT::Out>, Exec: client::CallExecutor + Send + Sync + Clone, - Backend: client::backend::Backend + Send, + Backend: interfaces::backend::Backend + Send, Client: ProvideRuntimeApi, RtApi: ConstructRuntimeApi> + Send + Sync, as ProvideRuntimeApi>::Api: @@ -187,7 +187,7 @@ fn import_block( ) -> () where Block: BlockT::Out>, Exec: client::CallExecutor + Send + Sync + Clone, - Backend: client::backend::Backend + Send, + Backend: interfaces::backend::Backend + Send, { let import = BlockImportParams { origin: BlockOrigin::File, diff --git a/test/utils/transaction-factory/src/simple_modes.rs b/test/utils/transaction-factory/src/simple_modes.rs index 827561c204e8e..0a372e85013f3 100644 --- a/test/utils/transaction-factory/src/simple_modes.rs +++ b/test/utils/transaction-factory/src/simple_modes.rs @@ -56,7 +56,7 @@ pub fn next( where Block: BlockT::Out>, Exec: client::CallExecutor + Send + Sync + Clone, - Backend: client::backend::Backend + Send, + Backend: interfaces::backend::Backend + Send, Client: ProvideRuntimeApi, as ProvideRuntimeApi>::Api: BlockBuilder, From f10ee926862387b181014381df8743c49fb7929f Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 01:53:54 +0100 Subject: [PATCH 34/61] move CallExecutor --- Cargo.lock | 1 + .../basic-authorship/src/basic_authorship.rs | 3 +- client/consensus/babe/src/lib.rs | 3 +- client/finality-grandpa/Cargo.toml | 1 + client/finality-grandpa/src/environment.rs | 10 +- client/finality-grandpa/src/finality_proof.rs | 7 +- client/finality-grandpa/src/import.rs | 8 +- client/finality-grandpa/src/justification.rs | 5 +- client/interfaces/src/call_executor.rs | 151 ++++++++++++++++++ client/interfaces/src/lib.rs | 26 +++ client/src/call_executor.rs | 119 +------------- client/src/client.rs | 4 +- client/src/lib.rs | 3 +- client/src/light/call_executor.rs | 4 +- 14 files changed, 208 insertions(+), 137 deletions(-) create mode 100644 client/interfaces/src/call_executor.rs diff --git a/Cargo.lock b/Cargo.lock index 28210080d4c5f..8ff4b3eae82b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5692,6 +5692,7 @@ dependencies = [ "sr-primitives 2.0.0", "srml-finality-tracker 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", "substrate-finality-grandpa-primitives 2.0.0", diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs index ff85795c07cd9..139dc1313925b 100644 --- a/client/basic-authorship/src/basic_authorship.rs +++ b/client/basic-authorship/src/basic_authorship.rs @@ -20,7 +20,8 @@ // use std::{time, sync::Arc}; -use client::{error, Client as SubstrateClient, CallExecutor}; +use interfaces::{error, CallExecutor}; +use client::Client as SubstrateClient; use codec::Decode; use consensus_common::{evaluation}; use inherents::InherentData; diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs index f7617e495be23..5f247dc473a8b 100644 --- a/client/consensus/babe/src/lib.rs +++ b/client/consensus/babe/src/lib.rs @@ -88,10 +88,11 @@ use consensus_common::SelectChain; use consensus_common::import_queue::{Verifier, BasicQueue, CacheKeyId}; use interfaces::{ backend::{AuxStore, Backend}, + call_executor::CallExecutor, error::{Result as ClientResult, Error as ClientError} }; use client::{ - blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, CallExecutor, Client, ProvideUncles, + blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, Client, ProvideUncles, }; use block_builder_api::BlockBuilder as BlockBuilderApi; diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 2f0238e120f2b..bcca611732ca7 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -20,6 +20,7 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" substrate-telemetry = { path = "../telemetry" } keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } client = { package = "substrate-client", path = "../" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs index 149b00e80f920..caf166fe50422 100644 --- a/client/finality-grandpa/src/environment.rs +++ b/client/finality-grandpa/src/environment.rs @@ -25,10 +25,14 @@ use futures::prelude::*; use tokio_timer::Delay; use parking_lot::RwLock; +use interfaces::{ + blockchain::{HeaderBackend, BlockchainEvents}, + backend::{Backend, Finalizer}, + call_executor::CallExecutor, + error::Error as ClientError, +} use client::{ - backend::Backend, apply_aux, BlockchainEvents, CallExecutor, - Client, error::Error as ClientError, utils::is_descendent_of, - blockchain::HeaderBackend, backend::Finalizer, + apply_aux, Client, utils::is_descendent_of, }; use grandpa::{ BlockNumberOps, Equivocation, Error as GrandpaError, round::State as RoundState, diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs index aa7207b422881..8bc5271f873ae 100644 --- a/client/finality-grandpa/src/finality_proof.rs +++ b/client/finality-grandpa/src/finality_proof.rs @@ -38,11 +38,12 @@ use std::iter; use std::sync::Arc; use log::{trace, warn}; -use client::{ - backend::Backend, blockchain::Backend as BlockchainBackend, CallExecutor, Client, +use interfaces::{ + backend::Backend, blockchain::Backend as BlockchainBackend, CallExecutor, error::{Error as ClientError, Result as ClientResult}, - light::fetcher::{FetchChecker, RemoteReadRequest, StorageProof}, + light::{FetchChecker, RemoteReadRequest, StorageProof}, }; +use client::Client; use codec::{Encode, Decode}; use grandpa::BlockNumberOps; use sr_primitives::{ diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs index 197acd748071f..1d99e35318f7e 100644 --- a/client/finality-grandpa/src/import.rs +++ b/client/finality-grandpa/src/import.rs @@ -21,9 +21,11 @@ use codec::Encode; use futures::sync::mpsc; use parking_lot::RwLockWriteGuard; -use client::{blockchain, CallExecutor, Client, well_known_cache_keys}; -use client::blockchain::HeaderBackend; -use interfaces::backend::Backend; +use interfaces::{ + backend::Backend, blockchain, + CallExecutor, blockchain::HeaderBackend, well_known_cache_keys +}; +use client::Client; use client::utils::is_descendent_of; use consensus_common::{ BlockImport, Error as ConsensusError, diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs index a386f89db7a82..98b1ce2d4cf39 100644 --- a/client/finality-grandpa/src/justification.rs +++ b/client/finality-grandpa/src/justification.rs @@ -16,9 +16,8 @@ use std::collections::{HashMap, HashSet}; -use client::{CallExecutor, Client}; -use interfaces::backend::Backend; -use client::error::Error as ClientError; +use client::Client; +use interfaces::{call_exectutor::CallExecutor, backend::Backend, error::Error as ClientError}; use codec::{Encode, Decode}; use grandpa::voter_set::VoterSet; use grandpa::{Error as GrandpaError}; diff --git a/client/interfaces/src/call_executor.rs b/client/interfaces/src/call_executor.rs new file mode 100644 index 0000000000000..e3c7d4078b21f --- /dev/null +++ b/client/interfaces/src/call_executor.rs @@ -0,0 +1,151 @@ +// Copyright 2017-2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +use std::{sync::Arc, cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; +use codec::{Encode, Decode}; +use sr_primitives::{ + generic::BlockId, traits::Block as BlockT, traits::NumberFor, +}; +use state_machine::{ + self, OverlayedChanges, Ext, ExecutionManager, StateMachine, ExecutionStrategy, + backend::Backend as _, ChangesTrieTransaction, StorageProof, +}; +use executor::{RuntimeVersion, RuntimeInfo, NativeVersion}; +use hash_db::Hasher; +use primitives::{ + offchain::OffchainExt, H256, Blake2Hasher, NativeOrEncoded, NeverNativeValue, + traits::{CodeExecutor, KeystoreExt}, +}; + +use sr_api::{ProofRecorder, InitializeBlock}; +use crate::error; + +/// Method call executor. +pub trait CallExecutor +where + B: BlockT, + H: Hasher, + H::Out: Ord, +{ + /// Externalities error type. + type Error: state_machine::Error; + + /// Execute a call to a contract on top of state in a block of given hash. + /// + /// No changes are made. + fn call( + &self, + id: &BlockId, + method: &str, + call_data: &[u8], + strategy: ExecutionStrategy, + side_effects_handler: Option, + ) -> Result, error::Error>; + + /// Execute a contextual call on top of state in a block of a given hash. + /// + /// No changes are made. + /// Before executing the method, passed header is installed as the current header + /// of the execution context. + fn contextual_call< + 'a, + IB: Fn() -> error::Result<()>, + EM: Fn( + Result, Self::Error>, + Result, Self::Error> + ) -> Result, Self::Error>, + R: Encode + Decode + PartialEq, + NC: FnOnce() -> result::Result + UnwindSafe, + >( + &self, + initialize_block_fn: IB, + at: &BlockId, + method: &str, + call_data: &[u8], + changes: &RefCell, + initialize_block: InitializeBlock<'a, B>, + execution_manager: ExecutionManager, + native_call: Option, + side_effects_handler: Option, + proof_recorder: &Option>>>, + enable_keystore: bool, + ) -> error::Result> where ExecutionManager: Clone; + + /// Extract RuntimeVersion of given block + /// + /// No changes are made. + fn runtime_version(&self, id: &BlockId) -> Result; + + /// Execute a call to a contract on top of given state. + /// + /// No changes are made. + fn call_at_state< + S: state_machine::Backend, + F: FnOnce( + Result, Self::Error>, + Result, Self::Error>, + ) -> Result, Self::Error>, + R: Encode + Decode + PartialEq, + NC: FnOnce() -> result::Result + UnwindSafe, + >(&self, + state: &S, + overlay: &mut OverlayedChanges, + method: &str, + call_data: &[u8], + manager: ExecutionManager, + native_call: Option, + side_effects_handler: Option, + ) -> Result< + ( + NativeOrEncoded, + (S::Transaction, H::Out), + Option>> + ), + error::Error, + >; + + /// Execute a call to a contract on top of given state, gathering execution proof. + /// + /// No changes are made. + fn prove_at_state>( + &self, + mut state: S, + overlay: &mut OverlayedChanges, + method: &str, + call_data: &[u8] + ) -> Result<(Vec, StorageProof), error::Error> { + let trie_state = state.as_trie_backend() + .ok_or_else(|| + Box::new(state_machine::ExecutionError::UnableToGenerateProof) + as Box + )?; + self.prove_at_trie_state(trie_state, overlay, method, call_data) + } + + /// Execute a call to a contract on top of given trie state, gathering execution proof. + /// + /// No changes are made. + fn prove_at_trie_state>( + &self, + trie_state: &state_machine::TrieBackend, + overlay: &mut OverlayedChanges, + method: &str, + call_data: &[u8] + ) -> Result<(Vec, StorageProof), error::Error>; + + /// Get runtime version if supported. + fn native_runtime_version(&self) -> Option<&NativeVersion>; +} \ No newline at end of file diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 70664ebb4655e..679dde4fec295 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -1,5 +1,31 @@ +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +//! Substrate client interfaces. + pub mod error; pub mod backend; pub mod blockchain; pub mod light; pub mod notifications; +pub mod call_executor; + +pub use error::*; +pub use backend::*; +pub use blockchain::*; +pub use light::*; +pub use notifications::*; +pub use call_executor::*; diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs index 4fe695c354bae..45b49144de3a6 100644 --- a/client/src/call_executor.rs +++ b/client/src/call_executor.rs @@ -32,126 +32,9 @@ use primitives::{ use sr_api::{ProofRecorder, InitializeBlock}; use interfaces::{ - error, backend + error, backend, call_executor::CallExecutor, }; -/// Method call executor. -pub trait CallExecutor -where - B: BlockT, - H: Hasher, - H::Out: Ord, -{ - /// Externalities error type. - type Error: state_machine::Error; - - /// Execute a call to a contract on top of state in a block of given hash. - /// - /// No changes are made. - fn call( - &self, - id: &BlockId, - method: &str, - call_data: &[u8], - strategy: ExecutionStrategy, - side_effects_handler: Option, - ) -> Result, error::Error>; - - /// Execute a contextual call on top of state in a block of a given hash. - /// - /// No changes are made. - /// Before executing the method, passed header is installed as the current header - /// of the execution context. - fn contextual_call< - 'a, - IB: Fn() -> error::Result<()>, - EM: Fn( - Result, Self::Error>, - Result, Self::Error> - ) -> Result, Self::Error>, - R: Encode + Decode + PartialEq, - NC: FnOnce() -> result::Result + UnwindSafe, - >( - &self, - initialize_block_fn: IB, - at: &BlockId, - method: &str, - call_data: &[u8], - changes: &RefCell, - initialize_block: InitializeBlock<'a, B>, - execution_manager: ExecutionManager, - native_call: Option, - side_effects_handler: Option, - proof_recorder: &Option>>>, - enable_keystore: bool, - ) -> error::Result> where ExecutionManager: Clone; - - /// Extract RuntimeVersion of given block - /// - /// No changes are made. - fn runtime_version(&self, id: &BlockId) -> Result; - - /// Execute a call to a contract on top of given state. - /// - /// No changes are made. - fn call_at_state< - S: state_machine::Backend, - F: FnOnce( - Result, Self::Error>, - Result, Self::Error>, - ) -> Result, Self::Error>, - R: Encode + Decode + PartialEq, - NC: FnOnce() -> result::Result + UnwindSafe, - >(&self, - state: &S, - overlay: &mut OverlayedChanges, - method: &str, - call_data: &[u8], - manager: ExecutionManager, - native_call: Option, - side_effects_handler: Option, - ) -> Result< - ( - NativeOrEncoded, - (S::Transaction, H::Out), - Option>> - ), - error::Error, - >; - - /// Execute a call to a contract on top of given state, gathering execution proof. - /// - /// No changes are made. - fn prove_at_state>( - &self, - mut state: S, - overlay: &mut OverlayedChanges, - method: &str, - call_data: &[u8] - ) -> Result<(Vec, StorageProof), error::Error> { - let trie_state = state.as_trie_backend() - .ok_or_else(|| - Box::new(state_machine::ExecutionError::UnableToGenerateProof) - as Box - )?; - self.prove_at_trie_state(trie_state, overlay, method, call_data) - } - - /// Execute a call to a contract on top of given trie state, gathering execution proof. - /// - /// No changes are made. - fn prove_at_trie_state>( - &self, - trie_state: &state_machine::TrieBackend, - overlay: &mut OverlayedChanges, - method: &str, - call_data: &[u8] - ) -> Result<(Vec, StorageProof), error::Error>; - - /// Get runtime version if supported. - fn native_runtime_version(&self) -> Option<&NativeVersion>; -} - /// Call executor that executes methods locally, querying all required /// data from local backend. pub struct LocalCallExecutor { diff --git a/client/src/client.rs b/client/src/client.rs index b1305057cdd75..6da56b8da3f36 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -70,9 +70,9 @@ use interfaces::{ error::Error, error, }; - +use interfaces::{CallExecutor}; use crate::{ - call_executor::{CallExecutor, LocalCallExecutor}, + call_executor::LocalCallExecutor, light::{call_executor::prove_execution, fetcher::ChangesProof}, in_mem, genesis, cht, }; diff --git a/client/src/lib.rs b/client/src/lib.rs index ef411d5e75677..9788ac5be42bd 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -90,8 +90,9 @@ pub use interfaces::{ blockchain::well_known_cache_keys, blockchain::Info as ChainInfo, notifications::{StorageEventStream, StorageChangeSet}, + call_executor::CallExecutor, }; -pub use crate::call_executor::{CallExecutor, LocalCallExecutor}; +pub use crate::call_executor::LocalCallExecutor; pub use crate::client::{ new_with_backend, new_in_mem, diff --git a/client/src/light/call_executor.rs b/client/src/light/call_executor.rs index 98c8411eff525..bd8cb36831090 100644 --- a/client/src/light/call_executor.rs +++ b/client/src/light/call_executor.rs @@ -35,11 +35,11 @@ use hash_db::Hasher; use sr_api::{ProofRecorder, InitializeBlock}; -use crate::call_executor::CallExecutor; use interfaces::{ backend::RemoteBackend, error::{Error as ClientError, Result as ClientResult}, - light::RemoteCallRequest + light::RemoteCallRequest, + call_executor::CallExecutor }; use executor::{RuntimeVersion, NativeVersion}; From 224f318a6f26aed4944bec792b2a7dbdd6314b5e Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 01:59:02 +0100 Subject: [PATCH 35/61] move cli off client --- Cargo.lock | 2 +- client/chain-spec/Cargo.toml | 2 -- client/cli/Cargo.toml | 2 +- client/cli/src/error.rs | 2 +- client/cli/src/informant.rs | 2 +- client/cli/src/informant/display.rs | 2 +- client/cli/src/lib.rs | 2 +- client/cli/src/params.rs | 12 ++++++------ 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ff4b3eae82b8..7912681b316c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5339,7 +5339,7 @@ dependencies = [ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-header-metadata 2.0.0", "substrate-keyring 2.0.0", "substrate-network 2.0.0", diff --git a/client/chain-spec/Cargo.toml b/client/chain-spec/Cargo.toml index 88cd6e633349a..da9543e398774 100644 --- a/client/chain-spec/Cargo.toml +++ b/client/chain-spec/Cargo.toml @@ -13,5 +13,3 @@ serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" sr-primitives = { path = "../../primitives/sr-primitives" } tel = { package = "substrate-telemetry", path = "../telemetry" } - -[dev-dependencies] diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index fa99c05f7aa75..b318b16fde830 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -23,7 +23,7 @@ fdlimit = "0.1.1" exit-future = "0.1.4" serde_json = "1.0.41" panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" } -client = { package = "substrate-client", path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } network = { package = "substrate-network", path = "../network" } sr-primitives = { path = "../../primitives/sr-primitives" } diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs index 600e73d44fe73..7a3bfb145d434 100644 --- a/client/cli/src/error.rs +++ b/client/cli/src/error.rs @@ -31,7 +31,7 @@ pub enum Error { /// Service error Service(service::Error), /// Client error - Client(client::error::Error), + Client(interfaces::error::Error), /// Input error Input(String), /// Invalid listen multiaddress diff --git a/client/cli/src/informant.rs b/client/cli/src/informant.rs index f7c23ba47918a..c93c3c21d4828 100644 --- a/client/cli/src/informant.rs +++ b/client/cli/src/informant.rs @@ -16,7 +16,7 @@ //! Console informant. Prints sync progress and block events. Runs on the calling thread. -use client::BlockchainEvents; +use interfaces::BlockchainEvents; use futures::{Future, Stream}; use futures03::{StreamExt as _, TryStreamExt as _}; use log::{info, warn}; diff --git a/client/cli/src/informant/display.rs b/client/cli/src/informant/display.rs index c7cf9bfc930b9..8dca9c1fdc707 100644 --- a/client/cli/src/informant/display.rs +++ b/client/cli/src/informant/display.rs @@ -15,7 +15,7 @@ // along with Substrate. If not, see . use ansi_term::Colour; -use client::ClientInfo; +use interfaces::ClientInfo; use log::info; use network::SyncState; use sr_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating}; diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index 4bcffac112c44..797f3306fd5d1 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -26,7 +26,7 @@ mod execution_strategy; pub mod error; pub mod informant; -use client::ExecutionStrategies; +use interfaces::ExecutionStrategies; use service::{ config::{Configuration, DatabaseConfig}, ServiceBuilderExport, ServiceBuilderImport, ServiceBuilderRevert, diff --git a/client/cli/src/params.rs b/client/cli/src/params.rs index dc4a9f759b1d8..daa79502e5a79 100644 --- a/client/cli/src/params.rs +++ b/client/cli/src/params.rs @@ -32,13 +32,13 @@ macro_rules! impl_get_log_filter { } } -impl Into for ExecutionStrategy { - fn into(self) -> client::ExecutionStrategy { +impl Into for ExecutionStrategy { + fn into(self) -> interfaces::ExecutionStrategy { match self { - ExecutionStrategy::Native => client::ExecutionStrategy::NativeWhenPossible, - ExecutionStrategy::Wasm => client::ExecutionStrategy::AlwaysWasm, - ExecutionStrategy::Both => client::ExecutionStrategy::Both, - ExecutionStrategy::NativeElseWasm => client::ExecutionStrategy::NativeElseWasm, + ExecutionStrategy::Native => interfaces::ExecutionStrategy::NativeWhenPossible, + ExecutionStrategy::Wasm => interfaces::ExecutionStrategy::AlwaysWasm, + ExecutionStrategy::Both => interfaces::ExecutionStrategy::Both, + ExecutionStrategy::NativeElseWasm => interfaces::ExecutionStrategy::NativeElseWasm, } } } From 9c3752db126139262fb02552c4da4fa397ef30f8 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 11:58:49 +0100 Subject: [PATCH 36/61] moving around more interfaces --- Cargo.lock | 5 +- client/cli/src/error.rs | 2 +- client/db/src/offchain.rs | 2 +- client/interfaces/src/backend.rs | 21 +-- client/interfaces/src/call_executor.rs | 13 +- client/interfaces/src/client.rs | 135 ++++++++++++++++++ client/interfaces/src/lib.rs | 7 + client/interfaces/src/offchain.rs | 77 ++++++++++ client/network/Cargo.toml | 2 + client/network/src/chain.rs | 6 +- client/network/src/error.rs | 4 +- client/network/src/on_demand_layer.rs | 4 +- client/network/src/protocol.rs | 6 +- client/network/src/protocol/light_dispatch.rs | 8 +- client/network/src/protocol/message.rs | 2 +- client/network/src/protocol/sync.rs | 2 +- .../src/protocol/sync/extra_requests.rs | 4 +- client/offchain/Cargo.toml | 2 +- client/offchain/src/api.rs | 2 +- client/offchain/src/lib.rs | 3 +- client/offchain/src/testing.rs | 6 +- client/service/Cargo.toml | 1 + client/service/src/builder.rs | 7 +- client/src/call_executor.rs | 2 +- client/src/client.rs | 117 ++------------- client/src/in_mem.rs | 44 +----- client/src/light/backend.rs | 3 +- 27 files changed, 278 insertions(+), 209 deletions(-) create mode 100644 client/interfaces/src/client.rs create mode 100644 client/interfaces/src/offchain.rs diff --git a/Cargo.lock b/Cargo.lock index 7912681b316c7..eb2b8f0779fa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5799,9 +5799,11 @@ dependencies = [ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-arithmetic 2.0.0", "sr-primitives 2.0.0", "substrate-block-builder 2.0.0", "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", "substrate-header-metadata 2.0.0", @@ -5838,8 +5840,8 @@ dependencies = [ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sr-api 2.0.0", "sr-primitives 2.0.0", - "substrate-client 2.0.0", "substrate-client-db 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-keystore 2.0.0", "substrate-network 2.0.0", "substrate-offchain-primitives 2.0.0", @@ -6112,6 +6114,7 @@ dependencies = [ "substrate-chain-spec 2.0.0", "substrate-client 2.0.0", "substrate-client-db 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", "substrate-executor 2.0.0", diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs index 7a3bfb145d434..4d9b4c89054b5 100644 --- a/client/cli/src/error.rs +++ b/client/cli/src/error.rs @@ -16,7 +16,7 @@ //! Initialization errors. -use client; +use interfaces; /// Result type alias for the CLI. pub type Result = std::result::Result; diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs index 86bc7357ab018..69c062e09af51 100644 --- a/client/db/src/offchain.rs +++ b/client/db/src/offchain.rs @@ -56,7 +56,7 @@ impl LocalStorage { } } -impl interfaces::backend::OffchainStorage for LocalStorage { +impl interfaces::OffchainStorage for LocalStorage { fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) { let key: Vec = prefix.iter().chain(key).cloned().collect(); let mut tx = self.db.transaction(); diff --git a/client/interfaces/src/backend.rs b/client/interfaces/src/backend.rs index 34e0d05ad89ea..03cd183ad2c21 100644 --- a/client/interfaces/src/backend.rs +++ b/client/interfaces/src/backend.rs @@ -27,6 +27,7 @@ use crate::{ blockchain::{ Backend as BlockchainBackend, well_known_cache_keys }, + offchain::OffchainStorage, error, light::RemoteBlockchain, }; @@ -299,26 +300,6 @@ pub trait Backend: AuxStore + Send + Sync where fn get_import_lock(&self) -> &Mutex<()>; } -/// Offchain workers local storage. -pub trait OffchainStorage: Clone + Send + Sync { - /// Persist a value in storage under given key and prefix. - fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]); - - /// Retrieve a value from storage under given key and prefix. - fn get(&self, prefix: &[u8], key: &[u8]) -> Option>; - - /// Replace the value in storage if given old_value matches the current one. - /// - /// Returns `true` if the value has been set and false otherwise. - fn compare_and_set( - &mut self, - prefix: &[u8], - key: &[u8], - old_value: Option<&[u8]>, - new_value: &[u8], - ) -> bool; -} - /// Changes trie storage that supports pruning. pub trait PrunableStateChangesTrieStorage: StateChangesTrieStorage> diff --git a/client/interfaces/src/call_executor.rs b/client/interfaces/src/call_executor.rs index e3c7d4078b21f..0cf9826677b62 100644 --- a/client/interfaces/src/call_executor.rs +++ b/client/interfaces/src/call_executor.rs @@ -14,21 +14,18 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use std::{sync::Arc, cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; +use std::{cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; use codec::{Encode, Decode}; use sr_primitives::{ generic::BlockId, traits::Block as BlockT, traits::NumberFor, }; use state_machine::{ - self, OverlayedChanges, Ext, ExecutionManager, StateMachine, ExecutionStrategy, - backend::Backend as _, ChangesTrieTransaction, StorageProof, + self, OverlayedChanges, ExecutionManager, ExecutionStrategy, + ChangesTrieTransaction, StorageProof, }; -use executor::{RuntimeVersion, RuntimeInfo, NativeVersion}; +use executor::{RuntimeVersion, NativeVersion}; use hash_db::Hasher; -use primitives::{ - offchain::OffchainExt, H256, Blake2Hasher, NativeOrEncoded, NeverNativeValue, - traits::{CodeExecutor, KeystoreExt}, -}; +use primitives::{offchain::OffchainExt, Blake2Hasher, NativeOrEncoded}; use sr_api::{ProofRecorder, InitializeBlock}; use crate::error; diff --git a/client/interfaces/src/client.rs b/client/interfaces/src/client.rs new file mode 100644 index 0000000000000..d2df2bb14455a --- /dev/null +++ b/client/interfaces/src/client.rs @@ -0,0 +1,135 @@ +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +use std::collections::HashMap; +use futures03::channel::mpsc; +use primitives::storage::StorageKey; +use state_machine::ExecutionStrategy; +use sr_primitives::{ + traits::{Block as BlockT, NumberFor}, + generic::BlockId +}; +use consensus::BlockOrigin; + +use crate::blockchain::Info; +use crate::notifications::StorageEventStream; +use crate::error; + +/// Type that implements `futures::Stream` of block import events. +pub type ImportNotifications = mpsc::UnboundedReceiver>; + +/// A stream of block finality notifications. +pub type FinalityNotifications = mpsc::UnboundedReceiver>; + +/// Expected hashes of blocks at given heights. +/// +/// This may be used as chain spec extension to filter out known, unwanted forks. +pub type ForkBlocks = Option, ::Hash>>; + +/// Execution strategies settings. +#[derive(Debug, Clone)] +pub struct ExecutionStrategies { + /// Execution strategy used when syncing. + pub syncing: ExecutionStrategy, + /// Execution strategy used when importing blocks. + pub importing: ExecutionStrategy, + /// Execution strategy used when constructing blocks. + pub block_construction: ExecutionStrategy, + /// Execution strategy used for offchain workers. + pub offchain_worker: ExecutionStrategy, + /// Execution strategy used in other cases. + pub other: ExecutionStrategy, +} + +impl Default for ExecutionStrategies { + fn default() -> ExecutionStrategies { + ExecutionStrategies { + syncing: ExecutionStrategy::NativeElseWasm, + importing: ExecutionStrategy::NativeElseWasm, + block_construction: ExecutionStrategy::AlwaysWasm, + offchain_worker: ExecutionStrategy::NativeWhenPossible, + other: ExecutionStrategy::NativeElseWasm, + } + } +} + +/// A source of blockchain events. +pub trait BlockchainEvents { + /// Get block import event stream. Not guaranteed to be fired for every + /// imported block. + fn import_notification_stream(&self) -> ImportNotifications; + + /// Get a stream of finality notifications. Not guaranteed to be fired for every + /// finalized block. + fn finality_notification_stream(&self) -> FinalityNotifications; + + /// Get storage changes event stream. + /// + /// Passing `None` as `filter_keys` subscribes to all storage changes. + fn storage_changes_notification_stream( + &self, + filter_keys: Option<&[StorageKey]>, + child_filter_keys: Option<&[(StorageKey, Option>)]>, + ) -> error::Result>; +} + +/// Fetch block body by ID. +pub trait BlockBody { + /// Get block body by ID. Returns `None` if the body is not stored. + fn block_body(&self, + id: &BlockId + ) -> error::Result::Extrinsic>>>; +} + +/// Provide a list of potential uncle headers for a given block. +pub trait ProvideUncles { + /// Gets the uncles of the block with `target_hash` going back `max_generation` ancestors. + fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor) + -> error::Result>; +} + +/// Client info +#[derive(Debug)] +pub struct ClientInfo { + /// Best block hash. + pub chain: Info, + /// State Cache Size currently used by the backend + pub used_state_cache_size: Option, +} + +/// Summary of an imported block +#[derive(Clone, Debug)] +pub struct BlockImportNotification { + /// Imported block header hash. + pub hash: Block::Hash, + /// Imported block origin. + pub origin: BlockOrigin, + /// Imported block header. + pub header: Block::Header, + /// Is this the new best block. + pub is_new_best: bool, + /// List of retracted blocks ordered by block number. + pub retracted: Vec, +} + +/// Summary of a finalized block. +#[derive(Clone, Debug)] +pub struct FinalityNotification { + /// Imported block header hash. + pub hash: Block::Hash, + /// Imported block header. + pub header: Block::Header, +} diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 679dde4fec295..795751498ec4e 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -16,12 +16,15 @@ //! Substrate client interfaces. +// TODO: make internal pub mod error; pub mod backend; pub mod blockchain; pub mod light; pub mod notifications; pub mod call_executor; +pub mod client; +pub mod offchain; pub use error::*; pub use backend::*; @@ -29,3 +32,7 @@ pub use blockchain::*; pub use light::*; pub use notifications::*; pub use call_executor::*; +pub use offchain::*; +pub use client::*; + +pub use state_machine::{StorageProof, ExecutionStrategy}; diff --git a/client/interfaces/src/offchain.rs b/client/interfaces/src/offchain.rs new file mode 100644 index 0000000000000..761241efe7996 --- /dev/null +++ b/client/interfaces/src/offchain.rs @@ -0,0 +1,77 @@ +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +use std::collections::hash_map::{HashMap, Entry}; + +/// Offchain workers local storage. +pub trait OffchainStorage: Clone + Send + Sync { + /// Persist a value in storage under given key and prefix. + fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]); + + /// Retrieve a value from storage under given key and prefix. + fn get(&self, prefix: &[u8], key: &[u8]) -> Option>; + + /// Replace the value in storage if given old_value matches the current one. + /// + /// Returns `true` if the value has been set and false otherwise. + fn compare_and_set( + &mut self, + prefix: &[u8], + key: &[u8], + old_value: Option<&[u8]>, + new_value: &[u8], + ) -> bool; +} + +/// In-memory storage for offchain workers. +#[derive(Debug, Clone, Default)] +pub struct InMemOffchainStorage { + storage: HashMap, Vec>, +} + +impl OffchainStorage for InMemOffchainStorage { + fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) { + let key = prefix.iter().chain(key).cloned().collect(); + self.storage.insert(key, value.to_vec()); + } + + fn get(&self, prefix: &[u8], key: &[u8]) -> Option> { + let key: Vec = prefix.iter().chain(key).cloned().collect(); + self.storage.get(&key).cloned() + } + + fn compare_and_set( + &mut self, + prefix: &[u8], + key: &[u8], + old_value: Option<&[u8]>, + new_value: &[u8], + ) -> bool { + let key = prefix.iter().chain(key).cloned().collect(); + + match self.storage.entry(key) { + Entry::Vacant(entry) => if old_value.is_none() { + entry.insert(new_value.to_vec()); + true + } else { false }, + Entry::Occupied(ref mut entry) if Some(entry.get().as_slice()) == old_value => { + entry.insert(new_value.to_vec()); + true + }, + _ => false, + } + } +} \ No newline at end of file diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 49240a8f298a8..048ef727866b9 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -26,8 +26,10 @@ libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-web fork-tree = { path = "../utils/fork-tree" } consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } client = { package = "substrate-client", path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" } sr-primitives = { path = "../../primitives/sr-primitives" } +sr-arithmetic = { path = "../../primitives/sr-arithmetic" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } block-builder = { package = "substrate-block-builder", path = "../block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs index 637b05ade8d93..7903c7b9451ff 100644 --- a/client/network/src/chain.rs +++ b/client/network/src/chain.rs @@ -16,9 +16,9 @@ //! Blockchain access trait -use client::{self, Client as SubstrateClient, ClientInfo, CallExecutor}; -use client::error::Error; -use client::light::fetcher::{ChangesProof, StorageProof}; +use client::Client as SubstrateClient; +use interfaces::error::Error; +use interfaces::{ChangesProof, StorageProof, ClientInfo, CallExecutor}; use consensus::{BlockImport, BlockStatus, Error as ConsensusError}; use sr_primitives::traits::{Block as BlockT, Header as HeaderT}; use sr_primitives::generic::{BlockId}; diff --git a/client/network/src/error.rs b/client/network/src/error.rs index c3f89e43c1710..5f7a030f1202e 100644 --- a/client/network/src/error.rs +++ b/client/network/src/error.rs @@ -16,7 +16,7 @@ //! Substrate network possible errors. -use client; +use interfaces; use libp2p::{PeerId, Multiaddr}; @@ -31,7 +31,7 @@ pub enum Error { /// Io error Io(std::io::Error), /// Client error - Client(client::error::Error), + Client(interfaces::error::Error), /// The same bootnode (based on address) is registered with two different peer ids. #[display( fmt = "The same bootnode (`{}`) is registered with two different peer ids: `{}` and `{}`", diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs index cdcb99a25f99e..d27cabeec6f59 100644 --- a/client/network/src/on_demand_layer.rs +++ b/client/network/src/on_demand_layer.rs @@ -22,8 +22,8 @@ use std::sync::Arc; use futures::{prelude::*, sync::mpsc, sync::oneshot}; use futures03::compat::{Compat01As03, Future01CompatExt as _}; use parking_lot::Mutex; -use client::error::Error as ClientError; -use client::light::fetcher::{Fetcher, FetchChecker, RemoteHeaderRequest, +use interfaces::error::Error as ClientError; +use interfaces::{Fetcher, FetchChecker, RemoteHeaderRequest, RemoteCallRequest, RemoteReadRequest, RemoteChangesRequest, RemoteReadChildRequest, RemoteBodyRequest}; use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs index f06f0cd937b5f..4e9c5665bd342 100644 --- a/client/network/src/protocol.rs +++ b/client/network/src/protocol.rs @@ -32,9 +32,9 @@ use consensus::{ use codec::{Decode, Encode}; use sr_primitives::{generic::BlockId, ConsensusEngineId, Justification}; use sr_primitives::traits::{ - Block as BlockT, Header as HeaderT, NumberFor, One, Zero, - CheckedSub, SaturatedConversion + Block as BlockT, Header as HeaderT, NumberFor, One, Zero, CheckedSub }; +use sr_arithmetic::traits::SaturatedConversion; use message::{BlockAnnounce, BlockAttributes, Direction, FromBlock, Message, RequestId}; use message::generic::{Message as GenericMessage, ConsensusMessage}; use consensus_gossip::{ConsensusGossip, MessageRecipient as GossipMessageRecipient}; @@ -50,7 +50,7 @@ use std::fmt::Write; use std::{cmp, num::NonZeroUsize, time}; use log::{trace, debug, warn, error}; use crate::chain::{Client, FinalityProofProvider}; -use client::light::fetcher::{FetchChecker, ChangesProof, StorageProof}; +use interfaces::{FetchChecker, ChangesProof, StorageProof}; use crate::error; use util::LruHashSet; diff --git a/client/network/src/protocol/light_dispatch.rs b/client/network/src/protocol/light_dispatch.rs index 3c0185da87346..60b8f3a0c38ea 100644 --- a/client/network/src/protocol/light_dispatch.rs +++ b/client/network/src/protocol/light_dispatch.rs @@ -25,8 +25,8 @@ use std::time::{Instant, Duration}; use log::{trace, info}; use futures::sync::oneshot::{Sender as OneShotSender}; use linked_hash_map::{Entry, LinkedHashMap}; -use client::error::Error as ClientError; -use client::light::fetcher::{FetchChecker, RemoteHeaderRequest, +use interfaces::error::Error as ClientError; +use interfaces::{FetchChecker, RemoteHeaderRequest, RemoteCallRequest, RemoteReadRequest, RemoteChangesRequest, ChangesProof, RemoteReadChildRequest, RemoteBodyRequest, StorageProof}; use crate::message::{self, BlockAttributes, Direction, FromBlock, RequestId}; @@ -677,8 +677,8 @@ pub mod tests { use std::time::Instant; use futures::{Future, sync::oneshot}; use sr_primitives::traits::{Block as BlockT, NumberFor, Header as HeaderT}; - use client::{error::{Error as ClientError, Result as ClientResult}}; - use client::light::fetcher::{FetchChecker, RemoteHeaderRequest, + use interfaces::{error::{Error as ClientError, Result as ClientResult}}; + use interfaces::{FetchChecker, RemoteHeaderRequest, ChangesProof, RemoteCallRequest, RemoteReadRequest, RemoteReadChildRequest, RemoteChangesRequest, RemoteBodyRequest}; use crate::config::Roles; diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs index 82ff791800ee0..3d10f63a98052 100644 --- a/client/network/src/protocol/message.rs +++ b/client/network/src/protocol/message.rs @@ -26,7 +26,7 @@ pub use self::generic::{ FinalityProofRequest, FinalityProofResponse, FromBlock, RemoteReadChildRequest, }; -use client::light::fetcher::StorageProof; +use interfaces::StorageProof; /// A unique ID of a request. pub type RequestId = u64; diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs index a7e6139e48dd3..c815e58424439 100644 --- a/client/network/src/protocol/sync.rs +++ b/client/network/src/protocol/sync.rs @@ -28,7 +28,7 @@ //! use blocks::BlockCollection; -use client::{ClientInfo, error::Error as ClientError}; +use interfaces::{ClientInfo, error::Error as ClientError}; use consensus::{BlockOrigin, BlockStatus, block_validation::{BlockAnnounceValidator, Validation}, import_queue::{IncomingBlock, BlockImportResult, BlockImportError} diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs index 28ed5fed9f682..4cfed324198df 100644 --- a/client/network/src/protocol/sync/extra_requests.rs +++ b/client/network/src/protocol/sync/extra_requests.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use client::error::Error as ClientError; +use interfaces::error::Error as ClientError; use crate::protocol::sync::{PeerSync, PeerSyncState}; use fork_tree::ForkTree; use libp2p::PeerId; @@ -283,7 +283,7 @@ impl<'a, B: BlockT> Matcher<'a, B> { #[cfg(test)] mod tests { use crate::protocol::sync::PeerSync; - use client::error::Error as ClientError; + use interfaces::error::Error as ClientError; use quickcheck::{Arbitrary, Gen, QuickCheck, StdThreadGen}; use rand::Rng; use std::collections::{HashMap, HashSet}; diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index d19930f5ea174..29c5dbb95604a 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] bytes = "0.4.12" -client = { package = "substrate-client", path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } sr-api = { path = "../../primitives/sr-api" } fnv = "1.0.6" futures01 = { package = "futures", version = "0.1" } diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs index b4d55e5f06823..977115321d6df 100644 --- a/client/offchain/src/api.rs +++ b/client/offchain/src/api.rs @@ -21,7 +21,7 @@ use std::{ thread::sleep, }; -use client::backend::OffchainStorage; +use interfaces::OffchainStorage; use futures::{StreamExt as _, Future, FutureExt as _, future, channel::mpsc}; use log::{info, debug, warn, error}; use network::{PeerId, Multiaddr, NetworkStateInfo}; diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs index 345ef17b07ea3..f21b776d3dd8c 100644 --- a/client/offchain/src/lib.rs +++ b/client/offchain/src/lib.rs @@ -44,6 +44,7 @@ use network::NetworkStateInfo; use primitives::{offchain, ExecutionContext}; use sr_primitives::{generic::BlockId, traits::{self, ProvideRuntimeApi}}; use transaction_pool::txpool::{Pool, ChainApi}; +use interfaces::{OffchainStorage}; mod api; @@ -89,7 +90,7 @@ impl OffchainWorkers< Block: traits::Block, Client: ProvideRuntimeApi + Send + Sync + 'static, Client::Api: OffchainWorkerApi, - Storage: client::backend::OffchainStorage + 'static, + Storage: OffchainStorage + 'static, { /// Start the offchain workers after given block. #[must_use] diff --git a/client/offchain/src/testing.rs b/client/offchain/src/testing.rs index 3f4415efa7a1d..2b78572de6df7 100644 --- a/client/offchain/src/testing.rs +++ b/client/offchain/src/testing.rs @@ -20,7 +20,7 @@ use std::{ collections::BTreeMap, sync::Arc, }; -use client::backend::OffchainStorage; +use interfaces::{OffchainStorage, InMemOffchainStorage}; use parking_lot::RwLock; use primitives::offchain::{ self, @@ -64,9 +64,9 @@ pub struct State { pub requests: BTreeMap, expected_requests: BTreeMap, /// Persistent local storage - pub persistent_storage: client::in_mem::OffchainStorage, + pub persistent_storage: InMemOffchainStorage, /// Local storage - pub local_storage: client::in_mem::OffchainStorage, + pub local_storage: InMemOffchainStorage, /// A vector of transactions submitted from the runtime. pub transactions: Vec>, } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 55b5243bc9cbd..45e0d3ab56bcc 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -37,6 +37,7 @@ app-crypto = { package = "substrate-application-crypto", path = "../../primitive consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" } network = { package = "substrate-network", path = "../network" } chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } client = { package = "substrate-client", path = "../" } sr-api = { path = "../../primitives/sr-api" } tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../primitives/transaction-pool/runtime-api" } diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs index f79eec1da0df7..a161651b01044 100644 --- a/client/service/src/builder.rs +++ b/client/service/src/builder.rs @@ -18,9 +18,12 @@ use crate::{Service, NetworkStatus, NetworkState, error::{self, Error}, DEFAULT_ use crate::{SpawnTaskHandle, start_rpc_servers, build_network_future, TransactionPoolAdapter}; use crate::status_sinks; use crate::config::{Configuration, DatabaseConfig}; -use client::{ - BlockchainEvents, Client, backend::RemoteBackend, light::blockchain::RemoteBlockchain, +use interfaces::{ + self, + BlockchainEvents, + backend::RemoteBackend, light::RemoteBlockchain, }; +use client::Client; use chain_spec::{RuntimeGenesis, Extension}; use codec::{Decode, Encode, IoReader}; use consensus_common::import_queue::ImportQueue; diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs index 45b49144de3a6..e491b7caaf275 100644 --- a/client/src/call_executor.rs +++ b/client/src/call_executor.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use std::{sync::Arc, cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; +use std::{sync::Arc, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; use codec::{Encode, Decode}; use sr_primitives::{ generic::BlockId, traits::Block as BlockT, traits::NumberFor, diff --git a/client/src/client.rs b/client/src/client.rs index 6da56b8da3f36..b30620db0627b 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -56,33 +56,32 @@ use header_metadata::{HeaderMetadata, CachedHeaderMetadata}; use sr_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock}; use block_builder::BlockBuilderApi; -use interfaces::{ +pub use interfaces::{ backend::{ self, BlockImportOperation, PrunableStateChangesTrieStorage, ClientImportOperation, Finalizer, ImportSummary, NewBlockState, }, blockchain::{ - self, Info as ChainInfo, Backend as ChainBackend, + self, Backend as ChainBackend, HeaderBackend as ChainHeaderBackend, ProvideCache, Cache, well_known_cache_keys::Id as CacheKeyId, }, + client::{ + ImportNotifications, FinalityNotification, FinalityNotifications, BlockImportNotification, + ClientInfo, BlockchainEvents, BlockBody, ProvideUncles, ExecutionStrategies, ForkBlocks + }, notifications::{StorageNotifications, StorageEventStream}, error::Error, error, + CallExecutor }; -use interfaces::{CallExecutor}; + use crate::{ call_executor::LocalCallExecutor, light::{call_executor::prove_execution, fetcher::ChangesProof}, in_mem, genesis, cht, }; -/// Type that implements `futures::Stream` of block import events. -pub type ImportNotifications = mpsc::UnboundedReceiver>; - -/// A stream of block finality notifications. -pub type FinalityNotifications = mpsc::UnboundedReceiver>; - type StorageUpdate = < < >::BlockImportOperation @@ -90,38 +89,6 @@ type StorageUpdate = < >::State as state_machine::Backend>::Transaction; type ChangesUpdate = ChangesTrieTransaction>; -/// Expected hashes of blocks at given heights. -/// -/// This may be used as chain spec extension to filter out known, unwanted forks. -pub type ForkBlocks = Option, ::Hash>>; - -/// Execution strategies settings. -#[derive(Debug, Clone)] -pub struct ExecutionStrategies { - /// Execution strategy used when syncing. - pub syncing: ExecutionStrategy, - /// Execution strategy used when importing blocks. - pub importing: ExecutionStrategy, - /// Execution strategy used when constructing blocks. - pub block_construction: ExecutionStrategy, - /// Execution strategy used for offchain workers. - pub offchain_worker: ExecutionStrategy, - /// Execution strategy used in other cases. - pub other: ExecutionStrategy, -} - -impl Default for ExecutionStrategies { - fn default() -> ExecutionStrategies { - ExecutionStrategies { - syncing: ExecutionStrategy::NativeElseWasm, - importing: ExecutionStrategy::NativeElseWasm, - block_construction: ExecutionStrategy::AlwaysWasm, - offchain_worker: ExecutionStrategy::NativeWhenPossible, - other: ExecutionStrategy::NativeElseWasm, - } - } -} - /// Substrate Client pub struct Client where Block: BlockT { backend: Arc, @@ -136,74 +103,6 @@ pub struct Client where Block: BlockT { _phantom: PhantomData, } -/// A source of blockchain events. -pub trait BlockchainEvents { - /// Get block import event stream. Not guaranteed to be fired for every - /// imported block. - fn import_notification_stream(&self) -> ImportNotifications; - - /// Get a stream of finality notifications. Not guaranteed to be fired for every - /// finalized block. - fn finality_notification_stream(&self) -> FinalityNotifications; - - /// Get storage changes event stream. - /// - /// Passing `None` as `filter_keys` subscribes to all storage changes. - fn storage_changes_notification_stream( - &self, - filter_keys: Option<&[StorageKey]>, - child_filter_keys: Option<&[(StorageKey, Option>)]>, - ) -> error::Result>; -} - -/// Fetch block body by ID. -pub trait BlockBody { - /// Get block body by ID. Returns `None` if the body is not stored. - fn block_body(&self, - id: &BlockId - ) -> error::Result::Extrinsic>>>; -} - -/// Provide a list of potential uncle headers for a given block. -pub trait ProvideUncles { - /// Gets the uncles of the block with `target_hash` going back `max_generation` ancestors. - fn uncles(&self, target_hash: Block::Hash, max_generation: NumberFor) - -> error::Result>; -} - -/// Client info -#[derive(Debug)] -pub struct ClientInfo { - /// Best block hash. - pub chain: ChainInfo, - /// State Cache Size currently used by the backend - pub used_state_cache_size: Option, -} - -/// Summary of an imported block -#[derive(Clone, Debug)] -pub struct BlockImportNotification { - /// Imported block header hash. - pub hash: Block::Hash, - /// Imported block origin. - pub origin: BlockOrigin, - /// Imported block header. - pub header: Block::Header, - /// Is this the new best block. - pub is_new_best: bool, - /// List of retracted blocks ordered by block number. - pub retracted: Vec, -} - -/// Summary of a finalized block. -#[derive(Clone, Debug)] -pub struct FinalityNotification { - /// Imported block header hash. - pub hash: Block::Hash, - /// Imported block header. - pub header: Block::Header, -} - // used in importing a block, where additional changes are made after the runtime // executed. enum PrePostHeader { diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs index ae4eba651bdd0..83e2fd6ac3735 100644 --- a/client/src/in_mem.rs +++ b/client/src/in_mem.rs @@ -35,6 +35,9 @@ use interfaces::{ blockchain::{ self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId }, + offchain::{ + InMemOffchainStorage as OffchainStorage + } }; use crate::leaves::LeafSet; @@ -806,47 +809,6 @@ pub fn check_genesis_storage(top: &StorageOverlay, children: &ChildrenStorageOve Ok(()) } -/// In-memory storage for offchain workers. -#[derive(Debug, Clone, Default)] -pub struct OffchainStorage { - storage: HashMap, Vec>, -} - -impl backend::OffchainStorage for OffchainStorage { - fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) { - let key = prefix.iter().chain(key).cloned().collect(); - self.storage.insert(key, value.to_vec()); - } - - fn get(&self, prefix: &[u8], key: &[u8]) -> Option> { - let key: Vec = prefix.iter().chain(key).cloned().collect(); - self.storage.get(&key).cloned() - } - - fn compare_and_set( - &mut self, - prefix: &[u8], - key: &[u8], - old_value: Option<&[u8]>, - new_value: &[u8], - ) -> bool { - use std::collections::hash_map::Entry; - let key = prefix.iter().chain(key).cloned().collect(); - - match self.storage.entry(key) { - Entry::Vacant(entry) => if old_value.is_none() { - entry.insert(new_value.to_vec()); - true - } else { false }, - Entry::Occupied(ref mut entry) if Some(entry.get().as_slice()) == old_value => { - entry.insert(new_value.to_vec()); - true - }, - _ => false, - } - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/client/src/light/backend.rs b/client/src/light/backend.rs index dbfe434ff0dd2..9b47cf1d265d5 100644 --- a/client/src/light/backend.rs +++ b/client/src/light/backend.rs @@ -37,6 +37,7 @@ use interfaces::{ Error as ClientError, Result as ClientResult }, light::Storage as BlockchainStorage, + InMemOffchainStorage, }; use crate::light::blockchain::{Blockchain}; use hash_db::Hasher; @@ -114,7 +115,7 @@ impl ClientBackend for Backend where type Blockchain = Blockchain; type State = GenesisOrUnavailableState; type ChangesTrieStorage = in_mem::ChangesTrieStorage; - type OffchainStorage = in_mem::OffchainStorage; + type OffchainStorage = InMemOffchainStorage; fn begin_operation(&self) -> ClientResult { Ok(ImportOperation { From 4738b9d0b4dc669a9f1f399443e4e15effca1fa3 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 13:38:00 +0100 Subject: [PATCH 37/61] re-add consensus crates into the mix --- Cargo.lock | 32 ++++++++++++++++++++++++++++-- Cargo.toml | 8 ++++++++ client/consensus/pow/Cargo.toml | 4 ++-- client/consensus/pow/src/lib.rs | 13 ++++++------ client/consensus/slots/Cargo.toml | 1 - client/consensus/slots/src/lib.rs | 7 ++++--- client/consensus/uncles/Cargo.toml | 2 +- client/consensus/uncles/src/lib.rs | 2 +- client/db/src/cache/list_cache.rs | 2 +- client/db/src/cache/list_entry.rs | 2 +- client/db/src/cache/mod.rs | 6 +++--- client/db/src/lib.rs | 6 +++--- client/interfaces/src/client.rs | 6 ++++++ client/src/client.rs | 9 ++------- 14 files changed, 69 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb2b8f0779fa3..1d9fb287f36e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5583,6 +5583,35 @@ dependencies = [ "substrate-test-runtime-client 2.0.0", ] +[[package]] +name = "substrate-consensus-pow" +version = "2.0.0" +dependencies = [ + "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0", + "srml-timestamp 2.0.0", + "substrate-block-builder-runtime-api 2.0.0", + "substrate-client-interfaces 2.0.0", + "substrate-consensus-common 2.0.0", + "substrate-consensus-pow-primitives 2.0.0", + "substrate-inherents 2.0.0", + "substrate-primitives 2.0.0", +] + +[[package]] +name = "substrate-consensus-pow-primitives" +version = "2.0.0" +dependencies = [ + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-api 2.0.0", + "sr-primitives 2.0.0", + "sr-std 2.0.0", + "substrate-primitives 2.0.0", +] + [[package]] name = "substrate-consensus-slots" version = "2.0.0" @@ -5593,7 +5622,6 @@ dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", - "substrate-client 2.0.0", "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-inherents 2.0.0", @@ -5609,7 +5637,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "srml-authorship 0.1.0", - "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-common 2.0.0", "substrate-inherents 2.0.0", "substrate-primitives 2.0.0", diff --git a/Cargo.toml b/Cargo.toml index 5f7700ce31e6c..0a74f414e66da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,11 @@ members = [ "client/chain-spec", "client/chain-spec/derive", "client/cli", + "client/consensus/aura", + "client/consensus/babe", + "client/consensus/pow", + "client/consensus/slots", + "client/consensus/uncles", "client/db", "client/executor", "client/executor/runtime-test", @@ -78,7 +83,10 @@ members = [ "paint/utility", "primitives/application-crypto", "primitives/block-builder/runtime-api", + "primitives/consensus/aura", + "primitives/consensus/babe", "primitives/consensus/common", + "primitives/consensus/pow", "primitives/core", "primitives/externalities", "primitives/finality-grandpa", diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index 06501fe36492f..ba2d3de9833c1 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -9,12 +9,12 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } -client = { package = "substrate-client", path = "../../" } +interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } srml-timestamp = { path = "../../../paint/timestamp" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } pow-primitives = { package = "substrate-consensus-pow-primitives", path = "../../../primitives/consensus/pow" } -consensus-common = { package = "substrate-consensus-common", path = "../common" } +consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } log = "0.4.8" futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] } derive_more = "0.15.0" diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs index b6e94411fdcbf..fcc6828576a06 100644 --- a/client/consensus/pow/src/lib.rs +++ b/client/consensus/pow/src/lib.rs @@ -32,7 +32,7 @@ use std::sync::Arc; use std::thread; use std::collections::HashMap; -use client::{ +use interfaces::{ BlockOf, blockchain::{HeaderBackend, ProvideCache}, backend::AuxStore, well_known_cache_keys::Id as CacheKeyId, }; @@ -50,6 +50,7 @@ use consensus_common::{ }; use consensus_common::import_queue::{BoxBlockImport, BasicQueue, Verifier}; use codec::{Encode, Decode}; +use interfaces; use log::*; #[derive(derive_more::Display, Debug)] @@ -65,7 +66,7 @@ pub enum Error { #[display(fmt = "Fetching best header failed using select chain: {:?}", _0)] BestHeaderSelectChain(ConsensusError), #[display(fmt = "Fetching best header failed: {:?}", _0)] - BestHeader(client::error::Error), + BestHeader(interfaces::error::Error), #[display(fmt = "Best header does not exist")] NoBestHeader, #[display(fmt = "Block proposing error: {:?}", _0)] @@ -78,7 +79,7 @@ pub enum Error { CreateInherents(inherents::Error), #[display(fmt = "Checking inherents failed: {}", _0)] CheckInherents(String), - Client(client::error::Error), + Client(interfaces::error::Error), Codec(codec::Error), Environment(String), Runtime(RuntimeString) @@ -210,7 +211,7 @@ impl, C, S, Algorithm> PowVerifier { inherent_data: InherentData, timestamp_now: u64, ) -> Result<(), Error> where - C: ProvideRuntimeApi, C::Api: BlockBuilderApi + C: ProvideRuntimeApi, C::Api: BlockBuilderApi { const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60; @@ -248,7 +249,7 @@ impl, C, S, Algorithm> PowVerifier { impl, C, S, Algorithm> Verifier for PowVerifier where C: ProvideRuntimeApi + Send + Sync + HeaderBackend + AuxStore + ProvideCache + BlockOf, - C::Api: BlockBuilderApi, + C::Api: BlockBuilderApi, S: SelectChain, Algorithm: PowAlgorithm + Send + Sync, { @@ -340,7 +341,7 @@ pub fn import_queue( B: BlockT, C: ProvideRuntimeApi + HeaderBackend + BlockOf + ProvideCache + AuxStore, C: Send + Sync + AuxStore + 'static, - C::Api: BlockBuilderApi, + C::Api: BlockBuilderApi, Algorithm: PowAlgorithm + Send + Sync + 'static, S: SelectChain + 'static, { diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml index 6f0e6bf5d0ed3..8a5f31869f3a7 100644 --- a/client/consensus/slots/Cargo.toml +++ b/client/consensus/slots/Cargo.toml @@ -9,7 +9,6 @@ build = "build.rs" [dependencies] codec = { package = "parity-scale-codec", version = "1.0.0" } interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } -client = { package = "substrate-client", path = "../../" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } substrate-telemetry = { path = "../../telemetry" } diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs index 921f23fd45e8e..f2f3a005a3f95 100644 --- a/client/consensus/slots/src/lib.rs +++ b/client/consensus/slots/src/lib.rs @@ -41,6 +41,7 @@ use sr_primitives::traits::{ApiRef, Block as BlockT, Header, ProvideRuntimeApi}; use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc}; use substrate_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO}; use parking_lot::Mutex; +use interfaces; /// A worker that should be invoked at every new slot. pub trait SlotWorker { @@ -389,17 +390,17 @@ impl SlotDuration { /// /// `slot_key` is marked as `'static`, as it should really be a /// compile-time constant. - pub fn get_or_compute(client: &C, cb: CB) -> ::client::error::Result where + pub fn get_or_compute(client: &C, cb: CB) -> interfaces::error::Result where C: interfaces::backend::AuxStore, C: ProvideRuntimeApi, - CB: FnOnce(ApiRef, &BlockId) -> ::client::error::Result, + CB: FnOnce(ApiRef, &BlockId) -> interfaces::error::Result, T: SlotData + Encode + Decode + Debug, { match client.get_aux(T::SLOT_KEY)? { Some(v) => ::decode(&mut &v[..]) .map(SlotDuration) .map_err(|_| { - client::error::Error::Backend({ + interfaces::error::Error::Backend({ error!(target: "slots", "slot duration kept in invalid format"); "slot duration kept in invalid format".to_string() }) diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index 927d22302b11f..a86c51be44846 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -6,7 +6,7 @@ description = "Generic uncle inclusion utilities for consensus" edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../" } +interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } srml-authorship = { path = "../../../paint/authorship" } diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs index 5638a23175d56..6cb3dbf79b0ba 100644 --- a/client/consensus/uncles/src/lib.rs +++ b/client/consensus/uncles/src/lib.rs @@ -22,7 +22,7 @@ use consensus_common::SelectChain; use inherents::{InherentDataProviders}; use log::warn; -use client::ProvideUncles; +use interfaces::ProvideUncles; use sr_primitives::traits::{Block as BlockT, Header}; use std::sync::Arc; diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs index 7a4fcc448e0e5..bf292d18b6210 100644 --- a/client/db/src/cache/list_cache.rs +++ b/client/db/src/cache/list_cache.rs @@ -43,7 +43,7 @@ use std::collections::{BTreeSet, BTreeMap}; use log::warn; -use client::error::{Error as ClientError, Result as ClientResult}; +use interfaces::error::{Error as ClientError, Result as ClientResult}; use sr_primitives::traits::{ Block as BlockT, NumberFor, Zero, Bounded, CheckedSub }; diff --git a/client/db/src/cache/list_entry.rs b/client/db/src/cache/list_entry.rs index 6de369ecf56d2..3fb11e0dafdaf 100644 --- a/client/db/src/cache/list_entry.rs +++ b/client/db/src/cache/list_entry.rs @@ -16,7 +16,7 @@ //! List-cache storage entries. -use client::error::Result as ClientResult; +use interfaces::error::Result as ClientResult; use sr_primitives::traits::{Block as BlockT, NumberFor}; use codec::{Encode, Decode}; diff --git a/client/db/src/cache/mod.rs b/client/db/src/cache/mod.rs index 9aaea57b0cdb2..7e8c96fe1ea1d 100644 --- a/client/db/src/cache/mod.rs +++ b/client/db/src/cache/mod.rs @@ -21,8 +21,8 @@ use parking_lot::RwLock; use kvdb::{KeyValueDB, DBTransaction}; -use client::blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, Cache as BlockchainCache}; -use client::error::Result as ClientResult; +use interfaces::blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, Cache as BlockchainCache}; +use interfaces::error::Result as ClientResult; use codec::{Encode, Decode}; use sr_primitives::generic::BlockId; use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; @@ -211,7 +211,7 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> { .cloned() .collect::>(); - let mut insert_op = |name: CacheKeyId, value: Option>| -> Result<(), client::error::Error> { + let mut insert_op = |name: CacheKeyId, value: Option>| -> Result<(), interfaces::error::Error> { let cache = self.cache.get_cache(name); let op = cache.on_block_insert( &mut self::list_storage::DbStorageTransaction::new( diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs index 717ab78f9e66c..60a9fb1bd9df9 100644 --- a/client/db/src/lib.rs +++ b/client/db/src/lib.rs @@ -40,10 +40,10 @@ use std::io; use std::collections::{HashMap, HashSet}; use interfaces::backend::NewBlockState; -use client::blockchain::{well_known_cache_keys, HeaderBackend}; -use client::{ForkBlocks, ExecutionStrategies}; +use interfaces::blockchain::{well_known_cache_keys, HeaderBackend}; +use interfaces::{ForkBlocks, ExecutionStrategies}; use interfaces::backend::{StorageCollection, ChildStorageCollection}; -use client::error::{Result as ClientResult, Error as ClientError}; +use interfaces::error::{Result as ClientResult, Error as ClientError}; use codec::{Decode, Encode}; use hash_db::{Hasher, Prefix}; use kvdb::{KeyValueDB, DBTransaction}; diff --git a/client/interfaces/src/client.rs b/client/interfaces/src/client.rs index d2df2bb14455a..a51fc9f03f875 100644 --- a/client/interfaces/src/client.rs +++ b/client/interfaces/src/client.rs @@ -66,6 +66,12 @@ impl Default for ExecutionStrategies { } } +/// Figure out the block type for a given type (for now, just a `Client`). +pub trait BlockOf { + /// The type of the block. + type Type: BlockT; +} + /// A source of blockchain events. pub trait BlockchainEvents { /// Get block import event stream. Not guaranteed to be fired for every diff --git a/client/src/client.rs b/client/src/client.rs index b30620db0627b..ac2c5ba89dd94 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -68,7 +68,8 @@ pub use interfaces::{ }, client::{ ImportNotifications, FinalityNotification, FinalityNotifications, BlockImportNotification, - ClientInfo, BlockchainEvents, BlockBody, ProvideUncles, ExecutionStrategies, ForkBlocks + ClientInfo, BlockchainEvents, BlockBody, ProvideUncles, ExecutionStrategies, ForkBlocks, + BlockOf, }, notifications::{StorageNotifications, StorageEventStream}, error::Error, @@ -174,12 +175,6 @@ pub fn new_with_backend( Client::new(backend, call_executor, build_genesis_storage, Default::default(), Default::default()) } -/// Figure out the block type for a given type (for now, just a `Client`). -pub trait BlockOf { - /// The type of the block. - type Type: BlockT; -} - impl BlockOf for Client where B: backend::Backend, E: CallExecutor, From 2cd33166978a5bc54b2dcf049c0fe38931823e5a Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 13:39:46 +0100 Subject: [PATCH 38/61] fix subkey path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 063e7c7232ae8..ef2147805ad68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,7 +117,7 @@ cargo-check-subkey: except: - /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - cd ./subkey + - cd ./bin/subkey - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release - sccache -s From cab5727ede28b9e012b4ddb716c1bdf3bbd67b51 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 13:49:24 +0100 Subject: [PATCH 39/61] relieve client from executor --- Cargo.lock | 2 +- client/executor/Cargo.toml | 2 +- client/executor/src/integration_tests/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d9fb287f36e6..b2598fd73b43f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5672,7 +5672,7 @@ dependencies = [ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0", "sr-version 2.0.0", - "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-externalities 2.0.0", "substrate-offchain 2.0.0", "substrate-panic-handler 2.0.0", diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index fa7e6911c63a1..ca22e5efdb6af 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -38,7 +38,7 @@ assert_matches = "1.3.0" wabt = "0.9.2" hex-literal = "0.2.1" runtime-test = { package = "substrate-runtime-test", path = "runtime-test" } -substrate-client = { path = "../" } +interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } substrate-offchain = { path = "../offchain/" } state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" } test-case = "0.3.3" diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs index 6db9911d44ab4..b8d23584b01d6 100644 --- a/client/executor/src/integration_tests/mod.rs +++ b/client/executor/src/integration_tests/mod.rs @@ -401,7 +401,7 @@ fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) { #[test_case(WasmExecutionMethod::Interpreted)] #[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))] fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) { - use substrate_client::backend::OffchainStorage; + use interfaces::OffchainStorage; let mut ext = TestExternalities::default(); let (offchain, state) = testing::TestOffchainExt::new(); From ee8bed2539dce83f2351a39ea19dce0d9787a5f1 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 14:05:59 +0100 Subject: [PATCH 40/61] starting to pull out client from grandpa --- Cargo.lock | 1 - client/finality-grandpa/Cargo.toml | 1 - client/finality-grandpa/src/aux_schema.rs | 4 ++-- client/finality-grandpa/src/consensus_changes.rs | 4 ++-- client/finality-grandpa/src/finality_proof.rs | 2 +- client/finality-grandpa/src/lib.rs | 12 ++++++------ client/finality-grandpa/src/light_import.rs | 6 +++--- client/finality-grandpa/src/observer.rs | 5 +++-- client/finality-grandpa/src/tests.rs | 5 +++-- client/finality-grandpa/src/until_imported.rs | 4 ++-- client/finality-grandpa/src/voting_rule.rs | 2 +- client/network/src/test/mod.rs | 7 ++++--- client/rpc/src/author/mod.rs | 5 +++-- client/rpc/src/chain/chain_full.rs | 4 ++-- 14 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2598fd73b43f..310f8839fada5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5719,7 +5719,6 @@ dependencies = [ "sr-api 2.0.0", "sr-primitives 2.0.0", "srml-finality-tracker 2.0.0", - "substrate-client 2.0.0", "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index bcca611732ca7..ab4437b58f8a3 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -21,7 +21,6 @@ substrate-telemetry = { path = "../telemetry" } keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } -client = { package = "substrate-client", path = "../" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } network = { package = "substrate-network", path = "../network" } diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs index 1aed0b95aba28..43240216df58d 100644 --- a/client/finality-grandpa/src/aux_schema.rs +++ b/client/finality-grandpa/src/aux_schema.rs @@ -19,8 +19,8 @@ use std::fmt::Debug; use std::sync::Arc; use codec::{Encode, Decode}; -use client::backend::AuxStore; -use client::error::{Result as ClientResult, Error as ClientError}; +use interfaces::backend::AuxStore; +use interfaces::error::{Result as ClientResult, Error as ClientError}; use fork_tree::ForkTree; use grandpa::round::State as RoundState; use sr_primitives::traits::{Block as BlockT, NumberFor}; diff --git a/client/finality-grandpa/src/consensus_changes.rs b/client/finality-grandpa/src/consensus_changes.rs index 4d942248920f7..ba41d62c606a8 100644 --- a/client/finality-grandpa/src/consensus_changes.rs +++ b/client/finality-grandpa/src/consensus_changes.rs @@ -47,11 +47,11 @@ impl ConsensusChanges { /// Finalize all pending consensus changes that are finalized by given block. /// Returns true if there any changes were finalized. - pub(crate) fn finalize ::client::error::Result>>( + pub(crate) fn finalize ::interfaces::error::Result>>( &mut self, block: (N, H), canonical_at_height: F, - ) -> ::client::error::Result<(bool, bool)> { + ) -> ::interfaces::error::Result<(bool, bool)> { let (split_idx, has_finalized_changes) = self.pending_changes.iter() .enumerate() .take_while(|(_, &(at_height, _))| at_height <= block.0) diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs index 8bc5271f873ae..369c8a08b19e3 100644 --- a/client/finality-grandpa/src/finality_proof.rs +++ b/client/finality-grandpa/src/finality_proof.rs @@ -258,7 +258,7 @@ pub(crate) fn prove_finality, B: BlockchainBackend ::client::error::Result>> +) -> ::interfaces::error::Result>> where J: ProvableJustification, { diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs index 88d7fbec07622..22a390df66de4 100644 --- a/client/finality-grandpa/src/lib.rs +++ b/client/finality-grandpa/src/lib.rs @@ -55,11 +55,11 @@ use futures::prelude::*; use log::{debug, error, info}; use futures::sync::mpsc; -use client::{ - BlockchainEvents, CallExecutor, Client, backend::Backend, error::Error as ClientError, - ExecutionStrategy, +use interfaces::{ + BlockchainEvents, CallExecutor, backend::Backend, error::Error as ClientError, + ExecutionStrategy, ::blockchain::HeaderBackend }; -use client::blockchain::HeaderBackend; +use client::Client; use codec::{Decode, Encode}; use sr_primitives::generic::BlockId; use sr_primitives::traits::{NumberFor, Block as BlockT, DigestFor, Zero}; @@ -546,7 +546,7 @@ pub struct GrandpaParams, N, RA, SC, VR, X> { /// block import worker that has already been instantiated with `block_import`. pub fn run_grandpa_voter, N, RA, SC, VR, X>( grandpa_params: GrandpaParams, -) -> client::error::Result + Send + 'static> where +) -> interfacess::error::Result + Send + 'static> where Block::Hash: Ord, B: Backend + 'static, E: CallExecutor + Send + Sync + 'static, @@ -879,7 +879,7 @@ where #[deprecated(since = "1.1.0", note = "Please switch to run_grandpa_voter.")] pub fn run_grandpa, N, RA, SC, VR, X>( grandpa_params: GrandpaParams, -) -> ::client::error::Result + Send + 'static> where +) -> ::interfaces::error::Result + Send + 'static> where Block::Hash: Ord, B: Backend + 'static, E: CallExecutor + Send + Sync + 'static, diff --git a/client/finality-grandpa/src/light_import.rs b/client/finality-grandpa/src/light_import.rs index d769b2fad9a21..573dce6b74ba1 100644 --- a/client/finality-grandpa/src/light_import.rs +++ b/client/finality-grandpa/src/light_import.rs @@ -18,9 +18,9 @@ use std::collections::HashMap; use std::sync::Arc; use log::{info, trace, warn}; use parking_lot::RwLock; - -use client::{ - CallExecutor, Client, +use client::Client; +use interfaces::{ + CallExecutor, backend::{AuxStore, Backend, Finalizer}, blockchain::HeaderBackend, error::Error as ClientError, diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs index e4d90ddc22e77..d3a61b968d4ef 100644 --- a/client/finality-grandpa/src/observer.rs +++ b/client/finality-grandpa/src/observer.rs @@ -25,7 +25,8 @@ use grandpa::{ use log::{debug, info, warn}; use consensus_common::SelectChain; -use client::{CallExecutor, Client, backend::Backend}; +use interfaces::{CallExecutor, backend::Backend}; +use client::Client; use sr_primitives::traits::{NumberFor, Block as BlockT}; use primitives::{H256, Blake2Hasher}; @@ -155,7 +156,7 @@ pub fn run_grandpa_observer, N, RA, SC>( link: LinkHalf, network: N, on_exit: impl Future + Clone + Send + 'static, -) -> ::client::error::Result + Send + 'static> where +) -> ::interfaces::error::Result + Send + 'static> where B: Backend + 'static, E: CallExecutor + Send + Sync + 'static, N: Network + Send + Sync + 'static, diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs index 0e2f2b02b3c94..88931631a4653 100644 --- a/client/finality-grandpa/src/tests.rs +++ b/client/finality-grandpa/src/tests.rs @@ -25,7 +25,8 @@ use parking_lot::Mutex; use futures03::{StreamExt as _, TryStreamExt as _}; use tokio::runtime::current_thread; use keyring::Ed25519Keyring; -use client::{error::Result, LongestChain}; +use client::LongestChain; +use interfaces::error::Result; use sr_api::{Core, RuntimeVersion, ApiExt, StorageProof}; use test_client::{self, runtime::BlockNumber}; use consensus_common::{BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, ImportResult}; @@ -241,7 +242,7 @@ impl Core for RuntimeApi { } impl ApiExt for RuntimeApi { - type Error = client::error::Error; + type Error = interfaces::error::Error; fn map_api_result result::Result, R, E>( &self, diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs index 5fca476a82b6a..d781bcb862161 100644 --- a/client/finality-grandpa/src/until_imported.rs +++ b/client/finality-grandpa/src/until_imported.rs @@ -29,7 +29,7 @@ use super::{ }; use log::{debug, warn}; -use client::{BlockImportNotification, ImportNotifications}; +use interfacess::{BlockImportNotification, ImportNotifications}; use futures::prelude::*; use futures::stream::Fuse; use futures03::{StreamExt as _, TryStreamExt as _}; @@ -474,7 +474,7 @@ mod tests { use tokio_timer::Delay; use test_client::runtime::{Block, Hash, Header}; use consensus_common::BlockOrigin; - use client::BlockImportNotification; + use interfaces::BlockImportNotification; use futures::future::Either; use futures03::channel::mpsc; use grandpa::Precommit; diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs index 355fa0cd2d080..162aa094db747 100644 --- a/client/finality-grandpa/src/voting_rule.rs +++ b/client/finality-grandpa/src/voting_rule.rs @@ -22,7 +22,7 @@ use std::sync::Arc; -use client::blockchain::HeaderBackend; +use interfaces::blockchain::HeaderBackend; use sr_primitives::generic::BlockId; use sr_primitives::traits::{Block as BlockT, Header, NumberFor, One, Zero}; diff --git a/client/network/src/test/mod.rs b/client/network/src/test/mod.rs index c292b24be4514..f15d2e72d4c80 100644 --- a/client/network/src/test/mod.rs +++ b/client/network/src/test/mod.rs @@ -27,15 +27,16 @@ use std::sync::Arc; use crate::config::build_multiaddr; use log::trace; use crate::chain::FinalityProofProvider; -use client::{ - self, ClientInfo, BlockchainEvents, BlockImportNotification, +use interfaces::{ + ClientInfo, BlockchainEvents, BlockImportNotification, FinalityNotifications, ImportNotifications, FinalityNotification, LongestChain, error::Result as ClientResult, well_known_cache_keys::{self, Id as CacheKeyId}, + ::backend::{AuxStore, Backend, Finalizer} }; use block_builder::BlockBuilder; -use client::backend::{AuxStore, Backend, Finalizer}; +use client::Client; use crate::config::Roles; use consensus::block_validation::DefaultBlockAnnounceValidator; use consensus::import_queue::BasicQueue; diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs index ccfe114402725..92b314e05165c 100644 --- a/client/rpc/src/author/mod.rs +++ b/client/rpc/src/author/mod.rs @@ -23,7 +23,8 @@ use std::{sync::Arc, convert::TryInto}; use futures03::future::{FutureExt, TryFutureExt}; use log::warn; -use client::{Client, error::Error as ClientError}; +use client::Client; +use interfaces::error::Error as ClientError; use rpc::futures::{ Sink, Future, @@ -82,7 +83,7 @@ impl Author where P: PoolChainApi + Sync + Send + 'sta impl AuthorApi, BlockHash

> for Author where B: interfaces::backend::Backend<

::Block, Blake2Hasher> + Send + Sync + 'static, - E: client::CallExecutor<

::Block, Blake2Hasher> + Send + Sync + 'static, + E: interfaces::CallExecutor<

::Block, Blake2Hasher> + Send + Sync + 'static, P: PoolChainApi + Sync + Send + 'static, P::Block: traits::Block, P::Error: 'static, diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs index c5e18db614a81..e83eb38bd348e 100644 --- a/client/rpc/src/chain/chain_full.rs +++ b/client/rpc/src/chain/chain_full.rs @@ -20,8 +20,8 @@ use std::sync::Arc; use rpc::futures::future::result; use api::Subscriptions; -use interfaces::backend::Backend; -use client::{CallExecutor, Client}; +use interfaces::{CallExecutor, backend::Backend}; +use client::Client; use primitives::{H256, Blake2Hasher}; use sr_primitives::{ generic::{BlockId, SignedBlock}, From 22857664fea995e1bf6fd8820bc52d1e1346c21e Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 14:17:00 +0100 Subject: [PATCH 41/61] move is_decendent_of out of client --- client/consensus/babe/src/epoch_changes.rs | 10 +++-- client/consensus/babe/src/lib.rs | 26 ++++++------ client/consensus/babe/src/tests.rs | 2 +- client/finality-grandpa/src/import.rs | 4 +- client/interfaces/src/lib.rs | 46 ++++++++++++++++++++++ client/src/client.rs | 43 -------------------- 6 files changed, 68 insertions(+), 63 deletions(-) diff --git a/client/consensus/babe/src/epoch_changes.rs b/client/consensus/babe/src/epoch_changes.rs index 09a14d286426d..81b0512d85535 100644 --- a/client/consensus/babe/src/epoch_changes.rs +++ b/client/consensus/babe/src/epoch_changes.rs @@ -25,9 +25,11 @@ use fork_tree::ForkTree; use parking_lot::{Mutex, MutexGuard}; use sr_primitives::traits::{Block as BlockT, NumberFor, One, Zero}; use codec::{Encode, Decode}; -use client::error::Error as ClientError; -use client::utils as client_utils; -use client::blockchain::HeaderBackend; +use interfaces::{ + error::Error as ClientError, + utils::is_descendent_of, + blockchain::HeaderBackend +}; use header_metadata::HeaderMetadata; use primitives::H256; use std::ops::Add; @@ -72,7 +74,7 @@ impl<'a, H, Block> IsDescendentOfBuilder fn build_is_descendent_of(&self, current: Option<(H256, H256)>) -> Self::IsDescendentOf { - Box::new(client_utils::is_descendent_of(self.0, current)) + Box::new(is_descendent_of(self.0, current)) } } diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs index 5f247dc473a8b..fb8a667f274c7 100644 --- a/client/consensus/babe/src/lib.rs +++ b/client/consensus/babe/src/lib.rs @@ -90,10 +90,10 @@ use interfaces::{ backend::{AuxStore, Backend}, call_executor::CallExecutor, error::{Result as ClientResult, Error as ClientError} + blockchain::{self, HeaderBackend, ProvideCache}, + BlockchainEvents, ProvideUncles, }; -use client::{ - blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, Client, ProvideUncles, -}; +use client::Client; use block_builder_api::BlockBuilder as BlockBuilderApi; @@ -156,11 +156,11 @@ enum Error { #[display(fmt = "VRF verification failed: {:?}", _0)] VRFVerificationFailed(SignatureError), #[display(fmt = "Could not fetch parent header: {:?}", _0)] - FetchParentHeader(client::error::Error), + FetchParentHeader(interfaces::error::Error), #[display(fmt = "Expected epoch change to happen at {:?}, s{}", _0, _1)] ExpectedEpochChange(B::Hash, u64), #[display(fmt = "Could not look up epoch: {:?}", _0)] - CouldNotLookUpEpoch(Box>), + CouldNotLookUpEpoch(Box>), #[display(fmt = "Block {} is not valid under any epoch.", _0)] BlockNotValid(B::Hash), #[display(fmt = "Unexpected epoch change")] @@ -169,9 +169,9 @@ enum Error { ParentBlockNoAssociatedWeight(B::Hash), #[display(fmt = "Checking inherents failed: {}", _0)] CheckInherents(String), - Client(client::error::Error), + Client(interfaces::error::Error), Runtime(inherents::Error), - ForkTree(Box>), + ForkTree(Box>), } impl std::convert::From> for String { @@ -205,7 +205,7 @@ impl Config { /// Either fetch the slot duration from disk or compute it from the genesis /// state. pub fn get_or_compute(client: &C) -> ClientResult where - C: AuxStore + ProvideRuntimeApi, C::Api: BabeApi, + C: AuxStore + ProvideRuntimeApi, C::Api: BabeApi, { trace!(target: "babe", "Getting slot duration"); match slots::SlotDuration::get_or_compute(client, |a, b| a.configuration(b)).map(Self) { @@ -557,7 +557,7 @@ impl BabeVerifier { block_id: BlockId, inherent_data: InherentData, ) -> Result<(), Error> - where PRA: ProvideRuntimeApi, PRA::Api: BlockBuilderApi + where PRA: ProvideRuntimeApi, PRA::Api: BlockBuilderApi { let inherent_res = self.api.runtime_api().check_inherents( &block_id, @@ -626,8 +626,8 @@ impl Verifier for BabeVerifier + 'static + Clone + Send + Sync, RA: Send + Sync, PRA: ProvideRuntimeApi + Send + Sync + AuxStore + ProvideCache, - PRA::Api: BlockBuilderApi - + BabeApi, + PRA::Api: BlockBuilderApi + + BabeApi, { fn verify( &mut self, @@ -906,7 +906,7 @@ impl BlockImport for BabeBlockImport| ConsensusError::ChainLookup( + .map_err(|e: fork_tree::Error| ConsensusError::ChainLookup( babe_err(Error::::CouldNotLookUpEpoch(Box::new(e))).into() ))? .ok_or_else(|| ConsensusError::ClientImport( @@ -1145,7 +1145,7 @@ pub fn import_queue, I, RA, PRA>( E: CallExecutor + Clone + Send + Sync + 'static, RA: Send + Sync + 'static, PRA: ProvideRuntimeApi + ProvideCache + Send + Sync + AuxStore + 'static, - PRA::Api: BlockBuilderApi + BabeApi + ApiExt, + PRA::Api: BlockBuilderApi + BabeApi + ApiExt, { register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration)?; diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs index 7fdf70045ec49..2b9e24db0ad50 100644 --- a/client/consensus/babe/src/tests.rs +++ b/client/consensus/babe/src/tests.rs @@ -34,7 +34,7 @@ use network::config::BoxFinalityProofRequestBuilder; use sr_primitives::{generic::DigestItem, traits::{Block as BlockT, DigestFor}}; use network::config::ProtocolConfig; use tokio::runtime::current_thread; -use client::BlockchainEvents; +use interfaces::BlockchainEvents; use test_client; use log::debug; use std::{time::Duration, cell::RefCell}; diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs index 1d99e35318f7e..8d6ce27b1a865 100644 --- a/client/finality-grandpa/src/import.rs +++ b/client/finality-grandpa/src/import.rs @@ -23,10 +23,10 @@ use parking_lot::RwLockWriteGuard; use interfaces::{ backend::Backend, blockchain, - CallExecutor, blockchain::HeaderBackend, well_known_cache_keys + CallExecutor, blockchain::HeaderBackend, well_known_cache_keys, + utils::is_descendent_of, }; use client::Client; -use client::utils::is_descendent_of; use consensus_common::{ BlockImport, Error as ConsensusError, BlockCheckParams, BlockImportParams, ImportResult, JustificationImport, diff --git a/client/interfaces/src/lib.rs b/client/interfaces/src/lib.rs index 795751498ec4e..4163320546db4 100644 --- a/client/interfaces/src/lib.rs +++ b/client/interfaces/src/lib.rs @@ -36,3 +36,49 @@ pub use offchain::*; pub use client::*; pub use state_machine::{StorageProof, ExecutionStrategy}; + + +/// Utility methods for the client. +pub mod utils { + use super::HeaderBackend; + use header_metadata::HeaderMetadata; + use crate::error; + use primitives::H256; + use sr_primitives::traits::{Block as BlockT}; + use std::borrow::Borrow; + + /// Returns a function for checking block ancestry, the returned function will + /// return `true` if the given hash (second parameter) is a descendent of the + /// base (first parameter). If the `current` parameter is defined, it should + /// represent the current block `hash` and its `parent hash`, if given the + /// function that's returned will assume that `hash` isn't part of the local DB + /// yet, and all searches in the DB will instead reference the parent. + pub fn is_descendent_of<'a, Block: BlockT, T, H: Borrow + 'a>( + client: &'a T, + current: Option<(H, H)>, + ) -> impl Fn(&H256, &H256) -> Result + 'a + where T: HeaderBackend + HeaderMetadata, + { + move |base, hash| { + if base == hash { return Ok(false); } + + let current = current.as_ref().map(|(c, p)| (c.borrow(), p.borrow())); + + let mut hash = hash; + if let Some((current_hash, current_parent_hash)) = current { + if base == current_hash { return Ok(false); } + if hash == current_hash { + if base == current_parent_hash { + return Ok(true); + } else { + hash = current_parent_hash; + } + } + } + + let ancestor = header_metadata::lowest_common_ancestor(client, *hash, *base)?; + + Ok(ancestor.hash == *base) + } + } +} diff --git a/client/src/client.rs b/client/src/client.rs index ac2c5ba89dd94..5844a3a77330e 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -1759,49 +1759,6 @@ where ) } -/// Utility methods for the client. -pub mod utils { - use super::*; - use interfaces::error; - use primitives::H256; - use std::borrow::Borrow; - - /// Returns a function for checking block ancestry, the returned function will - /// return `true` if the given hash (second parameter) is a descendent of the - /// base (first parameter). If the `current` parameter is defined, it should - /// represent the current block `hash` and its `parent hash`, if given the - /// function that's returned will assume that `hash` isn't part of the local DB - /// yet, and all searches in the DB will instead reference the parent. - pub fn is_descendent_of<'a, Block: BlockT, T, H: Borrow + 'a>( - client: &'a T, - current: Option<(H, H)>, - ) -> impl Fn(&H256, &H256) -> Result + 'a - where T: ChainHeaderBackend + HeaderMetadata, - { - move |base, hash| { - if base == hash { return Ok(false); } - - let current = current.as_ref().map(|(c, p)| (c.borrow(), p.borrow())); - - let mut hash = hash; - if let Some((current_hash, current_parent_hash)) = current { - if base == current_hash { return Ok(false); } - if hash == current_hash { - if base == current_parent_hash { - return Ok(true); - } else { - hash = current_parent_hash; - } - } - } - - let ancestor = header_metadata::lowest_common_ancestor(client, *hash, *base)?; - - Ok(ancestor.hash == *base) - } - } -} - impl consensus::block_validation::Chain for Client where BE: backend::Backend, E: CallExecutor, From 7376b518cfe53a38755513da4cca885c72bd9994 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Nov 2019 14:34:37 +0100 Subject: [PATCH 42/61] grandpa still depends on client directly --- client/finality-grandpa/Cargo.toml | 1 + client/finality-grandpa/src/environment.rs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index ab4437b58f8a3..bcca611732ca7 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -21,6 +21,7 @@ substrate-telemetry = { path = "../telemetry" } keystore = { package = "substrate-keystore", path = "../keystore" } serde_json = "1.0.41" interfaces = { package = "substrate-client-interfaces", path = "../interfaces" } +client = { package = "substrate-client", path = "../" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } network = { package = "substrate-network", path = "../network" } diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs index caf166fe50422..a37ac477ed558 100644 --- a/client/finality-grandpa/src/environment.rs +++ b/client/finality-grandpa/src/environment.rs @@ -30,9 +30,10 @@ use interfaces::{ backend::{Backend, Finalizer}, call_executor::CallExecutor, error::Error as ClientError, + utils::is_descendent_of, } use client::{ - apply_aux, Client, utils::is_descendent_of, + apply_aux, Client, }; use grandpa::{ BlockNumberOps, Equivocation, Error as GrandpaError, round::State as RoundState, From d288ec057c4e2d312bec08002cf255e789909ec2 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 13 Nov 2019 14:18:14 +0100 Subject: [PATCH 43/61] lemme tests pass --- Cargo.lock | 17 +++- Cargo.toml | 1 + bin/node/cli/Cargo.toml | 1 + bin/node/cli/src/service.rs | 2 +- client/consensus/babe/src/lib.rs | 2 +- client/consensus/babe/src/tests.rs | 2 +- client/db/src/lib.rs | 3 +- client/db/src/offchain.rs | 2 +- client/finality-grandpa/src/environment.rs | 7 +- client/finality-grandpa/src/finality_proof.rs | 5 +- client/finality-grandpa/src/justification.rs | 2 +- client/finality-grandpa/src/lib.rs | 4 +- client/finality-grandpa/src/until_imported.rs | 2 +- client/interfaces/Cargo.toml | 1 + client/interfaces/src/light.rs | 52 +++++++++++++ client/network/src/test/mod.rs | 6 +- client/src/client.rs | 5 +- client/src/in_mem.rs | 5 +- client/src/lib.rs | 4 +- client/src/light/fetcher.rs | 48 +----------- test/utils/primitives/Cargo.toml | 71 +++++++++++++++++ test/utils/primitives/src/lib.rs | 78 +++++++++++++++++++ test/utils/runtime/Cargo.toml | 1 - test/utils/runtime/client/Cargo.toml | 3 +- test/utils/runtime/client/src/trait_tests.rs | 10 +-- 25 files changed, 255 insertions(+), 79 deletions(-) create mode 100644 test/utils/primitives/Cargo.toml create mode 100644 test/utils/primitives/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 310f8839fada5..3b9332285f7a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2720,6 +2720,7 @@ dependencies = [ "substrate-cli 2.0.0", "substrate-client 2.0.0", "substrate-client-db 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-consensus-babe 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", @@ -5448,6 +5449,7 @@ dependencies = [ "substrate-primitives 2.0.0", "substrate-state-machine 2.0.0", "substrate-telemetry 2.0.0", + "substrate-test-primitives 2.0.0", "substrate-test-runtime-client 2.0.0", "substrate-trie 2.0.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5719,6 +5721,7 @@ dependencies = [ "sr-api 2.0.0", "sr-primitives 2.0.0", "srml-finality-tracker 2.0.0", + "substrate-client 2.0.0", "substrate-client-interfaces 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-consensus-common 2.0.0", @@ -6262,6 +6265,17 @@ dependencies = [ "substrate-state-machine 2.0.0", ] +[[package]] +name = "substrate-test-primitives" +version = "2.0.0" +dependencies = [ + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0", + "substrate-application-crypto 2.0.0", + "substrate-primitives 2.0.0", +] + [[package]] name = "substrate-test-runtime" version = "2.0.0" @@ -6285,7 +6299,6 @@ dependencies = [ "substrate-application-crypto 2.0.0", "substrate-block-builder-runtime-api 2.0.0", "substrate-client 2.0.0", - "substrate-client-interfaces 2.0.0", "substrate-consensus-aura-primitives 2.0.0", "substrate-consensus-babe-primitives 2.0.0", "substrate-executor 2.0.0", @@ -6310,6 +6323,8 @@ dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "substrate-block-builder 2.0.0", + "substrate-client 2.0.0", + "substrate-client-interfaces 2.0.0", "substrate-primitives 2.0.0", "substrate-test-client 2.0.0", "substrate-test-runtime 2.0.0", diff --git a/Cargo.toml b/Cargo.toml index 0a74f414e66da..c6ea2f0436964 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,6 +110,7 @@ members = [ "primitives/transaction-pool/runtime-api", "primitives/trie", "primitives/wasm-interface", + "test/utils/primitives", "test/utils/chain-spec-builder", "test/utils/client", "test/utils/runtime", diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index b95b65a9f0344..91fbb9b241255 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -40,6 +40,7 @@ grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = # core dependencies runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } +interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" } client = { package = "substrate-client", path = "../../../client/" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" } diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs index 52ad35fe7b315..e9ce3a5d1b8c5 100644 --- a/bin/node/cli/src/service.rs +++ b/bin/node/cli/src/service.rs @@ -265,7 +265,7 @@ pub fn new_full(config: NodeConfiguration) TransactionPool>, OffchainWorkers< ConcreteClient, - >::OffchainStorage, + >::OffchainStorage, ConcreteBlock, > >, diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs index fb8a667f274c7..1b37ed9477aec 100644 --- a/client/consensus/babe/src/lib.rs +++ b/client/consensus/babe/src/lib.rs @@ -89,7 +89,7 @@ use consensus_common::import_queue::{Verifier, BasicQueue, CacheKeyId}; use interfaces::{ backend::{AuxStore, Backend}, call_executor::CallExecutor, - error::{Result as ClientResult, Error as ClientError} + error::{Result as ClientResult, Error as ClientError}, blockchain::{self, HeaderBackend, ProvideCache}, BlockchainEvents, ProvideUncles, }; diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs index 2b9e24db0ad50..8a30b9f332ed1 100644 --- a/client/consensus/babe/src/tests.rs +++ b/client/consensus/babe/src/tests.rs @@ -633,7 +633,7 @@ fn importing_block_one_sets_genesis_epoch() { #[test] fn importing_epoch_change_block_prunes_tree() { - use client::backend::Finalizer; + use interfaces::Finalizer; let mut net = BabeTestNet::new(1); diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs index 60a9fb1bd9df9..2cec1898bb94d 100644 --- a/client/db/src/lib.rs +++ b/client/db/src/lib.rs @@ -1552,9 +1552,8 @@ mod tests { use hash_db::{HashDB, EMPTY_PREFIX}; use super::*; use crate::columns; - use interfaces::backend::Backend as BTrait; + use interfaces::backend::{Backend as BTrait, BlockImportOperation as Op}; use client::blockchain::Backend as BLBTrait; - use client::backend::BlockImportOperation as Op; use sr_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; use sr_primitives::traits::{Hash, BlakeTwo256}; use state_machine::{TrieMut, TrieDBMut, ChangesTrieRootsStorage, ChangesTrieStorage}; diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs index 69c062e09af51..1c9aa9ca9590b 100644 --- a/client/db/src/offchain.rs +++ b/client/db/src/offchain.rs @@ -117,7 +117,7 @@ impl interfaces::OffchainStorage for LocalStorage { #[cfg(test)] mod tests { use super::*; - use client::backend::OffchainStorage; + use interfaces::OffchainStorage; #[test] fn should_compare_and_set_and_clear_the_locks_map() { diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs index a37ac477ed558..e21bc6a79a47c 100644 --- a/client/finality-grandpa/src/environment.rs +++ b/client/finality-grandpa/src/environment.rs @@ -26,12 +26,13 @@ use tokio_timer::Delay; use parking_lot::RwLock; use interfaces::{ - blockchain::{HeaderBackend, BlockchainEvents}, - backend::{Backend, Finalizer}, + HeaderBackend, BlockchainEvents, + backend::{Backend}, + Finalizer, call_executor::CallExecutor, error::Error as ClientError, utils::is_descendent_of, -} +}; use client::{ apply_aux, Client, }; diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs index 369c8a08b19e3..2e1c669ff2597 100644 --- a/client/finality-grandpa/src/finality_proof.rs +++ b/client/finality-grandpa/src/finality_proof.rs @@ -41,7 +41,8 @@ use log::{trace, warn}; use interfaces::{ backend::Backend, blockchain::Backend as BlockchainBackend, CallExecutor, error::{Error as ClientError, Result as ClientResult}, - light::{FetchChecker, RemoteReadRequest, StorageProof}, + light::{FetchChecker, RemoteReadRequest}, + StorageProof, }; use client::Client; use codec::{Encode, Decode}; @@ -577,7 +578,7 @@ impl> ProvableJustification for GrandpaJ #[cfg(test)] pub(crate) mod tests { use test_client::runtime::{Block, Header, H256}; - use test_client::client::{backend::NewBlockState}; + use interfaces::NewBlockState; use test_client::client::in_mem::Blockchain as InMemoryBlockchain; use super::*; use primitives::crypto::Public; diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs index 98b1ce2d4cf39..9f88f79ec457f 100644 --- a/client/finality-grandpa/src/justification.rs +++ b/client/finality-grandpa/src/justification.rs @@ -17,7 +17,7 @@ use std::collections::{HashMap, HashSet}; use client::Client; -use interfaces::{call_exectutor::CallExecutor, backend::Backend, error::Error as ClientError}; +use interfaces::{CallExecutor, backend::Backend, error::Error as ClientError}; use codec::{Encode, Decode}; use grandpa::voter_set::VoterSet; use grandpa::{Error as GrandpaError}; diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs index 22a390df66de4..6e23bc7231fa9 100644 --- a/client/finality-grandpa/src/lib.rs +++ b/client/finality-grandpa/src/lib.rs @@ -57,7 +57,7 @@ use log::{debug, error, info}; use futures::sync::mpsc; use interfaces::{ BlockchainEvents, CallExecutor, backend::Backend, error::Error as ClientError, - ExecutionStrategy, ::blockchain::HeaderBackend + ExecutionStrategy, HeaderBackend }; use client::Client; use codec::{Decode, Encode}; @@ -546,7 +546,7 @@ pub struct GrandpaParams, N, RA, SC, VR, X> { /// block import worker that has already been instantiated with `block_import`. pub fn run_grandpa_voter, N, RA, SC, VR, X>( grandpa_params: GrandpaParams, -) -> interfacess::error::Result + Send + 'static> where +) -> interfaces::error::Result + Send + 'static> where Block::Hash: Ord, B: Backend + 'static, E: CallExecutor + Send + Sync + 'static, diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs index d781bcb862161..8356a9bf0f9a7 100644 --- a/client/finality-grandpa/src/until_imported.rs +++ b/client/finality-grandpa/src/until_imported.rs @@ -29,7 +29,7 @@ use super::{ }; use log::{debug, warn}; -use interfacess::{BlockImportNotification, ImportNotifications}; +use interfaces::{BlockImportNotification, ImportNotifications}; use futures::prelude::*; use futures::stream::Fuse; use futures03::{StreamExt as _, TryStreamExt as _}; diff --git a/client/interfaces/Cargo.toml b/client/interfaces/Cargo.toml index c526de46739c9..43240fc7d18ef 100644 --- a/client/interfaces/Cargo.toml +++ b/client/interfaces/Cargo.toml @@ -34,6 +34,7 @@ trie = { package = "substrate-trie", path = "../../primitives/trie" } env_logger = "0.7.0" tempfile = "3.1.0" client-db = { package = "substrate-client-db", path = ".././db", features = ["kvdb-rocksdb"] } +test-primitives = { package = "substrate-test-primitives", path = "../../test/utils/primitives" } test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" } diff --git a/client/interfaces/src/light.rs b/client/interfaces/src/light.rs index 0a610b0448fd3..b82f8ba745912 100644 --- a/client/interfaces/src/light.rs +++ b/client/interfaces/src/light.rs @@ -281,3 +281,55 @@ pub trait RemoteBlockchain: Send + Sync { RemoteHeaderRequest, >>; } + + + +#[cfg(test)] +pub mod tests { + use futures03::future::Ready; + use parking_lot::Mutex; + use crate::error::Error as ClientError; + use test_primitives::{Block, Header, Extrinsic}; + use super::*; + + pub type OkCallFetcher = Mutex>; + + fn not_implemented_in_tests() -> Ready> + where + E: std::convert::From<&'static str>, + { + futures03::future::ready(Err("Not implemented on test node".into())) + } + + impl Fetcher for OkCallFetcher { + type RemoteHeaderResult = Ready>; + type RemoteReadResult = Ready, Option>>, ClientError>>; + type RemoteCallResult = Ready, ClientError>>; + type RemoteChangesResult = Ready, u32)>, ClientError>>; + type RemoteBodyResult = Ready, ClientError>>; + + fn remote_header(&self, _request: RemoteHeaderRequest

) -> Self::RemoteHeaderResult { + not_implemented_in_tests() + } + + fn remote_read(&self, _request: RemoteReadRequest
) -> Self::RemoteReadResult { + not_implemented_in_tests() + } + + fn remote_read_child(&self, _request: RemoteReadChildRequest
) -> Self::RemoteReadResult { + not_implemented_in_tests() + } + + fn remote_call(&self, _request: RemoteCallRequest
) -> Self::RemoteCallResult { + futures03::future::ready(Ok((*self.lock()).clone())) + } + + fn remote_changes(&self, _request: RemoteChangesRequest
) -> Self::RemoteChangesResult { + not_implemented_in_tests() + } + + fn remote_body(&self, _request: RemoteBodyRequest
) -> Self::RemoteBodyResult { + not_implemented_in_tests() + } + } +} \ No newline at end of file diff --git a/client/network/src/test/mod.rs b/client/network/src/test/mod.rs index f15d2e72d4c80..4d37722e1acb1 100644 --- a/client/network/src/test/mod.rs +++ b/client/network/src/test/mod.rs @@ -30,13 +30,13 @@ use crate::chain::FinalityProofProvider; use interfaces::{ ClientInfo, BlockchainEvents, BlockImportNotification, FinalityNotifications, ImportNotifications, - FinalityNotification, LongestChain, + FinalityNotification, error::Result as ClientResult, well_known_cache_keys::{self, Id as CacheKeyId}, - ::backend::{AuxStore, Backend, Finalizer} + backend::{AuxStore, Backend, Finalizer} }; use block_builder::BlockBuilder; -use client::Client; +use client::LongestChain; use crate::config::Roles; use consensus::block_validation::DefaultBlockAnnounceValidator; use consensus::import_queue::BasicQueue; diff --git a/client/src/client.rs b/client/src/client.rs index 5844a3a77330e..6a231b172eea0 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -1778,6 +1778,7 @@ pub(crate) mod tests { use consensus::{BlockOrigin, SelectChain}; use test_client::{ prelude::*, + client_ext::ClientExt, client_db::{Backend, DatabaseSettings, DatabaseSettingsSrc, PruningMode}, runtime::{self, Block, Transfer, RuntimeApi, TestAPI}, }; @@ -2561,7 +2562,7 @@ pub(crate) mod tests { // we finalize block B1 which is on a different branch from current best // which should trigger a re-org. - client.finalize_block(BlockId::Hash(b1.hash()), None).unwrap(); + ClientExt::finalize_block(&client, BlockId::Hash(b1.hash()), None).unwrap(); // B1 should now be the latest finalized assert_eq!( @@ -2707,7 +2708,7 @@ pub(crate) mod tests { // we will finalize A2 which should make it impossible to import a new // B3 at the same height but that doesnt't include it - client.finalize_block(BlockId::Hash(a2.hash()), None).unwrap(); + ClientExt::finalize_block(&client, BlockId::Hash(a2.hash()), None).unwrap(); let b3 = client.new_block_at(&BlockId::Hash(b2.hash()), Default::default()) .unwrap().bake().unwrap(); diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs index 83e2fd6ac3735..8f9d86dc2ae64 100644 --- a/client/src/in_mem.rs +++ b/client/src/in_mem.rs @@ -811,7 +811,7 @@ pub fn check_genesis_storage(top: &StorageOverlay, children: &ChildrenStorageOve #[cfg(test)] mod tests { - use super::*; + use interfaces::offchain::{OffchainStorage, InMemOffchainStorage}; use std::sync::Arc; use test_client; use primitives::Blake2Hasher; @@ -834,9 +834,8 @@ mod tests { #[test] fn in_memory_offchain_storage() { - use crate::backend::OffchainStorage as _; - let mut storage = OffchainStorage::default(); + let mut storage = InMemOffchainStorage::default(); assert_eq!(storage.get(b"A", b"B"), None); assert_eq!(storage.get(b"B", b"A"), None); diff --git a/client/src/lib.rs b/client/src/lib.rs index 9788ac5be42bd..945fa8bf5a35b 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -91,6 +91,7 @@ pub use interfaces::{ blockchain::Info as ChainInfo, notifications::{StorageEventStream, StorageChangeSet}, call_executor::CallExecutor, + utils, }; pub use crate::call_executor::LocalCallExecutor; pub use crate::client::{ @@ -98,8 +99,7 @@ pub use crate::client::{ new_in_mem, BlockBody, ImportNotifications, FinalityNotifications, BlockchainEvents, BlockImportNotification, Client, ClientInfo, ExecutionStrategies, FinalityNotification, - LongestChain, BlockOf, ProvideUncles, ForkBlocks, - utils, apply_aux, + LongestChain, BlockOf, ProvideUncles, ForkBlocks, apply_aux, }; pub use state_machine::{ExecutionStrategy, StorageProof}; pub use crate::leaves::LeafSet; diff --git a/client/src/light/fetcher.rs b/client/src/light/fetcher.rs index 1ef183251e836..7bcf00d2c3388 100644 --- a/client/src/light/fetcher.rs +++ b/client/src/light/fetcher.rs @@ -326,14 +326,12 @@ impl<'a, H, Number, Hash> ChangesTrieRootsStorage for RootsStorage<'a #[cfg(test)] pub mod tests { - use futures03::future::Ready; - use parking_lot::Mutex; use codec::Decode; use crate::client::tests::prepare_client_with_key_changes; use executor::{NativeExecutor, WasmExecutionMethod}; use interfaces::{ backend::NewBlockState, - error::Error as ClientError + error::Error as ClientError, }; use test_client::{ self, ClientExt, blockchain::HeaderBackend, AccountKeyring, @@ -342,8 +340,7 @@ pub mod tests { use consensus::BlockOrigin; use crate::in_mem::{Blockchain as InMemoryBlockchain}; - use crate::light::fetcher::{Fetcher, FetchChecker, LightDataChecker, - RemoteCallRequest, RemoteHeaderRequest}; + use crate::light::fetcher::{FetchChecker, LightDataChecker, RemoteHeaderRequest}; use crate::light::blockchain::tests::{DummyStorage, DummyBlockchain}; use primitives::{blake2_256, Blake2Hasher, H256}; use primitives::storage::{well_known_keys, StorageKey}; @@ -351,47 +348,6 @@ pub mod tests { use state_machine::Backend; use super::*; - pub type OkCallFetcher = Mutex>; - - fn not_implemented_in_tests() -> Ready> - where - E: std::convert::From<&'static str>, - { - futures03::future::ready(Err("Not implemented on test node".into())) - } - - impl Fetcher for OkCallFetcher { - type RemoteHeaderResult = Ready>; - type RemoteReadResult = Ready, Option>>, ClientError>>; - type RemoteCallResult = Ready, ClientError>>; - type RemoteChangesResult = Ready, u32)>, ClientError>>; - type RemoteBodyResult = Ready, ClientError>>; - - fn remote_header(&self, _request: RemoteHeaderRequest
) -> Self::RemoteHeaderResult { - not_implemented_in_tests() - } - - fn remote_read(&self, _request: RemoteReadRequest
) -> Self::RemoteReadResult { - not_implemented_in_tests() - } - - fn remote_read_child(&self, _request: RemoteReadChildRequest
) -> Self::RemoteReadResult { - not_implemented_in_tests() - } - - fn remote_call(&self, _request: RemoteCallRequest
) -> Self::RemoteCallResult { - futures03::future::ready(Ok((*self.lock()).clone())) - } - - fn remote_changes(&self, _request: RemoteChangesRequest
) -> Self::RemoteChangesResult { - not_implemented_in_tests() - } - - fn remote_body(&self, _request: RemoteBodyRequest
) -> Self::RemoteBodyResult { - not_implemented_in_tests() - } - } - type TestChecker = LightDataChecker< NativeExecutor, Blake2Hasher, diff --git a/test/utils/primitives/Cargo.toml b/test/utils/primitives/Cargo.toml new file mode 100644 index 0000000000000..aa6c04431f314 --- /dev/null +++ b/test/utils/primitives/Cargo.toml @@ -0,0 +1,71 @@ +[package] +name = "substrate-test-primitives" +version = "2.0.0" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +app-crypto = { package = "substrate-application-crypto", path = "../../../primitives/application-crypto", default-features = false } +codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } +# aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura", default-features = false } +# babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe", default-features = false } +# block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false } +# inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } +# log = { version = "0.4.8", optional = true } +# memory-db = { version = "0.15.2", default-features = false } +# offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false} +primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false } +# rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false } +# runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false} +# runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false } +# runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false } +# runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } +serde = { version = "1.0.101", optional = true, features = ["derive"] } +# session = { package = "substrate-session", path = "../../../primitives/session", default-features = false } +# sr-api = { path = "../../../primitives/sr-api", default-features = false } +sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false } +# srml-babe = { path = "../../../paint/babe", default-features = false } +# srml-system = { path = "../../../paint/system", default-features = false } +# srml-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false } +# srml-timestamp = { path = "../../../paint/timestamp", default-features = false } +# substrate-client = { path = "../../../client", optional = true } +# substrate-trie = { path = "../../../primitives/trie", default-features = false } +# transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false } +# trie-db = { version = "0.15.2", default-features = false } + +[features] +default = [ + "std", +] +std = [ + "app-crypto/std", + # "aura-primitives/std", + # "babe-primitives/std", + # "block-builder-api/std", + # "codec/std", + # "executive/std", + # "inherents/std", + # "keyring", + # "log", + # "memory-db/std", + # "offchain-primitives/std", + # "primitives/std", + # "primitives/std", + # "rstd/std", + # "runtime-interface/std", + # "runtime_io/std", + # "runtime_support/std", + # "runtime_version/std", + "serde", + # "session/std", + # "sr-api/std", + # "sr-primitives/std", + # "srml-babe/std", + # "srml-system-rpc-runtime-api/std", + # "srml-system/std", + # "srml-timestamp/std", + # "substrate-client", + # "substrate-trie/std", + # "transaction-pool-api/std", + # "trie-db/std", +] diff --git a/test/utils/primitives/src/lib.rs b/test/utils/primitives/src/lib.rs new file mode 100644 index 0000000000000..d30b9eabf6fa8 --- /dev/null +++ b/test/utils/primitives/src/lib.rs @@ -0,0 +1,78 @@ +// Copyright 2017-2019 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +//! The Substrate test primitives to share + +#![cfg_attr(not(feature = "std"), no_std)] + +use codec::{Encode, Decode}; + +use app_crypto::sr25519; +pub use app_crypto; + +pub use primitives::{hash::H256, RuntimeDebug}; +use sr_primitives::traits::{BlakeTwo256, Verify, Extrinsic as ExtrinsicT,}; + +/// Extrinsic for test-runtime. +#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)] +pub enum Extrinsic { + IncludeData(Vec), + StorageChange(Vec, Option>), +} + +#[cfg(feature = "std")] +impl serde::Serialize for Extrinsic { + fn serialize(&self, seq: S) -> Result where S: ::serde::Serializer { + self.using_encoded(|bytes| seq.serialize_bytes(bytes)) + } +} + + +impl ExtrinsicT for Extrinsic { + type Call = Extrinsic; + type SignaturePayload = (); + + fn is_signed(&self) -> Option { + if let Extrinsic::IncludeData(_) = *self { + Some(false) + } else { + Some(true) + } + } + + fn new(call: Self::Call, _signature_payload: Option) -> Option { + Some(call) + } +} + +/// The signature type used by accounts/transactions. +pub type AccountSignature = sr25519::Signature; +/// An identifier for an account on this system. +pub type AccountId = ::Signer; +/// A simple hash type for all our hashing. +pub type Hash = H256; +/// The block number type used in this runtime. +pub type BlockNumber = u64; +/// Index of a transaction. +pub type Index = u64; +/// The item of a block digest. +pub type DigestItem = sr_primitives::generic::DigestItem; +/// The digest of a block. +pub type Digest = sr_primitives::generic::Digest; +/// A test block. +pub type Block = sr_primitives::generic::Block; +/// A test block's header. +pub type Header = sr_primitives::generic::Header; diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 32198edec2923..c622ca49879d7 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -11,7 +11,6 @@ aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../../primitives/consensus/babe", default-features = false } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false } cfg-if = "0.1.10" -interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false } diff --git a/test/utils/runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml index 4dbfb66df0271..d4c039f891eae 100644 --- a/test/utils/runtime/client/Cargo.toml +++ b/test/utils/runtime/client/Cargo.toml @@ -11,4 +11,5 @@ primitives = { package = "substrate-primitives", path = "../../../../primitives/ runtime = { package = "substrate-test-runtime", path = "../../runtime" } sr-primitives = { path = "../../../../primitives/sr-primitives" } codec = { package = "parity-scale-codec", version = "1.0.0" } - +interfaces = { package = "substrate-client-interfaces", path = "../../../../client/interfaces" } +client = { package = "substrate-client", path = "../../../../client/" } diff --git a/test/utils/runtime/client/src/trait_tests.rs b/test/utils/runtime/client/src/trait_tests.rs index 37fad9c7a1bf1..eb5ba77604f6a 100644 --- a/test/utils/runtime/client/src/trait_tests.rs +++ b/test/utils/runtime/client/src/trait_tests.rs @@ -21,9 +21,9 @@ use std::sync::Arc; -use crate::backend; +use interfaces::backend::LocalBackend; use crate::block_builder_ext::BlockBuilderExt; -use crate::blockchain::{Backend as BlockChainBackendT, HeaderBackend}; +use interfaces::blockchain::{Backend as BlockChainBackendT, HeaderBackend}; use crate::{AccountKeyring, ClientExt, TestClientBuilder, TestClientBuilderExt}; use generic_test_client::consensus::BlockOrigin; use primitives::Blake2Hasher; @@ -33,7 +33,7 @@ use sr_primitives::traits::Block as BlockT; /// helper to test the `leaves` implementation for various backends pub fn test_leaves_for_backend(backend: Arc) where - B: backend::LocalBackend, + B: LocalBackend, { // block tree: // G -> A1 -> A2 -> A3 -> A4 -> A5 @@ -149,7 +149,7 @@ pub fn test_leaves_for_backend(backend: Arc) where /// helper to test the `children` implementation for various backends pub fn test_children_for_backend(backend: Arc) where - B: backend::LocalBackend, + B: LocalBackend, { // block tree: // G -> A1 -> A2 -> A3 -> A4 -> A5 @@ -240,7 +240,7 @@ pub fn test_children_for_backend(backend: Arc) where } pub fn test_blockchain_query_by_number_gets_canonical(backend: Arc) where - B: backend::LocalBackend, + B: LocalBackend, { // block tree: // G -> A1 -> A2 -> A3 -> A4 -> A5 From 5e60373d8bbc93d7f31545b32461bf388ada8131 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 13 Nov 2019 14:45:21 +0100 Subject: [PATCH 44/61] rename srml->paint --- .maintain/ensure-deps.sh | 4 +- .maintain/gitlab/check_runtime.sh | 6 +- Cargo.lock | 2690 ++++++++--------- bin/node-template/runtime/Cargo.toml | 22 +- bin/node-template/runtime/src/template.rs | 2 +- bin/node/cli/Cargo.toml | 20 +- bin/node/executor/Cargo.toml | 20 +- bin/node/rpc/Cargo.toml | 6 +- bin/node/rpc/src/lib.rs | 12 +- bin/node/runtime/Cargo.toml | 60 +- bin/node/runtime/src/lib.rs | 2 +- bin/node/testing/Cargo.toml | 22 +- bin/subkey/Cargo.toml | 6 +- client/consensus/aura/Cargo.toml | 4 +- client/consensus/aura/src/lib.rs | 6 +- client/consensus/babe/Cargo.toml | 4 +- client/consensus/babe/src/lib.rs | 6 +- client/consensus/pow/Cargo.toml | 2 +- client/consensus/pow/src/lib.rs | 6 +- client/consensus/uncles/Cargo.toml | 2 +- client/consensus/uncles/src/lib.rs | 4 +- client/finality-grandpa/Cargo.toml | 2 +- client/finality-grandpa/src/lib.rs | 6 +- docs/CODEOWNERS | 16 +- docs/README.adoc | 8 +- docs/Structure.adoc | 4 +- paint/assets/Cargo.toml | 6 +- paint/assets/src/lib.rs | 4 +- paint/aura/Cargo.toml | 10 +- paint/aura/src/lib.rs | 4 +- paint/authority-discovery/Cargo.toml | 8 +- paint/authorship/Cargo.toml | 6 +- paint/babe/Cargo.toml | 10 +- paint/babe/src/lib.rs | 4 +- paint/balances/Cargo.toml | 8 +- paint/balances/src/lib.rs | 10 +- paint/collective/Cargo.toml | 8 +- paint/contracts/Cargo.toml | 12 +- paint/contracts/rpc/Cargo.toml | 4 +- paint/contracts/rpc/runtime-api/Cargo.toml | 2 +- paint/contracts/rpc/src/lib.rs | 2 +- paint/contracts/src/lib.rs | 2 +- paint/democracy/Cargo.toml | 8 +- paint/elections-phragmen/Cargo.toml | 10 +- paint/elections-phragmen/src/lib.rs | 8 +- paint/elections/Cargo.toml | 8 +- paint/evm/Cargo.toml | 10 +- paint/example/Cargo.toml | 8 +- paint/example/src/lib.rs | 6 +- paint/executive/Cargo.toml | 12 +- paint/executive/src/lib.rs | 4 +- paint/finality-tracker/Cargo.toml | 8 +- paint/finality-tracker/src/lib.rs | 8 +- paint/generic-asset/Cargo.toml | 6 +- paint/grandpa/Cargo.toml | 10 +- paint/im-online/Cargo.toml | 10 +- paint/im-online/src/lib.rs | 6 +- paint/indices/Cargo.toml | 6 +- paint/membership/Cargo.toml | 6 +- paint/metadata/Cargo.toml | 2 +- paint/nicks/Cargo.toml | 8 +- paint/offences/Cargo.toml | 8 +- paint/offences/src/mock.rs | 2 +- paint/randomness-collective-flip/Cargo.toml | 6 +- paint/randomness-collective-flip/src/lib.rs | 2 +- paint/scored-pool/Cargo.toml | 8 +- paint/scored-pool/src/lib.rs | 4 +- paint/session/Cargo.toml | 8 +- paint/session/src/lib.rs | 14 +- paint/staking/Cargo.toml | 16 +- paint/staking/reward-curve/Cargo.toml | 2 +- paint/staking/reward-curve/src/lib.rs | 4 +- paint/staking/reward-curve/tests/test.rs | 6 +- paint/staking/src/inflation.rs | 2 +- paint/staking/src/lib.rs | 8 +- paint/staking/src/mock.rs | 2 +- paint/sudo/Cargo.toml | 6 +- paint/sudo/src/lib.rs | 4 +- paint/support/Cargo.toml | 10 +- paint/support/procedural/Cargo.toml | 4 +- paint/support/procedural/src/lib.rs | 22 +- .../src/storage/genesis_config/builder_def.rs | 2 +- .../genesis_config/genesis_config_def.rs | 2 +- .../procedural/src/storage/metadata.rs | 2 +- paint/support/procedural/src/storage/mod.rs | 6 +- paint/support/procedural/src/storage/parse.rs | 2 +- paint/support/procedural/tools/Cargo.toml | 4 +- .../procedural/tools/derive/Cargo.toml | 2 +- paint/support/procedural/tools/src/lib.rs | 6 +- paint/support/procedural/tools/src/syn_ext.rs | 2 +- paint/support/rpc/Cargo.toml | 6 +- paint/support/rpc/src/lib.rs | 16 +- paint/support/src/debug.rs | 6 +- paint/support/src/dispatch.rs | 36 +- paint/support/src/error.rs | 4 +- paint/support/src/event.rs | 12 +- paint/support/src/hash.rs | 2 +- paint/support/src/lib.rs | 16 +- paint/support/src/metadata.rs | 10 +- paint/support/src/traits.rs | 2 +- paint/support/src/unsigned.rs | 6 +- paint/support/test/Cargo.toml | 4 +- paint/support/test/src/lib.rs | 2 +- paint/system/Cargo.toml | 4 +- paint/system/benches/bench.rs | 2 +- paint/system/rpc/Cargo.toml | 4 +- paint/system/rpc/runtime-api/Cargo.toml | 2 +- paint/system/rpc/src/lib.rs | 2 +- paint/system/src/lib.rs | 2 +- paint/timestamp/Cargo.toml | 6 +- paint/timestamp/src/lib.rs | 6 +- paint/transaction-payment/Cargo.toml | 10 +- paint/transaction-payment/rpc/Cargo.toml | 4 +- .../rpc/runtime-api/Cargo.toml | 2 +- paint/transaction-payment/rpc/src/lib.rs | 4 +- paint/treasury/Cargo.toml | 8 +- paint/utility/Cargo.toml | 8 +- primitives/phragmen/Cargo.toml | 2 +- test/utils/primitives/Cargo.toml | 18 +- test/utils/runtime/Cargo.toml | 20 +- test/utils/runtime/src/lib.rs | 24 +- test/utils/runtime/src/system.rs | 2 +- 122 files changed, 1802 insertions(+), 1802 deletions(-) diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh index ad168a675209c..4306bfd2e519f 100755 --- a/.maintain/ensure-deps.sh +++ b/.maintain/ensure-deps.sh @@ -6,8 +6,8 @@ # [top-lvl-dir]<[crate-name-prefix] # For instance no crate within `./client` directory -# is allowed to import any crate with a directory path containing `srml`. -# Such rule is just: `client(client: Arc, pool: Arc>) -> jsonrpc_core::IoHa C: ProvideRuntimeApi, C: client::blockchain::HeaderBackend, C: Send + Sync + 'static, - C::Api: srml_system_rpc::AccountNonceApi, - C::Api: srml_contracts_rpc::ContractsRuntimeApi, - C::Api: srml_transaction_payment_rpc::TransactionPaymentRuntimeApi, + C::Api: paint_system_rpc::AccountNonceApi, + C::Api: paint_contracts_rpc::ContractsRuntimeApi, + C::Api: paint_transaction_payment_rpc::TransactionPaymentRuntimeApi, P: ChainApi + Sync + Send + 'static, M: jsonrpc_core::Metadata + Default, { - use srml_system_rpc::{System, SystemApi}; - use srml_contracts_rpc::{Contracts, ContractsApi}; - use srml_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; + use paint_system_rpc::{System, SystemApi}; + use paint_contracts_rpc::{Contracts, ContractsApi}; + use paint_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; let mut io = jsonrpc_core::IoHandler::default(); io.extend_with( diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index c6e0d7a5c1b96..a6489fe6519f7 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -29,36 +29,36 @@ substrate-session = { path = "../../../primitives/session", default-features = f tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false } version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false } -# srml dependencies -authorship = { package = "srml-authorship", path = "../../../paint/authorship", default-features = false } -babe = { package = "srml-babe", path = "../../../paint/babe", default-features = false } -balances = { package = "srml-balances", path = "../../../paint/balances", default-features = false } -collective = { package = "srml-collective", path = "../../../paint/collective", default-features = false } -contracts = { package = "srml-contracts", path = "../../../paint/contracts", default-features = false } -contracts-rpc-runtime-api = { package = "srml-contracts-rpc-runtime-api", path = "../../../paint/contracts/rpc/runtime-api/", default-features = false } -democracy = { package = "srml-democracy", path = "../../../paint/democracy", default-features = false } -elections-phragmen = { package = "srml-elections-phragmen", path = "../../../paint/elections-phragmen", default-features = false } -executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false } -finality-tracker = { package = "srml-finality-tracker", path = "../../../paint/finality-tracker", default-features = false } -grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa", default-features = false } -im-online = { package = "srml-im-online", path = "../../../paint/im-online", default-features = false } -indices = { package = "srml-indices", path = "../../../paint/indices", default-features = false } -membership = { package = "srml-membership", path = "../../../paint/membership", default-features = false } -nicks = { package = "srml-nicks", path = "../../../paint/nicks", default-features = false } -offences = { package = "srml-offences", path = "../../../paint/offences", default-features = false } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../../../paint/randomness-collective-flip", default-features = false } -session = { package = "srml-session", path = "../../../paint/session", default-features = false, features = ["historical"] } -staking = { package = "srml-staking", path = "../../../paint/staking", default-features = false } -srml-staking-reward-curve = { path = "../../../paint/staking/reward-curve"} -sudo = { package = "srml-sudo", path = "../../../paint/sudo", default-features = false } -support = { package = "srml-support", path = "../../../paint/support", default-features = false } -system = { package = "srml-system", path = "../../../paint/system", default-features = false } -system-rpc-runtime-api = { package = "srml-system-rpc-runtime-api", path = "../../../paint/system/rpc/runtime-api/", default-features = false } -timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp", default-features = false } -treasury = { package = "srml-treasury", path = "../../../paint/treasury", default-features = false } -utility = { package = "srml-utility", path = "../../../paint/utility", default-features = false } -transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment", default-features = false } -transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", default-features = false } +# paint dependencies +authorship = { package = "paint-authorship", path = "../../../paint/authorship", default-features = false } +babe = { package = "paint-babe", path = "../../../paint/babe", default-features = false } +balances = { package = "paint-balances", path = "../../../paint/balances", default-features = false } +collective = { package = "paint-collective", path = "../../../paint/collective", default-features = false } +contracts = { package = "paint-contracts", path = "../../../paint/contracts", default-features = false } +contracts-rpc-runtime-api = { package = "paint-contracts-rpc-runtime-api", path = "../../../paint/contracts/rpc/runtime-api/", default-features = false } +democracy = { package = "paint-democracy", path = "../../../paint/democracy", default-features = false } +elections-phragmen = { package = "paint-elections-phragmen", path = "../../../paint/elections-phragmen", default-features = false } +executive = { package = "paint-executive", path = "../../../paint/executive", default-features = false } +finality-tracker = { package = "paint-finality-tracker", path = "../../../paint/finality-tracker", default-features = false } +grandpa = { package = "paint-grandpa", path = "../../../paint/grandpa", default-features = false } +im-online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false } +indices = { package = "paint-indices", path = "../../../paint/indices", default-features = false } +membership = { package = "paint-membership", path = "../../../paint/membership", default-features = false } +nicks = { package = "paint-nicks", path = "../../../paint/nicks", default-features = false } +offences = { package = "paint-offences", path = "../../../paint/offences", default-features = false } +randomness-collective-flip = { package = "paint-randomness-collective-flip", path = "../../../paint/randomness-collective-flip", default-features = false } +session = { package = "paint-session", path = "../../../paint/session", default-features = false, features = ["historical"] } +staking = { package = "paint-staking", path = "../../../paint/staking", default-features = false } +paint-staking-reward-curve = { path = "../../../paint/staking/reward-curve"} +sudo = { package = "paint-sudo", path = "../../../paint/sudo", default-features = false } +support = { package = "paint-support", path = "../../../paint/support", default-features = false } +system = { package = "paint-system", path = "../../../paint/system", default-features = false } +system-rpc-runtime-api = { package = "paint-system-rpc-runtime-api", path = "../../../paint/system/rpc/runtime-api/", default-features = false } +timestamp = { package = "paint-timestamp", path = "../../../paint/timestamp", default-features = false } +treasury = { package = "paint-treasury", path = "../../../paint/treasury", default-features = false } +utility = { package = "paint-utility", path = "../../../paint/utility", default-features = false } +transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment", default-features = false } +transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" } diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 42ae8063b3572..6aa0be08476ad 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -233,7 +233,7 @@ impl session::historical::Trait for Runtime { type FullIdentificationOf = staking::ExposureOf; } -srml_staking_reward_curve::build! { +paint_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_025_000, max_inflation: 0_100_000, diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml index cdb35b6251920..ac58eb77ed44f 100644 --- a/bin/node/testing/Cargo.toml +++ b/bin/node/testing/Cargo.toml @@ -6,11 +6,11 @@ description = "Test utilities for Substrate node." edition = "2018" [dependencies] -balances = { package = "srml-balances", path = "../../../paint/balances" } +balances = { package = "paint-balances", path = "../../../paint/balances" } client = { package = "substrate-client", path = "../../../client/" } -contracts = { package = "srml-contracts", path = "../../../paint/contracts" } -grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa" } -indices = { package = "srml-indices", path = "../../../paint/indices" } +contracts = { package = "paint-contracts", path = "../../../paint/contracts" } +grandpa = { package = "paint-grandpa", path = "../../../paint/grandpa" } +indices = { package = "paint-indices", path = "../../../paint/indices" } keyring = { package = "substrate-keyring", path = "../../../client/keyring" } node-executor = { path = "../executor" } node-primitives = { path = "../primitives" } @@ -19,13 +19,13 @@ codec = { package = "parity-scale-codec", version = "1.0.0" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } sr-primitives = { path = "../../../primitives/sr-primitives" } -runtime_support = { package = "srml-support", path = "../../../paint/support" } -session = { package = "srml-session", path = "../../../paint/session" } -staking = { package = "srml-staking", path = "../../../paint/staking" } +runtime_support = { package = "paint-support", path = "../../../paint/support" } +session = { package = "paint-session", path = "../../../paint/session" } +staking = { package = "paint-staking", path = "../../../paint/staking" } substrate-executor = { path = "../../../client/executor" } -system = { package = "srml-system", path = "../../../paint/system" } +system = { package = "paint-system", path = "../../../paint/system" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } -timestamp = { package = "srml-timestamp", path = "../../../paint/timestamp" } -treasury = { package = "srml-treasury", path = "../../../paint/treasury" } -transaction-payment = { package = "srml-transaction-payment", path = "../../../paint/transaction-payment" } +timestamp = { package = "paint-timestamp", path = "../../../paint/timestamp" } +treasury = { package = "paint-treasury", path = "../../../paint/treasury" } +transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment" } wabt = "0.9.2" diff --git a/bin/subkey/Cargo.toml b/bin/subkey/Cargo.toml index 6f27a161738b9..2a3a8318c9e85 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/subkey/Cargo.toml @@ -17,9 +17,9 @@ substrate-bip39 = "0.3.1" hex = "0.3.2" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0" } -system = { package = "srml-system", path = "../../paint/system" } -balances = { package = "srml-balances", path = "../../paint/balances" } -transaction-payment = { package = "srml-transaction-payment", path = "../../paint/transaction-payment" } +system = { package = "paint-system", path = "../../paint/system" } +balances = { package = "paint-balances", path = "../../paint/balances" } +transaction-payment = { package = "paint-transaction-payment", path = "../../paint/transaction-payment" } [features] bench = [] diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index f749256843047..c0aa464f5bf4a 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -23,12 +23,12 @@ log = "0.4.8" parking_lot = "0.9.0" primitives = { package = "substrate-primitives", path = "../../../primitives/core" } runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" } -runtime_support = { package = "srml-support", path = "../../../paint/support" } +runtime_support = { package = "paint-support", path = "../../../paint/support" } runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" } slots = { package = "substrate-consensus-slots", path = "../slots" } sr-api = { path = "../../../primitives/sr-api" } sr-primitives = { path = "../../../primitives/sr-primitives" } -srml-aura = { path = "../../../paint/aura" } +paint-aura = { path = "../../../paint/aura" } substrate-telemetry = { path = "../../telemetry" } [dev-dependencies] diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs index 1fed91d595dbb..8c5860b4c3963 100644 --- a/client/consensus/aura/src/lib.rs +++ b/client/consensus/aura/src/lib.rs @@ -56,7 +56,7 @@ use futures::prelude::*; use parking_lot::Mutex; use log::{debug, info, trace}; -use srml_aura::{ +use paint_aura::{ InherentType as AuraInherent, AuraInherentData, timestamp::{TimestampInherentData, InherentType as TimestampInherent, InherentError as TIError} }; @@ -654,9 +654,9 @@ fn register_aura_inherent_data_provider( inherent_data_providers: &InherentDataProviders, slot_duration: u64, ) -> Result<(), consensus_common::Error> { - if !inherent_data_providers.has_provider(&srml_aura::INHERENT_IDENTIFIER) { + if !inherent_data_providers.has_provider(&paint_aura::INHERENT_IDENTIFIER) { inherent_data_providers - .register_provider(srml_aura::InherentDataProvider::new(slot_duration)) + .register_provider(paint_aura::InherentDataProvider::new(slot_duration)) .map_err(Into::into) .map_err(consensus_common::Error::InherentData) } else { diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index 91c4e92c57754..bbae2250fde96 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -13,13 +13,13 @@ app-crypto = { package = "substrate-application-crypto", path = "../../../primit num-bigint = "0.2.3" num-rational = "0.2.2" num-traits = "0.2.8" -runtime-support = { package = "srml-support", path = "../../../paint/support" } +runtime-support = { package = "paint-support", path = "../../../paint/support" } runtime-version = { package = "sr-version", path = "../../../primitives/sr-version" } runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } substrate-telemetry = { path = "../../telemetry" } keystore = { package = "substrate-keystore", path = "../../keystore" } -srml-babe = { path = "../../../paint/babe" } +paint-babe = { path = "../../../paint/babe" } interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } client = { package = "substrate-client", path = "../../" } sr-api = { path = "../../../primitives/sr-api" } diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs index 1b37ed9477aec..b397c09a79e58 100644 --- a/client/consensus/babe/src/lib.rs +++ b/client/consensus/babe/src/lib.rs @@ -80,7 +80,7 @@ use consensus_common::{ self, BlockImport, Environment, Proposer, BlockCheckParams, ForkChoiceStrategy, BlockImportParams, BlockOrigin, Error as ConsensusError, }; -use srml_babe::{ +use paint_babe::{ BabeInherentData, timestamp::{TimestampInherentData, InherentType as TimestampInherent} }; @@ -771,9 +771,9 @@ fn register_babe_inherent_data_provider( slot_duration: u64, ) -> Result<(), consensus_common::Error> { debug!(target: "babe", "Registering"); - if !inherent_data_providers.has_provider(&srml_babe::INHERENT_IDENTIFIER) { + if !inherent_data_providers.has_provider(&paint_babe::INHERENT_IDENTIFIER) { inherent_data_providers - .register_provider(srml_babe::InherentDataProvider::new(slot_duration)) + .register_provider(paint_babe::InherentDataProvider::new(slot_duration)) .map_err(Into::into) .map_err(consensus_common::Error::InherentData) } else { diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index ba2d3de9833c1..a4bece7001952 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -11,7 +11,7 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/cor sr-primitives = { path = "../../../primitives/sr-primitives" } interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" } -srml-timestamp = { path = "../../../paint/timestamp" } +paint-timestamp = { path = "../../../paint/timestamp" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } pow-primitives = { package = "substrate-consensus-pow-primitives", path = "../../../primitives/consensus/pow" } consensus-common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs index fcc6828576a06..890f20553bff7 100644 --- a/client/consensus/pow/src/lib.rs +++ b/client/consensus/pow/src/lib.rs @@ -40,7 +40,7 @@ use block_builder_api::BlockBuilder as BlockBuilderApi; use sr_primitives::{Justification, RuntimeString}; use sr_primitives::generic::{BlockId, Digest, DigestItem}; use sr_primitives::traits::{Block as BlockT, Header as HeaderT, ProvideRuntimeApi}; -use srml_timestamp::{TimestampInherentData, InherentError as TIError}; +use paint_timestamp::{TimestampInherentData, InherentError as TIError}; use pow_primitives::{Seal, TotalDifficulty, POW_ENGINE_ID}; use primitives::H256; use inherents::{InherentDataProviders, InherentData}; @@ -316,9 +316,9 @@ impl, C, S, Algorithm> Verifier for PowVerifier Result<(), consensus_common::Error> { - if !inherent_data_providers.has_provider(&srml_timestamp::INHERENT_IDENTIFIER) { + if !inherent_data_providers.has_provider(&paint_timestamp::INHERENT_IDENTIFIER) { inherent_data_providers - .register_provider(srml_timestamp::InherentDataProvider) + .register_provider(paint_timestamp::InherentDataProvider) .map_err(Into::into) .map_err(consensus_common::Error::InherentData) } else { diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml index a86c51be44846..2360ad79195d1 100644 --- a/client/consensus/uncles/Cargo.toml +++ b/client/consensus/uncles/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" } primitives = { package = "substrate-primitives", path = "../../../primitives/core" } sr-primitives = { path = "../../../primitives/sr-primitives" } -srml-authorship = { path = "../../../paint/authorship" } +paint-authorship = { path = "../../../paint/authorship" } consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" } inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" } log = "0.4.8" diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs index 6cb3dbf79b0ba..aba3e4dda6c8b 100644 --- a/client/consensus/uncles/src/lib.rs +++ b/client/consensus/uncles/src/lib.rs @@ -39,9 +39,9 @@ pub fn register_uncles_inherent_data_provider( C: ProvideUncles + Send + Sync + 'static, SC: SelectChain + 'static, { - if !inherent_data_providers.has_provider(&srml_authorship::INHERENT_IDENTIFIER) { + if !inherent_data_providers.has_provider(&paint_authorship::INHERENT_IDENTIFIER) { inherent_data_providers - .register_provider(srml_authorship::InherentDataProvider::new(move || { + .register_provider(paint_authorship::InherentDataProvider::new(move || { { let chain_head = match select_chain.best_chain() { Ok(x) => x, diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index bcca611732ca7..3cd6b5778b615 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -25,7 +25,7 @@ client = { package = "substrate-client", path = "../" } header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" } inherents = { package = "substrate-inherents", path = "../../primitives/inherents" } network = { package = "substrate-network", path = "../network" } -srml-finality-tracker = { path = "../../paint/finality-tracker" } +paint-finality-tracker = { path = "../../paint/finality-tracker" } fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" } grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec"] } diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs index 6e23bc7231fa9..50770bcc87d86 100644 --- a/client/finality-grandpa/src/lib.rs +++ b/client/finality-grandpa/src/lib.rs @@ -70,7 +70,7 @@ use primitives::{H256, Blake2Hasher, Pair}; use substrate_telemetry::{telemetry, CONSENSUS_INFO, CONSENSUS_DEBUG, CONSENSUS_WARN}; use serde_json; -use srml_finality_tracker; +use paint_finality_tracker; use grandpa::Error as GrandpaError; use grandpa::{voter, BlockNumberOps, voter_set::VoterSet}; @@ -505,9 +505,9 @@ fn register_finality_tracker_inherent_data_provider + Send + Sync + 'static, RA: Send + Sync + 'static, { - if !inherent_data_providers.has_provider(&srml_finality_tracker::INHERENT_IDENTIFIER) { + if !inherent_data_providers.has_provider(&paint_finality_tracker::INHERENT_IDENTIFIER) { inherent_data_providers - .register_provider(srml_finality_tracker::InherentDataProvider::new(move || { + .register_provider(paint_finality_tracker::InherentDataProvider::new(move || { #[allow(deprecated)] { let info = client.info().chain; diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 866f16522316b..f61da029bc8ab 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -41,22 +41,22 @@ /core/rpc-servers/ @tomusdrw # GRANDPA, BABE, consensus stuff -/srml/babe/ @andresilva @DemiMarie-parity -/srml/grandpa/ @andresilva @DemiMarie-parity +/paint/babe/ @andresilva @DemiMarie-parity +/paint/grandpa/ @andresilva @DemiMarie-parity /core/finality-grandpa/ @andresilva @DemiMarie-parity /core/consensus/babe/ @andresilva @DemiMarie-parity /core/consensus/slots/ @andresilva @DemiMarie-parity # Contracts -/srml/contracts/ @pepyakin @thiolliere @jimpo -/srml/contracts/src/wasm/runtime.rs @Robbepop +/paint/contracts/ @pepyakin @thiolliere @jimpo +/paint/contracts/src/wasm/runtime.rs @Robbepop # Inflation points -/srml/staking/src/inflation.rs @thiolliere +/paint/staking/src/inflation.rs @thiolliere # NPoS and Governance -/srml/staking/ @kianenigma -/srml/election/ @kianenigma +/paint/staking/ @kianenigma +/paint/election/ @kianenigma # End to end testing of substrate node /node/executor/ @kianenigma @@ -65,4 +65,4 @@ /core/sr-primitives/weights.rs @kianenigma # Support crates -/srml/support/ @thiolliere @kianenigma +/paint/support/ @thiolliere @kianenigma diff --git a/docs/README.adoc b/docs/README.adoc index 5caa3f932b23e..05eb7e3f814ae 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -272,7 +272,7 @@ You can run all the tests if you like: [source, shell] cargo test --all -Or just run the tests of a specific package (i.e. `cargo test -p srml-assets`) +Or just run the tests of a specific package (i.e. `cargo test -p paint-assets`) You can start a development chain with: @@ -446,9 +446,9 @@ substrate-trie sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version * Substrate Runtime Module Library (SRML) [source, shell] -srml-assets, srml-balances, srml-consensus, srml-contracts, srml-council, srml-democracy, srml-example, -srml-executive, srml-metadata, srml-session, srml-staking, srml-support, srml-system, srml-timestamp, -srml-treasury +paint-assets, paint-balances, paint-consensus, paint-contracts, paint-council, paint-democracy, paint-example, +paint-executive, paint-metadata, paint-session, paint-staking, paint-support, paint-system, paint-timestamp, +paint-treasury * Node [source, shell] node-cli, node-consensus, node-executor, node-network, node-primitives, node-runtime diff --git a/docs/Structure.adoc b/docs/Structure.adoc index c870177df71c1..0e9606e0a900a 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -11,7 +11,7 @@ Substrate is split into multiple levels with increasing opinion and decreasing f * primitives * client -* PAINT (formerly `srml`) +* PAINT (formerly `paint`) Putting all these components together we have: @@ -39,7 +39,7 @@ In the lowest level, substrate defines primitives, interfaces and traits to impl In the client you can find a set of crates to construct the outer substrate-node, implementing outer runtime interfaces, thus it depends on `runtime`. It provides the outer building blocks like transaction queue, networking layer, database backend, full* and light-client support. -=== PAINT (formerly `srml`) +=== PAINT (formerly `paint`) * _found in_: `/paint` * _crates prefix_: `paint-` diff --git a/paint/assets/Cargo.toml b/paint/assets/Cargo.toml index 10b471682fad3..d8fa259484dbc 100644 --- a/paint/assets/Cargo.toml +++ b/paint/assets/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-assets" +name = "paint-assets" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -10,9 +10,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = # Needed for various traits. In our case, `OnFinalize`. sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } # Needed for type-safe access to storage DB. -support = { package = "srml-support", path = "../support", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } # `system` module provides us with all sorts of useful stuff and macros depend on it being around. -system = { package = "srml-system", path = "../system", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/paint/assets/src/lib.rs b/paint/assets/src/lib.rs index 5c8b1bbd610a3..4f91cd19198a4 100644 --- a/paint/assets/src/lib.rs +++ b/paint/assets/src/lib.rs @@ -124,8 +124,8 @@ //! //! ## Related Modules //! -//! * [`System`](../srml_system/index.html) -//! * [`Support`](../srml_support/index.html) +//! * [`System`](../paint_system/index.html) +//! * [`Support`](../paint_support/index.html) // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] diff --git a/paint/aura/Cargo.toml b/paint/aura/Cargo.toml index 15e9219e8cbe0..23250ac312ee6 100644 --- a/paint/aura/Cargo.toml +++ b/paint/aura/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-aura" +name = "paint-aura" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,13 +11,13 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -session = { package = "srml-session", path = "../session", default-features = false } +session = { package = "paint-session", path = "../session", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } substrate-consensus-aura-primitives = { path = "../../primitives/consensus/aura", default-features = false} -system = { package = "srml-system", path = "../system", default-features = false } -timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } +timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } [dev-dependencies] lazy_static = "1.4.0" diff --git a/paint/aura/src/lib.rs b/paint/aura/src/lib.rs index 62f0115abb1d1..4b14c5b6485fa 100644 --- a/paint/aura/src/lib.rs +++ b/paint/aura/src/lib.rs @@ -31,9 +31,9 @@ //! //! ## Related Modules //! -//! - [Timestamp](../srml_timestamp/index.html): The Timestamp module is used in Aura to track +//! - [Timestamp](../paint_timestamp/index.html): The Timestamp module is used in Aura to track //! consensus rounds (via `slots`). -//! - [Consensus](../srml_consensus/index.html): The Consensus module does not relate directly to Aura, +//! - [Consensus](../paint_consensus/index.html): The Consensus module does not relate directly to Aura, //! but serves to manage offline reporting by implementing `ProvideInherent` in a similar way. //! //! ## References diff --git a/paint/authority-discovery/Cargo.toml b/paint/authority-discovery/Cargo.toml index c00664891de88..da05da3d4f3ea 100644 --- a/paint/authority-discovery/Cargo.toml +++ b/paint/authority-discovery/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-authority-discovery" +name = "paint-authority-discovery" version = "0.1.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,10 +11,10 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } -session = { package = "srml-session", path = "../session", default-features = false } +session = { package = "paint-session", path = "../session", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe", default-features = false } diff --git a/paint/authorship/Cargo.toml b/paint/authorship/Cargo.toml index 477ec15d529bd..b53c059c3a01c 100644 --- a/paint/authorship/Cargo.toml +++ b/paint/authorship/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-authorship" +name = "paint-authorship" version = "0.1.0" description = "Block and Uncle Author tracking for the SRML" authors = ["Parity Technologies "] @@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/paint/babe/Cargo.toml b/paint/babe/Cargo.toml index da96a59279fee..cdbee72216dde 100644 --- a/paint/babe/Cargo.toml +++ b/paint/babe/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-babe" +name = "paint-babe" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,10 +12,10 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } -timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } -session = { package = "srml-session", path = "../session", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } +timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } +session = { package = "paint-session", path = "../session", default-features = false } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } diff --git a/paint/babe/src/lib.rs b/paint/babe/src/lib.rs index 17ce12c716359..5bdae6ce9b1b0 100644 --- a/paint/babe/src/lib.rs +++ b/paint/babe/src/lib.rs @@ -148,7 +148,7 @@ pub trait EpochChangeTrigger { } /// A type signifying to BABE that an external trigger -/// for epoch changes (e.g. srml-session) is used. +/// for epoch changes (e.g. paint-session) is used. pub struct ExternalTrigger; impl EpochChangeTrigger for ExternalTrigger { @@ -390,7 +390,7 @@ impl Module { /// and the caller is the only caller of this function. /// /// Typically, this is not handled directly by the user, but by higher-level validator-set manager logic like - /// `srml-session`. + /// `paint-session`. pub fn enact_epoch_change( authorities: Vec<(AuthorityId, BabeAuthorityWeight)>, next_authorities: Vec<(AuthorityId, BabeAuthorityWeight)>, diff --git a/paint/balances/Cargo.toml b/paint/balances/Cargo.toml index 8403b9a727aff..cd766e4aeebc8 100644 --- a/paint/balances/Cargo.toml +++ b/paint/balances/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-balances" +name = "paint-balances" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,13 +11,13 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = substrate-keyring = { path = "../../client/keyring", optional = true } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } -transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" } +transaction-payment = { package = "paint-transaction-payment", path = "../transaction-payment" } [features] default = ["std"] diff --git a/paint/balances/src/lib.rs b/paint/balances/src/lib.rs index e22dba3fee477..a9051f5d603ad 100644 --- a/paint/balances/src/lib.rs +++ b/paint/balances/src/lib.rs @@ -63,16 +63,16 @@ //! The Balances module provides implementations for the following traits. If these traits provide the functionality //! that you need, then you can avoid coupling with the Balances module. //! -//! - [`Currency`](../srml_support/traits/trait.Currency.html): Functions for dealing with a +//! - [`Currency`](../paint_support/traits/trait.Currency.html): Functions for dealing with a //! fungible assets system. -//! - [`ReservableCurrency`](../srml_support/traits/trait.ReservableCurrency.html): +//! - [`ReservableCurrency`](../paint_support/traits/trait.ReservableCurrency.html): //! Functions for dealing with assets that can be reserved from an account. -//! - [`LockableCurrency`](../srml_support/traits/trait.LockableCurrency.html): Functions for +//! - [`LockableCurrency`](../paint_support/traits/trait.LockableCurrency.html): Functions for //! dealing with accounts that allow liquidity restrictions. -//! - [`Imbalance`](../srml_support/traits/trait.Imbalance.html): Functions for handling +//! - [`Imbalance`](../paint_support/traits/trait.Imbalance.html): Functions for handling //! imbalances between total issuance in the system and account balances. Must be used when a function //! creates new funds (e.g. a reward) or destroys some funds (e.g. a system fee). -//! - [`IsDeadAccount`](../srml_system/trait.IsDeadAccount.html): Determiner to say whether a +//! - [`IsDeadAccount`](../paint_system/trait.IsDeadAccount.html): Determiner to say whether a //! given account is unused. //! //! ## Interface diff --git a/paint/collective/Cargo.toml b/paint/collective/Cargo.toml index 2f98e0e436986..3f629f25c1e94 100644 --- a/paint/collective/Cargo.toml +++ b/paint/collective/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-collective" +name = "paint-collective" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,12 +12,12 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -balances = { package = "srml-balances", path = "../balances" } +balances = { package = "paint-balances", path = "../balances" } [features] default = ["std"] diff --git a/paint/contracts/Cargo.toml b/paint/contracts/Cargo.toml index aa4e6439bbc61..728cf72e11d49 100644 --- a/paint/contracts/Cargo.toml +++ b/paint/contracts/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-contracts" +name = "paint-contracts" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -15,17 +15,17 @@ sr-primitives = { path = "../../primitives/sr-primitives", default-features = fa runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sandbox = { package = "sr-sandbox", path = "../../primitives/sr-sandbox", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] wabt = "0.9.2" assert_matches = "1.3.0" hex-literal = "0.2.1" -balances = { package = "srml-balances", path = "../balances" } +balances = { package = "paint-balances", path = "../balances" } hex = "0.3.2" -timestamp = { package = "srml-timestamp", path = "../timestamp" } -randomness-collective-flip = { package = "srml-randomness-collective-flip", path = "../randomness-collective-flip" } +timestamp = { package = "paint-timestamp", path = "../timestamp" } +randomness-collective-flip = { package = "paint-randomness-collective-flip", path = "../randomness-collective-flip" } [features] default = ["std"] diff --git a/paint/contracts/rpc/Cargo.toml b/paint/contracts/rpc/Cargo.toml index 1788e3214813e..723b51a38bdaa 100644 --- a/paint/contracts/rpc/Cargo.toml +++ b/paint/contracts/rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-contracts-rpc" +name = "paint-contracts-rpc" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -14,4 +14,4 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/co rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" } serde = { version = "1.0.101", features = ["derive"] } sr-primitives = { path = "../../../primitives/sr-primitives" } -srml-contracts-rpc-runtime-api = { path = "./runtime-api" } +paint-contracts-rpc-runtime-api = { path = "./runtime-api" } diff --git a/paint/contracts/rpc/runtime-api/Cargo.toml b/paint/contracts/rpc/runtime-api/Cargo.toml index 284882e873a66..ac5c2be224713 100644 --- a/paint/contracts/rpc/runtime-api/Cargo.toml +++ b/paint/contracts/rpc/runtime-api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-contracts-rpc-runtime-api" +name = "paint-contracts-rpc-runtime-api" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/paint/contracts/rpc/src/lib.rs b/paint/contracts/rpc/src/lib.rs index 91783df99617e..e226949d54a64 100644 --- a/paint/contracts/rpc/src/lib.rs +++ b/paint/contracts/rpc/src/lib.rs @@ -31,7 +31,7 @@ use sr_primitives::{ }; pub use self::gen_client::Client as ContractsClient; -pub use srml_contracts_rpc_runtime_api::{ +pub use paint_contracts_rpc_runtime_api::{ self as runtime_api, ContractExecResult, ContractsApi as ContractsRuntimeApi, GetStorageResult, }; diff --git a/paint/contracts/src/lib.rs b/paint/contracts/src/lib.rs index 05e22aeae2fad..a4b59226dcdf4 100644 --- a/paint/contracts/src/lib.rs +++ b/paint/contracts/src/lib.rs @@ -84,7 +84,7 @@ //! //! ## Related Modules //! -//! * [Balances](../srml_balances/index.html) +//! * [Balances](../paint_balances/index.html) #![cfg_attr(not(feature = "std"), no_std)] diff --git a/paint/democracy/Cargo.toml b/paint/democracy/Cargo.toml index b455d070bb41d..1f28c013c5d1c 100644 --- a/paint/democracy/Cargo.toml +++ b/paint/democracy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-democracy" +name = "paint-democracy" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,12 +11,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } -balances = { package = "srml-balances", path = "../balances" } +balances = { package = "paint-balances", path = "../balances" } [features] default = ["std"] diff --git a/paint/elections-phragmen/Cargo.toml b/paint/elections-phragmen/Cargo.toml index 53bfd42322894..0fb1f6246567d 100644 --- a/paint/elections-phragmen/Cargo.toml +++ b/paint/elections-phragmen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-elections-phragmen" +name = "paint-elections-phragmen" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -8,14 +8,14 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen", default-features = false } -srml-support = { path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +paint-support = { path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } hex-literal = "0.2.1" -balances = { package = "srml-balances", path = "../balances" } +balances = { package = "paint-balances", path = "../balances" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } serde = { version = "1.0.101" } @@ -23,7 +23,7 @@ serde = { version = "1.0.101" } default = ["std"] std = [ "codec/std", - "srml-support/std", + "paint-support/std", "sr-primitives/std", "phragmen/std", "system/std", diff --git a/paint/elections-phragmen/src/lib.rs b/paint/elections-phragmen/src/lib.rs index 1ddd890b8e02f..0a615bb8c98a2 100644 --- a/paint/elections-phragmen/src/lib.rs +++ b/paint/elections-phragmen/src/lib.rs @@ -80,7 +80,7 @@ use rstd::prelude::*; use codec::Decode; use sr_primitives::{print, traits::{Zero, StaticLookup, Bounded, Convert}}; use sr_primitives::weights::SimpleDispatchInfo; -use srml_support::{ +use paint_support::{ decl_storage, decl_event, ensure, decl_module, dispatch, storage::unhashed, traits::{ @@ -667,7 +667,7 @@ impl Module { mod tests { use super::*; use std::cell::RefCell; - use srml_support::{assert_ok, assert_noop, parameter_types, assert_eq_uvec}; + use paint_support::{assert_ok, assert_noop, parameter_types, assert_eq_uvec}; use primitives::H256; use sr_primitives::{ Perbill, testing::Header, BuildStorage, @@ -783,7 +783,7 @@ mod tests { pub type Block = sr_primitives::generic::Block; pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic; - srml_support::construct_runtime!( + paint_support::construct_runtime!( pub enum Test where Block = Block, NodeBlock = Block, @@ -863,7 +863,7 @@ mod tests { #[test] fn temp_migration_works() { ExtBuilder::default().build().execute_with(|| { - use srml_support::storage::unhashed; + use paint_support::storage::unhashed; use codec::Encode; let old_members = vec![1u64, 2]; diff --git a/paint/elections/Cargo.toml b/paint/elections/Cargo.toml index 829f09acec65d..1e8e7702f557d 100644 --- a/paint/elections/Cargo.toml +++ b/paint/elections/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-elections" +name = "paint-elections" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,12 +12,12 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -balances = { package = "srml-balances", path = "../balances" } +balances = { package = "paint-balances", path = "../balances" } [features] default = ["std"] diff --git a/paint/evm/Cargo.toml b/paint/evm/Cargo.toml index ed7f03790e695..45cb990861d27 100644 --- a/paint/evm/Cargo.toml +++ b/paint/evm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-evm" +name = "paint-evm" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -7,10 +7,10 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } -timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } -balances = { package = "srml-balances", path = "../balances", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } +timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } +balances = { package = "paint-balances", path = "../balances", default-features = false } primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } diff --git a/paint/example/Cargo.toml b/paint/example/Cargo.toml index 3a2cb88d09342..c25e91235f67b 100644 --- a/paint/example/Cargo.toml +++ b/paint/example/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "srml-example" +name = "paint-example" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -support = { package = "srml-support", path = "../support", default-features = false } -system = { package = "srml-system", path = "../system", default-features = false } -balances = { package = "srml-balances", path = "../balances", default-features = false } +support = { package = "paint-support", path = "../support", default-features = false } +system = { package = "paint-system", path = "../system", default-features = false } +balances = { package = "paint-balances", path = "../balances", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } diff --git a/paint/example/src/lib.rs b/paint/example/src/lib.rs index 154ea632564fe..91e3740dabd95 100644 --- a/paint/example/src/lib.rs +++ b/paint/example/src/lib.rs @@ -20,7 +20,7 @@ //! The Example: A simple example of a runtime module demonstrating //! concepts, APIs and structures common to most runtime modules. //! -//! Run `cargo doc --package srml-example --open` to view this module's documentation. +//! Run `cargo doc --package paint-example --open` to view this module's documentation. //! //! ### Documentation Guidelines: //! @@ -49,8 +49,8 @@ //! //! ### Documentation Template:
//! -//! Copy and paste this template from srml/example/src/lib.rs into file -//! `srml//src/lib.rs` of your own custom module and complete it. +//! Copy and paste this template from paint/example/src/lib.rs into file +//! `paint//src/lib.rs` of your own custom module and complete it. //! 

 //! // Add heading with custom module name
 //!
diff --git a/paint/executive/Cargo.toml b/paint/executive/Cargo.toml
index 23a67872d756d..9dbea514d20ec 100644
--- a/paint/executive/Cargo.toml
+++ b/paint/executive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-executive"
+name = "paint-executive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,15 +10,15 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-srml-indices = { path = "../indices" }
-balances = { package = "srml-balances", path = "../balances" }
-transaction-payment = { package = "srml-transaction-payment", path = "../transaction-payment" }
+paint-indices = { path = "../indices" }
+balances = { package = "paint-balances", path = "../balances" }
+transaction-payment = { package = "paint-transaction-payment", path = "../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/paint/executive/src/lib.rs b/paint/executive/src/lib.rs
index 146e0ebcadcd8..a3d2b1fdfd443 100644
--- a/paint/executive/src/lib.rs
+++ b/paint/executive/src/lib.rs
@@ -23,7 +23,7 @@
 //!
 //! The executive module is not a typical SRML module providing functionality around a specific feature.
 //! It is a cross-cutting framework component for the SRML. It works in conjunction with the
-//! [SRML System module](../srml_system/index.html) to perform these cross-cutting functions.
+//! [SRML System module](../paint_system/index.html) to perform these cross-cutting functions.
 //!
 //! The Executive module provides functions to:
 //!
@@ -51,7 +51,7 @@
 //!
 //! ```
 //! # use sr_primitives::generic;
-//! # use srml_executive as executive;
+//! # use paint_executive as executive;
 //! # pub struct UncheckedExtrinsic {};
 //! # pub struct Header {};
 //! # type Context = system::ChainContext;
diff --git a/paint/finality-tracker/Cargo.toml b/paint/finality-tracker/Cargo.toml
index 031016e0143da..f11fa2c4d9159 100644
--- a/paint/finality-tracker/Cargo.toml
+++ b/paint/finality-tracker/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-finality-tracker"
+name = "paint-finality-tracker"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-srml-system = { path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+paint-system = { path = "../system", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
@@ -26,6 +26,6 @@ std = [
 	"rstd/std",
 	"support/std",
 	"sr-primitives/std",
-	"srml-system/std",
+	"paint-system/std",
 	"inherents/std",
 ]
diff --git a/paint/finality-tracker/src/lib.rs b/paint/finality-tracker/src/lib.rs
index b5c01c3c8733f..e0721e5a1419f 100644
--- a/paint/finality-tracker/src/lib.rs
+++ b/paint/finality-tracker/src/lib.rs
@@ -24,7 +24,7 @@ use rstd::{prelude::*, result, cmp, vec};
 use codec::Decode;
 use support::{decl_module, decl_storage};
 use support::traits::Get;
-use srml_system::{ensure_none, Trait as SystemTrait};
+use paint_system::{ensure_none, Trait as SystemTrait};
 
 #[cfg(feature = "std")]
 use codec::Encode;
@@ -124,7 +124,7 @@ decl_module! {
 			ensure_none(origin)?;
 			assert!(!::Update::exists(), "Final hint must be updated only once in the block");
 			assert!(
-				srml_system::Module::::block_number() >= hint,
+				paint_system::Module::::block_number() >= hint,
 				"Finalized height above block number",
 			);
 			::Update::put(hint);
@@ -199,7 +199,7 @@ impl Module {
 		::Median::put(median);
 
 		if T::BlockNumber::from(our_window_size) == window_size {
-			let now = srml_system::Module::::block_number();
+			let now = paint_system::Module::::block_number();
 			let latency = T::ReportLatency::get();
 
 			// the delay is the latency plus half the window size.
@@ -254,7 +254,7 @@ mod tests {
 		traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT},
 	};
 	use support::{assert_ok, impl_outer_origin, parameter_types};
-	use srml_system as system;
+	use paint_system as system;
 	use std::cell::RefCell;
 
 	#[derive(Clone, PartialEq, Debug)]
diff --git a/paint/generic-asset/Cargo.toml b/paint/generic-asset/Cargo.toml
index 5e0767db140b5..db0bae7a46bff 100644
--- a/paint/generic-asset/Cargo.toml
+++ b/paint/generic-asset/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-generic-asset"
+name = "paint-generic-asset"
 version = "2.0.0"
 authors = ["Centrality Developers "]
 edition = "2018"
@@ -9,8 +9,8 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/paint/grandpa/Cargo.toml b/paint/grandpa/Cargo.toml
index 482eacacbdf14..956478b41af45 100644
--- a/paint/grandpa/Cargo.toml
+++ b/paint/grandpa/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-grandpa"
+name = "paint-grandpa"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -12,10 +12,10 @@ substrate-finality-grandpa-primitives = { path = "../../primitives/finality-gran
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
-session = { package = "srml-session", path = "../session", default-features = false }
-finality-tracker = { package = "srml-finality-tracker", path = "../finality-tracker", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
+session = { package = "paint-session", path = "../session", default-features = false }
+finality-tracker = { package = "paint-finality-tracker", path = "../finality-tracker", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/paint/im-online/Cargo.toml b/paint/im-online/Cargo.toml
index 15ddfa73ac38e..e509620f6e037 100644
--- a/paint/im-online/Cargo.toml
+++ b/paint/im-online/Cargo.toml
@@ -1,22 +1,22 @@
 [package]
-name = "srml-im-online"
+name = "paint-im-online"
 version = "0.1.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
 app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto", default-features = false }
-authorship = { package = "srml-authorship", path = "../authorship", default-features = false }
+authorship = { package = "paint-authorship", path = "../authorship", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package="substrate-primitives", path = "../../primitives/core", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
-session = { package = "srml-session", path = "../session", default-features = false }
+session = { package = "paint-session", path = "../session", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 offchain = { package = "substrate-offchain", path = "../../client/offchain" }
diff --git a/paint/im-online/src/lib.rs b/paint/im-online/src/lib.rs
index 8dde894fb8245..4df8f442e4da4 100644
--- a/paint/im-online/src/lib.rs
+++ b/paint/im-online/src/lib.rs
@@ -44,7 +44,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use srml_im_online::{self as im_online};
+//! use paint_im_online::{self as im_online};
 //!
 //! pub trait Trait: im_online::Trait {}
 //!
@@ -62,7 +62,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [Session module](../srml_session/index.html).
+//! This module depends on the [Session module](../paint_session/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -131,7 +131,7 @@ pub mod ed25519 {
 
 /// The local storage database key under which the worker progress status
 /// is tracked.
-const DB_KEY: &[u8] = b"srml/im-online-worker-status";
+const DB_KEY: &[u8] = b"paint/im-online-worker-status";
 
 /// It's important to persist the worker state, since e.g. the
 /// server could be restarted while starting the gossip process, but before
diff --git a/paint/indices/Cargo.toml b/paint/indices/Cargo.toml
index 35719aa13da84..99ed5b196143d 100644
--- a/paint/indices/Cargo.toml
+++ b/paint/indices/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-indices"
+name = "paint-indices"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -13,8 +13,8 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 ref_thread_local = "0.0.0"
diff --git a/paint/membership/Cargo.toml b/paint/membership/Cargo.toml
index 09605578e6e65..fc75bc4c69ea5 100644
--- a/paint/membership/Cargo.toml
+++ b/paint/membership/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-membership"
+name = "paint-membership"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -9,8 +9,8 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 
 [dev-dependencies]
diff --git a/paint/metadata/Cargo.toml b/paint/metadata/Cargo.toml
index 0aa8d6edb9d2f..1d7185cc1060a 100644
--- a/paint/metadata/Cargo.toml
+++ b/paint/metadata/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-metadata"
+name = "paint-metadata"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/paint/nicks/Cargo.toml b/paint/nicks/Cargo.toml
index 097b6351ce16f..9e78254332451 100644
--- a/paint/nicks/Cargo.toml
+++ b/paint/nicks/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-nicks"
+name = "paint-nicks"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "srml-balances", path = "../balances", default-features = false }
+balances = { package = "paint-balances", path = "../balances", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/paint/offences/Cargo.toml b/paint/offences/Cargo.toml
index 60190a7518dc9..8eb217c8b3265 100644
--- a/paint/offences/Cargo.toml
+++ b/paint/offences/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-name = "srml-offences"
+name = "paint-offences"
 version = "1.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-balances = { package = "srml-balances", path = "../balances", default-features = false }
+balances = { package = "paint-balances", path = "../balances", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/paint/offences/src/mock.rs b/paint/offences/src/mock.rs
index f9c79390819e0..6ae0e35b9bd58 100644
--- a/paint/offences/src/mock.rs
+++ b/paint/offences/src/mock.rs
@@ -148,7 +148,7 @@ impl offence::Offence for Offence {
 	}
 
 	fn session_index(&self) -> SessionIndex {
-		// session index is not used by the srml-offences directly, but rather it exists only for
+		// session index is not used by the paint-offences directly, but rather it exists only for
 		// filtering historical reports.
 		unimplemented!()
 	}
diff --git a/paint/randomness-collective-flip/Cargo.toml b/paint/randomness-collective-flip/Cargo.toml
index 314578e6a7fab..97e56d1a83a41 100644
--- a/paint/randomness-collective-flip/Cargo.toml
+++ b/paint/randomness-collective-flip/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-randomness-collective-flip"
+name = "paint-randomness-collective-flip"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,8 +8,8 @@ edition = "2018"
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 
 [dev-dependencies]
diff --git a/paint/randomness-collective-flip/src/lib.rs b/paint/randomness-collective-flip/src/lib.rs
index 3644b8898c2ab..62170e8a8842c 100644
--- a/paint/randomness-collective-flip/src/lib.rs
+++ b/paint/randomness-collective-flip/src/lib.rs
@@ -42,7 +42,7 @@
 //! decl_module! {
 //! 	pub struct Module for enum Call where origin: T::Origin {
 //! 		pub fn random_module_example(origin) -> Result {
-//! 			let _random_seed = >::random_seed();
+//! 			let _random_seed = >::random_seed();
 //! 			Ok(())
 //! 		}
 //! 	}
diff --git a/paint/scored-pool/Cargo.toml b/paint/scored-pool/Cargo.toml
index e145e12a7a0cf..35da18437bb51 100644
--- a/paint/scored-pool/Cargo.toml
+++ b/paint/scored-pool/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-scored-pool"
+name = "paint-scored-pool"
 version = "1.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,11 +10,11 @@ serde = { version = "1.0.101", optional = true }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-balances = { package = "srml-balances", path = "../balances" }
+balances = { package = "paint-balances", path = "../balances" }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
 
 [features]
diff --git a/paint/scored-pool/src/lib.rs b/paint/scored-pool/src/lib.rs
index 5fde1e9c450cf..3ed4b8f21fa49 100644
--- a/paint/scored-pool/src/lib.rs
+++ b/paint/scored-pool/src/lib.rs
@@ -55,7 +55,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use srml_scored_pool::{self as scored_pool};
+//! use paint_scored_pool::{self as scored_pool};
 //!
 //! pub trait Trait: scored_pool::Trait {}
 //!
@@ -77,7 +77,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [System module](../srml_system/index.html).
+//! This module depends on the [System module](../paint_system/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/paint/session/Cargo.toml b/paint/session/Cargo.toml
index 6c029dd586336..3a5b1476a455f 100644
--- a/paint/session/Cargo.toml
+++ b/paint/session/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-session"
+name = "paint-session"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition =  "2018"
@@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
-timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
+timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false }
 substrate-trie = { path = "../../primitives/trie", default-features = false, optional = true }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 impl-trait-for-tuples = "0.1.3"
diff --git a/paint/session/src/lib.rs b/paint/session/src/lib.rs
index aa86dedd987f4..95209c9ab6bd3 100644
--- a/paint/session/src/lib.rs
+++ b/paint/session/src/lib.rs
@@ -45,7 +45,7 @@
 //! a block author or a validator. The session keys of accounts are removed once their account balance is zero.
 //! - **Validator set session key configuration process:** Each session we iterate through the current
 //! set of validator account IDs to check if a session key was created for it in the previous session
-//! using `set_key`. If it was then we call `set_authority` from the [Consensus module](../srml_consensus/index.html)
+//! using `set_key`. If it was then we call `set_authority` from the [Consensus module](../paint_consensus/index.html)
 //! and pass it a set of session keys (each associated with an account ID) as the session keys for the new
 //! validator set. Lastly, if the session key of the current authority does not match any session keys stored under
 //! its validator index in the `AuthorityStorageVec` mapping, then we update the mapping with its session
@@ -100,10 +100,10 @@
 //!
 //! ### Example from the SRML
 //!
-//! The [Staking module](../srml_staking/index.html) uses the Session module to get the validator set.
+//! The [Staking module](../paint_staking/index.html) uses the Session module to get the validator set.
 //!
 //! ```
-//! use srml_session as session;
+//! use paint_session as session;
 //! # fn not_executed() {
 //!
 //! let validators = >::validators();
@@ -113,9 +113,9 @@
 //!
 //! ## Related Modules
 //!
-//! - [Consensus](../srml_consensus/index.html)
-//! - [Staking](../srml_staking/index.html)
-//! - [Timestamp](../srml_timestamp/index.html)
+//! - [Consensus](../paint_consensus/index.html)
+//! - [Staking](../paint_staking/index.html)
+//! - [Timestamp](../paint_timestamp/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -358,7 +358,7 @@ pub trait Trait: system::Trait {
 	/// The fraction of validators set that is safe to be disabled.
 	///
 	/// After the threshold is reached `disabled` method starts to return true,
-	/// which in combination with `srml_staking` forces a new era.
+	/// which in combination with `paint_staking` forces a new era.
 	type DisabledValidatorsThreshold: Get;
 
 	/// Select initial validators.
diff --git a/paint/staking/Cargo.toml b/paint/staking/Cargo.toml
index 2ec289e1ebc91..9ecb8586d0c0b 100644
--- a/paint/staking/Cargo.toml
+++ b/paint/staking/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-staking"
+name = "paint-staking"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -14,16 +14,16 @@ phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen",
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
-session = { package = "srml-session", path = "../session", default-features = false, features = ["historical"] }
-authorship = { package = "srml-authorship", path = "../authorship", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
+session = { package = "paint-session", path = "../session", default-features = false, features = ["historical"] }
+authorship = { package = "paint-authorship", path = "../authorship", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "srml-balances", path = "../balances" }
-timestamp = { package = "srml-timestamp", path = "../timestamp" }
-srml-staking-reward-curve = { path = "../staking/reward-curve"}
+balances = { package = "paint-balances", path = "../balances" }
+timestamp = { package = "paint-timestamp", path = "../timestamp" }
+paint-staking-reward-curve = { path = "../staking/reward-curve"}
 
 [features]
 equalize = []
diff --git a/paint/staking/reward-curve/Cargo.toml b/paint/staking/reward-curve/Cargo.toml
index cf911666af4bb..03b6ab8955de1 100644
--- a/paint/staking/reward-curve/Cargo.toml
+++ b/paint/staking/reward-curve/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-staking-reward-curve"
+name = "paint-staking-reward-curve"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/paint/staking/reward-curve/src/lib.rs b/paint/staking/reward-curve/src/lib.rs
index 4ccffa2172f6d..947a9a84d0cb3 100644
--- a/paint/staking/reward-curve/src/lib.rs
+++ b/paint/staking/reward-curve/src/lib.rs
@@ -44,7 +44,7 @@ use syn::parse::{Parse, ParseStream};
 /// # fn main() {}
 /// use sr_primitives::curve::PiecewiseLinear;
 ///
-/// srml_staking_reward_curve::build! {
+/// paint_staking_reward_curve::build! {
 /// 	const I_NPOS: PiecewiseLinear<'static> = curve!(
 /// 		min_inflation: 0_025_000,
 /// 		max_inflation: 0_100_000,
@@ -373,7 +373,7 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 
 	quote!(
 		#[cfg(test)]
-		mod __srml_staking_reward_curve_test_module {
+		mod __paint_staking_reward_curve_test_module {
 			fn i_npos(x: f64) -> f64 {
 				if x <= #x_ideal {
 					#i_0 + x * (#i_ideal - #i_0 / #x_ideal)
diff --git a/paint/staking/reward-curve/tests/test.rs b/paint/staking/reward-curve/tests/test.rs
index 55a3b7d383e9e..be7f0cbd1883c 100644
--- a/paint/staking/reward-curve/tests/test.rs
+++ b/paint/staking/reward-curve/tests/test.rs
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Test crate for srml-staking-reward-curve. Allows to test for procedural macro.
+//! Test crate for paint-staking-reward-curve. Allows to test for procedural macro.
 //! See tests directory.
 
 mod test_small_falloff {
-	srml_staking_reward_curve::build! {
+	paint_staking_reward_curve::build! {
 		const REWARD_CURVE: sr_primitives::curve::PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_020_000,
 			max_inflation: 0_200_000,
@@ -31,7 +31,7 @@ mod test_small_falloff {
 }
 
 mod test_big_falloff {
-	srml_staking_reward_curve::build! {
+	paint_staking_reward_curve::build! {
 		const REWARD_CURVE: sr_primitives::curve::PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_100_000,
 			max_inflation: 0_400_000,
diff --git a/paint/staking/src/inflation.rs b/paint/staking/src/inflation.rs
index 03e5b84eede57..11cf3151f6599 100644
--- a/paint/staking/src/inflation.rs
+++ b/paint/staking/src/inflation.rs
@@ -49,7 +49,7 @@ pub fn compute_total_payout(
 mod test {
 	use sr_primitives::curve::PiecewiseLinear;
 
-	srml_staking_reward_curve::build! {
+	paint_staking_reward_curve::build! {
 		const I_NPOS: PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_025_000,
 			max_inflation: 0_100_000,
diff --git a/paint/staking/src/lib.rs b/paint/staking/src/lib.rs
index e5613a57be69e..3ef7032783465 100644
--- a/paint/staking/src/lib.rs
+++ b/paint/staking/src/lib.rs
@@ -138,7 +138,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use srml_staking::{self as staking};
+//! use paint_staking::{self as staking};
 //!
 //! pub trait Trait: staking::Trait {}
 //!
@@ -179,7 +179,7 @@
 //! [`reward_by_indices`](./enum.Call.html#variant.reward_by_indices).
 //!
 //! [`Module`](./struct.Module.html) implements
-//! [`authorship::EventHandler`](../srml_authorship/trait.EventHandler.html) to add reward points
+//! [`authorship::EventHandler`](../paint_authorship/trait.EventHandler.html) to add reward points
 //! to block producer and block producer of referenced uncles.
 //!
 //! The validator and its nominator split their reward as following:
@@ -237,8 +237,8 @@
 //!
 //! ## Related Modules
 //!
-//! - [Balances](../srml_balances/index.html): Used to manage values at stake.
-//! - [Session](../srml_session/index.html): Used to manage sessions. Also, a list of new validators
+//! - [Balances](../paint_balances/index.html): Used to manage values at stake.
+//! - [Session](../paint_session/index.html): Used to manage sessions. Also, a list of new validators
 //! is stored in the Session module's `Validators` at the end of each era.
 
 #![recursion_limit="128"]
diff --git a/paint/staking/src/mock.rs b/paint/staking/src/mock.rs
index 58d46d765543f..ff9bfe50a5df1 100644
--- a/paint/staking/src/mock.rs
+++ b/paint/staking/src/mock.rs
@@ -178,7 +178,7 @@ impl timestamp::Trait for Test {
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 }
-srml_staking_reward_curve::build! {
+paint_staking_reward_curve::build! {
 	const I_NPOS: PiecewiseLinear<'static> = curve!(
 		min_inflation: 0_025_000,
 		max_inflation: 0_100_000,
diff --git a/paint/sudo/Cargo.toml b/paint/sudo/Cargo.toml
index 80568a2650f35..2bd1e83585ff7 100644
--- a/paint/sudo/Cargo.toml
+++ b/paint/sudo/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-sudo"
+name = "paint-sudo"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
diff --git a/paint/sudo/src/lib.rs b/paint/sudo/src/lib.rs
index 7801384abcc2f..326c07cf8f436 100644
--- a/paint/sudo/src/lib.rs
+++ b/paint/sudo/src/lib.rs
@@ -77,8 +77,8 @@
 //!
 //! ## Related Modules
 //!
-//! * [Consensus](../srml_consensus/index.html)
-//! * [Democracy](../srml_democracy/index.html)
+//! * [Consensus](../paint_consensus/index.html)
+//! * [Democracy](../paint_democracy/index.html)
 //!
 //! [`Call`]: ./enum.Call.html
 //! [`Trait`]: ./trait.Trait.html
diff --git a/paint/support/Cargo.toml b/paint/support/Cargo.toml
index 957323995c5aa..17f0ddebc9c27 100644
--- a/paint/support/Cargo.toml
+++ b/paint/support/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-support"
+name = "paint-support"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,13 +8,13 @@ edition = "2018"
 log = "0.4"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
-srml-metadata = { path = "../metadata", default-features = false }
+paint-metadata = { path = "../metadata", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" }
+paint-support-procedural = { package = "paint-support-procedural", path = "./procedural" }
 paste = "0.1.6"
 once_cell = { version = "0.2.4", default-features = false, optional = true }
 state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine", optional = true }
@@ -23,7 +23,7 @@ impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
-srml-system = { path = "../system" }
+paint-system = { path = "../system" }
 
 [features]
 default = ["std"]
@@ -35,7 +35,7 @@ std = [
 	"codec/std",
 	"rstd/std",
 	"sr-primitives/std",
-	"srml-metadata/std",
+	"paint-metadata/std",
 	"inherents/std",
 	"state-machine",
 ]
diff --git a/paint/support/procedural/Cargo.toml b/paint/support/procedural/Cargo.toml
index 59025800ec615..96839c7d1fe55 100644
--- a/paint/support/procedural/Cargo.toml
+++ b/paint/support/procedural/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-support-procedural"
+name = "paint-support-procedural"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,7 +8,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-srml-support-procedural-tools = { package = "srml-support-procedural-tools", path = "./tools" }
+paint-support-procedural-tools = { package = "paint-support-procedural-tools", path = "./tools" }
 
 proc-macro2 = "1.0.6"
 quote = "1.0.2"
diff --git a/paint/support/procedural/src/lib.rs b/paint/support/procedural/src/lib.rs
index 792f739f1c357..2d70f7d57c7ef 100644
--- a/paint/support/procedural/src/lib.rs
+++ b/paint/support/procedural/src/lib.rs
@@ -53,16 +53,16 @@ use proc_macro::TokenStream;
 /// Basic storage consists of a name and a type; supported types are:
 ///
 /// * Value: `Foo: type`: Implements the
-///   [`StorageValue`](../srml_support/storage/trait.StorageValue.html) trait using the
-///   [`StorageValue generator`](../srml_support/storage/generator/trait.StorageValue.html).
+///   [`StorageValue`](../paint_support/storage/trait.StorageValue.html) trait using the
+///   [`StorageValue generator`](../paint_support/storage/generator/trait.StorageValue.html).
 ///   The generator `unhashed_key` is `$module_prefix ++ " " ++ $storage_name`
 ///
 /// * Map: `Foo: map hasher($hash) type => type`: Implements the
-///   [`StorageMap`](../srml_support/storage/trait.StorageMap.html) trait using the
-///   [`StorageMap generator`](../srml_support/storage/generator/trait.StorageMap.html).
+///   [`StorageMap`](../paint_support/storage/trait.StorageMap.html) trait using the
+///   [`StorageMap generator`](../paint_support/storage/generator/trait.StorageMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../srml_support/trait.Hashable.html) trait.
+///   [`Hashable`](../paint_support/trait.Hashable.html) trait.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`. One should use another hasher
 ///   with care, see generator documentation.
@@ -72,11 +72,11 @@ use proc_macro::TokenStream;
 ///   * `Hasher`: $hash
 ///
 /// * Linked map: `Foo: linked_map hasher($hash) type => type`: Implements the
-///   [`StorageLinkedMap`](../srml_support/storage/trait.StorageLinkedMap.html) trait using the
-///   [`StorageLinkedMap generator`](../srml_support/storage/generator/trait.StorageLinkedMap.html).
+///   [`StorageLinkedMap`](../paint_support/storage/trait.StorageLinkedMap.html) trait using the
+///   [`StorageLinkedMap generator`](../paint_support/storage/generator/trait.StorageLinkedMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../srml_support/trait.Hashable.html) trait.
+///   [`Hashable`](../paint_support/trait.Hashable.html) trait.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`. One should use another hasher
 ///   with care, see generator documentation.
@@ -87,11 +87,11 @@ use proc_macro::TokenStream;
 ///   * `Hasher`: $hash
 ///
 /// * Double map: `Foo: double_map hasher($hash1) u32, $hash2(u32) => u32`: Implements the
-///   [`StorageDoubleMap`](../srml_support/storage/trait.StorageDoubleMap.html) trait using the
-///   [`StorageDoubleMap generator`](../srml_support/storage/generator/trait.StorageDoubleMap.html).
+///   [`StorageDoubleMap`](../paint_support/storage/trait.StorageDoubleMap.html) trait using the
+///   [`StorageDoubleMap generator`](../paint_support/storage/generator/trait.StorageDoubleMap.html).
 ///
 ///   `$hash1` and `$hash2` representing choices of hashing algorithms available in the
-///   [`Hashable`](../srml_support/trait.Hashable.html) trait. They must be choosen with care, see
+///   [`Hashable`](../paint_support/trait.Hashable.html) trait. They must be choosen with care, see
 ///   generator documentation.
 ///
 ///   `hasher($hash)` is optional and its default is `blake2_256`.
diff --git a/paint/support/procedural/src/storage/genesis_config/builder_def.rs b/paint/support/procedural/src/storage/genesis_config/builder_def.rs
index fc425e4a6d532..12694e1f0610e 100644
--- a/paint/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/paint/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -16,7 +16,7 @@
 
 //! Builder logic definition used to build genesis storage.
 
-use srml_support_procedural_tools::syn_ext as ext;
+use paint_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::spanned::Spanned;
 use quote::{quote, quote_spanned};
diff --git a/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index 4bf665de71fa6..b63c2993b25f6 100644
--- a/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -16,7 +16,7 @@
 
 //! Genesis config defintion.
 
-use srml_support_procedural_tools::syn_ext as ext;
+use paint_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::{spanned::Spanned, parse_quote};
 use quote::quote;
diff --git a/paint/support/procedural/src/storage/metadata.rs b/paint/support/procedural/src/storage/metadata.rs
index f81da84c74c66..e02e02c3ce875 100644
--- a/paint/support/procedural/src/storage/metadata.rs
+++ b/paint/support/procedural/src/storage/metadata.rs
@@ -16,7 +16,7 @@
 
 //! Implementation of `storage_metadata` on module structure, used by construct_runtime.
 
-use srml_support_procedural_tools::clean_type_string;
+use paint_support_procedural_tools::clean_type_string;
 use proc_macro2::TokenStream;
 use quote::quote;
 use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
diff --git a/paint/support/procedural/src/storage/mod.rs b/paint/support/procedural/src/storage/mod.rs
index bdbef49d2776a..ca03f6d3d5626 100644
--- a/paint/support/procedural/src/storage/mod.rs
+++ b/paint/support/procedural/src/storage/mod.rs
@@ -25,7 +25,7 @@ mod instance_trait;
 mod genesis_config;
 
 use quote::quote;
-use srml_support_procedural_tools::{
+use paint_support_procedural_tools::{
 	generate_crate_access, generate_hidden_includes, syn_ext as ext
 };
 
@@ -403,8 +403,8 @@ pub fn decl_storage_impl(input: proc_macro::TokenStream) -> proc_macro::TokenStr
 	let hidden_crate_name = def_ext.hidden_crate.as_ref().map(|i| i.to_string())
 		.unwrap_or_else(|| "decl_storage".to_string());
 
-	let scrate = generate_crate_access(&hidden_crate_name, "srml-support");
-	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "srml-support");
+	let scrate = generate_crate_access(&hidden_crate_name, "paint-support");
+	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "paint-support");
 
 	let store_trait = store_trait::decl_and_impl(&def_ext);
 	let getters = getters::impl_getters(&scrate, &def_ext);
diff --git a/paint/support/procedural/src/storage/parse.rs b/paint/support/procedural/src/storage/parse.rs
index e428fbe24f295..a680d5e9ee8b2 100644
--- a/paint/support/procedural/src/storage/parse.rs
+++ b/paint/support/procedural/src/storage/parse.rs
@@ -16,7 +16,7 @@
 
 //! Parsing of decl_storage input.
 
-use srml_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
+use paint_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
 use syn::{Ident, Token, spanned::Spanned};
 
 mod keyword {
diff --git a/paint/support/procedural/tools/Cargo.toml b/paint/support/procedural/tools/Cargo.toml
index 4c5726c202521..7fb906b6ffcca 100644
--- a/paint/support/procedural/tools/Cargo.toml
+++ b/paint/support/procedural/tools/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "srml-support-procedural-tools"
+name = "paint-support-procedural-tools"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-srml-support-procedural-tools-derive = { package = "srml-support-procedural-tools-derive", path = "./derive" }
+paint-support-procedural-tools-derive = { package = "paint-support-procedural-tools-derive", path = "./derive" }
 proc-macro2 = "1.0.6"
 quote = "1.0.2"
 syn = { version = "1.0.7", features = ["full"] }
diff --git a/paint/support/procedural/tools/derive/Cargo.toml b/paint/support/procedural/tools/derive/Cargo.toml
index acc0c1b1d3367..6b81ee829d1cb 100644
--- a/paint/support/procedural/tools/derive/Cargo.toml
+++ b/paint/support/procedural/tools/derive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-support-procedural-tools-derive"
+name = "paint-support-procedural-tools-derive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/paint/support/procedural/tools/src/lib.rs b/paint/support/procedural/tools/src/lib.rs
index 2b08104ca71ba..d76ef24f19d7e 100644
--- a/paint/support/procedural/tools/src/lib.rs
+++ b/paint/support/procedural/tools/src/lib.rs
@@ -19,7 +19,7 @@
 // end::description[]
 
 // reexport proc macros
-pub use srml_support_procedural_tools_derive::*;
+pub use paint_support_procedural_tools_derive::*;
 
 use proc_macro_crate::crate_name;
 use syn::parse::Error;
@@ -35,10 +35,10 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 	Ident::new(&format!("sr_api_hidden_includes_{}", unique_id), Span::call_site())
 }
 
-/// Generates the access to the `srml-support` crate.
+/// Generates the access to the `paint-support` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote::quote!( srml_support )
+		quote::quote!( paint_support )
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote::quote!( self::#mod_name::hidden_include )
diff --git a/paint/support/procedural/tools/src/syn_ext.rs b/paint/support/procedural/tools/src/syn_ext.rs
index 39cfb0ee1cf2f..a3f6d52c4c643 100644
--- a/paint/support/procedural/tools/src/syn_ext.rs
+++ b/paint/support/procedural/tools/src/syn_ext.rs
@@ -22,7 +22,7 @@ use syn::{visit::{Visit, self}, parse::{Parse, ParseStream, Result}, Ident};
 use proc_macro2::{TokenStream, TokenTree};
 use quote::ToTokens;
 use std::iter::once;
-use srml_support_procedural_tools_derive::{ToTokens, Parse};
+use paint_support_procedural_tools_derive::{ToTokens, Parse};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)
diff --git a/paint/support/rpc/Cargo.toml b/paint/support/rpc/Cargo.toml
index a57bfa3e8dbb9..17533950102b2 100644
--- a/paint/support/rpc/Cargo.toml
+++ b/paint/support/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-support-rpc"
+name = "paint-support-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies ", "Andrew Dirksen "]
 edition = "2018"
@@ -10,10 +10,10 @@ jsonrpc-client-transports = "14"
 jsonrpc-core = "14"
 parity-scale-codec = "1"
 serde = "1"
-srml-support = { path = "../" }
+paint-support = { path = "../" }
 substrate-primitives-storage = { path = "../../../primitives/core/storage" }
 substrate-rpc-api = { path = "../../../client/rpc/api" }
 
 [dev-dependencies]
-srml-system = { path = "../../system" }
+paint-system = { path = "../../system" }
 tokio = "0.1"
diff --git a/paint/support/rpc/src/lib.rs b/paint/support/rpc/src/lib.rs
index f2a6182cd239f..a09fbd694c872 100644
--- a/paint/support/rpc/src/lib.rs
+++ b/paint/support/rpc/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Combines [substrate_rpc_api::state::StateClient] with [srml_support::storage::generator] traits
+//! Combines [substrate_rpc_api::state::StateClient] with [paint_support::storage::generator] traits
 //! to provide strongly typed chain state queries over rpc.
 
 #![warn(missing_docs)]
@@ -24,7 +24,7 @@ use futures::compat::Future01CompatExt;
 use jsonrpc_client_transports::RpcError;
 use parity_scale_codec::{DecodeAll, FullCodec, FullEncode};
 use serde::{de::DeserializeOwned, Serialize};
-use srml_support::storage::generator::{
+use paint_support::storage::generator::{
 	StorageDoubleMap, StorageLinkedMap, StorageMap, StorageValue
 };
 use substrate_primitives_storage::{StorageData, StorageKey};
@@ -39,13 +39,13 @@ use substrate_rpc_api::state::StateClient;
 /// # use jsonrpc_client_transports::RpcError;
 /// # use jsonrpc_client_transports::transports::http;
 /// # use parity_scale_codec::Encode;
-/// # use srml_support::{decl_storage, decl_module};
-/// # use srml_support_rpc::StorageQuery;
-/// # use srml_system::Trait;
+/// # use paint_support::{decl_storage, decl_module};
+/// # use paint_support_rpc::StorageQuery;
+/// # use paint_system::Trait;
 /// # use substrate_rpc_api::state::StateClient;
 /// #
-/// # // Hash would normally be ::Hash, but we don't have
-/// # // srml_system::Trait implemented for TestRuntime. Here we just pretend.
+/// # // Hash would normally be ::Hash, but we don't have
+/// # // paint_system::Trait implemented for TestRuntime. Here we just pretend.
 /// # type Hash = ();
 /// #
 /// # fn main() -> Result<(), RpcError> {
@@ -134,7 +134,7 @@ impl StorageQuery {
 
 	/// Send this query over RPC, await the typed result.
 	///
-	/// Hash should be ::Hash.
+	/// Hash should be ::Hash.
 	///
 	/// # Arguments
 	///
diff --git a/paint/support/src/debug.rs b/paint/support/src/debug.rs
index ee187edb396d8..8904d3defef63 100644
--- a/paint/support/src/debug.rs
+++ b/paint/support/src/debug.rs
@@ -35,7 +35,7 @@
 //! that WASM debug formatting of structs will be empty.
 //!
 //! ```rust,no_run
-//!	use srml_support::debug;
+//!	use paint_support::debug;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -66,7 +66,7 @@
 //! logs conditionally and strips out logs in WASM.
 //!
 //! ```rust,no_run
-//!	use srml_support::debug::native;
+//!	use paint_support::debug::native;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -124,7 +124,7 @@ pub mod native {
 /// # Example
 ///
 /// ```
-/// srml_support::runtime_print!("my value is {}", 3);
+/// paint_support::runtime_print!("my value is {}", 3);
 /// ```
 #[macro_export]
 macro_rules! runtime_print {
diff --git a/paint/support/src/dispatch.rs b/paint/support/src/dispatch.rs
index df86f436117a1..e507df4ea0e61 100644
--- a/paint/support/src/dispatch.rs
+++ b/paint/support/src/dispatch.rs
@@ -19,7 +19,7 @@
 
 pub use crate::rstd::{result, fmt, prelude::{Vec, Clone, Eq, PartialEq}, marker};
 pub use crate::codec::{Codec, EncodeLike, Decode, Encode, Input, Output, HasCompact, EncodeAsRef};
-pub use srml_metadata::{
+pub use paint_metadata::{
 	FunctionMetadata, DecodeDifferent, DecodeDifferentArray, FunctionArgumentMetadata,
 	ModuleConstantMetadata, DefaultByte, DefaultByteGetter, ModuleErrorMetadata, ErrorMetadata
 };
@@ -57,9 +57,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::dispatch::Result;
-/// # use srml_system::{self as system, Trait, ensure_signed};
+/// # extern crate paint_support;
+/// # use paint_support::dispatch::Result;
+/// # use paint_system::{self as system, Trait, ensure_signed};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///
@@ -97,9 +97,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::dispatch::Result;
-/// # use srml_system::{self as system, Trait, ensure_signed};
+/// # extern crate paint_support;
+/// # use paint_support::dispatch::Result;
+/// # use paint_system::{self as system, Trait, ensure_signed};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///
@@ -122,9 +122,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::dispatch::Result;
-/// # use srml_system::{self as system, Trait, ensure_signed, ensure_root};
+/// # extern crate paint_support;
+/// # use paint_support::dispatch::Result;
+/// # use paint_system::{self as system, Trait, ensure_signed, ensure_root};
 /// decl_module! {
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///			fn my_privileged_function(origin) -> Result {
@@ -140,15 +140,15 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// ## Multiple Module Instances Example
 ///
 /// A Substrate module can be built such that multiple instances of the same module can be used within a single
-/// runtime. For example, the [Balances module](../srml_balances/index.html) can be added multiple times to your
+/// runtime. For example, the [Balances module](../paint_balances/index.html) can be added multiple times to your
 /// runtime in order to support multiple, independent currencies for your blockchain. Here is an example of how
 /// you would declare such a module using the `decl_module!` macro:
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::dispatch::Result;
-/// # use srml_system::{self as system, ensure_signed};
+/// # extern crate paint_support;
+/// # use paint_support::dispatch::Result;
+/// # use paint_system::{self as system, ensure_signed};
 /// # pub struct DefaultInstance;
 /// # pub trait Instance {}
 /// # impl Instance for DefaultInstance {}
@@ -174,9 +174,9 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::dispatch::Result;
-/// # use srml_system::{self as system, ensure_signed};
+/// # extern crate paint_support;
+/// # use paint_support::dispatch::Result;
+/// # use paint_system::{self as system, ensure_signed};
 /// pub trait Trait: system::Trait where Self::AccountId: From {}
 ///
 /// decl_module! {
@@ -192,7 +192,7 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// The following are reserved function signatures:
 ///
 /// * `deposit_event`: Helper function for depositing an [event](https://docs.substrate.dev/docs/event-enum).
-/// The default behavior is to call `deposit_event` from the [System module](../srml_system/index.html).
+/// The default behavior is to call `deposit_event` from the [System module](../paint_system/index.html).
 /// However, you can write your own implementation for events in your runtime. To use the default behavior,
 /// add `fn deposit_event() = default;` to your `Module`.
 ///
diff --git a/paint/support/src/error.rs b/paint/support/src/error.rs
index 9aa13713daafb..4b2e0a232d4d3 100644
--- a/paint/support/src/error.rs
+++ b/paint/support/src/error.rs
@@ -18,7 +18,7 @@
 
 #[doc(hidden)]
 pub use sr_primitives::traits::LookupError;
-pub use srml_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
+pub use paint_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 
 /// Declare an error type for a runtime module.
 ///
@@ -31,7 +31,7 @@ pub use srml_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 /// # Usage
 ///
 /// ```
-/// # use srml_support::decl_error;
+/// # use paint_support::decl_error;
 /// decl_error! {
 ///     /// Errors that can occur in my module.
 ///     pub enum MyError {
diff --git a/paint/support/src/event.rs b/paint/support/src/event.rs
index 3411c93922e2b..139db1f609b9a 100644
--- a/paint/support/src/event.rs
+++ b/paint/support/src/event.rs
@@ -17,14 +17,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
+pub use paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
 
 /// Implement the `Event` for a module.
 ///
 /// # Simple Event Example:
 ///
 /// ```rust
-/// srml_support::decl_event!(
+/// paint_support::decl_event!(
 ///    pub enum Event {
 ///       Success,
 ///       Failure(String),
@@ -44,7 +44,7 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 ///
 /// mod event1 {
 ///     // Event that specifies the generic parameter explicitly (`Balance`).
-///     srml_support::decl_event!(
+///     paint_support::decl_event!(
 ///        pub enum Event where Balance = ::Balance {
 ///           Message(Balance),
 ///        }
@@ -55,7 +55,7 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 ///     // Event that uses the generic parameter `Balance`.
 ///     // If no name for the generic parameter is specified explicitly,
 ///     // the name will be taken from the type name of the trait.
-///     srml_support::decl_event!(
+///     paint_support::decl_event!(
 ///        pub enum Event where ::Balance {
 ///           Message(Balance),
 ///        }
@@ -64,7 +64,7 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 ///
 /// mod event3 {
 ///     // And we even support declaring multiple generic parameters!
-///     srml_support::decl_event!(
+///     paint_support::decl_event!(
 ///        pub enum Event where ::Balance, ::Token {
 ///           Message(Balance, Token),
 ///        }
@@ -88,7 +88,7 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 /// }
 ///
 /// // For module with instances, DefaultInstance is optional
-/// srml_support::decl_event!(
+/// paint_support::decl_event!(
 ///    pub enum Event where
 ///       ::Balance,
 ///       ::Token
diff --git a/paint/support/src/hash.rs b/paint/support/src/hash.rs
index c2b63a84db346..122fefab70e96 100644
--- a/paint/support/src/hash.rs
+++ b/paint/support/src/hash.rs
@@ -20,7 +20,7 @@ use codec::Codec;
 use rstd::prelude::Vec;
 use runtime_io::hashing::{blake2_128, blake2_256, twox_64, twox_128, twox_256};
 
-// This trait must be kept coherent with srml-support-procedural HasherKind usage
+// This trait must be kept coherent with paint-support-procedural HasherKind usage
 pub trait Hashable: Sized {
 	fn blake2_128(&self) -> [u8; 16];
 	fn blake2_256(&self) -> [u8; 32];
diff --git a/paint/support/src/lib.rs b/paint/support/src/lib.rs
index ed08ce5f41e9e..37dd2b4f9d47a 100644
--- a/paint/support/src/lib.rs
+++ b/paint/support/src/lib.rs
@@ -18,8 +18,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-/// Export ourself as `srml_support` to make tests happy.
-extern crate self as srml_support;
+/// Export ourself as `paint_support` to make tests happy.
+extern crate self as paint_support;
 
 #[macro_use]
 extern crate bitmask;
@@ -113,7 +113,7 @@ macro_rules! parameter_types {
 }
 
 #[doc(inline)]
-pub use srml_support_procedural::decl_storage;
+pub use paint_support_procedural::decl_storage;
 
 /// Return Err of the expression: `return Err($expression);`.
 ///
@@ -190,8 +190,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust
 /// #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::{assert_eq_uvec};
+/// # extern crate paint_support;
+/// # use paint_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2], vec![2,1]);
 /// # }
@@ -199,8 +199,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust,should_panic
 /// #[macro_use]
-/// # extern crate srml_support;
-/// # use srml_support::{assert_eq_uvec};
+/// # extern crate paint_support;
+/// # use paint_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2,3], vec![2,1]);
 /// # }
@@ -238,7 +238,7 @@ pub use serde::{Serialize, Deserialize};
 mod tests {
 	use super::*;
 	use codec::{Codec, EncodeLike};
-	use srml_metadata::{
+	use paint_metadata::{
 		DecodeDifferent, StorageEntryMetadata, StorageMetadata, StorageEntryType,
 		StorageEntryModifier, DefaultByteGetter, StorageHasher,
 	};
diff --git a/paint/support/src/metadata.rs b/paint/support/src/metadata.rs
index a223a14f9e405..f55cddea9914e 100644
--- a/paint/support/src/metadata.rs
+++ b/paint/support/src/metadata.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-pub use srml_metadata::{
+pub use paint_metadata::{
 	DecodeDifferent, FnEncode, RuntimeMetadata, ModuleMetadata, RuntimeMetadataLastVersion,
 	DefaultByteGetter, RuntimeMetadataPrefixed, StorageEntryMetadata, StorageMetadata,
 	StorageEntryType, StorageEntryModifier, DefaultByte, StorageHasher, ModuleErrorMetadata
@@ -29,11 +29,11 @@ pub use srml_metadata::{
 ///#        type Origin;
 ///#        type BlockNumber;
 ///#    }
-///#    srml_support::decl_module! {
+///#    paint_support::decl_module! {
 ///#        pub struct Module for enum Call where origin: T::Origin {}
 ///#    }
 ///#
-///#    srml_support::decl_storage! {
+///#    paint_support::decl_storage! {
 ///#        trait Store for Module as TestStorage {}
 ///#    }
 ///# }
@@ -45,7 +45,7 @@ pub use srml_metadata::{
 ///# }
 ///
 /// struct Runtime;
-/// srml_support::impl_runtime_metadata! {
+/// paint_support::impl_runtime_metadata! {
 ///     for Runtime with modules
 ///         module0::Module as Module0 with,
 ///         module1::Module as Module1 with,
@@ -229,7 +229,7 @@ macro_rules! __runtime_modules_to_metadata_calls_storage {
 #[allow(dead_code)]
 mod tests {
 	use super::*;
-	use srml_metadata::{
+	use paint_metadata::{
 		EventMetadata, StorageEntryModifier, StorageEntryType, FunctionMetadata, StorageEntryMetadata,
 		ModuleMetadata, RuntimeMetadataPrefixed, DefaultByte, ModuleConstantMetadata, DefaultByteGetter,
 		ErrorMetadata,
diff --git a/paint/support/src/traits.rs b/paint/support/src/traits.rs
index 297e128ebc2f0..67e46d4e75622 100644
--- a/paint/support/src/traits.rs
+++ b/paint/support/src/traits.rs
@@ -619,7 +619,7 @@ impl WithdrawReasons {
 	/// Choose all variants except for `one`.
 	///
 	/// ```rust
-	/// # use srml_support::traits::{WithdrawReason, WithdrawReasons};
+	/// # use paint_support::traits::{WithdrawReason, WithdrawReasons};
 	/// # fn main() {
 	/// assert_eq!(
 	/// 	WithdrawReason::Fee | WithdrawReason::Transfer | WithdrawReason::Reserve | WithdrawReason::Tip,
diff --git a/paint/support/src/unsigned.rs b/paint/support/src/unsigned.rs
index 282f3ac8ae9a8..690ea4947129e 100644
--- a/paint/support/src/unsigned.rs
+++ b/paint/support/src/unsigned.rs
@@ -32,10 +32,10 @@ pub use crate::sr_primitives::ApplyError;
 /// # mod timestamp {
 /// # 	pub struct Module;
 /// #
-/// # 	impl srml_support::unsigned::ValidateUnsigned for Module {
+/// # 	impl paint_support::unsigned::ValidateUnsigned for Module {
 /// # 		type Call = Call;
 /// #
-/// # 		fn validate_unsigned(call: &Self::Call) -> srml_support::unsigned::TransactionValidity {
+/// # 		fn validate_unsigned(call: &Self::Call) -> paint_support::unsigned::TransactionValidity {
 /// # 			unimplemented!();
 /// # 		}
 /// # 	}
@@ -53,7 +53,7 @@ pub use crate::sr_primitives::ApplyError;
 /// # #[allow(unused)]
 /// pub struct Runtime;
 ///
-/// srml_support::impl_outer_validate_unsigned! {
+/// paint_support::impl_outer_validate_unsigned! {
 /// 	impl ValidateUnsigned for Runtime {
 /// 		Timestamp
 /// 	}
diff --git a/paint/support/test/Cargo.toml b/paint/support/test/Cargo.toml
index cb791f58d3e39..19ed73566090e 100644
--- a/paint/support/test/Cargo.toml
+++ b/paint/support/test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-support-test"
+name = "paint-support-test"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -9,7 +9,7 @@ serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 runtime-io ={ package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
 state-machine ={ package = "substrate-state-machine", path = "../../../primitives/state-machine", optional = true }
-support = { package = "srml-support", version = "2", path = "../", default-features = false }
+support = { package = "paint-support", version = "2", path = "../", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false }
 sr-primitives = { package = "sr-primitives", path = "../../../primitives/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core", default-features = false }
diff --git a/paint/support/test/src/lib.rs b/paint/support/test/src/lib.rs
index b65bc43cbb5a8..fa5c8cf1ea31d 100644
--- a/paint/support/test/src/lib.rs
+++ b/paint/support/test/src/lib.rs
@@ -14,5 +14,5 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Test crate for srml_support. Allow to make use of `support::decl_storage`.
+//! Test crate for paint_support. Allow to make use of `support::decl_storage`.
 //! See tests directory.
diff --git a/paint/system/Cargo.toml b/paint/system/Cargo.toml
index 4fbcdeaabf763..9fa98937b9d36 100644
--- a/paint/system/Cargo.toml
+++ b/paint/system/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-system"
+name = "paint-system"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -13,7 +13,7 @@ rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 sr-version = { path = "../../primitives/sr-version", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
diff --git a/paint/system/benches/bench.rs b/paint/system/benches/bench.rs
index 6da02cf9c8cea..2ff794521d4e5 100644
--- a/paint/system/benches/bench.rs
+++ b/paint/system/benches/bench.rs
@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see .
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
-use srml_system as system;
+use paint_system as system;
 use support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
 use primitives::H256;
 use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
diff --git a/paint/system/rpc/Cargo.toml b/paint/system/rpc/Cargo.toml
index fb30935618929..6f71b9af51b14 100644
--- a/paint/system/rpc/Cargo.toml
+++ b/paint/system/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-system-rpc"
+name = "paint-system-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -13,7 +13,7 @@ jsonrpc-derive = "14.0.3"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
 sr-primitives = { path = "../../../primitives/sr-primitives" }
-srml-system-rpc-runtime-api = { path = "./runtime-api" }
+paint-system-rpc-runtime-api = { path = "./runtime-api" }
 substrate-primitives = { path = "../../../primitives/core" }
 transaction_pool = { package = "substrate-transaction-pool", path = "../../../client/transaction-pool" }
 
diff --git a/paint/system/rpc/runtime-api/Cargo.toml b/paint/system/rpc/runtime-api/Cargo.toml
index 5787acd31c30a..e0e90e79658ba 100644
--- a/paint/system/rpc/runtime-api/Cargo.toml
+++ b/paint/system/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-system-rpc-runtime-api"
+name = "paint-system-rpc-runtime-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/paint/system/rpc/src/lib.rs b/paint/system/rpc/src/lib.rs
index c6c0a658fba53..e89e9b7592cb8 100644
--- a/paint/system/rpc/src/lib.rs
+++ b/paint/system/rpc/src/lib.rs
@@ -29,7 +29,7 @@ use sr_primitives::{
 use substrate_primitives::hexdisplay::HexDisplay;
 use transaction_pool::txpool::{self, Pool};
 
-pub use srml_system_rpc_runtime_api::AccountNonceApi;
+pub use paint_system_rpc_runtime_api::AccountNonceApi;
 pub use self::gen_client::Client as SystemClient;
 
 /// System RPC methods.
diff --git a/paint/system/src/lib.rs b/paint/system/src/lib.rs
index 3ffbf9c23d701..d810cd157f8c0 100644
--- a/paint/system/src/lib.rs
+++ b/paint/system/src/lib.rs
@@ -69,7 +69,7 @@
 //!
 //! ```
 //! use support::{decl_module, dispatch::Result};
-//! use srml_system::{self as system, ensure_signed};
+//! use paint_system::{self as system, ensure_signed};
 //!
 //! pub trait Trait: system::Trait {}
 //!
diff --git a/paint/timestamp/Cargo.toml b/paint/timestamp/Cargo.toml
index 0c38e912e69de..73485f96e12bb 100644
--- a/paint/timestamp/Cargo.toml
+++ b/paint/timestamp/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-timestamp"
+name = "paint-timestamp"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
diff --git a/paint/timestamp/src/lib.rs b/paint/timestamp/src/lib.rs
index 8271c6e0e5795..d6123e54a9b38 100644
--- a/paint/timestamp/src/lib.rs
+++ b/paint/timestamp/src/lib.rs
@@ -62,7 +62,7 @@
 //!
 //! ```
 //! use support::{decl_module, dispatch::Result};
-//! # use srml_timestamp as timestamp;
+//! # use paint_timestamp as timestamp;
 //! use system::ensure_signed;
 //!
 //! pub trait Trait: timestamp::Trait {}
@@ -81,12 +81,12 @@
 //!
 //! ### Example from the SRML
 //!
-//! The [Session module](https://github.com/paritytech/substrate/blob/master/srml/session/src/lib.rs) uses
+//! The [Session module](https://github.com/paritytech/substrate/blob/master/paint/session/src/lib.rs) uses
 //! the Timestamp module for session management.
 //!
 //! ## Related Modules
 //!
-//! * [Session](../srml_session/index.html)
+//! * [Session](../paint_session/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/paint/transaction-payment/Cargo.toml b/paint/transaction-payment/Cargo.toml
index 1fa591b329737..535df1ed95660 100644
--- a/paint/transaction-payment/Cargo.toml
+++ b/paint/transaction-payment/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-transaction-payment"
+name = "paint-transaction-payment"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,14 +8,14 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
-transaction-payment-rpc-runtime-api = { package = "srml-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
+transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false }
 
 [dev-dependencies]
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io" }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "srml-balances", path = "../balances" }
+balances = { package = "paint-balances", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/paint/transaction-payment/rpc/Cargo.toml b/paint/transaction-payment/rpc/Cargo.toml
index 8503bcd4cfd82..22d68f8a6c7ea 100644
--- a/paint/transaction-payment/rpc/Cargo.toml
+++ b/paint/transaction-payment/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-transaction-payment-rpc"
+name = "paint-transaction-payment-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -14,4 +14,4 @@ primitives = { package = "substrate-primitives",  path = "../../../primitives/co
 rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
 sr-primitives = { path = "../../../primitives/sr-primitives" }
-srml-transaction-payment-rpc-runtime-api = { path = "./runtime-api" }
+paint-transaction-payment-rpc-runtime-api = { path = "./runtime-api" }
diff --git a/paint/transaction-payment/rpc/runtime-api/Cargo.toml b/paint/transaction-payment/rpc/runtime-api/Cargo.toml
index 20c768aba5757..05ba940d675f6 100644
--- a/paint/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/paint/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-transaction-payment-rpc-runtime-api"
+name = "paint-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/paint/transaction-payment/rpc/src/lib.rs b/paint/transaction-payment/rpc/src/lib.rs
index 6ee3c7eddbc55..8b59263b57959 100644
--- a/paint/transaction-payment/rpc/src/lib.rs
+++ b/paint/transaction-payment/rpc/src/lib.rs
@@ -26,8 +26,8 @@ use sr_primitives::{
 	traits::{Block as BlockT, ProvideRuntimeApi},
 };
 use primitives::Bytes;
-use srml_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-pub use srml_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
+use paint_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
+pub use paint_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
 pub use self::gen_client::Client as TransactionPaymentClient;
 
 #[rpc]
diff --git a/paint/treasury/Cargo.toml b/paint/treasury/Cargo.toml
index 4fb82cded37c3..7f917fb22e50b 100644
--- a/paint/treasury/Cargo.toml
+++ b/paint/treasury/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-treasury"
+name = "paint-treasury"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -9,9 +9,9 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
-balances = { package = "srml-balances", path = "../balances", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
+balances = { package = "paint-balances", path = "../balances", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/paint/utility/Cargo.toml b/paint/utility/Cargo.toml
index 675f31c150629..1415c3e92245a 100644
--- a/paint/utility/Cargo.toml
+++ b/paint/utility/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "srml-utility"
+name = "paint-utility"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -7,15 +7,15 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-support = { package = "srml-support", path = "../support", default-features = false }
-system = { package = "srml-system", path = "../system", default-features = false }
+support = { package = "paint-support", path = "../support", default-features = false }
+system = { package = "paint-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "srml-balances", path = "../balances" }
+balances = { package = "paint-balances", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/primitives/phragmen/Cargo.toml b/primitives/phragmen/Cargo.toml
index 9b6a58363172a..250a09dd34a06 100644
--- a/primitives/phragmen/Cargo.toml
+++ b/primitives/phragmen/Cargo.toml
@@ -11,7 +11,7 @@ sr-primitives = { path = "../../primitives/sr-primitives", default-features = fa
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
-support = { package = "srml-support", path = "../../paint/support" }
+support = { package = "paint-support", path = "../../paint/support" }
 rand = "0.7.2"
 
 [features]
diff --git a/test/utils/primitives/Cargo.toml b/test/utils/primitives/Cargo.toml
index aa6c04431f314..b3d200f95defb 100644
--- a/test/utils/primitives/Cargo.toml
+++ b/test/utils/primitives/Cargo.toml
@@ -18,16 +18,16 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/cor
 # rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false }
 # runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
 # runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
-# runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false }
+# runtime_support = { package = "paint-support", path = "../../../paint/support", default-features = false }
 # runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 # session = { package = "substrate-session", path = "../../../primitives/session", default-features = false }
 # sr-api = { path = "../../../primitives/sr-api", default-features = false }
 sr-primitives = {  path = "../../../primitives/sr-primitives", default-features = false }
-# srml-babe = { path = "../../../paint/babe", default-features = false }
-# srml-system = { path = "../../../paint/system", default-features = false }
-# srml-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
-# srml-timestamp = { path = "../../../paint/timestamp", default-features = false }
+# paint-babe = { path = "../../../paint/babe", default-features = false }
+# paint-system = { path = "../../../paint/system", default-features = false }
+# paint-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
+# paint-timestamp = { path = "../../../paint/timestamp", default-features = false }
 # substrate-client = { path = "../../../client", optional = true }
 # substrate-trie = { path = "../../../primitives/trie", default-features = false }
 # transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
@@ -60,10 +60,10 @@ std = [
 	# "session/std",
 	# "sr-api/std",
 	# "sr-primitives/std",
-	# "srml-babe/std",
-	# "srml-system-rpc-runtime-api/std",
-	# "srml-system/std",
-	# "srml-timestamp/std",
+	# "paint-babe/std",
+	# "paint-system-rpc-runtime-api/std",
+	# "paint-system/std",
+	# "paint-timestamp/std",
 	# "substrate-client",
 	# "substrate-trie/std",
 	# "transaction-pool-api/std",
diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml
index c622ca49879d7..28435302b7dd6 100644
--- a/test/utils/runtime/Cargo.toml
+++ b/test/utils/runtime/Cargo.toml
@@ -12,7 +12,7 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api", default-features = false }
 cfg-if = "0.1.10"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false }
+executive = { package = "paint-executive", path = "../../../paint/executive", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false }
 keyring = { package = "substrate-keyring", path = "../../../client/keyring", optional = true }
 log = { version = "0.4.8", optional = true }
@@ -22,16 +22,16 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/cor
 rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-features = false }
 runtime-interface = { package = "substrate-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
 runtime_io = { package = "sr-io", path = "../../../primitives/sr-io", default-features = false }
-runtime_support = { package = "srml-support", path = "../../../paint/support", default-features = false }
+runtime_support = { package = "paint-support", path = "../../../paint/support", default-features = false }
 runtime_version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 session = { package = "substrate-session", path = "../../../primitives/session", default-features = false }
 sr-api = { path = "../../../primitives/sr-api", default-features = false }
 sr-primitives = {  path = "../../../primitives/sr-primitives", default-features = false }
-srml-babe = { path = "../../../paint/babe", default-features = false }
-srml-system = { path = "../../../paint/system", default-features = false }
-srml-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
-srml-timestamp = { path = "../../../paint/timestamp", default-features = false }
+paint-babe = { path = "../../../paint/babe", default-features = false }
+paint-system = { path = "../../../paint/system", default-features = false }
+paint-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
+paint-timestamp = { path = "../../../paint/timestamp", default-features = false }
 substrate-client = { path = "../../../client", optional = true }
 substrate-trie = { path = "../../../primitives/trie", default-features = false }
 transaction-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
@@ -72,10 +72,10 @@ std = [
 	"session/std",
 	"sr-api/std",
 	"sr-primitives/std",
-	"srml-babe/std",
-	"srml-system-rpc-runtime-api/std",
-	"srml-system/std",
-	"srml-timestamp/std",
+	"paint-babe/std",
+	"paint-system-rpc-runtime-api/std",
+	"paint-system/std",
+	"paint-timestamp/std",
 	"substrate-client",
 	"substrate-trie/std",
 	"transaction-pool-api/std",
diff --git a/test/utils/runtime/src/lib.rs b/test/utils/runtime/src/lib.rs
index 2bd6cc6bcbd1c..2ec109938889d 100644
--- a/test/utils/runtime/src/lib.rs
+++ b/test/utils/runtime/src/lib.rs
@@ -338,14 +338,14 @@ impl GetRuntimeBlockType for Runtime {
 }
 
 impl_outer_origin!{
-	pub enum Origin for Runtime where system = srml_system {}
+	pub enum Origin for Runtime where system = paint_system {}
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct Event;
 
-impl From for Event {
-	fn from(_evt: srml_system::Event) -> Self {
+impl From for Event {
+	fn from(_evt: paint_system::Event) -> Self {
 		unimplemented!("Not required in tests!")
 	}
 }
@@ -358,7 +358,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl srml_system::Trait for Runtime {
+impl paint_system::Trait for Runtime {
 	type Origin = Origin;
 	type Call = Extrinsic;
 	type Index = u64;
@@ -376,7 +376,7 @@ impl srml_system::Trait for Runtime {
 	type Version = ();
 }
 
-impl srml_timestamp::Trait for Runtime {
+impl paint_timestamp::Trait for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -388,13 +388,13 @@ parameter_types! {
 	pub const ExpectedBlockTime: u64 = 10_000;
 }
 
-impl srml_babe::Trait for Runtime {
+impl paint_babe::Trait for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	// there is no actual runtime in this test-runtime, so testing crates
 	// are manually adding the digests. normally in this situation you'd use
-	// srml_babe::SameAuthoritiesForever.
-	type EpochChangeTrigger = srml_babe::ExternalTrigger;
+	// paint_babe::SameAuthoritiesForever.
+	type EpochChangeTrigger = paint_babe::ExternalTrigger;
 }
 
 /// Adds one to the given input and returns the final result.
@@ -615,7 +615,7 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: >::randomness(),
+						randomness: >::randomness(),
 						secondary_slots: true,
 					}
 				}
@@ -634,7 +634,7 @@ cfg_if! {
 				}
 			}
 
-			impl srml_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl paint_system_rpc_runtime_api::AccountNonceApi for Runtime {
 				fn account_nonce(_account: AccountId) -> Index {
 					0
 				}
@@ -831,7 +831,7 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: >::randomness(),
+						randomness: >::randomness(),
 						secondary_slots: true,
 					}
 				}
@@ -850,7 +850,7 @@ cfg_if! {
 				}
 			}
 
-			impl srml_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl paint_system_rpc_runtime_api::AccountNonceApi for Runtime {
 				fn account_nonce(_account: AccountId) -> Index {
 					0
 				}
diff --git a/test/utils/runtime/src/system.rs b/test/utils/runtime/src/system.rs
index dcb9aa4f32583..44743be200840 100644
--- a/test/utils/runtime/src/system.rs
+++ b/test/utils/runtime/src/system.rs
@@ -29,7 +29,7 @@ use sr_primitives::{
 	transaction_validity::{TransactionValidity, ValidTransaction, InvalidTransaction},
 };
 use codec::{KeyedVec, Encode};
-use srml_system::Trait;
+use paint_system::Trait;
 use crate::{
 	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
 };

From 9fe4663483833e383d55e8b3ef1206528e5fb480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= 
Date: Wed, 13 Nov 2019 14:46:49 +0100
Subject: [PATCH 45/61] Make it compile.

---
 Cargo.lock                             | 28 +++++++++++++++++++++-----
 client/interfaces/src/call_executor.rs |  2 +-
 client/src/call_executor.rs            |  4 +---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b9332285f7a3..5c7abf1ec45b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3498,6 +3498,17 @@ name = "quick-error"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "quickcheck"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "quickcheck"
 version = "0.9.0"
@@ -4297,7 +4308,6 @@ dependencies = [
  "substrate-runtime-interface 2.0.0",
  "substrate-state-machine 2.0.0",
  "substrate-trie 2.0.0",
- "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4631,7 +4641,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
  "srml-balances 2.0.0",
- "srml-indices 2.0.0",
  "srml-support 2.0.0",
  "srml-system 2.0.0",
  "srml-transaction-payment 2.0.0",
@@ -5404,6 +5413,7 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-client 2.0.0",
  "substrate-client-interfaces 2.0.0",
@@ -5686,7 +5696,6 @@ dependencies = [
  "substrate-trie 2.0.0",
  "substrate-wasm-interface 2.0.0",
  "test-case 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmtime-environ 0.2.0 (git+https://github.com/CraneStation/wasmtime.git?rev=71dd73d6)",
@@ -5959,7 +5968,7 @@ dependencies = [
  "substrate-runtime-interface 2.0.0",
  "substrate-serializer 2.0.0",
  "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "zeroize 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6382,7 +6391,6 @@ dependencies = [
  "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "keccak-hasher 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-std 2.0.0",
@@ -6595,6 +6603,14 @@ dependencies = [
  "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crunchy 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.0.2"
@@ -7886,6 +7902,7 @@ dependencies = [
 "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
 "checksum pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d473123ba135028544926f7aa6f34058d8bc6f120c4fcd3777f84af724280b3"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456"
 "checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
@@ -7999,6 +8016,7 @@ dependencies = [
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060"
 "checksum tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
+"checksum tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2953ca5148619bc99695c1274cb54c5275bbb913c6adad87e72eaf8db9787f69"
 "checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
 "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
diff --git a/client/interfaces/src/call_executor.rs b/client/interfaces/src/call_executor.rs
index 1b69b755691e9..c143999047d5e 100644
--- a/client/interfaces/src/call_executor.rs
+++ b/client/interfaces/src/call_executor.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-use std::{cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc};
+use std::{cmp::Ord, panic::UnwindSafe, result, cell::RefCell};
 use codec::{Encode, Decode};
 use sr_primitives::{
 	generic::BlockId, traits::Block as BlockT, traits::NumberFor,
diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs
index a078d317f33f6..fcb9137fd7388 100644
--- a/client/src/call_executor.rs
+++ b/client/src/call_executor.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-use std::{sync::Arc, panic::UnwindSafe, result, cell::RefCell, rc::Rc};
+use std::{sync::Arc, panic::UnwindSafe, result, cell::RefCell};
 use codec::{Encode, Decode};
 use sr_primitives::{
 	generic::BlockId, traits::Block as BlockT, traits::NumberFor,
@@ -34,8 +34,6 @@ use sr_api::{ProofRecorder, InitializeBlock};
 use interfaces::{
 	error, backend, call_executor::CallExecutor,
 };
-use crate::backend;
-use crate::error;
 
 /// Call executor that executes methods locally, querying all required
 /// data from local backend.

From 87c8a757e8168b9c5a189abc0a3c9224b516f945 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Wed, 13 Nov 2019 14:50:51 +0100
Subject: [PATCH 46/61] rename interfaces->client-api

---
 Cargo.lock                                    | 82 +++++++++----------
 Cargo.toml                                    |  2 +-
 bin/node/cli/Cargo.toml                       |  2 +-
 bin/node/cli/src/service.rs                   |  2 +-
 client/Cargo.toml                             |  2 +-
 client/{interfaces => api}/Cargo.toml         |  2 +-
 client/{interfaces => api}/src/backend.rs     |  0
 client/{interfaces => api}/src/blockchain.rs  |  0
 .../{interfaces => api}/src/call_executor.rs  |  0
 client/{interfaces => api}/src/client.rs      |  0
 client/{interfaces => api}/src/error.rs       |  0
 client/{interfaces => api}/src/lib.rs         |  0
 client/{interfaces => api}/src/light.rs       |  0
 .../{interfaces => api}/src/notifications.rs  |  0
 client/{interfaces => api}/src/offchain.rs    |  0
 client/authority-discovery/Cargo.toml         |  2 +-
 client/authority-discovery/src/error.rs       |  2 +-
 client/authority-discovery/src/lib.rs         | 36 ++++----
 client/basic-authorship/Cargo.toml            |  2 +-
 .../basic-authorship/src/basic_authorship.rs  |  8 +-
 client/cli/Cargo.toml                         |  2 +-
 client/cli/src/error.rs                       |  2 +-
 client/cli/src/informant.rs                   |  2 +-
 client/cli/src/informant/display.rs           |  2 +-
 client/cli/src/lib.rs                         |  2 +-
 client/cli/src/params.rs                      | 12 +--
 client/consensus/aura/Cargo.toml              |  2 +-
 client/consensus/aura/src/lib.rs              |  6 +-
 client/consensus/babe/Cargo.toml              |  2 +-
 client/consensus/babe/src/aux_schema.rs       |  2 +-
 client/consensus/babe/src/epoch_changes.rs    |  2 +-
 client/consensus/babe/src/lib.rs              | 22 ++---
 client/consensus/babe/src/tests.rs            |  4 +-
 client/consensus/pow/Cargo.toml               |  2 +-
 client/consensus/pow/src/lib.rs               | 12 +--
 client/consensus/slots/Cargo.toml             |  2 +-
 client/consensus/slots/src/aux_schema.rs      |  4 +-
 client/consensus/slots/src/lib.rs             |  8 +-
 client/consensus/uncles/Cargo.toml            |  2 +-
 client/consensus/uncles/src/lib.rs            |  2 +-
 client/db/Cargo.toml                          |  2 +-
 client/db/src/cache/list_cache.rs             |  2 +-
 client/db/src/cache/list_entry.rs             |  2 +-
 client/db/src/cache/list_storage.rs           |  2 +-
 client/db/src/cache/mod.rs                    |  6 +-
 client/db/src/children.rs                     |  2 +-
 client/db/src/lib.rs                          | 26 +++---
 client/db/src/light.rs                        |  2 +-
 client/db/src/offchain.rs                     |  4 +-
 client/db/src/storage_cache.rs                |  2 +-
 client/executor/Cargo.toml                    |  2 +-
 client/executor/src/integration_tests/mod.rs  |  2 +-
 client/finality-grandpa/Cargo.toml            |  2 +-
 client/finality-grandpa/src/aux_schema.rs     |  4 +-
 .../finality-grandpa/src/consensus_changes.rs |  4 +-
 client/finality-grandpa/src/environment.rs    |  2 +-
 client/finality-grandpa/src/finality_proof.rs |  6 +-
 client/finality-grandpa/src/import.rs         |  2 +-
 client/finality-grandpa/src/justification.rs  |  2 +-
 client/finality-grandpa/src/lib.rs            |  6 +-
 client/finality-grandpa/src/light_import.rs   |  2 +-
 client/finality-grandpa/src/observer.rs       |  4 +-
 client/finality-grandpa/src/tests.rs          |  4 +-
 client/finality-grandpa/src/until_imported.rs |  4 +-
 client/finality-grandpa/src/voting_rule.rs    |  2 +-
 client/network/Cargo.toml                     |  2 +-
 client/network/src/chain.rs                   |  6 +-
 client/network/src/error.rs                   |  2 +-
 client/network/src/on_demand_layer.rs         |  4 +-
 client/network/src/protocol.rs                |  2 +-
 client/network/src/protocol/light_dispatch.rs |  8 +-
 client/network/src/protocol/message.rs        |  2 +-
 client/network/src/protocol/sync.rs           |  2 +-
 .../src/protocol/sync/extra_requests.rs       |  4 +-
 client/network/src/test/mod.rs                |  2 +-
 client/offchain/Cargo.toml                    |  2 +-
 client/offchain/src/api.rs                    |  2 +-
 client/offchain/src/lib.rs                    |  2 +-
 client/offchain/src/testing.rs                |  2 +-
 client/rpc/Cargo.toml                         |  2 +-
 client/rpc/src/author/mod.rs                  |  6 +-
 client/rpc/src/chain/chain_full.rs            |  2 +-
 client/rpc/src/chain/chain_light.rs           |  2 +-
 client/rpc/src/chain/mod.rs                   | 10 +--
 client/rpc/src/state/mod.rs                   |  8 +-
 client/rpc/src/state/state_full.rs            |  2 +-
 client/rpc/src/state/state_light.rs           |  2 +-
 client/service/Cargo.toml                     |  2 +-
 client/service/src/builder.rs                 | 12 +--
 client/service/src/lib.rs                     |  4 +-
 client/src/call_executor.rs                   |  2 +-
 client/src/cht.rs                             |  2 +-
 client/src/client.rs                          |  2 +-
 client/src/in_mem.rs                          |  8 +-
 client/src/leaves.rs                          |  2 +-
 client/src/lib.rs                             |  2 +-
 client/src/light/backend.rs                   |  4 +-
 client/src/light/blockchain.rs                |  4 +-
 client/src/light/call_executor.rs             |  6 +-
 client/src/light/fetcher.rs                   |  4 +-
 client/src/light/mod.rs                       |  2 +-
 test/utils/client/Cargo.toml                  |  2 +-
 test/utils/client/src/client_ext.rs           |  4 +-
 test/utils/client/src/lib.rs                  |  4 +-
 test/utils/runtime/client/Cargo.toml          |  2 +-
 test/utils/runtime/client/src/lib.rs          |  2 +-
 test/utils/runtime/client/src/trait_tests.rs  |  4 +-
 test/utils/transaction-factory/Cargo.toml     |  2 +-
 .../transaction-factory/src/complex_mode.rs   |  2 +-
 test/utils/transaction-factory/src/lib.rs     |  6 +-
 .../transaction-factory/src/simple_modes.rs   |  2 +-
 111 files changed, 248 insertions(+), 248 deletions(-)
 rename client/{interfaces => api}/Cargo.toml (98%)
 rename client/{interfaces => api}/src/backend.rs (100%)
 rename client/{interfaces => api}/src/blockchain.rs (100%)
 rename client/{interfaces => api}/src/call_executor.rs (100%)
 rename client/{interfaces => api}/src/client.rs (100%)
 rename client/{interfaces => api}/src/error.rs (100%)
 rename client/{interfaces => api}/src/lib.rs (100%)
 rename client/{interfaces => api}/src/light.rs (100%)
 rename client/{interfaces => api}/src/notifications.rs (100%)
 rename client/{interfaces => api}/src/offchain.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 3e2b3fbc16784..a7e5d0920a354 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2719,8 +2719,8 @@ dependencies = [
  "substrate-chain-spec 2.0.0",
  "substrate-cli 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
- "substrate-client-interfaces 2.0.0",
  "substrate-consensus-babe 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
@@ -5221,7 +5221,7 @@ dependencies = [
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
  "substrate-authority-discovery-primitives 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-network 2.0.0",
  "substrate-peerset 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5248,7 +5248,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5340,7 +5340,7 @@ dependencies = [
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-header-metadata 2.0.0",
  "substrate-keyring 2.0.0",
  "substrate-network 2.0.0",
@@ -5375,8 +5375,8 @@ dependencies = [
  "sr-std 2.0.0",
  "sr-version 2.0.0",
  "substrate-block-builder 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
- "substrate-client-interfaces 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-header-metadata 2.0.0",
@@ -5392,67 +5392,67 @@ dependencies = [
 ]
 
 [[package]]
-name = "substrate-client-db"
+name = "substrate-client-api"
 version = "2.0.0"
 dependencies = [
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
  "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
- "kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
  "sr-primitives 2.0.0",
- "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "sr-std 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-block-builder 2.0.0",
+ "substrate-client-db 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-header-metadata 2.0.0",
+ "substrate-inherents 2.0.0",
  "substrate-keyring 2.0.0",
+ "substrate-panic-handler 2.0.0",
  "substrate-primitives 2.0.0",
- "substrate-state-db 2.0.0",
  "substrate-state-machine 2.0.0",
+ "substrate-telemetry 2.0.0",
+ "substrate-test-primitives 2.0.0",
  "substrate-test-runtime-client 2.0.0",
  "substrate-trie 2.0.0",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "substrate-client-interfaces"
+name = "substrate-client-db"
 version = "2.0.0"
 dependencies = [
- "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
  "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
+ "kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
  "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "sr-version 2.0.0",
- "substrate-block-builder 2.0.0",
- "substrate-client-db 2.0.0",
+ "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-header-metadata 2.0.0",
- "substrate-inherents 2.0.0",
  "substrate-keyring 2.0.0",
- "substrate-panic-handler 2.0.0",
  "substrate-primitives 2.0.0",
+ "substrate-state-db 2.0.0",
  "substrate-state-machine 2.0.0",
- "substrate-telemetry 2.0.0",
- "substrate-test-primitives 2.0.0",
  "substrate-test-runtime-client 2.0.0",
  "substrate-trie 2.0.0",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5476,7 +5476,7 @@ dependencies = [
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-aura-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-slots 2.0.0",
@@ -5534,7 +5534,7 @@ dependencies = [
  "substrate-block-builder 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-slots 2.0.0",
@@ -5596,7 +5596,7 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-pow-primitives 2.0.0",
  "substrate-inherents 2.0.0",
@@ -5624,7 +5624,7 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5639,7 +5639,7 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "paint-authorship 0.1.0",
  "sr-primitives 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5674,7 +5674,7 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-version 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-externalities 2.0.0",
  "substrate-offchain 2.0.0",
  "substrate-panic-handler 2.0.0",
@@ -5722,7 +5722,7 @@ dependencies = [
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-finality-grandpa-primitives 2.0.0",
@@ -5833,7 +5833,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-header-metadata 2.0.0",
@@ -5870,8 +5870,8 @@ dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
- "substrate-client-interfaces 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
  "substrate-offchain-primitives 2.0.0",
@@ -5995,7 +5995,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
@@ -6143,8 +6143,8 @@ dependencies = [
  "substrate-application-crypto 2.0.0",
  "substrate-chain-spec 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
- "substrate-client-interfaces 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
@@ -6256,8 +6256,8 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
- "substrate-client-interfaces 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-keyring 2.0.0",
@@ -6324,7 +6324,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-test-client 2.0.0",
  "substrate-test-runtime 2.0.0",
@@ -6841,7 +6841,7 @@ dependencies = [
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-cli 2.0.0",
  "substrate-client 2.0.0",
- "substrate-client-interfaces 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-service 2.0.0",
diff --git a/Cargo.toml b/Cargo.toml
index c6ea2f0436964..3ef32db3f1f27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
 	"bin/node/testing",
 	"bin/subkey",
 	"client/",
+	"client/api",
 	"client/authority-discovery",
 	"client/block-builder",
 	"client/chain-spec",
@@ -25,7 +26,6 @@ members = [
 	"client/executor/runtime-test",
 	"client/finality-grandpa",
 	"client/header-metadata",
-	"client/interfaces",
 	"client/keyring",
 	"client/keystore",
 	"client/network",
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 3087cb8cb7f3a..79f0fb4bd1df6 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -40,7 +40,7 @@ grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path =
 
 # core dependencies
 runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" }
-interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" }
+client-api = { package = "substrate-client-api", path = "../../../client/api" }
 client = { package = "substrate-client", path = "../../../client/" }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" }
 chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" }
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index e9ce3a5d1b8c5..9b1aac46110ff 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -265,7 +265,7 @@ pub fn new_full(config: NodeConfiguration)
 		TransactionPool>,
 		OffchainWorkers<
 			ConcreteClient,
-			>::OffchainStorage,
+			>::OffchainStorage,
 			ConcreteBlock,
 		>
 	>,
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 312fe62a616e5..39f7a0a2c2657 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-interfaces = { package = "substrate-client-interfaces", path = "interfaces" }
+client-api = { package = "substrate-client-api", path = "api" }
 block-builder = { package = "substrate-block-builder", path = "block-builder" }
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
 consensus = { package = "substrate-consensus-common", path = "../primitives/consensus/common" }
diff --git a/client/interfaces/Cargo.toml b/client/api/Cargo.toml
similarity index 98%
rename from client/interfaces/Cargo.toml
rename to client/api/Cargo.toml
index 43240fc7d18ef..69c6ff7a013c0 100644
--- a/client/interfaces/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "substrate-client-interfaces"
+name = "substrate-client-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/client/interfaces/src/backend.rs b/client/api/src/backend.rs
similarity index 100%
rename from client/interfaces/src/backend.rs
rename to client/api/src/backend.rs
diff --git a/client/interfaces/src/blockchain.rs b/client/api/src/blockchain.rs
similarity index 100%
rename from client/interfaces/src/blockchain.rs
rename to client/api/src/blockchain.rs
diff --git a/client/interfaces/src/call_executor.rs b/client/api/src/call_executor.rs
similarity index 100%
rename from client/interfaces/src/call_executor.rs
rename to client/api/src/call_executor.rs
diff --git a/client/interfaces/src/client.rs b/client/api/src/client.rs
similarity index 100%
rename from client/interfaces/src/client.rs
rename to client/api/src/client.rs
diff --git a/client/interfaces/src/error.rs b/client/api/src/error.rs
similarity index 100%
rename from client/interfaces/src/error.rs
rename to client/api/src/error.rs
diff --git a/client/interfaces/src/lib.rs b/client/api/src/lib.rs
similarity index 100%
rename from client/interfaces/src/lib.rs
rename to client/api/src/lib.rs
diff --git a/client/interfaces/src/light.rs b/client/api/src/light.rs
similarity index 100%
rename from client/interfaces/src/light.rs
rename to client/api/src/light.rs
diff --git a/client/interfaces/src/notifications.rs b/client/api/src/notifications.rs
similarity index 100%
rename from client/interfaces/src/notifications.rs
rename to client/api/src/notifications.rs
diff --git a/client/interfaces/src/offchain.rs b/client/api/src/offchain.rs
similarity index 100%
rename from client/interfaces/src/offchain.rs
rename to client/api/src/offchain.rs
diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml
index 4702744c91e88..f8c96076280ae 100644
--- a/client/authority-discovery/Cargo.toml
+++ b/client/authority-discovery/Cargo.toml
@@ -11,7 +11,7 @@ prost-build = "0.5.0"
 [dependencies]
 authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../primitives/authority-discovery" }
 bytes = "0.4.12"
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 derive_more = "0.15.0"
 futures-preview = "0.3.0-alpha.19"
diff --git a/client/authority-discovery/src/error.rs b/client/authority-discovery/src/error.rs
index 894edec5922bb..e54c9a9f63558 100644
--- a/client/authority-discovery/src/error.rs
+++ b/client/authority-discovery/src/error.rs
@@ -27,7 +27,7 @@ pub enum Error {
 	/// Failed to hash the authority id to be used as a dht key.
 	HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError),
 	/// Failed calling into the Substrate runtime.
-	CallingRuntime(interfaces::error::Error),
+	CallingRuntime(client_api::error::Error),
 	/// Failed signing the dht payload via the Substrate runtime.
 	SigningDhtPayload,
 	/// From the Dht we only get the hashed authority id. In order to retrieve the actual authority id and to ensure it
diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 59f01185e7b27..2de91f6764389 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -57,7 +57,7 @@ use futures::Future;
 use futures_timer::Interval;
 
 use authority_discovery_primitives::{AuthorityDiscoveryApi, AuthorityId, Signature};
-use interfaces::blockchain::HeaderBackend;
+use client_api::blockchain::HeaderBackend;
 use error::{Error, Result};
 use log::{debug, error, log_enabled, warn};
 use network::specialization::NetworkSpecialization;
@@ -105,7 +105,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend,
-	::Api: AuthorityDiscoveryApi,
+	::Api: AuthorityDiscoveryApi,
 	Self: Future,
 {
 	/// Return a new authority discovery.
@@ -303,7 +303,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend,
-	::Api: AuthorityDiscoveryApi,
+	::Api: AuthorityDiscoveryApi,
 {
 	type Output = ();
 
@@ -430,12 +430,12 @@ mod tests {
 		fn header(
 			&self,
 			_id: BlockId,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			Ok(None)
 		}
 
-		fn info(&self) -> interfaces::blockchain::Info {
-			interfaces::blockchain::Info {
+		fn info(&self) -> client_api::blockchain::Info {
+			client_api::blockchain::Info {
 				best_hash: Default::default(),
 				best_number: Zero::zero(),
 				finalized_hash: Default::default(),
@@ -447,21 +447,21 @@ mod tests {
 		fn status(
 			&self,
 			_id: BlockId,
-		) -> std::result::Result {
-			Ok(interfaces::blockchain::BlockStatus::Unknown)
+		) -> std::result::Result {
+			Ok(client_api::blockchain::BlockStatus::Unknown)
 		}
 
 		fn number(
 			&self,
 			_hash: Block::Hash,
-		) -> std::result::Result>, interfaces::error::Error> {
+		) -> std::result::Result>, client_api::error::Error> {
 			Ok(None)
 		}
 
 		fn hash(
 			&self,
 			_number: NumberFor,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			Ok(None)
 		}
 	}
@@ -475,7 +475,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<()>,
 			_: Vec,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -485,7 +485,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<(Block)>,
 			_: Vec,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -495,13 +495,13 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<&::Header>,
 			_: Vec,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 	}
 
 	impl ApiExt for RuntimeApi {
-		type Error = interfaces::error::Error;
+		type Error = client_api::error::Error;
 
 		fn map_api_result std::result::Result, R, E>(
 			&self,
@@ -513,7 +513,7 @@ mod tests {
 		fn runtime_version_at(
 			&self,
 			_: &BlockId,
-		) -> std::result::Result {
+		) -> std::result::Result {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -533,7 +533,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<()>,
 			_: Vec,
-		) -> std::result::Result>, interfaces::error::Error> {
+		) -> std::result::Result>, client_api::error::Error> {
 			return Ok(NativeOrEncoded::Native(vec![
 				AuthorityId("test-authority-id-1".as_bytes().to_vec()),
 				AuthorityId("test-authority-id-2".as_bytes().to_vec()),
@@ -547,7 +547,7 @@ mod tests {
 			_: Vec,
 		) -> std::result::Result<
 			NativeOrEncoded>,
-			interfaces::error::Error,
+			client_api::error::Error,
 		> {
 			return Ok(NativeOrEncoded::Native(Some((
 				Signature("test-signature-1".as_bytes().to_vec()),
@@ -560,7 +560,7 @@ mod tests {
 			_: ExecutionContext,
 			args: Option<(&Vec, &Signature, &AuthorityId)>,
 			_: Vec,
-		) -> std::result::Result, interfaces::error::Error> {
+		) -> std::result::Result, client_api::error::Error> {
 			if *args.unwrap().1 == Signature("test-signature-1".as_bytes().to_vec()) {
 				return Ok(NativeOrEncoded::Native(true));
 			}
diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml
index 50b11ce7d24ab..3104b70043b0c 100644
--- a/client/basic-authorship/Cargo.toml
+++ b/client/basic-authorship/Cargo.toml
@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0" }
 sr-primitives = { path = "../../primitives/sr-primitives" }
 primitives = { package = "substrate-primitives", path = "../../primitives/core" }
 client = { package = "substrate-client", path = "../" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents" }
 substrate-telemetry = { path = "../telemetry" }
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index 139dc1313925b..dbe914c89422e 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -20,7 +20,7 @@
 //
 
 use std::{time, sync::Arc};
-use interfaces::{error, CallExecutor};
+use client_api::{error, CallExecutor};
 use client::Client as SubstrateClient;
 use codec::Decode;
 use consensus_common::{evaluation};
@@ -49,7 +49,7 @@ impl consensus_common::Environment for
 ProposerFactory, A>
 where
 	A: txpool::ChainApi,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: CallExecutor + Send + Sync + Clone + 'static,
 	Block: BlockT,
 	RA: Send + Sync + 'static,
@@ -97,7 +97,7 @@ impl consensus_common::Proposer for
 Proposer, A>
 where
 	A: txpool::ChainApi,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: CallExecutor + Send + Sync + Clone + 'static,
 	Block: BlockT,
 	RA: Send + Sync + 'static,
@@ -122,7 +122,7 @@ where
 
 impl Proposer, A>	where
 	A: txpool::ChainApi,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: CallExecutor + Send + Sync + Clone + 'static,
 	Block: BlockT,
 	RA: Send + Sync + 'static,
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index b318b16fde830..81131e507390d 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -23,7 +23,7 @@ fdlimit = "0.1.1"
 exit-future = "0.1.4"
 serde_json = "1.0.41"
 panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 network = { package = "substrate-network", path = "../network" }
 sr-primitives = { path = "../../primitives/sr-primitives" }
diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 4d9b4c89054b5..0090e5a7ff002 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -31,7 +31,7 @@ pub enum Error {
 	/// Service error
 	Service(service::Error),
 	/// Client error
-	Client(interfaces::error::Error),
+	Client(client_api::error::Error),
 	/// Input error
 	Input(String),
 	/// Invalid listen multiaddress
diff --git a/client/cli/src/informant.rs b/client/cli/src/informant.rs
index c93c3c21d4828..4e9572522c331 100644
--- a/client/cli/src/informant.rs
+++ b/client/cli/src/informant.rs
@@ -16,7 +16,7 @@
 
 //! Console informant. Prints sync progress and block events. Runs on the calling thread.
 
-use interfaces::BlockchainEvents;
+use client_api::BlockchainEvents;
 use futures::{Future, Stream};
 use futures03::{StreamExt as _, TryStreamExt as _};
 use log::{info, warn};
diff --git a/client/cli/src/informant/display.rs b/client/cli/src/informant/display.rs
index 8dca9c1fdc707..76d326047253a 100644
--- a/client/cli/src/informant/display.rs
+++ b/client/cli/src/informant/display.rs
@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see .
 
 use ansi_term::Colour;
-use interfaces::ClientInfo;
+use client_api::ClientInfo;
 use log::info;
 use network::SyncState;
 use sr_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating};
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
index 797f3306fd5d1..1209518cbaf65 100644
--- a/client/cli/src/lib.rs
+++ b/client/cli/src/lib.rs
@@ -26,7 +26,7 @@ mod execution_strategy;
 pub mod error;
 pub mod informant;
 
-use interfaces::ExecutionStrategies;
+use client_api::ExecutionStrategies;
 use service::{
 	config::{Configuration, DatabaseConfig},
 	ServiceBuilderExport, ServiceBuilderImport, ServiceBuilderRevert,
diff --git a/client/cli/src/params.rs b/client/cli/src/params.rs
index daa79502e5a79..f9b36e9a7f771 100644
--- a/client/cli/src/params.rs
+++ b/client/cli/src/params.rs
@@ -32,13 +32,13 @@ macro_rules! impl_get_log_filter {
 	}
 }
 
-impl Into for ExecutionStrategy {
-	fn into(self) -> interfaces::ExecutionStrategy {
+impl Into for ExecutionStrategy {
+	fn into(self) -> client_api::ExecutionStrategy {
 		match self {
-			ExecutionStrategy::Native => interfaces::ExecutionStrategy::NativeWhenPossible,
-			ExecutionStrategy::Wasm => interfaces::ExecutionStrategy::AlwaysWasm,
-			ExecutionStrategy::Both => interfaces::ExecutionStrategy::Both,
-			ExecutionStrategy::NativeElseWasm => interfaces::ExecutionStrategy::NativeElseWasm,
+			ExecutionStrategy::Native => client_api::ExecutionStrategy::NativeWhenPossible,
+			ExecutionStrategy::Wasm => client_api::ExecutionStrategy::AlwaysWasm,
+			ExecutionStrategy::Both => client_api::ExecutionStrategy::Both,
+			ExecutionStrategy::NativeElseWasm => client_api::ExecutionStrategy::NativeElseWasm,
 		}
 	}
 }
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index c0aa464f5bf4a..55a0c11adb5f4 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -10,7 +10,7 @@ app-crypto = { package = "substrate-application-crypto", path = "../../../primit
 aura_primitives = { package = "substrate-consensus-aura-primitives", path = "../../../primitives/consensus/aura" }
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" }
 client = { package = "substrate-client", path = "../../" }
-interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" }
+client-api = { package = "substrate-client-api", path = "../../api" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
 derive_more = "0.15.0"
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 8c5860b4c3963..a6b9c11bc361a 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -38,7 +38,7 @@ use consensus_common::{self, BlockImport, Environment, Proposer,
 use consensus_common::import_queue::{
 	Verifier, BasicQueue, BoxBlockImport, BoxJustificationImport, BoxFinalityProofImport,
 };
-use interfaces::{ error::Result as CResult, backend::AuxStore };
+use client_api::{ error::Result as CResult, backend::AuxStore };
 use client::{
 	blockchain::ProvideCache, BlockOf,
 	well_known_cache_keys::{self, Id as CacheKeyId},
@@ -373,7 +373,7 @@ fn check_header(
 ) -> Result)>, Error> where
 	DigestItemFor: CompatibleDigestItem
,
 	P::Signature: Decode,
-	C: interfaces::backend::AuxStore,
+	C: client_api::backend::AuxStore,
 	P::Public: Encode + Decode + PartialEq + Clone,
 	T: Send + Sync + 'static,
 {
@@ -488,7 +488,7 @@ impl AuraVerifier
 
 #[forbid(deprecated)]
 impl Verifier for AuraVerifier where
-	C: ProvideRuntimeApi + Send + Sync + interfaces::backend::AuxStore + ProvideCache + BlockOf,
+	C: ProvideRuntimeApi + Send + Sync + client_api::backend::AuxStore + ProvideCache + BlockOf,
 	C::Api: BlockBuilderApi + AuraApi> + ApiExt,
 	DigestItemFor: CompatibleDigestItem
,
 	P: Pair + Send + Sync + 'static,
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index bbae2250fde96..9ec0c8cb68141 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -20,7 +20,7 @@ inherents = { package = "substrate-inherents", path = "../../../primitives/inher
 substrate-telemetry = { path = "../../telemetry" }
 keystore = { package = "substrate-keystore", path = "../../keystore" }
 paint-babe = { path = "../../../paint/babe" }
-interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" }
+client-api = { package = "substrate-client-api", path = "../../api" }
 client = { package = "substrate-client", path = "../../" }
 sr-api = { path = "../../../primitives/sr-api" }
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" }
diff --git a/client/consensus/babe/src/aux_schema.rs b/client/consensus/babe/src/aux_schema.rs
index 093ff14f46def..04e9f81e5cffe 100644
--- a/client/consensus/babe/src/aux_schema.rs
+++ b/client/consensus/babe/src/aux_schema.rs
@@ -19,7 +19,7 @@
 use log::info;
 use codec::{Decode, Encode};
 
-use interfaces::{
+use client_api::{
 	backend::AuxStore,
 	error::{Result as ClientResult, Error as ClientError},
 };
diff --git a/client/consensus/babe/src/epoch_changes.rs b/client/consensus/babe/src/epoch_changes.rs
index 81b0512d85535..a5621efcd15a3 100644
--- a/client/consensus/babe/src/epoch_changes.rs
+++ b/client/consensus/babe/src/epoch_changes.rs
@@ -25,7 +25,7 @@ use fork_tree::ForkTree;
 use parking_lot::{Mutex, MutexGuard};
 use sr_primitives::traits::{Block as BlockT, NumberFor, One, Zero};
 use codec::{Encode, Decode};
-use interfaces::{
+use client_api::{
 	error::Error as ClientError,
 	utils::is_descendent_of,
 	blockchain::HeaderBackend
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index b397c09a79e58..dbfd3dbfa4b54 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -86,7 +86,7 @@ use paint_babe::{
 };
 use consensus_common::SelectChain;
 use consensus_common::import_queue::{Verifier, BasicQueue, CacheKeyId};
-use interfaces::{
+use client_api::{
 	backend::{AuxStore, Backend},
 	call_executor::CallExecutor,
 	error::{Result as ClientResult, Error as ClientError},
@@ -156,11 +156,11 @@ enum Error {
 	#[display(fmt = "VRF verification failed: {:?}", _0)]
 	VRFVerificationFailed(SignatureError),
 	#[display(fmt = "Could not fetch parent header: {:?}", _0)]
-	FetchParentHeader(interfaces::error::Error),
+	FetchParentHeader(client_api::error::Error),
 	#[display(fmt = "Expected epoch change to happen at {:?}, s{}", _0, _1)]
 	ExpectedEpochChange(B::Hash, u64),
 	#[display(fmt = "Could not look up epoch: {:?}", _0)]
-	CouldNotLookUpEpoch(Box>),
+	CouldNotLookUpEpoch(Box>),
 	#[display(fmt = "Block {} is not valid under any epoch.", _0)]
 	BlockNotValid(B::Hash),
 	#[display(fmt = "Unexpected epoch change")]
@@ -169,9 +169,9 @@ enum Error {
 	ParentBlockNoAssociatedWeight(B::Hash),
 	#[display(fmt = "Checking inherents failed: {}", _0)]
 	CheckInherents(String),
-	Client(interfaces::error::Error),
+	Client(client_api::error::Error),
 	Runtime(inherents::Error),
-	ForkTree(Box>),
+	ForkTree(Box>),
 }
 
 impl std::convert::From> for String {
@@ -205,7 +205,7 @@ impl Config {
 	/// Either fetch the slot duration from disk or compute it from the genesis
 	/// state.
 	pub fn get_or_compute(client: &C) -> ClientResult where
-		C: AuxStore + ProvideRuntimeApi, C::Api: BabeApi,
+		C: AuxStore + ProvideRuntimeApi, C::Api: BabeApi,
 	{
 		trace!(target: "babe", "Getting slot duration");
 		match slots::SlotDuration::get_or_compute(client, |a, b| a.configuration(b)).map(Self) {
@@ -557,7 +557,7 @@ impl BabeVerifier {
 		block_id: BlockId,
 		inherent_data: InherentData,
 	) -> Result<(), Error>
-		where PRA: ProvideRuntimeApi, PRA::Api: BlockBuilderApi
+		where PRA: ProvideRuntimeApi, PRA::Api: BlockBuilderApi
 	{
 		let inherent_res = self.api.runtime_api().check_inherents(
 			&block_id,
@@ -626,8 +626,8 @@ impl Verifier for BabeVerifier + 'static + Clone + Send + Sync,
 	RA: Send + Sync,
 	PRA: ProvideRuntimeApi + Send + Sync + AuxStore + ProvideCache,
-	PRA::Api: BlockBuilderApi
-		+ BabeApi,
+	PRA::Api: BlockBuilderApi
+		+ BabeApi,
 {
 	fn verify(
 		&mut self,
@@ -906,7 +906,7 @@ impl BlockImport for BabeBlockImport| ConsensusError::ChainLookup(
+				.map_err(|e: fork_tree::Error| ConsensusError::ChainLookup(
 					babe_err(Error::::CouldNotLookUpEpoch(Box::new(e))).into()
 				))?
 				.ok_or_else(|| ConsensusError::ClientImport(
@@ -1145,7 +1145,7 @@ pub fn import_queue, I, RA, PRA>(
 	E: CallExecutor + Clone + Send + Sync + 'static,
 	RA: Send + Sync + 'static,
 	PRA: ProvideRuntimeApi + ProvideCache + Send + Sync + AuxStore + 'static,
-	PRA::Api: BlockBuilderApi + BabeApi + ApiExt,
+	PRA::Api: BlockBuilderApi + BabeApi + ApiExt,
 {
 	register_babe_inherent_data_provider(&inherent_data_providers, babe_link.config.slot_duration)?;
 
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 8a30b9f332ed1..19c5844511288 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -34,7 +34,7 @@ use network::config::BoxFinalityProofRequestBuilder;
 use sr_primitives::{generic::DigestItem, traits::{Block as BlockT, DigestFor}};
 use network::config::ProtocolConfig;
 use tokio::runtime::current_thread;
-use interfaces::BlockchainEvents;
+use client_api::BlockchainEvents;
 use test_client;
 use log::debug;
 use std::{time::Duration, cell::RefCell};
@@ -633,7 +633,7 @@ fn importing_block_one_sets_genesis_epoch() {
 
 #[test]
 fn importing_epoch_change_block_prunes_tree() {
-	use interfaces::Finalizer;
+	use client_api::Finalizer;
 
 	let mut net = BabeTestNet::new(1);
 
diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml
index a4bece7001952..9d510cc6da67a 100644
--- a/client/consensus/pow/Cargo.toml
+++ b/client/consensus/pow/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
 sr-primitives = { path = "../../../primitives/sr-primitives" }
-interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" }
+client-api = { package = "substrate-client-api", path = "../../api" }
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" }
 paint-timestamp = { path = "../../../paint/timestamp" }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" }
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 890f20553bff7..39a37abacd8b1 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -32,7 +32,7 @@
 use std::sync::Arc;
 use std::thread;
 use std::collections::HashMap;
-use interfaces::{
+use client_api::{
 	BlockOf, blockchain::{HeaderBackend, ProvideCache}, backend::AuxStore,
 	well_known_cache_keys::Id as CacheKeyId,
 };
@@ -66,7 +66,7 @@ pub enum Error {
 	#[display(fmt = "Fetching best header failed using select chain: {:?}", _0)]
 	BestHeaderSelectChain(ConsensusError),
 	#[display(fmt = "Fetching best header failed: {:?}", _0)]
-	BestHeader(interfaces::error::Error),
+	BestHeader(client_api::error::Error),
 	#[display(fmt = "Best header does not exist")]
 	NoBestHeader,
 	#[display(fmt = "Block proposing error: {:?}", _0)]
@@ -79,7 +79,7 @@ pub enum Error {
 	CreateInherents(inherents::Error),
 	#[display(fmt = "Checking inherents failed: {}", _0)]
 	CheckInherents(String),
-	Client(interfaces::error::Error),
+	Client(client_api::error::Error),
 	Codec(codec::Error),
 	Environment(String),
 	Runtime(RuntimeString)
@@ -211,7 +211,7 @@ impl, C, S, Algorithm> PowVerifier {
 		inherent_data: InherentData,
 		timestamp_now: u64,
 	) -> Result<(), Error> where
-		C: ProvideRuntimeApi, C::Api: BlockBuilderApi
+		C: ProvideRuntimeApi, C::Api: BlockBuilderApi
 	{
 		const MAX_TIMESTAMP_DRIFT_SECS: u64 = 60;
 
@@ -249,7 +249,7 @@ impl, C, S, Algorithm> PowVerifier {
 
 impl, C, S, Algorithm> Verifier for PowVerifier where
 	C: ProvideRuntimeApi + Send + Sync + HeaderBackend + AuxStore + ProvideCache + BlockOf,
-	C::Api: BlockBuilderApi,
+	C::Api: BlockBuilderApi,
 	S: SelectChain,
 	Algorithm: PowAlgorithm + Send + Sync,
 {
@@ -341,7 +341,7 @@ pub fn import_queue(
 	B: BlockT,
 	C: ProvideRuntimeApi + HeaderBackend + BlockOf + ProvideCache + AuxStore,
 	C: Send + Sync + AuxStore + 'static,
-	C::Api: BlockBuilderApi,
+	C::Api: BlockBuilderApi,
 	Algorithm: PowAlgorithm + Send + Sync + 'static,
 	S: SelectChain + 'static,
 {
diff --git a/client/consensus/slots/Cargo.toml b/client/consensus/slots/Cargo.toml
index 8a5f31869f3a7..5e9af2f29a474 100644
--- a/client/consensus/slots/Cargo.toml
+++ b/client/consensus/slots/Cargo.toml
@@ -8,7 +8,7 @@ build = "build.rs"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" }
+client-api = { package = "substrate-client-api", path = "../../api" }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
 sr-primitives = {  path = "../../../primitives/sr-primitives" }
 substrate-telemetry = { path = "../../telemetry" }
diff --git a/client/consensus/slots/src/aux_schema.rs b/client/consensus/slots/src/aux_schema.rs
index cf7f83adee576..1e777f35a17ed 100644
--- a/client/consensus/slots/src/aux_schema.rs
+++ b/client/consensus/slots/src/aux_schema.rs
@@ -17,8 +17,8 @@
 //! Schema for slots in the aux-db.
 
 use codec::{Encode, Decode};
-use interfaces::backend::AuxStore;
-use interfaces::error::{Result as ClientResult, Error as ClientError};
+use client_api::backend::AuxStore;
+use client_api::error::{Result as ClientResult, Error as ClientError};
 use sr_primitives::traits::Header;
 
 const SLOT_HEADER_MAP_KEY: &[u8] = b"slot_header_map";
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index f2f3a005a3f95..856cf006036cb 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -390,17 +390,17 @@ impl SlotDuration {
 	///
 	/// `slot_key` is marked as `'static`, as it should really be a
 	/// compile-time constant.
-	pub fn get_or_compute(client: &C, cb: CB) -> interfaces::error::Result where
-		C: interfaces::backend::AuxStore,
+	pub fn get_or_compute(client: &C, cb: CB) -> client_api::error::Result where
+		C: client_api::backend::AuxStore,
 		C: ProvideRuntimeApi,
-		CB: FnOnce(ApiRef, &BlockId) -> interfaces::error::Result,
+		CB: FnOnce(ApiRef, &BlockId) -> client_api::error::Result,
 		T: SlotData + Encode + Decode + Debug,
 	{
 		match client.get_aux(T::SLOT_KEY)? {
 			Some(v) => ::decode(&mut &v[..])
 				.map(SlotDuration)
 				.map_err(|_| {
-					interfaces::error::Error::Backend({
+					client_api::error::Error::Backend({
 						error!(target: "slots", "slot duration kept in invalid format");
 						"slot duration kept in invalid format".to_string()
 					})
diff --git a/client/consensus/uncles/Cargo.toml b/client/consensus/uncles/Cargo.toml
index 2360ad79195d1..1212449a55d60 100644
--- a/client/consensus/uncles/Cargo.toml
+++ b/client/consensus/uncles/Cargo.toml
@@ -6,7 +6,7 @@ description = "Generic uncle inclusion utilities for consensus"
 edition = "2018"
 
 [dependencies]
-interfaces = { package = "substrate-client-interfaces", path = "../../interfaces" }
+client-api = { package = "substrate-client-api", path = "../../api" }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
 sr-primitives = {  path = "../../../primitives/sr-primitives" }
 paint-authorship = {  path = "../../../paint/authorship" }
diff --git a/client/consensus/uncles/src/lib.rs b/client/consensus/uncles/src/lib.rs
index aba3e4dda6c8b..63d4f584a31aa 100644
--- a/client/consensus/uncles/src/lib.rs
+++ b/client/consensus/uncles/src/lib.rs
@@ -22,7 +22,7 @@
 use consensus_common::SelectChain;
 use inherents::{InherentDataProviders};
 use log::warn;
-use interfaces::ProvideUncles;
+use client_api::ProvideUncles;
 use sr_primitives::traits::{Block as BlockT, Header};
 use std::sync::Arc;
 
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index afad576ff32eb..1fe2ab3b8db33 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -13,7 +13,7 @@ kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317
 kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 primitives = { package = "substrate-primitives", path = "../../primitives/core" }
 sr-primitives = {  path = "../../primitives/sr-primitives" }
 client = { package = "substrate-client", path = "../" }
diff --git a/client/db/src/cache/list_cache.rs b/client/db/src/cache/list_cache.rs
index bf292d18b6210..a51e6045c02fb 100644
--- a/client/db/src/cache/list_cache.rs
+++ b/client/db/src/cache/list_cache.rs
@@ -43,7 +43,7 @@ use std::collections::{BTreeSet, BTreeMap};
 
 use log::warn;
 
-use interfaces::error::{Error as ClientError, Result as ClientResult};
+use client_api::error::{Error as ClientError, Result as ClientResult};
 use sr_primitives::traits::{
 	Block as BlockT, NumberFor, Zero, Bounded, CheckedSub
 };
diff --git a/client/db/src/cache/list_entry.rs b/client/db/src/cache/list_entry.rs
index 3fb11e0dafdaf..afb2899362f91 100644
--- a/client/db/src/cache/list_entry.rs
+++ b/client/db/src/cache/list_entry.rs
@@ -16,7 +16,7 @@
 
 //! List-cache storage entries.
 
-use interfaces::error::Result as ClientResult;
+use client_api::error::Result as ClientResult;
 use sr_primitives::traits::{Block as BlockT, NumberFor};
 use codec::{Encode, Decode};
 
diff --git a/client/db/src/cache/list_storage.rs b/client/db/src/cache/list_storage.rs
index 4fd9ecaced25e..d689619053d46 100644
--- a/client/db/src/cache/list_storage.rs
+++ b/client/db/src/cache/list_storage.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 
 use kvdb::{KeyValueDB, DBTransaction};
 
-use client::error::{Error as ClientError, Result as ClientResult};
+use client_api::error::{Error as ClientError, Result as ClientResult};
 use codec::{Encode, Decode};
 use sr_primitives::generic::BlockId;
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor};
diff --git a/client/db/src/cache/mod.rs b/client/db/src/cache/mod.rs
index 7e8c96fe1ea1d..b3ff1a4ea6dbc 100644
--- a/client/db/src/cache/mod.rs
+++ b/client/db/src/cache/mod.rs
@@ -21,8 +21,8 @@ use parking_lot::RwLock;
 
 use kvdb::{KeyValueDB, DBTransaction};
 
-use interfaces::blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, Cache as BlockchainCache};
-use interfaces::error::Result as ClientResult;
+use client_api::blockchain::{well_known_cache_keys::{self, Id as CacheKeyId}, Cache as BlockchainCache};
+use client_api::error::Result as ClientResult;
 use codec::{Encode, Decode};
 use sr_primitives::generic::BlockId;
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
@@ -211,7 +211,7 @@ impl<'a, Block: BlockT> DbCacheTransaction<'a, Block> {
 			.cloned()
 			.collect::>();
 
-		let mut insert_op = |name: CacheKeyId, value: Option>| -> Result<(), interfaces::error::Error> {
+		let mut insert_op = |name: CacheKeyId, value: Option>| -> Result<(), client_api::error::Error> {
 			let cache = self.cache.get_cache(name);
 			let op = cache.on_block_insert(
 				&mut self::list_storage::DbStorageTransaction::new(
diff --git a/client/db/src/children.rs b/client/db/src/children.rs
index 66465c4ebf93c..f6dd7299e43f5 100644
--- a/client/db/src/children.rs
+++ b/client/db/src/children.rs
@@ -18,7 +18,7 @@
 
 use kvdb::{KeyValueDB, DBTransaction};
 use codec::{Encode, Decode};
-use interfaces::error;
+use client_api::error;
 use std::hash::Hash;
 
 
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 2cec1898bb94d..90d8aadccc1ae 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -39,11 +39,11 @@ use std::path::PathBuf;
 use std::io;
 use std::collections::{HashMap, HashSet};
 
-use interfaces::backend::NewBlockState;
-use interfaces::blockchain::{well_known_cache_keys, HeaderBackend};
-use interfaces::{ForkBlocks, ExecutionStrategies};
-use interfaces::backend::{StorageCollection, ChildStorageCollection};
-use interfaces::error::{Result as ClientResult, Error as ClientError};
+use client_api::backend::NewBlockState;
+use client_api::blockchain::{well_known_cache_keys, HeaderBackend};
+use client_api::{ForkBlocks, ExecutionStrategies};
+use client_api::backend::{StorageCollection, ChildStorageCollection};
+use client_api::error::{Result as ClientResult, Error as ClientError};
 use codec::{Decode, Encode};
 use hash_db::{Hasher, Prefix};
 use kvdb::{KeyValueDB, DBTransaction};
@@ -471,7 +471,7 @@ impl BlockImportOperation {
 	}
 }
 
-impl interfaces::backend::BlockImportOperation
+impl client_api::backend::BlockImportOperation
 	for BlockImportOperation where Block: BlockT,
 {
 	type State = CachingState, Block>;
@@ -661,7 +661,7 @@ impl> DbChangesTrieStorage {
 	}
 }
 
-impl interfaces::backend::PrunableStateChangesTrieStorage
+impl client_api::backend::PrunableStateChangesTrieStorage
 	for DbChangesTrieStorage
 where
 	Block: BlockT,
@@ -853,7 +853,7 @@ impl> Backend {
 	/// Returns in-memory blockchain that contains the same set of blocks that the self.
 	#[cfg(feature = "test-helpers")]
 	pub fn as_in_memory(&self) -> InMemoryBackend {
-		use interfaces::backend::{Backend as ClientBackend, BlockImportOperation};
+		use client_api::backend::{Backend as ClientBackend, BlockImportOperation};
 		use client::blockchain::Backend as BlockchainBackend;
 
 		let inmem = InMemoryBackend::::new();
@@ -913,7 +913,7 @@ impl> Backend {
 		match cached_changes_trie_config.clone() {
 			Some(cached_changes_trie_config) => Ok(cached_changes_trie_config),
 			None => {
-				use interfaces::backend::Backend;
+				use client_api::backend::Backend;
 				let changes_trie_config = self
 					.state_at(BlockId::Hash(block))?
 					.storage(well_known_keys::CHANGES_TRIE_CONFIG)?
@@ -1318,7 +1318,7 @@ fn apply_state_commit(transaction: &mut DBTransaction, commit: state_db::CommitS
 	}
 }
 
-impl interfaces::backend::AuxStore for Backend where Block: BlockT {
+impl client_api::backend::AuxStore for Backend where Block: BlockT {
 	fn insert_aux<
 		'a,
 		'b: 'a,
@@ -1342,7 +1342,7 @@ impl interfaces::backend::AuxStore for Backend where Block: BlockT
 	}
 }
 
-impl interfaces::backend::Backend for Backend where Block: BlockT {
+impl client_api::backend::Backend for Backend where Block: BlockT {
 	type BlockImportOperation = BlockImportOperation;
 	type Blockchain = BlockchainDb;
 	type State = CachingState, Block>;
@@ -1538,7 +1538,7 @@ impl interfaces::backend::Backend for Backend
 	}
 }
 
-impl interfaces::backend::LocalBackend for Backend
+impl client_api::backend::LocalBackend for Backend
 where Block: BlockT {}
 
 /// TODO: remove me in #3201
@@ -1552,7 +1552,7 @@ mod tests {
 	use hash_db::{HashDB, EMPTY_PREFIX};
 	use super::*;
 	use crate::columns;
-	use interfaces::backend::{Backend as BTrait, BlockImportOperation as Op};
+	use client_api::backend::{Backend as BTrait, BlockImportOperation as Op};
 	use client::blockchain::Backend as BLBTrait;
 	use sr_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper};
 	use sr_primitives::traits::{Hash, BlakeTwo256};
diff --git a/client/db/src/light.rs b/client/db/src/light.rs
index 5079a995dc5a0..bdce0e638428e 100644
--- a/client/db/src/light.rs
+++ b/client/db/src/light.rs
@@ -22,7 +22,7 @@ use parking_lot::RwLock;
 
 use kvdb::{KeyValueDB, DBTransaction};
 
-use interfaces::backend::{AuxStore, NewBlockState};
+use client_api::backend::{AuxStore, NewBlockState};
 use client::blockchain::{
 	BlockStatus, Cache as BlockchainCache,
 	HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo,
diff --git a/client/db/src/offchain.rs b/client/db/src/offchain.rs
index 1c9aa9ca9590b..09578f5f6b1d0 100644
--- a/client/db/src/offchain.rs
+++ b/client/db/src/offchain.rs
@@ -56,7 +56,7 @@ impl LocalStorage {
 	}
 }
 
-impl interfaces::OffchainStorage for LocalStorage {
+impl client_api::OffchainStorage for LocalStorage {
 	fn set(&mut self, prefix: &[u8], key: &[u8], value: &[u8]) {
 		let key: Vec = prefix.iter().chain(key).cloned().collect();
 		let mut tx = self.db.transaction();
@@ -117,7 +117,7 @@ impl interfaces::OffchainStorage for LocalStorage {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use interfaces::OffchainStorage;
+	use client_api::OffchainStorage;
 
 	#[test]
 	fn should_compare_and_set_and_clear_the_locks_map() {
diff --git a/client/db/src/storage_cache.rs b/client/db/src/storage_cache.rs
index e96705c03495a..a157312eb1b59 100644
--- a/client/db/src/storage_cache.rs
+++ b/client/db/src/storage_cache.rs
@@ -25,7 +25,7 @@ use sr_primitives::traits::{Block as BlockT, Header};
 use primitives::hexdisplay::HexDisplay;
 use state_machine::{backend::Backend as StateBackend, TrieBackend};
 use log::trace;
-use interfaces::backend::{StorageCollection, ChildStorageCollection};
+use client_api::backend::{StorageCollection, ChildStorageCollection};
 use std::hash::Hash as StdHash;
 const STATE_CACHE_BLOCKS: usize = 12;
 
diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
index ca22e5efdb6af..d47ab618f8aa0 100644
--- a/client/executor/Cargo.toml
+++ b/client/executor/Cargo.toml
@@ -38,7 +38,7 @@ assert_matches = "1.3.0"
 wabt = "0.9.2"
 hex-literal = "0.2.1"
 runtime-test = { package = "substrate-runtime-test", path = "runtime-test" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 substrate-offchain = { path = "../offchain/" }
 state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine"  }
 test-case = "0.3.3"
diff --git a/client/executor/src/integration_tests/mod.rs b/client/executor/src/integration_tests/mod.rs
index b8d23584b01d6..71df0b8d8cc9e 100644
--- a/client/executor/src/integration_tests/mod.rs
+++ b/client/executor/src/integration_tests/mod.rs
@@ -401,7 +401,7 @@ fn ordered_trie_root_should_work(wasm_method: WasmExecutionMethod) {
 #[test_case(WasmExecutionMethod::Interpreted)]
 #[cfg_attr(feature = "wasmtime", test_case(WasmExecutionMethod::Compiled))]
 fn offchain_local_storage_should_work(wasm_method: WasmExecutionMethod) {
-	use interfaces::OffchainStorage;
+	use client_api::OffchainStorage;
 
 	let mut ext = TestExternalities::default();
 	let (offchain, state) = testing::TestOffchainExt::new();
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 3cd6b5778b615..72b10959776f7 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -20,7 +20,7 @@ primitives = { package = "substrate-primitives",  path = "../../primitives/core"
 substrate-telemetry = { path = "../telemetry" }
 keystore = { package = "substrate-keystore", path = "../keystore" }
 serde_json = "1.0.41"
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 client = { package = "substrate-client", path = "../" }
 header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents" }
diff --git a/client/finality-grandpa/src/aux_schema.rs b/client/finality-grandpa/src/aux_schema.rs
index 43240216df58d..9857367dc99e6 100644
--- a/client/finality-grandpa/src/aux_schema.rs
+++ b/client/finality-grandpa/src/aux_schema.rs
@@ -19,8 +19,8 @@
 use std::fmt::Debug;
 use std::sync::Arc;
 use codec::{Encode, Decode};
-use interfaces::backend::AuxStore;
-use interfaces::error::{Result as ClientResult, Error as ClientError};
+use client_api::backend::AuxStore;
+use client_api::error::{Result as ClientResult, Error as ClientError};
 use fork_tree::ForkTree;
 use grandpa::round::State as RoundState;
 use sr_primitives::traits::{Block as BlockT, NumberFor};
diff --git a/client/finality-grandpa/src/consensus_changes.rs b/client/finality-grandpa/src/consensus_changes.rs
index ba41d62c606a8..e276b287dd18f 100644
--- a/client/finality-grandpa/src/consensus_changes.rs
+++ b/client/finality-grandpa/src/consensus_changes.rs
@@ -47,11 +47,11 @@ impl ConsensusChanges {
 
 	/// Finalize all pending consensus changes that are finalized by given block.
 	/// Returns true if there any changes were finalized.
-	pub(crate) fn finalize ::interfaces::error::Result>>(
+	pub(crate) fn finalize ::client_api::error::Result>>(
 		&mut self,
 		block: (N, H),
 		canonical_at_height: F,
-	) -> ::interfaces::error::Result<(bool, bool)> {
+	) -> ::client_api::error::Result<(bool, bool)> {
 		let (split_idx, has_finalized_changes) = self.pending_changes.iter()
 			.enumerate()
 			.take_while(|(_, &(at_height, _))| at_height <= block.0)
diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
index e21bc6a79a47c..883dc0e35c0d6 100644
--- a/client/finality-grandpa/src/environment.rs
+++ b/client/finality-grandpa/src/environment.rs
@@ -25,7 +25,7 @@ use futures::prelude::*;
 use tokio_timer::Delay;
 use parking_lot::RwLock;
 
-use interfaces::{
+use client_api::{
 	HeaderBackend, BlockchainEvents,
 	backend::{Backend},
 	Finalizer,
diff --git a/client/finality-grandpa/src/finality_proof.rs b/client/finality-grandpa/src/finality_proof.rs
index 2e1c669ff2597..f81c4c9d93ed2 100644
--- a/client/finality-grandpa/src/finality_proof.rs
+++ b/client/finality-grandpa/src/finality_proof.rs
@@ -38,7 +38,7 @@ use std::iter;
 use std::sync::Arc;
 use log::{trace, warn};
 
-use interfaces::{
+use client_api::{
 	backend::Backend, blockchain::Backend as BlockchainBackend, CallExecutor,
 	error::{Error as ClientError, Result as ClientResult},
 	light::{FetchChecker, RemoteReadRequest},
@@ -259,7 +259,7 @@ pub(crate) fn prove_finality, B: BlockchainBackend ::interfaces::error::Result>>
+) -> ::client_api::error::Result>>
 	where
 		J: ProvableJustification,
 {
@@ -578,7 +578,7 @@ impl> ProvableJustification for GrandpaJ
 #[cfg(test)]
 pub(crate) mod tests {
 	use test_client::runtime::{Block, Header, H256};
-	use interfaces::NewBlockState;
+	use client_api::NewBlockState;
 	use test_client::client::in_mem::Blockchain as InMemoryBlockchain;
 	use super::*;
 	use primitives::crypto::Public;
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index 8d6ce27b1a865..d6a3ea6e94bbf 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -21,7 +21,7 @@ use codec::Encode;
 use futures::sync::mpsc;
 use parking_lot::RwLockWriteGuard;
 
-use interfaces::{
+use client_api::{
 	backend::Backend, blockchain,
 	CallExecutor, blockchain::HeaderBackend, well_known_cache_keys,
 	utils::is_descendent_of,
diff --git a/client/finality-grandpa/src/justification.rs b/client/finality-grandpa/src/justification.rs
index 9f88f79ec457f..eff06776bdb92 100644
--- a/client/finality-grandpa/src/justification.rs
+++ b/client/finality-grandpa/src/justification.rs
@@ -17,7 +17,7 @@
 use std::collections::{HashMap, HashSet};
 
 use client::Client;
-use interfaces::{CallExecutor, backend::Backend, error::Error as ClientError};
+use client_api::{CallExecutor, backend::Backend, error::Error as ClientError};
 use codec::{Encode, Decode};
 use grandpa::voter_set::VoterSet;
 use grandpa::{Error as GrandpaError};
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 50770bcc87d86..80d2350982481 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -55,7 +55,7 @@
 use futures::prelude::*;
 use log::{debug, error, info};
 use futures::sync::mpsc;
-use interfaces::{
+use client_api::{
 	BlockchainEvents, CallExecutor, backend::Backend, error::Error as ClientError,
 	ExecutionStrategy, HeaderBackend
 };
@@ -546,7 +546,7 @@ pub struct GrandpaParams, N, RA, SC, VR, X> {
 /// block import worker that has already been instantiated with `block_import`.
 pub fn run_grandpa_voter, N, RA, SC, VR, X>(
 	grandpa_params: GrandpaParams,
-) -> interfaces::error::Result + Send + 'static> where
+) -> client_api::error::Result + Send + 'static> where
 	Block::Hash: Ord,
 	B: Backend + 'static,
 	E: CallExecutor + Send + Sync + 'static,
@@ -879,7 +879,7 @@ where
 #[deprecated(since = "1.1.0", note = "Please switch to run_grandpa_voter.")]
 pub fn run_grandpa, N, RA, SC, VR, X>(
 	grandpa_params: GrandpaParams,
-) -> ::interfaces::error::Result + Send + 'static> where
+) -> ::client_api::error::Result + Send + 'static> where
 	Block::Hash: Ord,
 	B: Backend + 'static,
 	E: CallExecutor + Send + Sync + 'static,
diff --git a/client/finality-grandpa/src/light_import.rs b/client/finality-grandpa/src/light_import.rs
index 573dce6b74ba1..5ab9082c90707 100644
--- a/client/finality-grandpa/src/light_import.rs
+++ b/client/finality-grandpa/src/light_import.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;
 use log::{info, trace, warn};
 use parking_lot::RwLock;
 use client::Client;
-use interfaces::{
+use client_api::{
 	CallExecutor,
 	backend::{AuxStore, Backend, Finalizer},
 	blockchain::HeaderBackend,
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index d3a61b968d4ef..b182eaaaa5e61 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -25,7 +25,7 @@ use grandpa::{
 use log::{debug, info, warn};
 
 use consensus_common::SelectChain;
-use interfaces::{CallExecutor, backend::Backend};
+use client_api::{CallExecutor, backend::Backend};
 use client::Client;
 use sr_primitives::traits::{NumberFor, Block as BlockT};
 use primitives::{H256, Blake2Hasher};
@@ -156,7 +156,7 @@ pub fn run_grandpa_observer, N, RA, SC>(
 	link: LinkHalf,
 	network: N,
 	on_exit: impl Future + Clone + Send + 'static,
-) -> ::interfaces::error::Result + Send + 'static> where
+) -> ::client_api::error::Result + Send + 'static> where
 	B: Backend + 'static,
 	E: CallExecutor + Send + Sync + 'static,
 	N: Network + Send + Sync + 'static,
diff --git a/client/finality-grandpa/src/tests.rs b/client/finality-grandpa/src/tests.rs
index 88931631a4653..6d4d439a9fb34 100644
--- a/client/finality-grandpa/src/tests.rs
+++ b/client/finality-grandpa/src/tests.rs
@@ -26,7 +26,7 @@ use futures03::{StreamExt as _, TryStreamExt as _};
 use tokio::runtime::current_thread;
 use keyring::Ed25519Keyring;
 use client::LongestChain;
-use interfaces::error::Result;
+use client_api::error::Result;
 use sr_api::{Core, RuntimeVersion, ApiExt, StorageProof};
 use test_client::{self, runtime::BlockNumber};
 use consensus_common::{BlockOrigin, ForkChoiceStrategy, ImportedAux, BlockImportParams, ImportResult};
@@ -242,7 +242,7 @@ impl Core for RuntimeApi {
 }
 
 impl ApiExt for RuntimeApi {
-	type Error = interfaces::error::Error;
+	type Error = client_api::error::Error;
 
 	fn map_api_result result::Result, R, E>(
 		&self,
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index 8356a9bf0f9a7..fca67ab195e54 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -29,7 +29,7 @@ use super::{
 };
 
 use log::{debug, warn};
-use interfaces::{BlockImportNotification, ImportNotifications};
+use client_api::{BlockImportNotification, ImportNotifications};
 use futures::prelude::*;
 use futures::stream::Fuse;
 use futures03::{StreamExt as _, TryStreamExt as _};
@@ -474,7 +474,7 @@ mod tests {
 	use tokio_timer::Delay;
 	use test_client::runtime::{Block, Hash, Header};
 	use consensus_common::BlockOrigin;
-	use interfaces::BlockImportNotification;
+	use client_api::BlockImportNotification;
 	use futures::future::Either;
 	use futures03::channel::mpsc;
 	use grandpa::Precommit;
diff --git a/client/finality-grandpa/src/voting_rule.rs b/client/finality-grandpa/src/voting_rule.rs
index 162aa094db747..7907515074466 100644
--- a/client/finality-grandpa/src/voting_rule.rs
+++ b/client/finality-grandpa/src/voting_rule.rs
@@ -22,7 +22,7 @@
 
 use std::sync::Arc;
 
-use interfaces::blockchain::HeaderBackend;
+use client_api::blockchain::HeaderBackend;
 use sr_primitives::generic::BlockId;
 use sr_primitives::traits::{Block as BlockT, Header, NumberFor, One, Zero};
 
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 048ef727866b9..294b55162ed59 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -26,7 +26,7 @@ libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-web
 fork-tree = { path = "../utils/fork-tree" }
 consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
 client = { package = "substrate-client", path = "../" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 sr-primitives = { path = "../../primitives/sr-primitives" }
 sr-arithmetic = { path = "../../primitives/sr-arithmetic" }
diff --git a/client/network/src/chain.rs b/client/network/src/chain.rs
index 7903c7b9451ff..5207a24bf9d30 100644
--- a/client/network/src/chain.rs
+++ b/client/network/src/chain.rs
@@ -17,8 +17,8 @@
 //! Blockchain access trait
 
 use client::Client as SubstrateClient;
-use interfaces::error::Error;
-use interfaces::{ChangesProof, StorageProof, ClientInfo, CallExecutor};
+use client_api::error::Error;
+use client_api::{ChangesProof, StorageProof, ClientInfo, CallExecutor};
 use consensus::{BlockImport, BlockStatus, Error as ConsensusError};
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT};
 use sr_primitives::generic::{BlockId};
@@ -91,7 +91,7 @@ impl FinalityProofProvider for () {
 }
 
 impl Client for SubstrateClient where
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: CallExecutor + Send + Sync + 'static,
 	Self: BlockImport,
 	Block: BlockT,
diff --git a/client/network/src/error.rs b/client/network/src/error.rs
index 5f7a030f1202e..b0abff2671236 100644
--- a/client/network/src/error.rs
+++ b/client/network/src/error.rs
@@ -31,7 +31,7 @@ pub enum Error {
 	/// Io error
 	Io(std::io::Error),
 	/// Client error
-	Client(interfaces::error::Error),
+	Client(client_api::error::Error),
 	/// The same bootnode (based on address) is registered with two different peer ids.
 	#[display(
 		fmt = "The same bootnode (`{}`) is registered with two different peer ids: `{}` and `{}`",
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index d27cabeec6f59..4a5ec4adcfb40 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -22,8 +22,8 @@ use std::sync::Arc;
 use futures::{prelude::*, sync::mpsc, sync::oneshot};
 use futures03::compat::{Compat01As03, Future01CompatExt as _};
 use parking_lot::Mutex;
-use interfaces::error::Error as ClientError;
-use interfaces::{Fetcher, FetchChecker, RemoteHeaderRequest,
+use client_api::error::Error as ClientError;
+use client_api::{Fetcher, FetchChecker, RemoteHeaderRequest,
 	RemoteCallRequest, RemoteReadRequest, RemoteChangesRequest,
 	RemoteReadChildRequest, RemoteBodyRequest};
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor};
diff --git a/client/network/src/protocol.rs b/client/network/src/protocol.rs
index 4e9c5665bd342..cbb14ff62ac2f 100644
--- a/client/network/src/protocol.rs
+++ b/client/network/src/protocol.rs
@@ -50,7 +50,7 @@ use std::fmt::Write;
 use std::{cmp, num::NonZeroUsize, time};
 use log::{trace, debug, warn, error};
 use crate::chain::{Client, FinalityProofProvider};
-use interfaces::{FetchChecker, ChangesProof, StorageProof};
+use client_api::{FetchChecker, ChangesProof, StorageProof};
 use crate::error;
 use util::LruHashSet;
 
diff --git a/client/network/src/protocol/light_dispatch.rs b/client/network/src/protocol/light_dispatch.rs
index 60b8f3a0c38ea..280495c0c41b6 100644
--- a/client/network/src/protocol/light_dispatch.rs
+++ b/client/network/src/protocol/light_dispatch.rs
@@ -25,8 +25,8 @@ use std::time::{Instant, Duration};
 use log::{trace, info};
 use futures::sync::oneshot::{Sender as OneShotSender};
 use linked_hash_map::{Entry, LinkedHashMap};
-use interfaces::error::Error as ClientError;
-use interfaces::{FetchChecker, RemoteHeaderRequest,
+use client_api::error::Error as ClientError;
+use client_api::{FetchChecker, RemoteHeaderRequest,
 	RemoteCallRequest, RemoteReadRequest, RemoteChangesRequest, ChangesProof,
 	RemoteReadChildRequest, RemoteBodyRequest, StorageProof};
 use crate::message::{self, BlockAttributes, Direction, FromBlock, RequestId};
@@ -677,8 +677,8 @@ pub mod tests {
 	use std::time::Instant;
 	use futures::{Future, sync::oneshot};
 	use sr_primitives::traits::{Block as BlockT, NumberFor, Header as HeaderT};
-	use interfaces::{error::{Error as ClientError, Result as ClientResult}};
-	use interfaces::{FetchChecker, RemoteHeaderRequest,
+	use client_api::{error::{Error as ClientError, Result as ClientResult}};
+	use client_api::{FetchChecker, RemoteHeaderRequest,
 		ChangesProof, RemoteCallRequest, RemoteReadRequest,
 		RemoteReadChildRequest, RemoteChangesRequest, RemoteBodyRequest};
 	use crate::config::Roles;
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 3d10f63a98052..847c03f680d7c 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -26,7 +26,7 @@ pub use self::generic::{
 	FinalityProofRequest, FinalityProofResponse,
 	FromBlock, RemoteReadChildRequest,
 };
-use interfaces::StorageProof;
+use client_api::StorageProof;
 
 /// A unique ID of a request.
 pub type RequestId = u64;
diff --git a/client/network/src/protocol/sync.rs b/client/network/src/protocol/sync.rs
index c815e58424439..e6772f452a331 100644
--- a/client/network/src/protocol/sync.rs
+++ b/client/network/src/protocol/sync.rs
@@ -28,7 +28,7 @@
 //!
 
 use blocks::BlockCollection;
-use interfaces::{ClientInfo, error::Error as ClientError};
+use client_api::{ClientInfo, error::Error as ClientError};
 use consensus::{BlockOrigin, BlockStatus,
 	block_validation::{BlockAnnounceValidator, Validation},
 	import_queue::{IncomingBlock, BlockImportResult, BlockImportError}
diff --git a/client/network/src/protocol/sync/extra_requests.rs b/client/network/src/protocol/sync/extra_requests.rs
index 4cfed324198df..5bfeeba2a5c3a 100644
--- a/client/network/src/protocol/sync/extra_requests.rs
+++ b/client/network/src/protocol/sync/extra_requests.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-use interfaces::error::Error as ClientError;
+use client_api::error::Error as ClientError;
 use crate::protocol::sync::{PeerSync, PeerSyncState};
 use fork_tree::ForkTree;
 use libp2p::PeerId;
@@ -283,7 +283,7 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 #[cfg(test)]
 mod tests {
 	use crate::protocol::sync::PeerSync;
-	use interfaces::error::Error as ClientError;
+	use client_api::error::Error as ClientError;
 	use quickcheck::{Arbitrary, Gen, QuickCheck, StdThreadGen};
 	use rand::Rng;
 	use std::collections::{HashMap, HashSet};
diff --git a/client/network/src/test/mod.rs b/client/network/src/test/mod.rs
index 4d37722e1acb1..964f27051a47d 100644
--- a/client/network/src/test/mod.rs
+++ b/client/network/src/test/mod.rs
@@ -27,7 +27,7 @@ use std::sync::Arc;
 use crate::config::build_multiaddr;
 use log::trace;
 use crate::chain::FinalityProofProvider;
-use interfaces::{
+use client_api::{
 	ClientInfo, BlockchainEvents, BlockImportNotification,
 	FinalityNotifications, ImportNotifications,
 	FinalityNotification,
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index 29c5dbb95604a..29621d8502bc1 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 bytes = "0.4.12"
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 sr-api = { path = "../../primitives/sr-api" }
 fnv = "1.0.6"
 futures01 = { package = "futures", version = "0.1" }
diff --git a/client/offchain/src/api.rs b/client/offchain/src/api.rs
index 977115321d6df..25d4fc267ae4d 100644
--- a/client/offchain/src/api.rs
+++ b/client/offchain/src/api.rs
@@ -21,7 +21,7 @@ use std::{
 	thread::sleep,
 };
 
-use interfaces::OffchainStorage;
+use client_api::OffchainStorage;
 use futures::{StreamExt as _, Future, FutureExt as _, future, channel::mpsc};
 use log::{info, debug, warn, error};
 use network::{PeerId, Multiaddr, NetworkStateInfo};
diff --git a/client/offchain/src/lib.rs b/client/offchain/src/lib.rs
index f21b776d3dd8c..e253a6d9234fb 100644
--- a/client/offchain/src/lib.rs
+++ b/client/offchain/src/lib.rs
@@ -44,7 +44,7 @@ use network::NetworkStateInfo;
 use primitives::{offchain, ExecutionContext};
 use sr_primitives::{generic::BlockId, traits::{self, ProvideRuntimeApi}};
 use transaction_pool::txpool::{Pool, ChainApi};
-use interfaces::{OffchainStorage};
+use client_api::{OffchainStorage};
 
 mod api;
 
diff --git a/client/offchain/src/testing.rs b/client/offchain/src/testing.rs
index 2b78572de6df7..b1699a94ca37f 100644
--- a/client/offchain/src/testing.rs
+++ b/client/offchain/src/testing.rs
@@ -20,7 +20,7 @@ use std::{
 	collections::BTreeMap,
 	sync::Arc,
 };
-use interfaces::{OffchainStorage, InMemOffchainStorage};
+use client_api::{OffchainStorage, InMemOffchainStorage};
 use parking_lot::RwLock;
 use primitives::offchain::{
 	self,
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 613c61eea184b..4bd0f84b5f029 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 api = { package = "substrate-rpc-api", path = "./api" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 client = { package = "substrate-client", path = "../" }
 sr-api = { path = "../../primitives/sr-api" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 92b314e05165c..e0d7cc10d7890 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -24,7 +24,7 @@ use futures03::future::{FutureExt, TryFutureExt};
 use log::warn;
 
 use client::Client;
-use interfaces::error::Error as ClientError;
+use client_api::error::Error as ClientError;
 
 use rpc::futures::{
 	Sink, Future,
@@ -82,8 +82,8 @@ impl Author where P: PoolChainApi + Sync + Send + 'sta
 }
 
 impl AuthorApi, BlockHash
> for Author where
-	B: interfaces::backend::Backend<
::Block, Blake2Hasher> + Send + Sync + 'static,
-	E: interfaces::CallExecutor<
::Block, Blake2Hasher> + Send + Sync + 'static,
+	B: client_api::backend::Backend<
::Block, Blake2Hasher> + Send + Sync + 'static,
+	E: client_api::CallExecutor<
::Block, Blake2Hasher> + Send + Sync + 'static,
 	P: PoolChainApi + Sync + Send + 'static,
 	P::Block: traits::Block,
 	P::Error: 'static,
diff --git a/client/rpc/src/chain/chain_full.rs b/client/rpc/src/chain/chain_full.rs
index e83eb38bd348e..945ed19838db2 100644
--- a/client/rpc/src/chain/chain_full.rs
+++ b/client/rpc/src/chain/chain_full.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use rpc::futures::future::result;
 
 use api::Subscriptions;
-use interfaces::{CallExecutor, backend::Backend};
+use client_api::{CallExecutor, backend::Backend};
 use client::Client;
 use primitives::{H256, Blake2Hasher};
 use sr_primitives::{
diff --git a/client/rpc/src/chain/chain_light.rs b/client/rpc/src/chain/chain_light.rs
index 2138bcc20d83d..5c2f1f803a438 100644
--- a/client/rpc/src/chain/chain_light.rs
+++ b/client/rpc/src/chain/chain_light.rs
@@ -68,7 +68,7 @@ impl> LightChain
 
 impl ChainBackend for LightChain where
 	Block: BlockT + 'static,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: client::CallExecutor + Send + Sync + 'static,
 	RA: Send + Sync + 'static,
 	F: Fetcher + Send + Sync + 'static,
diff --git a/client/rpc/src/chain/mod.rs b/client/rpc/src/chain/mod.rs
index 19d6d055e946c..e846f7b59c441 100644
--- a/client/rpc/src/chain/mod.rs
+++ b/client/rpc/src/chain/mod.rs
@@ -51,7 +51,7 @@ pub use api::chain::*;
 trait ChainBackend: Send + Sync + 'static
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: client::CallExecutor + Send + Sync + 'static,
 {
 	/// Get client reference.
@@ -156,7 +156,7 @@ pub fn new_full(
 ) -> Chain
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: client::CallExecutor + Send + Sync + 'static + Clone,
 		RA: Send + Sync + 'static,
 {
@@ -174,7 +174,7 @@ pub fn new_light>(
 ) -> Chain
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: client::CallExecutor + Send + Sync + 'static + Clone,
 		RA: Send + Sync + 'static,
 		F: Send + Sync + 'static,
@@ -196,7 +196,7 @@ pub struct Chain {
 
 impl ChainApi, Block::Hash, Block::Header, SignedBlock> for Chain where
 	Block: BlockT + 'static,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: client::CallExecutor + Send + Sync + 'static,
 	RA: Send + Sync + 'static
 {
@@ -245,7 +245,7 @@ fn subscribe_headers(
 	stream: F,
 ) where
 	Block: BlockT + 'static,
-	B: interfaces::backend::Backend + Send + Sync + 'static,
+	B: client_api::backend::Backend + Send + Sync + 'static,
 	E: client::CallExecutor + Send + Sync + 'static,
 	F: FnOnce() -> S,
 	G: FnOnce() -> Block::Hash,
diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index 9838f0bf92ab6..8e15c488070fd 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -47,7 +47,7 @@ pub use api::state::*;
 pub trait StateBackend: Send + Sync + 'static
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: client::CallExecutor + Send + Sync + 'static,
 		RA: Send + Sync + 'static,
 {
@@ -179,7 +179,7 @@ pub fn new_full(
 ) -> State
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: CallExecutor + Send + Sync + 'static + Clone,
 		RA: Send + Sync + 'static,
 		Client: ProvideRuntimeApi,
@@ -200,7 +200,7 @@ pub fn new_light>(
 ) -> State
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: CallExecutor + Send + Sync + 'static + Clone,
 		RA: Send + Sync + 'static,
 		F: Send + Sync + 'static,
@@ -223,7 +223,7 @@ pub struct State {
 impl StateApi for State
 	where
 		Block: BlockT + 'static,
-		B: interfaces::backend::Backend + Send + Sync + 'static,
+		B: client_api::backend::Backend + Send + Sync + 'static,
 		E: CallExecutor + Send + Sync + 'static + Clone,
 		RA: Send + Sync + 'static,
 {
diff --git a/client/rpc/src/state/state_full.rs b/client/rpc/src/state/state_full.rs
index 62cb3ad444001..7c4382210ce8f 100644
--- a/client/rpc/src/state/state_full.rs
+++ b/client/rpc/src/state/state_full.rs
@@ -28,7 +28,7 @@ use rpc::{
 };
 
 use api::Subscriptions;
-use interfaces::{backend::Backend, error::Result as ClientResult};
+use client_api::{backend::Backend, error::Result as ClientResult};
 use client::{
 	Client, CallExecutor, BlockchainEvents, 
 };
diff --git a/client/rpc/src/state/state_light.rs b/client/rpc/src/state/state_light.rs
index 5b336aaf1a501..2c8e59c5b6aac 100644
--- a/client/rpc/src/state/state_light.rs
+++ b/client/rpc/src/state/state_light.rs
@@ -39,7 +39,7 @@ use rpc::{
 };
 
 use api::Subscriptions;
-use interfaces::backend::Backend;
+use client_api::backend::Backend;
 use client::{
 	BlockchainEvents, Client, CallExecutor, 
 	error::Error as ClientError,
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index 45e0d3ab56bcc..f7ede13471383 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -37,7 +37,7 @@ app-crypto = { package = "substrate-application-crypto", path = "../../primitive
 consensus_common = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
 network = { package = "substrate-network", path = "../network" }
 chain-spec = { package = "substrate-chain-spec", path = "../chain-spec" }
-interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
+client-api = { package = "substrate-client-api", path = "../api" }
 client = { package = "substrate-client", path = "../" }
 sr-api = { path = "../../primitives/sr-api" }
 tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../primitives/transaction-pool/runtime-api" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index a161651b01044..679b11c224ff5 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -18,7 +18,7 @@ use crate::{Service, NetworkStatus, NetworkState, error::{self, Error}, DEFAULT_
 use crate::{SpawnTaskHandle, start_rpc_servers, build_network_future, TransactionPoolAdapter};
 use crate::status_sinks;
 use crate::config::{Configuration, DatabaseConfig};
-use interfaces::{
+use client_api::{
 	self,
 	BlockchainEvents,
 	backend::RemoteBackend, light::RemoteBlockchain,
@@ -680,7 +680,7 @@ impl<
 	TFchr, TSc, TImpQu, TFprb, TFpp, TNetP, TExPool, TRpc, Backend
 > where
 	TBl: BlockT::Out>,
-	TBackend: 'static + interfaces::backend::Backend + Send,
+	TBackend: 'static + client_api::backend::Backend + Send,
 	TExec: 'static + client::CallExecutor + Send + Sync + Clone,
 	TImpQu: 'static + ImportQueue,
 	TRtApi: 'static + Send + Sync,
@@ -702,7 +702,7 @@ impl
 where
 	TBl: BlockT::Out>,
-	TBackend: 'static + interfaces::backend::Backend + Send,
+	TBackend: 'static + client_api::backend::Backend + Send,
 	TExec: 'static + client::CallExecutor + Send + Sync + Clone
 {
 	type Block = TBl;
@@ -725,7 +725,7 @@ impl
 where
 	TBl: BlockT::Out>,
-	TBackend: 'static + interfaces::backend::Backend + Send,
+	TBackend: 'static + client_api::backend::Backend + Send,
 	TExec: 'static + client::CallExecutor + Send + Sync + Clone
 {
 	type Block = TBl;
@@ -769,7 +769,7 @@ ServiceBuilder<
 	TCfg: Default,
 	TGen: RuntimeGenesis,
 	TCSExt: Extension,
-	TBackend: 'static + interfaces::backend::Backend + Send,
+	TBackend: 'static + client_api::backend::Backend + Send,
 	TExec: 'static + client::CallExecutor + Send + Sync + Clone,
 	TSc: Clone,
 	TImpQu: 'static + ImportQueue,
@@ -1164,7 +1164,7 @@ pub(crate) fn maintain_transaction_pool(
 	retracted: &[Block::Hash],
 ) -> error::Result + Send>> where
 	Block: BlockT::Out>,
-	Backend: 'static + interfaces::backend::Backend,
+	Backend: 'static + client_api::backend::Backend,
 	Client: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
 		tx_pool_api::TaggedTransactionQueue,
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index b61e142d725eb..2bc56647a6092 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -136,7 +136,7 @@ pub trait AbstractService: 'static + Future +
 	/// Type of block of this chain.
 	type Block: BlockT;
 	/// Backend storage for the client.
-	type Backend: 'static + interfaces::backend::Backend;
+	type Backend: 'static + client_api::backend::Backend;
 	/// How to execute calls towards the runtime.
 	type CallExecutor: 'static + client::CallExecutor + Send + Sync + Clone;
 	/// API that the runtime provides.
@@ -203,7 +203,7 @@ impl AbstractServi
 		NetworkService, TransactionPool, TOc>
 where
 	TBl: BlockT,
-	TBackend: 'static + interfaces::backend::Backend,
+	TBackend: 'static + client_api::backend::Backend,
 	TExec: 'static + client::CallExecutor + Send + Sync + Clone,
 	TRtApi: 'static + Send + Sync,
 	TSc: consensus_common::SelectChain + 'static + Clone + Send,
diff --git a/client/src/call_executor.rs b/client/src/call_executor.rs
index e491b7caaf275..c481718f3bcdb 100644
--- a/client/src/call_executor.rs
+++ b/client/src/call_executor.rs
@@ -31,7 +31,7 @@ use primitives::{
 };
 
 use sr_api::{ProofRecorder, InitializeBlock};
-use interfaces::{
+use client_api::{
 	error, backend, call_executor::CallExecutor,
 };
 
diff --git a/client/src/cht.rs b/client/src/cht.rs
index 2dc72f189c3af..874ea02c2a1a3 100644
--- a/client/src/cht.rs
+++ b/client/src/cht.rs
@@ -33,7 +33,7 @@ use state_machine::backend::InMemory as InMemoryState;
 use state_machine::{MemoryDB, TrieBackend, Backend as StateBackend, StorageProof,
 	prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend};
 
-use interfaces::error::{Error as ClientError, Result as ClientResult};
+use client_api::error::{Error as ClientError, Result as ClientResult};
 
 /// The size of each CHT. This value is passed to every CHT-related function from
 /// production code. Other values are passed from tests.
diff --git a/client/src/client.rs b/client/src/client.rs
index 6a231b172eea0..911843a712d93 100644
--- a/client/src/client.rs
+++ b/client/src/client.rs
@@ -56,7 +56,7 @@ use header_metadata::{HeaderMetadata, CachedHeaderMetadata};
 use sr_api::{CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock};
 use block_builder::BlockBuilderApi;
 
-pub use interfaces::{
+pub use client_api::{
 	backend::{
 		self, BlockImportOperation, PrunableStateChangesTrieStorage,
 		ClientImportOperation, Finalizer, ImportSummary, NewBlockState,
diff --git a/client/src/in_mem.rs b/client/src/in_mem.rs
index 8f9d86dc2ae64..4c74943189020 100644
--- a/client/src/in_mem.rs
+++ b/client/src/in_mem.rs
@@ -29,7 +29,7 @@ use hash_db::{Hasher, Prefix};
 use trie::MemoryDB;
 use header_metadata::{CachedHeaderMetadata, HeaderMetadata};
 
-use interfaces::{
+use client_api::{
 	error,
 	backend::{self, NewBlockState, StorageCollection, ChildStorageCollection},
 	blockchain::{
@@ -158,7 +158,7 @@ impl Blockchain {
 		justification: Option,
 		body: Option::Extrinsic>>,
 		new_state: NewBlockState,
-	) -> interfaces::error::Result<()> {
+	) -> client_api::error::Result<()> {
 		let number = header.number().clone();
 		if new_state.is_best() {
 			self.apply_head(&header)?;
@@ -399,7 +399,7 @@ impl backend::AuxStore for Blockchain {
 	}
 }
 
-impl interfaces::light::Storage for Blockchain
+impl client_api::light::Storage for Blockchain
 	where
 		Block::Hash: From<[u8; 32]>,
 {
@@ -811,7 +811,7 @@ pub fn check_genesis_storage(top: &StorageOverlay, children: &ChildrenStorageOve
 
 #[cfg(test)]
 mod tests {
-	use interfaces::offchain::{OffchainStorage, InMemOffchainStorage};
+	use client_api::offchain::{OffchainStorage, InMemOffchainStorage};
 	use std::sync::Arc;
 	use test_client;
 	use primitives::Blake2Hasher;
diff --git a/client/src/leaves.rs b/client/src/leaves.rs
index a3e619b51f6a6..bc42e83a66f57 100644
--- a/client/src/leaves.rs
+++ b/client/src/leaves.rs
@@ -21,7 +21,7 @@ use std::cmp::Reverse;
 use kvdb::{KeyValueDB, DBTransaction};
 use sr_primitives::traits::SimpleArithmetic;
 use codec::{Encode, Decode};
-use interfaces::error;
+use client_api::error;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct LeafSetItem {
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 945fa8bf5a35b..21a1c415d54a5 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -84,7 +84,7 @@ pub mod leaves;
 mod call_executor;
 mod client;
 
-pub use interfaces::{
+pub use client_api::{
 	error,
 	blockchain,
 	blockchain::well_known_cache_keys,
diff --git a/client/src/light/backend.rs b/client/src/light/backend.rs
index 9b47cf1d265d5..ec4543191896e 100644
--- a/client/src/light/backend.rs
+++ b/client/src/light/backend.rs
@@ -25,7 +25,7 @@ use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenSto
 use state_machine::{Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState, ChangesTrieTransaction};
 use sr_primitives::traits::{Block as BlockT, NumberFor, Zero, Header};
 use crate::in_mem::{self, check_genesis_storage};
-use interfaces::{
+use client_api::{
 	backend::{
 		AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState,
 		StorageCollection, ChildStorageCollection,
@@ -450,7 +450,7 @@ impl StateBackend for GenesisOrUnavailableState
 mod tests {
 	use primitives::Blake2Hasher;
 	use test_client::{self, runtime::Block};
-	use interfaces::backend::NewBlockState;
+	use client_api::backend::NewBlockState;
 	use crate::light::blockchain::tests::{DummyBlockchain, DummyStorage};
 	use super::*;
 
diff --git a/client/src/light/blockchain.rs b/client/src/light/blockchain.rs
index 77796f59bf4d2..aa1866ae4d789 100644
--- a/client/src/light/blockchain.rs
+++ b/client/src/light/blockchain.rs
@@ -24,7 +24,7 @@ use sr_primitives::{Justification, generic::BlockId};
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero};
 
 use header_metadata::{HeaderMetadata, CachedHeaderMetadata};
-pub use interfaces::{
+pub use client_api::{
 	backend::{
 		AuxStore, NewBlockState
 	},
@@ -196,7 +196,7 @@ pub mod tests {
 	use std::collections::HashMap;
 	use parking_lot::Mutex;
 	use test_client::runtime::{Hash, Block, Header};
-	use interfaces::blockchain::Info;
+	use client_api::blockchain::Info;
 	use super::*;
 
 	pub type DummyBlockchain = Blockchain;
diff --git a/client/src/light/call_executor.rs b/client/src/light/call_executor.rs
index bd8cb36831090..cfb0ae0e40518 100644
--- a/client/src/light/call_executor.rs
+++ b/client/src/light/call_executor.rs
@@ -35,7 +35,7 @@ use hash_db::Hasher;
 
 use sr_api::{ProofRecorder, InitializeBlock};
 
-use interfaces::{
+use client_api::{
 	backend::RemoteBackend,
 	error::{Error as ClientError, Result as ClientResult},
 	light::RemoteCallRequest,
@@ -297,7 +297,7 @@ mod tests {
 	use test_client::{self, runtime::{Header, Digest, Block}, ClientExt, TestClient};
 	use executor::{NativeExecutor, WasmExecutionMethod};
 	use primitives::Blake2Hasher;
-	use interfaces::backend::{Backend, NewBlockState};
+	use client_api::backend::{Backend, NewBlockState};
 	use crate::in_mem::Backend as InMemBackend;
 
 	struct DummyCallExecutor;
@@ -452,7 +452,7 @@ mod tests {
 				),
 			);
 			match execution_result {
-				Err(interfaces::error::Error::Execution(_)) => (),
+				Err(client_api::error::Error::Execution(_)) => (),
 				_ => panic!("Unexpected execution result: {:?}", execution_result),
 			}
 		}
diff --git a/client/src/light/fetcher.rs b/client/src/light/fetcher.rs
index 7bcf00d2c3388..e8b88e93b9bab 100644
--- a/client/src/light/fetcher.rs
+++ b/client/src/light/fetcher.rs
@@ -35,7 +35,7 @@ use state_machine::{
 pub use state_machine::StorageProof;
 
 use crate::cht;
-pub use interfaces::{
+pub use client_api::{
 	error::{
 		Error as ClientError, Result as ClientResult
 	},
@@ -329,7 +329,7 @@ pub mod tests {
 	use codec::Decode;
 	use crate::client::tests::prepare_client_with_key_changes;
 	use executor::{NativeExecutor, WasmExecutionMethod};
-	use interfaces::{
+	use client_api::{
 		backend::NewBlockState,
 		error::Error as ClientError,
 	};
diff --git a/client/src/light/mod.rs b/client/src/light/mod.rs
index 2c35924ca17f6..7db1bff58900f 100644
--- a/client/src/light/mod.rs
+++ b/client/src/light/mod.rs
@@ -30,7 +30,7 @@ use sr_primitives::traits::Block as BlockT;
 
 use crate::call_executor::LocalCallExecutor;
 use crate::client::Client;
-use interfaces::{
+use client_api::{
 	error::Result as ClientResult,
 	light::Storage as BlockchainStorage,
 };
diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml
index b4817406c4594..6611822fc13b7 100644
--- a/test/utils/client/Cargo.toml
+++ b/test/utils/client/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" }
+client-api = { package = "substrate-client-api", path = "../../../client/api" }
 client = { package = "substrate-client", path = "../../../client/" }
 client-db = { package = "substrate-client-db", path = "../../../client//db", features = ["test-helpers"] }
 consensus = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
diff --git a/test/utils/client/src/client_ext.rs b/test/utils/client/src/client_ext.rs
index 1d9bbf3e00b5a..93f626eb9d1f1 100644
--- a/test/utils/client/src/client_ext.rs
+++ b/test/utils/client/src/client_ext.rs
@@ -17,7 +17,7 @@
 //! Client extension for tests.
 
 use client::{self, Client};
-use interfaces::backend::Finalizer;
+use client_api::backend::Finalizer;
 use consensus::{
 	BlockImportParams, BlockImport, BlockOrigin, Error as ConsensusError,
 	ForkChoiceStrategy,
@@ -60,7 +60,7 @@ pub trait ClientExt: Sized {
 
 impl ClientExt for Client
 	where
-		B: interfaces::backend::Backend,
+		B: client_api::backend::Backend,
 		E: client::CallExecutor,
 		for<'r> &'r Self: BlockImport,
 		Block: BlockT::Out>,
diff --git a/test/utils/client/src/lib.rs b/test/utils/client/src/lib.rs
index a1e9e5777fdec..7143b67599199 100644
--- a/test/utils/client/src/lib.rs
+++ b/test/utils/client/src/lib.rs
@@ -171,7 +171,7 @@ impl TestClientBuilder
 		client::LongestChain,
 	) where
 		Executor: client::CallExecutor,
-		Backend: interfaces::backend::Backend,
+		Backend: client_api::backend::Backend,
 		Block: BlockT::Out>,
 	{
 
@@ -223,7 +223,7 @@ impl TestClientBuilder<
 	) where
 		I: Into>>,
 		E: executor::NativeExecutionDispatch,
-		Backend: interfaces::backend::Backend,
+		Backend: client_api::backend::Backend,
 		Block: BlockT::Out>,
 	{
 		let executor = executor.into().unwrap_or_else(||
diff --git a/test/utils/runtime/client/Cargo.toml b/test/utils/runtime/client/Cargo.toml
index d4c039f891eae..68f5820062100 100644
--- a/test/utils/runtime/client/Cargo.toml
+++ b/test/utils/runtime/client/Cargo.toml
@@ -11,5 +11,5 @@ primitives = { package = "substrate-primitives", path = "../../../../primitives/
 runtime = { package = "substrate-test-runtime", path = "../../runtime" }
 sr-primitives = { path = "../../../../primitives/sr-primitives" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-interfaces = { package = "substrate-client-interfaces", path = "../../../../client/interfaces" }
+client-api = { package = "substrate-client-api", path = "../../../../client/api" }
 client = { package = "substrate-client", path = "../../../../client/" }
diff --git a/test/utils/runtime/client/src/lib.rs b/test/utils/runtime/client/src/lib.rs
index 508eaa6865666..b5f3833e52f07 100644
--- a/test/utils/runtime/client/src/lib.rs
+++ b/test/utils/runtime/client/src/lib.rs
@@ -205,7 +205,7 @@ impl TestClientBuilderExt for TestClientBuilder<
 	client::LocalCallExecutor>,
 	B
 > where
-	B: interfaces::backend::Backend,
+	B: client_api::backend::Backend,
 {
 	fn set_heap_pages(mut self, heap_pages: u64) -> Self {
 		self.genesis_init_mut().heap_pages_override = Some(heap_pages);
diff --git a/test/utils/runtime/client/src/trait_tests.rs b/test/utils/runtime/client/src/trait_tests.rs
index eb5ba77604f6a..bfdab4d942ed2 100644
--- a/test/utils/runtime/client/src/trait_tests.rs
+++ b/test/utils/runtime/client/src/trait_tests.rs
@@ -21,9 +21,9 @@
 
 use std::sync::Arc;
 
-use interfaces::backend::LocalBackend;
+use client_api::backend::LocalBackend;
 use crate::block_builder_ext::BlockBuilderExt;
-use interfaces::blockchain::{Backend as BlockChainBackendT, HeaderBackend};
+use client_api::blockchain::{Backend as BlockChainBackendT, HeaderBackend};
 use crate::{AccountKeyring, ClientExt, TestClientBuilder, TestClientBuilderExt};
 use generic_test_client::consensus::BlockOrigin;
 use primitives::Blake2Hasher;
diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml
index fb09761b4761a..fdd948a6f2d29 100644
--- a/test/utils/transaction-factory/Cargo.toml
+++ b/test/utils/transaction-factory/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 block-builder-api = { package = "substrate-block-builder-runtime-api", path = "../../../primitives/block-builder/runtime-api" }
 cli = { package = "substrate-cli", path = "../../../client/cli" }
-interfaces = { package = "substrate-client-interfaces", path = "../../../client/interfaces" }
+client-api = { package = "substrate-client-api", path = "../../../client/api" }
 client = { package = "substrate-client", path = "../../../client" }
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
 consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
diff --git a/test/utils/transaction-factory/src/complex_mode.rs b/test/utils/transaction-factory/src/complex_mode.rs
index 86bd3b75c2a29..086698ffc3ac9 100644
--- a/test/utils/transaction-factory/src/complex_mode.rs
+++ b/test/utils/transaction-factory/src/complex_mode.rs
@@ -61,7 +61,7 @@ pub fn next(
 where
 	Block: BlockT::Out>,
 	Exec: client::CallExecutor + Send + Sync + Clone,
-	Backend: interfaces::backend::Backend + Send,
+	Backend: client_api::backend::Backend + Send,
 	Client: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
 		BlockBuilder,
diff --git a/test/utils/transaction-factory/src/lib.rs b/test/utils/transaction-factory/src/lib.rs
index 05d0ed5aee4fd..357e8067f37b9 100644
--- a/test/utils/transaction-factory/src/lib.rs
+++ b/test/utils/transaction-factory/src/lib.rs
@@ -102,7 +102,7 @@ pub fn factory(
 where
 	Block: BlockT::Out>,
 	Exec: client::CallExecutor + Send + Sync + Clone,
-	Backend: interfaces::backend::Backend + Send,
+	Backend: client_api::backend::Backend + Send,
 	Client: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
 		BlockBuilder,
@@ -161,7 +161,7 @@ pub fn create_block(
 where
 	Block: BlockT::Out>,
 	Exec: client::CallExecutor + Send + Sync + Clone,
-	Backend: interfaces::backend::Backend + Send,
+	Backend: client_api::backend::Backend + Send,
 	Client: ProvideRuntimeApi,
 	RtApi: ConstructRuntimeApi> + Send + Sync,
 	 as ProvideRuntimeApi>::Api:
@@ -187,7 +187,7 @@ fn import_block(
 ) -> () where
 	Block: BlockT::Out>,
 	Exec: client::CallExecutor + Send + Sync + Clone,
-	Backend: interfaces::backend::Backend + Send,
+	Backend: client_api::backend::Backend + Send,
 {
 	let import = BlockImportParams {
 		origin: BlockOrigin::File,
diff --git a/test/utils/transaction-factory/src/simple_modes.rs b/test/utils/transaction-factory/src/simple_modes.rs
index 0a372e85013f3..f869201b46cd6 100644
--- a/test/utils/transaction-factory/src/simple_modes.rs
+++ b/test/utils/transaction-factory/src/simple_modes.rs
@@ -56,7 +56,7 @@ pub fn next(
 where
 	Block: BlockT::Out>,
 	Exec: client::CallExecutor + Send + Sync + Clone,
-	Backend: interfaces::backend::Backend + Send,
+	Backend: client_api::backend::Backend + Send,
 	Client: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
 		BlockBuilder,

From 1feec16a24856d7a76b5a7dc220857e16c06d5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= 
Date: Wed, 13 Nov 2019 14:59:51 +0100
Subject: [PATCH 47/61] Move keyring to primitives.

---
 Cargo.lock                                    | 2 --
 Cargo.toml                                    | 4 ++--
 bin/node/cli/Cargo.toml                       | 4 ++--
 bin/node/runtime/Cargo.toml                   | 2 +-
 bin/node/testing/Cargo.toml                   | 2 +-
 client/Cargo.toml                             | 2 +-
 client/cli/Cargo.toml                         | 2 +-
 client/consensus/aura/Cargo.toml              | 3 +--
 client/consensus/babe/Cargo.toml              | 3 +--
 client/db/Cargo.toml                          | 2 +-
 client/finality-grandpa/Cargo.toml            | 2 +-
 client/interfaces/Cargo.toml                  | 2 +-
 client/network/Cargo.toml                     | 4 ++--
 client/transaction-pool/Cargo.toml            | 2 +-
 paint/balances/Cargo.toml                     | 2 +-
 paint/indices/Cargo.toml                      | 2 +-
 paint/staking/Cargo.toml                      | 2 +-
 {client => primitives}/keyring/Cargo.toml     | 4 ++--
 {client => primitives}/keyring/src/ed25519.rs | 0
 {client => primitives}/keyring/src/lib.rs     | 0
 {client => primitives}/keyring/src/sr25519.rs | 0
 test/utils/client/Cargo.toml                  | 2 +-
 test/utils/runtime/Cargo.toml                 | 2 +-
 23 files changed, 23 insertions(+), 27 deletions(-)
 rename {client => primitives}/keyring/Cargo.toml (58%)
 rename {client => primitives}/keyring/src/ed25519.rs (100%)
 rename {client => primitives}/keyring/src/lib.rs (100%)
 rename {client => primitives}/keyring/src/sr25519.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 5c7abf1ec45b7..fa105129bb82a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5482,7 +5482,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
  "srml-aura 2.0.0",
- "srml-support 2.0.0",
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
@@ -5539,7 +5538,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
  "srml-babe 2.0.0",
- "srml-support 2.0.0",
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
diff --git a/Cargo.toml b/Cargo.toml
index c6ea2f0436964..a0519866e0be1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,6 @@ members = [
 	"client/finality-grandpa",
 	"client/header-metadata",
 	"client/interfaces",
-	"client/keyring",
 	"client/keystore",
 	"client/network",
 	"client/rpc",
@@ -91,6 +90,7 @@ members = [
 	"primitives/externalities",
 	"primitives/finality-grandpa",
 	"primitives/inherents",
+	"primitives/keyring",
 	"primitives/panic-handler",
 	"primitives/rpc",
 	"primitives/runtime-interface",
@@ -110,9 +110,9 @@ members = [
 	"primitives/transaction-pool/runtime-api",
 	"primitives/trie",
 	"primitives/wasm-interface",
-	"test/utils/primitives",
 	"test/utils/chain-spec-builder",
 	"test/utils/client",
+	"test/utils/primitives",
 	"test/utils/runtime",
 	"test/utils/runtime/client",
 ]
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 91fbb9b241255..d63034b763744 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -48,8 +48,8 @@ transaction_pool = { package = "substrate-transaction-pool", path = "../../../cl
 network = { package = "substrate-network", path = "../../../client/network" }
 babe = { package = "substrate-consensus-babe", path = "../../../client/consensus/babe" }
 grandpa = { package = "substrate-finality-grandpa", path = "../../../client/finality-grandpa" }
-keyring = { package = "substrate-keyring", path = "../../../client/keyring" }
-client_db = { package = "substrate-client-db", path = "../../../client//db", default-features = false }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
+client_db = { package = "substrate-client-db", path = "../../../client/db", default-features = false }
 offchain = { package = "substrate-offchain", path = "../../../client/offchain" }
 substrate-rpc = { package = "substrate-rpc", path = "../../../client/rpc" }
 substrate-basic-authorship = { path = "../../../client/basic-authorship" }
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index c6e0d7a5c1b96..8767074230635 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -24,7 +24,7 @@ rstd = { package = "sr-std", path = "../../../primitives/sr-std", default-featur
 sr-api = { path = "../../../primitives/sr-api", default-features = false }
 sr-primitives = { path = "../../../primitives/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../../primitives/sr-staking-primitives", default-features = false }
-substrate-keyring = { path = "../../../client/keyring", optional = true }
+substrate-keyring = { path = "../../../primitives/keyring", optional = true }
 substrate-session = { path = "../../../primitives/session", default-features = false }
 tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
 version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
diff --git a/bin/node/testing/Cargo.toml b/bin/node/testing/Cargo.toml
index cdb35b6251920..e2c13edde1a7b 100644
--- a/bin/node/testing/Cargo.toml
+++ b/bin/node/testing/Cargo.toml
@@ -11,7 +11,7 @@ client = { package = "substrate-client", path = "../../../client/" }
 contracts = { package = "srml-contracts", path = "../../../paint/contracts" }
 grandpa = { package = "srml-grandpa", path = "../../../paint/grandpa" }
 indices = { package = "srml-indices", path = "../../../paint/indices" }
-keyring = { package = "substrate-keyring", path = "../../../client/keyring" }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
 node-executor = { path = "../executor" }
 node-primitives = { path = "../primitives" }
 node-runtime = { path = "../runtime" }
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 312fe62a616e5..4e58572cb6153 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -19,7 +19,7 @@ hash-db = { version = "0.15.2" }
 header-metadata = { package = "substrate-header-metadata", path = "header-metadata" }
 hex-literal = { version = "0.2.1" }
 inherents = { package = "substrate-inherents", path = "../primitives/inherents" }
-keyring = { package = "substrate-keyring", path = "keyring" }
+keyring = { package = "substrate-keyring", path = "../primitives/keyring" }
 log = { version = "0.4.8" }
 parking_lot = { version = "0.9.0" }
 primitives = { package = "substrate-primitives", path = "../primitives/core" }
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index b318b16fde830..35782fa6e0bfc 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -31,7 +31,7 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core"
 service = { package = "substrate-service", path = "../service", default-features = false }
 state-machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" }
 substrate-telemetry = { path = "../telemetry" }
-keyring = { package = "substrate-keyring", path = "../keyring" }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
 names = "0.11.0"
 structopt = "0.3.3"
 rpassword = "4.0.1"
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
index f749256843047..0c9e8e7ce5a24 100644
--- a/client/consensus/aura/Cargo.toml
+++ b/client/consensus/aura/Cargo.toml
@@ -23,7 +23,6 @@ log = "0.4.8"
 parking_lot = "0.9.0"
 primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
 runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" }
-runtime_support = { package = "srml-support", path = "../../../paint/support" }
 runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" }
 slots = { package = "substrate-consensus-slots", path = "../slots" }
 sr-api = { path = "../../../primitives/sr-api" }
@@ -32,7 +31,7 @@ srml-aura = { path = "../../../paint/aura" }
 substrate-telemetry = { path = "../../telemetry" }
 
 [dev-dependencies]
-keyring = { package = "substrate-keyring", path = "../../keyring" }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
 substrate-executor = { path = "../../executor" }
 network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]}
 service = { package = "substrate-service", path = "../../service" }
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 91c4e92c57754..6c6466e58ad61 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -13,7 +13,6 @@ app-crypto = { package = "substrate-application-crypto", path = "../../../primit
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
-runtime-support = { package = "srml-support", path = "../../../paint/support" }
 runtime-version = { package = "sr-version", path = "../../../primitives/sr-version" }
 runtime-io = { package = "sr-io", path = "../../../primitives/sr-io" }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents" }
@@ -42,7 +41,7 @@ pdqselect = "0.1.0"
 derive_more = "0.15.0"
 
 [dev-dependencies]
-keyring = { package = "substrate-keyring", path = "../../keyring" }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
 substrate-executor = { path = "../../executor" }
 network = { package = "substrate-network", path = "../../network", features = ["test-helpers"]}
 service = { package = "substrate-service", path = "../../service" }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index f939dab3d1f51..c35b16cb21d8f 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -26,7 +26,7 @@ consensus_common = { package = "substrate-consensus-common", path = "../../primi
 header_metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 
 [dev-dependencies]
-substrate-keyring = { path = "../keyring" }
+substrate-keyring = { path = "../../primitives/keyring" }
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
 env_logger = "0.7.0"
 quickcheck = "0.8"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index bcca611732ca7..a8ecdd9c5abea 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -32,7 +32,7 @@ grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive
 [dev-dependencies]
 grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec", "test-helpers"] }
 network = { package = "substrate-network", path = "../network", features = ["test-helpers"] }
-keyring = { package = "substrate-keyring", path = "../keyring" }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client"}
 babe_primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe" }
 state_machine = { package = "substrate-state-machine", path = "../../primitives/state-machine" }
diff --git a/client/interfaces/Cargo.toml b/client/interfaces/Cargo.toml
index 43240fc7d18ef..410645de738ed 100644
--- a/client/interfaces/Cargo.toml
+++ b/client/interfaces/Cargo.toml
@@ -17,7 +17,7 @@ hash-db = { version = "0.15.2", default-features = false }
 header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 hex-literal = { version = "0.2.1" }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-keyring = { package = "substrate-keyring", path = "../keyring" }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
 kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 log = { version = "0.4.8" }
 parking_lot = { version = "0.9.0" }
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 048ef727866b9..5b14c8ab64c08 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -42,7 +42,7 @@ smallvec = "0.6.10"
 tokio-io = "0.1.12"
 tokio = { version = "0.1.22", optional = true }
 unsigned-varint = { version = "0.2.2", features = ["codec"] }
-keyring = { package = "substrate-keyring", path = "../keyring", optional = true }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring", optional = true }
 test_client = { package = "substrate-test-client", path = "../../test/utils/client", optional = true }
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client", optional = true }
 erased-serde = "0.3.9"
@@ -52,7 +52,7 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../
 
 [dev-dependencies]
 env_logger = "0.7.0"
-keyring = { package = "substrate-keyring", path = "../keyring" }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
 quickcheck = "0.9.0"
 rand = "0.7.2"
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 1368c20acce3d..1060dcd2a3ed3 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -17,5 +17,5 @@ tx-runtime-api = { package = "substrate-transaction-pool-runtime-api", path = ".
 txpool = { package = "substrate-transaction-graph", path = "./graph" }
 
 [dev-dependencies]
-keyring = { package = "substrate-keyring", path = "../keyring" }
+keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
diff --git a/paint/balances/Cargo.toml b/paint/balances/Cargo.toml
index 8403b9a727aff..91e7b51dd4e9b 100644
--- a/paint/balances/Cargo.toml
+++ b/paint/balances/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 safe-mix = { version = "1.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-substrate-keyring = { path = "../../client/keyring", optional = true }
+substrate-keyring = { path = "../../primitives/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 support = { package = "srml-support", path = "../support", default-features = false }
diff --git a/paint/indices/Cargo.toml b/paint/indices/Cargo.toml
index 35719aa13da84..3f61104276ad3 100644
--- a/paint/indices/Cargo.toml
+++ b/paint/indices/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 safe-mix = { version = "1.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-substrate-keyring = { path = "../../client/keyring", optional = true }
+substrate-keyring = { path = "../../primitives/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
diff --git a/paint/staking/Cargo.toml b/paint/staking/Cargo.toml
index 2ec289e1ebc91..530c126ed52ae 100644
--- a/paint/staking/Cargo.toml
+++ b/paint/staking/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 safe-mix = { version = "1.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-substrate-keyring = { path = "../../client/keyring", optional = true }
+substrate-keyring = { path = "../../primitives/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 phragmen = { package = "substrate-phragmen", path = "../../primitives/phragmen", default-features = false }
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false }
diff --git a/client/keyring/Cargo.toml b/primitives/keyring/Cargo.toml
similarity index 58%
rename from client/keyring/Cargo.toml
rename to primitives/keyring/Cargo.toml
index e31da0b7c67c7..cc0e2836bacea 100644
--- a/client/keyring/Cargo.toml
+++ b/primitives/keyring/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-sr-primitives = { path = "../../primitives/sr-primitives" }
+primitives = { package = "substrate-primitives",  path = "../core" }
+sr-primitives = { path = "../sr-primitives" }
 lazy_static = "1.4.0"
 strum = "0.15.0"
 strum_macros = "0.15.0"
diff --git a/client/keyring/src/ed25519.rs b/primitives/keyring/src/ed25519.rs
similarity index 100%
rename from client/keyring/src/ed25519.rs
rename to primitives/keyring/src/ed25519.rs
diff --git a/client/keyring/src/lib.rs b/primitives/keyring/src/lib.rs
similarity index 100%
rename from client/keyring/src/lib.rs
rename to primitives/keyring/src/lib.rs
diff --git a/client/keyring/src/sr25519.rs b/primitives/keyring/src/sr25519.rs
similarity index 100%
rename from client/keyring/src/sr25519.rs
rename to primitives/keyring/src/sr25519.rs
diff --git a/test/utils/client/Cargo.toml b/test/utils/client/Cargo.toml
index b4817406c4594..797c461775051 100644
--- a/test/utils/client/Cargo.toml
+++ b/test/utils/client/Cargo.toml
@@ -12,7 +12,7 @@ consensus = { package = "substrate-consensus-common", path = "../../../primitive
 executor = { package = "substrate-executor", path = "../../../client/executor" }
 futures-preview = "0.3.0-alpha.19"
 hash-db = "0.15.2"
-keyring = { package = "substrate-keyring", path = "../../../client/keyring" }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
 sr-primitives = {  path = "../../../primitives/sr-primitives" }
diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml
index c622ca49879d7..f718f22cbaa46 100644
--- a/test/utils/runtime/Cargo.toml
+++ b/test/utils/runtime/Cargo.toml
@@ -14,7 +14,7 @@ cfg-if = "0.1.10"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 executive = { package = "srml-executive", path = "../../../paint/executive", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../primitives/inherents", default-features = false }
-keyring = { package = "substrate-keyring", path = "../../../client/keyring", optional = true }
+keyring = { package = "substrate-keyring", path = "../../../primitives/keyring", optional = true }
 log = { version = "0.4.8", optional = true }
 memory-db = { version = "0.15.2", default-features = false }
 offchain-primitives = { package = "substrate-offchain-primitives", path = "../../../primitives/offchain", default-features = false}

From 9fab2ba30a23d07bce1b4f4578daf60fcac24d97 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Wed, 13 Nov 2019 15:04:26 +0100
Subject: [PATCH 48/61] fixup libp2p dep

---
 Cargo.lock | 70 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec4a0d3075aed..73410751271b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -297,6 +297,11 @@ dependencies = [
  "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bs58"
 version = "0.3.0"
@@ -2011,7 +2016,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2022,12 +2027,12 @@ dependencies = [
  "libp2p-deflate 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-dns 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-floodsub 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-identify 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-kad 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-identify 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-kad 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-mdns 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-mplex 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-noise 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-ping 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p-ping 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-plaintext 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-secio 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2036,8 +2041,8 @@ dependencies = [
  "libp2p-wasm-ext 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-websocket 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-yamux 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2132,7 +2137,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2140,7 +2145,7 @@ dependencies = [
  "libp2p-core 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2151,7 +2156,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2162,8 +2167,8 @@ dependencies = [
  "libp2p-core 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2236,7 +2241,7 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2244,7 +2249,7 @@ dependencies = [
  "libp2p-core 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2692,7 +2697,7 @@ dependencies = [
  "js-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-executor 2.0.0",
  "node-primitives 2.0.0",
@@ -3846,19 +3851,19 @@ source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7
 
 [[package]]
 name = "parity-multiaddr"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bs58 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3880,7 +3885,7 @@ dependencies = [
 
 [[package]]
 name = "parity-multihash"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5252,7 +5257,7 @@ dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5615,7 +5620,7 @@ dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5855,7 +5860,7 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5944,7 +5949,7 @@ name = "substrate-peerset"
 version = "2.0.0"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6172,7 +6177,7 @@ dependencies = [
  "node-executor 2.0.0",
  "node-primitives 2.0.0",
  "node-runtime 2.0.0",
- "parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multiaddr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6275,7 +6280,7 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -7636,6 +7641,7 @@ dependencies = [
 "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
 "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+"checksum bs58 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c95ee6bba9d950218b6cc910cf62bc9e0a171d0f4537e3627b0f54d08549b188"
 "checksum bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum build-helper 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdce191bf3fa4995ce948c8c83b4640a1745457a149e73c6db75b4ffe36aad5f"
@@ -7821,18 +7827,18 @@ dependencies = [
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-"checksum libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9aa3d728b96c06763b2e919b4c99a334d698303c49489671b5ffe3a4b0fd4c9c"
+"checksum libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fab3090cd3af0f0ff5e6c2cc0f6fe6607e9f9282680cf7cd3bdd4cda38ea722"
 "checksum libp2p-core 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4a3def059145c191b6975e51784d5edc59e77e1ed5b25402fccac704dd7731f3"
 "checksum libp2p-core-derive 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eeb2704ac14c60f31967e351ed928b848526a5fc6db4104520020665012826f"
 "checksum libp2p-deflate 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2b0bf5d37692ac90e2bffa436bec26c0b0def6c0cab7ea85ff67a353d58aaa"
 "checksum libp2p-dns 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3175fb0fc9016c95c8517a297bbdb5fb6bfbd5665bacd2eb23495d1cbdeb033"
 "checksum libp2p-floodsub 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92c11b95281e8cb87eb83c204b3ca4988fa665ed9351199b5bcc323056f49816"
-"checksum libp2p-identify 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4eba6103329e9a1a2aa940671efe5600c758a295e61172139d7a900166da0017"
-"checksum libp2p-kad 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "84ceb0faa267b96560ef883dc5bc6dddd9de1662e35a4070208623b391deefca"
+"checksum libp2p-identify 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b4e4b0b4bcf410f77361b08335022d5705df34970dc1744ff58d4bb902309547"
+"checksum libp2p-kad 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fd25360fc12b23edb1ed13f73426325a38d32e0927a46fec26ddb6873d7644d"
 "checksum libp2p-mdns 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c4c2e225a7dfc571c3ad77a0a5ecccc9537afe42d72289ac9f19768567cd677d"
 "checksum libp2p-mplex 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2fe584816d993dc0f893396521a3c93191d78a6f28a892b150baa714a12c3e5"
 "checksum libp2p-noise 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a30ec2640262a7ad6b1a8b28f6cd8281e620a6802f700adf9ff26e61487c333a"
-"checksum libp2p-ping 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4e1682cdae649394d2793758ded2bfd4d9d440f807e3b4d9f70981f377aa28a"
+"checksum libp2p-ping 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5b975ad345eb9bb29ddc64670664a50a8ab3e66e28357abb0f83cfc0a9ca2d78"
 "checksum libp2p-plaintext 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4fe82189f5c20e8f0a11deaa04d492703c501cefd2428ad68f4f64aefab76f"
 "checksum libp2p-secio 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee09e259ceb7633a52fd17f187bedf94e3545b1746487beedbd3a0a07d99817"
 "checksum libp2p-swarm 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd55bc9f5f9eac2bb1ff24ca3c8a655810a566ac38c7a6ee1f30aced5a62905b"
@@ -7891,9 +7897,9 @@ dependencies = [
 "checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = ""
-"checksum parity-multiaddr 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7dbc379f41150dedda75cbbdb5b9beb2bf786a07e56c2c99ec89aeaaa894662c"
+"checksum parity-multiaddr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "045b3c7af871285146300da35b1932bb6e4639b66c7c98e85d06a32cbc4e8fa7"
 "checksum parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "82afcb7461eae5d122543d8be1c57d306ed89af2d6ff7f8b0f5a3cc8f7e511bc"
-"checksum parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "340ed03f939e02e4cb71a5a127b5507ba4dab506e41a05f8f467e28d8ce529f4"
+"checksum parity-multihash 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df3a17dc27848fd99e4f87eb0f8c9baba6ede0a6d555400c850ca45254ef4ce3"
 "checksum parity-multihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c70cad855872dd51ce6679e823efb6434061a2c1782a1686438aabf506392cdd"
 "checksum parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "001fbbb956d8593f321c7a784f64d16b2c99b2657823976eea729006ad2c3668"
 "checksum parity-scale-codec-derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42af752f59119656fa3cb31e8852ed24e895b968c0bdb41847da7f0cea6d155f"

From 0c7a49d1237a77babc2fc8daf63f516d93050c58 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Wed, 13 Nov 2019 15:20:17 +0100
Subject: [PATCH 49/61] fix broken use

---
 client/cli/src/error.rs           | 2 +-
 client/consensus/pow/src/lib.rs   | 2 +-
 client/consensus/slots/src/lib.rs | 2 +-
 client/network/src/error.rs       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cli/src/error.rs b/client/cli/src/error.rs
index 0090e5a7ff002..6b42773bb833a 100644
--- a/client/cli/src/error.rs
+++ b/client/cli/src/error.rs
@@ -16,7 +16,7 @@
 
 //! Initialization errors.
 
-use interfaces;
+use client_api;
 
 /// Result type alias for the CLI.
 pub type Result = std::result::Result;
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 39a37abacd8b1..57d05fcc450be 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -50,7 +50,7 @@ use consensus_common::{
 };
 use consensus_common::import_queue::{BoxBlockImport, BasicQueue, Verifier};
 use codec::{Encode, Decode};
-use interfaces;
+use client_api;
 use log::*;
 
 #[derive(derive_more::Display, Debug)]
diff --git a/client/consensus/slots/src/lib.rs b/client/consensus/slots/src/lib.rs
index 856cf006036cb..5897f88c77c29 100644
--- a/client/consensus/slots/src/lib.rs
+++ b/client/consensus/slots/src/lib.rs
@@ -41,7 +41,7 @@ use sr_primitives::traits::{ApiRef, Block as BlockT, Header, ProvideRuntimeApi};
 use std::{fmt::Debug, ops::Deref, pin::Pin, sync::Arc};
 use substrate_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
 use parking_lot::Mutex;
-use interfaces;
+use client_api;
 
 /// A worker that should be invoked at every new slot.
 pub trait SlotWorker {
diff --git a/client/network/src/error.rs b/client/network/src/error.rs
index b0abff2671236..a33f0280abd42 100644
--- a/client/network/src/error.rs
+++ b/client/network/src/error.rs
@@ -16,7 +16,7 @@
 
 //! Substrate network possible errors.
 
-use interfaces;
+use client_api;
 
 use libp2p::{PeerId, Multiaddr};
 

From 58a3fe10a67e700a51a43ff34d7fa6c1fcee4dd2 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Wed, 13 Nov 2019 16:46:17 +0100
Subject: [PATCH 50/61] allow dependency enforcement to fail

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef2147805ad68..f1aecb91fbaf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,6 +148,7 @@ test-linux-stable:                 &test-linux
 test-dependency-rules:             &test-linux
   stage:                           test
   <<:                              *docker-env
+  allow_failure:                   true
   except:
     variables:
       - $DEPLOY_TAG

From 62edb89370e142168bd94419ace5af888b4404fa Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 14:22:13 +0100
Subject: [PATCH 51/61] move fork-tree

---
 Cargo.toml                                    |  2 +-
 client/consensus/babe/Cargo.toml              |  2 +-
 client/finality-grandpa/Cargo.toml            |  2 +-
 client/network/Cargo.toml                     |  2 +-
 primitives/core/src/uint.rs                   |  4 +-
 primitives/sr-io/src/lib.rs                   |  6 ++-
 primitives/sr-primitives/src/lib.rs           |  6 ++-
 primitives/sr-primitives/src/testing.rs       |  4 +-
 primitives/sr-sandbox/src/lib.rs              |  4 +-
 primitives/sr-std/src/lib.rs                  |  6 ++-
 .../state-machine/src/changes_trie/prune.rs   | 21 +++++++---
 .../state-machine/src/overlayed_changes.rs    | 40 +++++++++++++------
 {client/utils => utils}/fork-tree/Cargo.toml  |  0
 {client/utils => utils}/fork-tree/src/lib.rs  |  0
 14 files changed, 68 insertions(+), 31 deletions(-)
 rename {client/utils => utils}/fork-tree/Cargo.toml (100%)
 rename {client/utils => utils}/fork-tree/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 4d6baf4330485..51b92dce29ec7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ members = [
 	"client/telemetry",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
-	"client/utils/fork-tree",
+	"utils/fork-tree",
 	"client/utils/wasm-builder",
 	"client/utils/wasm-builder-runner",
 	"paint/assets",
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 8f51dc82d1d3e..a4a92f04f0247 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -28,7 +28,7 @@ consensus-common = { package = "substrate-consensus-common", path = "../../../pr
 uncles = { package = "substrate-consensus-uncles", path = "../uncles" }
 slots = { package = "substrate-consensus-slots", path = "../slots"  }
 sr-primitives = {  path = "../../../primitives/sr-primitives" }
-fork-tree = { path = "../../utils/fork-tree" }
+fork-tree = { path = "../../../utils/fork-tree" }
 futures-preview = { version = "0.3.0-alpha.19", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1" }
 futures-timer = "0.4.0"
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index d25e4ab0c7de5..d8320327a9fb0 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-fork-tree = { path = "../utils/fork-tree" }
+fork-tree = { path = "../../utils/fork-tree" }
 futures = "0.1.29"
 futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
 log = "0.4.8"
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index 255d13368467a..19c720c15011f 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -23,7 +23,7 @@ lru-cache = "0.1.2"
 rustc-hex = "2.0.1"
 rand = "0.7.2"
 libp2p = { version = "0.13.0", default-features = false, features = ["libp2p-websocket"] }
-fork-tree = { path = "../utils/fork-tree" }
+fork-tree = { path = "../../utils/fork-tree" }
 consensus = { package = "substrate-consensus-common", path = "../../primitives/consensus/common" }
 client = { package = "substrate-client", path = "../" }
 client-api = { package = "substrate-client-api", path = "../api" }
diff --git a/primitives/core/src/uint.rs b/primitives/core/src/uint.rs
index b41596a910326..c835cf5773518 100644
--- a/primitives/core/src/uint.rs
+++ b/primitives/core/src/uint.rs
@@ -91,7 +91,9 @@ mod tests {
 			"\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\""
 		);
 		assert!(
-			ser::from_str::("\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"").unwrap_err().is_data()
+			ser::from_str::("\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"")
+			.unwrap_err()
+			.is_data()
 		);
 	}
 }
diff --git a/primitives/sr-io/src/lib.rs b/primitives/sr-io/src/lib.rs
index 0399b1ac66a8c..080d0b245b738 100644
--- a/primitives/sr-io/src/lib.rs
+++ b/primitives/sr-io/src/lib.rs
@@ -23,8 +23,10 @@
 #![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
 
-#![cfg_attr(feature = "std", doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
-#![cfg_attr(not(feature = "std"), doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
+#![cfg_attr(feature = "std",
+   doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
+#![cfg_attr(not(feature = "std"),
+   doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
 
 use rstd::vec::Vec;
 
diff --git a/primitives/sr-primitives/src/lib.rs b/primitives/sr-primitives/src/lib.rs
index f072661d611aa..01ace2c004d0b 100644
--- a/primitives/sr-primitives/src/lib.rs
+++ b/primitives/sr-primitives/src/lib.rs
@@ -453,7 +453,11 @@ impl From<&'static str> for DispatchError {
 
 /// Verify a signature on an encoded value in a lazy manner. This can be
 /// an optimization if the signature scheme has an "unsigned" escape hash.
-pub fn verify_encoded_lazy(sig: &V, item: &T, signer: &::AccountId) -> bool {
+pub fn verify_encoded_lazy(
+	sig: &V,
+	item: &T,
+	signer: &::AccountId
+) -> bool {
 	// The `Lazy` trait expresses something like `X: FnMut &'a T>`.
 	// unfortunately this is a lifetime relationship that can't
 	// be expressed without generic associated types, better unification of HRTBs in type position,
diff --git a/primitives/sr-primitives/src/testing.rs b/primitives/sr-primitives/src/testing.rs
index ae359f6b6ba15..bd3f673cd5c43 100644
--- a/primitives/sr-primitives/src/testing.rs
+++ b/primitives/sr-primitives/src/testing.rs
@@ -258,7 +258,9 @@ pub struct Block {
 	pub extrinsics: Vec,
 }
 
-impl traits::Block for Block {
+impl traits::Block
+	for Block
+{
 	type Extrinsic = Xt;
 	type Header = Header;
 	type Hash = 
::Hash;
diff --git a/primitives/sr-sandbox/src/lib.rs b/primitives/sr-sandbox/src/lib.rs
index 4639cf983af44..17b2cb7c1ebda 100755
--- a/primitives/sr-sandbox/src/lib.rs
+++ b/primitives/sr-sandbox/src/lib.rs
@@ -178,7 +178,9 @@ impl Instance {
 	/// be returned.
 	///
 	/// [`EnvironmentDefinitionBuilder`]: struct.EnvironmentDefinitionBuilder.html
-	pub fn new(code: &[u8], env_def_builder: &EnvironmentDefinitionBuilder, state: &mut T) -> Result, Error> {
+	pub fn new(code: &[u8], env_def_builder: &EnvironmentDefinitionBuilder, state: &mut T)
+		-> Result, Error>
+	{
 		Ok(Instance {
 			inner: imp::Instance::new(code, &env_def_builder.inner, state)?,
 		})
diff --git a/primitives/sr-std/src/lib.rs b/primitives/sr-std/src/lib.rs
index db628ded01f8b..5aa8e82235247 100644
--- a/primitives/sr-std/src/lib.rs
+++ b/primitives/sr-std/src/lib.rs
@@ -20,8 +20,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
 
-#![cfg_attr(feature = "std", doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
-#![cfg_attr(not(feature = "std"), doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
+#![cfg_attr(feature = "std",
+   doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
+#![cfg_attr(not(feature = "std"),
+   doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
 
 #[macro_export]
 macro_rules! map {
diff --git a/primitives/state-machine/src/changes_trie/prune.rs b/primitives/state-machine/src/changes_trie/prune.rs
index 531318e234c8d..fccd177e60a2f 100644
--- a/primitives/state-machine/src/changes_trie/prune.rs
+++ b/primitives/state-machine/src/changes_trie/prune.rs
@@ -168,7 +168,9 @@ fn pruning_range(
 
 	// last block for which changes trie is pruned
 	let last_block_to_prune = blocks_to_keep.and_then(|b| block.checked_sub(&b));
-	let first_block_to_prune = last_block_to_prune.clone().and_then(|b| b.checked_sub(&prune_interval.into()));
+	let first_block_to_prune = last_block_to_prune
+		.clone()
+		.and_then(|b| b.checked_sub(&prune_interval.into()));
 
 	last_block_to_prune
 		.and_then(|last| first_block_to_prune.map(|first| (first + One::one(), last)))
@@ -221,7 +223,10 @@ mod tests {
 		current_block: u64,
 	) -> HashSet {
 		let mut pruned_trie_nodes = HashSet::new();
-		prune(config, storage, min_blocks_to_keep, &AnchorBlockId { hash: Default::default(), number: current_block },
+		prune(config,
+			storage,
+			min_blocks_to_keep,
+			&AnchorBlockId { hash: Default::default(), number: current_block },
 			|node| { pruned_trie_nodes.insert(node); });
 		pruned_trie_nodes
 	}
@@ -232,18 +237,22 @@ mod tests {
 
 			let child_key = ChildIndex { block: 67u64, storage_key: b"1".to_vec() }.encode();
 			let mut mdb1 = MemoryDB::::default();
-			let root1 = insert_into_memory_db::(&mut mdb1, vec![(vec![10], vec![20])]).unwrap();
+			let root1 = insert_into_memory_db::(
+				&mut mdb1, vec![(vec![10], vec![20])]).unwrap();
 			let mut mdb2 = MemoryDB::::default();
-			let root2 = insert_into_memory_db::(&mut mdb2, vec![(vec![11], vec![21]), (vec![12], vec![22])]).unwrap();
+			let root2 = insert_into_memory_db::(
+				&mut mdb2, vec![(vec![11], vec![21]), (vec![12], vec![22])]).unwrap();
 			let mut mdb3 = MemoryDB::::default();
-			let ch_root3 = insert_into_memory_db::(&mut mdb3, vec![(vec![110], vec![120])]).unwrap();
+			let ch_root3 = insert_into_memory_db::(
+				&mut mdb3, vec![(vec![110], vec![120])]).unwrap();
 			let root3 = insert_into_memory_db::(&mut mdb3, vec![
 				(vec![13], vec![23]),
 				(vec![14], vec![24]),
 				(child_key, ch_root3.as_ref().encode()),
 			]).unwrap();
 			let mut mdb4 = MemoryDB::::default();
-			let root4 = insert_into_memory_db::(&mut mdb4, vec![(vec![15], vec![25])]).unwrap();
+			let root4 = insert_into_memory_db::(
+				&mut mdb4, vec![(vec![15], vec![25])]).unwrap();
 			let storage = InMemoryStorage::new();
 			storage.insert(65, root1, mdb1);
 			storage.insert(66, root2, mdb2);
diff --git a/primitives/state-machine/src/overlayed_changes.rs b/primitives/state-machine/src/overlayed_changes.rs
index 53a66dc49ee05..73cb8b604a1c2 100644
--- a/primitives/state-machine/src/overlayed_changes.rs
+++ b/primitives/state-machine/src/overlayed_changes.rs
@@ -359,7 +359,9 @@ mod tests {
 	use crate::ext::Ext;
 	use super::*;
 
-	fn strip_extrinsic_index(map: &HashMap, OverlayedValue>) -> HashMap, OverlayedValue> {
+	fn strip_extrinsic_index(map: &HashMap, OverlayedValue>)
+		-> HashMap, OverlayedValue>
+	{
 		let mut clone = map.clone();
 		clone.remove(&EXTRINSIC_INDEX.to_vec());
 		clone
@@ -455,7 +457,8 @@ mod tests {
 		assert_eq!(
 			strip_extrinsic_index(&overlay.prospective.top),
 			vec![
-				(vec![1], OverlayedValue { value: Some(vec![2]), extrinsics: Some(vec![0].into_iter().collect()) }),
+				(vec![1], OverlayedValue { value: Some(vec![2]),
+				 extrinsics: Some(vec![0].into_iter().collect()) }),
 			].into_iter().collect(),
 		);
 	}
@@ -491,9 +494,12 @@ mod tests {
 
 		assert_eq!(strip_extrinsic_index(&overlay.prospective.top),
 			vec![
-				(vec![1], OverlayedValue { value: Some(vec![6]), extrinsics: Some(vec![0, 2].into_iter().collect()) }),
-				(vec![3], OverlayedValue { value: Some(vec![4]), extrinsics: Some(vec![1].into_iter().collect()) }),
-				(vec![100], OverlayedValue { value: Some(vec![101]), extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
+				(vec![1], OverlayedValue { value: Some(vec![6]),
+				 extrinsics: Some(vec![0, 2].into_iter().collect()) }),
+				(vec![3], OverlayedValue { value: Some(vec![4]),
+				 extrinsics: Some(vec![1].into_iter().collect()) }),
+				(vec![100], OverlayedValue { value: Some(vec![101]),
+				 extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
 			].into_iter().collect());
 
 		overlay.commit_prospective();
@@ -506,24 +512,32 @@ mod tests {
 
 		assert_eq!(strip_extrinsic_index(&overlay.committed.top),
 			vec![
-				(vec![1], OverlayedValue { value: Some(vec![6]), extrinsics: Some(vec![0, 2].into_iter().collect()) }),
-				(vec![3], OverlayedValue { value: Some(vec![4]), extrinsics: Some(vec![1].into_iter().collect()) }),
-				(vec![100], OverlayedValue { value: Some(vec![101]), extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
+				(vec![1], OverlayedValue { value: Some(vec![6]),
+				 extrinsics: Some(vec![0, 2].into_iter().collect()) }),
+				(vec![3], OverlayedValue { value: Some(vec![4]),
+				 extrinsics: Some(vec![1].into_iter().collect()) }),
+				(vec![100], OverlayedValue { value: Some(vec![101]),
+				 extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
 			].into_iter().collect());
 
 		assert_eq!(strip_extrinsic_index(&overlay.prospective.top),
 			vec![
-				(vec![1], OverlayedValue { value: Some(vec![8]), extrinsics: Some(vec![4].into_iter().collect()) }),
-				(vec![3], OverlayedValue { value: Some(vec![7]), extrinsics: Some(vec![3].into_iter().collect()) }),
+				(vec![1], OverlayedValue { value: Some(vec![8]),
+				 extrinsics: Some(vec![4].into_iter().collect()) }),
+				(vec![3], OverlayedValue { value: Some(vec![7]),
+				 extrinsics: Some(vec![3].into_iter().collect()) }),
 			].into_iter().collect());
 
 		overlay.commit_prospective();
 
 		assert_eq!(strip_extrinsic_index(&overlay.committed.top),
 			vec![
-				(vec![1], OverlayedValue { value: Some(vec![8]), extrinsics: Some(vec![0, 2, 4].into_iter().collect()) }),
-				(vec![3], OverlayedValue { value: Some(vec![7]), extrinsics: Some(vec![1, 3].into_iter().collect()) }),
-				(vec![100], OverlayedValue { value: Some(vec![101]), extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
+				(vec![1], OverlayedValue { value: Some(vec![8]),
+				 extrinsics: Some(vec![0, 2, 4].into_iter().collect()) }),
+				(vec![3], OverlayedValue { value: Some(vec![7]),
+				 extrinsics: Some(vec![1, 3].into_iter().collect()) }),
+				(vec![100], OverlayedValue { value: Some(vec![101]),
+				 extrinsics: Some(vec![NO_EXTRINSIC_INDEX].into_iter().collect()) }),
 			].into_iter().collect());
 
 		assert_eq!(overlay.prospective,
diff --git a/client/utils/fork-tree/Cargo.toml b/utils/fork-tree/Cargo.toml
similarity index 100%
rename from client/utils/fork-tree/Cargo.toml
rename to utils/fork-tree/Cargo.toml
diff --git a/client/utils/fork-tree/src/lib.rs b/utils/fork-tree/src/lib.rs
similarity index 100%
rename from client/utils/fork-tree/src/lib.rs
rename to utils/fork-tree/src/lib.rs

From 44effe48b3053cdff278acf969dfca5d01ea810c Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 14:23:23 +0100
Subject: [PATCH 52/61] Moving wasm-builder

---
 Cargo.toml                                                | 4 ++--
 bin/node/runtime/Cargo.toml                               | 2 +-
 client/executor/runtime-test/Cargo.toml                   | 2 +-
 primitives/runtime-interface/test-wasm/Cargo.toml         | 2 +-
 test/utils/runtime/Cargo.toml                             | 2 +-
 {client/utils => utils}/wasm-builder/Cargo.toml           | 0
 {client/utils => utils}/wasm-builder/README.md            | 0
 {client/utils => utils}/wasm-builder/src/lib.rs           | 0
 {client/utils => utils}/wasm-builder/src/prerequisites.rs | 0
 {client/utils => utils}/wasm-builder/src/wasm_project.rs  | 0
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename {client/utils => utils}/wasm-builder/Cargo.toml (100%)
 rename {client/utils => utils}/wasm-builder/README.md (100%)
 rename {client/utils => utils}/wasm-builder/src/lib.rs (100%)
 rename {client/utils => utils}/wasm-builder/src/prerequisites.rs (100%)
 rename {client/utils => utils}/wasm-builder/src/wasm_project.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 51b92dce29ec7..5793d24f3dc8f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,8 +36,8 @@ members = [
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
 	"utils/fork-tree",
-	"client/utils/wasm-builder",
-	"client/utils/wasm-builder-runner",
+	"utils/wasm-builder",
+	"utils/wasm-builder-runner",
 	"paint/assets",
 	"paint/aura",
 	"paint/authority-discovery",
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index aa306de513bac..da8985d807005 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -61,7 +61,7 @@ transaction-payment = { package = "paint-transaction-payment", path = "../../../
 transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../utils/wasm-builder-runner" }
 
 [dev-dependencies]
 runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" }
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 435ce078f7268..ca5be1abde2b2 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,7 @@ primitives = { package = "substrate-primitives",  path = "../../../primitives/co
 sr-primitives = { package = "sr-primitives",  path = "../../../primitives/sr-primitives", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../utils/wasm-builder-runner" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../utils/wasm-builder-runner" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 13d6e2591421b..f75e3c4c33ebc 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -12,7 +12,7 @@ runtime-io = { package = "sr-io", path = "../../sr-io", default-features = false
 primitives = { package = "substrate-primitives", path = "../../core", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../client/utils/wasm-builder-runner" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../utils/wasm-builder-runner" }
 
 [features]
 default = [ "std" ]
diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml
index bf7767404ea84..96940bb52bebd 100644
--- a/test/utils/runtime/Cargo.toml
+++ b/test/utils/runtime/Cargo.toml
@@ -43,7 +43,7 @@ substrate-test-runtime-client = { path = "./client" }
 state_machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../client/utils/wasm-builder-runner" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4", path = "../../../utils/wasm-builder-runner" }
 
 [features]
 default = [
diff --git a/client/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
similarity index 100%
rename from client/utils/wasm-builder/Cargo.toml
rename to utils/wasm-builder/Cargo.toml
diff --git a/client/utils/wasm-builder/README.md b/utils/wasm-builder/README.md
similarity index 100%
rename from client/utils/wasm-builder/README.md
rename to utils/wasm-builder/README.md
diff --git a/client/utils/wasm-builder/src/lib.rs b/utils/wasm-builder/src/lib.rs
similarity index 100%
rename from client/utils/wasm-builder/src/lib.rs
rename to utils/wasm-builder/src/lib.rs
diff --git a/client/utils/wasm-builder/src/prerequisites.rs b/utils/wasm-builder/src/prerequisites.rs
similarity index 100%
rename from client/utils/wasm-builder/src/prerequisites.rs
rename to utils/wasm-builder/src/prerequisites.rs
diff --git a/client/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
similarity index 100%
rename from client/utils/wasm-builder/src/wasm_project.rs
rename to utils/wasm-builder/src/wasm_project.rs

From 191fa200d58d85444f2e206e387def738184a38b Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 14:24:42 +0100
Subject: [PATCH 53/61] make env

---
 .maintain/ensure-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maintain/ensure-deps.sh b/.maintain/ensure-deps.sh
index 4306bfd2e519f..b4477dab5392c 100755
--- a/.maintain/ensure-deps.sh
+++ b/.maintain/ensure-deps.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # The script is meant to check if the rules regarding packages
 # dependencies are satisfied.

From b3a7e1f8defb727f3b2e57cd1aad2a1d5c377335 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 14:25:43 +0100
Subject: [PATCH 54/61] move build-script-utils

---
 bin/node-template/Cargo.toml                          | 2 +-
 bin/node/cli/Cargo.toml                               | 2 +-
 {client/utils => utils}/build-script-utils/Cargo.toml | 0
 {client/utils => utils}/build-script-utils/src/lib.rs | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {client/utils => utils}/build-script-utils/Cargo.toml (100%)
 rename {client/utils => utils}/build-script-utils/src/lib.rs (100%)

diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml
index d2b6dd068de3d..f67917f67f1e2 100644
--- a/bin/node-template/Cargo.toml
+++ b/bin/node-template/Cargo.toml
@@ -38,4 +38,4 @@ basic-authorship = { package = "substrate-basic-authorship", path  = "../../clie
 
 [build-dependencies]
 vergen = "3.0.4"
-build-script-utils = { package = "substrate-build-script-utils", path = "../../client/utils/build-script-utils" }
+build-script-utils = { package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 6a33a6a422875..193871f2d3888 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -101,7 +101,7 @@ tempfile = "3.1.0"
 
 [build-dependencies]
 substrate-cli = { package = "substrate-cli", path = "../../../client/cli" }
-build-script-utils = { package = "substrate-build-script-utils", path = "../../../client/utils/build-script-utils" }
+build-script-utils = { package = "substrate-build-script-utils", path = "../../../../utils/build-script-utils" }
 structopt = "0.3.3"
 vergen = "3.0.4"
 
diff --git a/client/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml
similarity index 100%
rename from client/utils/build-script-utils/Cargo.toml
rename to utils/build-script-utils/Cargo.toml
diff --git a/client/utils/build-script-utils/src/lib.rs b/utils/build-script-utils/src/lib.rs
similarity index 100%
rename from client/utils/build-script-utils/src/lib.rs
rename to utils/build-script-utils/src/lib.rs

From 8fb157eb04a4efb2c66f08430f1d70322779e852 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 17:39:19 +0100
Subject: [PATCH 55/61] fixup broken crate depdencies and names

---
 Cargo.lock                                    | 2856 ++++++++---------
 Cargo.toml                                    |    2 +-
 bin/node-template/runtime/Cargo.toml          |    2 +-
 bin/node/runtime/Cargo.toml                   |    2 +-
 bin/node/runtime/build.rs                     |    2 +-
 client/executor/runtime-test/Cargo.toml       |    2 +-
 client/executor/runtime-test/build.rs         |    2 +-
 client/utils/wasm-builder-runner/Cargo.toml   |    2 +-
 .../runtime-interface/test-wasm/Cargo.toml    |    2 +-
 .../runtime-interface/test-wasm/build.rs      |    2 +-
 test/utils/runtime/Cargo.toml                 |    2 +-
 test/utils/runtime/build.rs                   |    2 +-
 12 files changed, 1434 insertions(+), 1444 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fb1475f31ba9..56940a0e537b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -999,15 +999,6 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "evm"
 version = "0.14.0"
@@ -2707,30 +2698,29 @@ dependencies = [
  "node-primitives 2.0.0",
  "node-rpc 2.0.0",
  "node-runtime 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-contracts 2.0.0",
+ "paint-finality-tracker 2.0.0",
+ "paint-im-online 0.1.0",
+ "paint-indices 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "paint-transaction-payment 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
- "srml-authority-discovery 0.1.0",
- "srml-balances 2.0.0",
- "srml-contracts 2.0.0",
- "srml-finality-tracker 2.0.0",
- "srml-im-online 0.1.0",
- "srml-indices 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "srml-transaction-payment 2.0.0",
  "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-authority-discovery 2.0.0",
  "substrate-authority-discovery-primitives 2.0.0",
  "substrate-basic-authorship 2.0.0",
  "substrate-build-script-utils 2.0.0",
  "substrate-chain-spec 2.0.0",
  "substrate-cli 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
  "substrate-consensus-babe 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
@@ -2764,19 +2754,19 @@ dependencies = [
  "node-primitives 2.0.0",
  "node-runtime 2.0.0",
  "node-testing 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-contracts 2.0.0",
+ "paint-grandpa 2.0.0",
+ "paint-indices 2.0.0",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "paint-transaction-payment 2.0.0",
+ "paint-treasury 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
- "srml-balances 2.0.0",
- "srml-contracts 2.0.0",
- "srml-grandpa 2.0.0",
- "srml-indices 2.0.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "srml-transaction-payment 2.0.0",
- "srml-treasury 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-state-machine 2.0.0",
@@ -2803,10 +2793,10 @@ dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-primitives 2.0.0",
  "node-runtime 2.0.0",
+ "paint-contracts-rpc 2.0.0",
+ "paint-system-rpc 2.0.0",
+ "paint-transaction-payment-rpc 2.0.0",
  "sr-primitives 2.0.0",
- "srml-contracts-rpc 2.0.0",
- "srml-system-rpc 2.0.0",
- "srml-transaction-payment-rpc 2.0.0",
  "substrate-client 2.0.0",
  "substrate-transaction-pool 2.0.0",
 ]
@@ -2830,6 +2820,36 @@ version = "2.0.0"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-primitives 2.0.0",
+ "paint-authority-discovery 0.1.0",
+ "paint-authorship 0.1.0",
+ "paint-babe 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-collective 2.0.0",
+ "paint-contracts 2.0.0",
+ "paint-contracts-rpc-runtime-api 2.0.0",
+ "paint-democracy 2.0.0",
+ "paint-elections-phragmen 2.0.0",
+ "paint-executive 2.0.0",
+ "paint-finality-tracker 2.0.0",
+ "paint-grandpa 2.0.0",
+ "paint-im-online 0.1.0",
+ "paint-indices 2.0.0",
+ "paint-membership 2.0.0",
+ "paint-nicks 2.0.0",
+ "paint-offences 1.0.0",
+ "paint-randomness-collective-flip 2.0.0",
+ "paint-session 2.0.0",
+ "paint-staking 2.0.0",
+ "paint-staking-reward-curve 2.0.0",
+ "paint-sudo 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-system-rpc-runtime-api 2.0.0",
+ "paint-timestamp 2.0.0",
+ "paint-transaction-payment 2.0.0",
+ "paint-transaction-payment-rpc-runtime-api 2.0.0",
+ "paint-treasury 2.0.0",
+ "paint-utility 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2840,36 +2860,6 @@ dependencies = [
  "sr-staking-primitives 2.0.0",
  "sr-std 2.0.0",
  "sr-version 2.0.0",
- "srml-authority-discovery 0.1.0",
- "srml-authorship 0.1.0",
- "srml-babe 2.0.0",
- "srml-balances 2.0.0",
- "srml-collective 2.0.0",
- "srml-contracts 2.0.0",
- "srml-contracts-rpc-runtime-api 2.0.0",
- "srml-democracy 2.0.0",
- "srml-elections-phragmen 2.0.0",
- "srml-executive 2.0.0",
- "srml-finality-tracker 2.0.0",
- "srml-grandpa 2.0.0",
- "srml-im-online 0.1.0",
- "srml-indices 2.0.0",
- "srml-membership 2.0.0",
- "srml-nicks 2.0.0",
- "srml-offences 1.0.0",
- "srml-randomness-collective-flip 2.0.0",
- "srml-session 2.0.0",
- "srml-staking 2.0.0",
- "srml-staking-reward-curve 2.0.0",
- "srml-sudo 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-system-rpc-runtime-api 2.0.0",
- "srml-timestamp 2.0.0",
- "srml-transaction-payment 2.0.0",
- "srml-transaction-payment-rpc-runtime-api 2.0.0",
- "srml-treasury 2.0.0",
- "srml-utility 2.0.0",
  "substrate-authority-discovery-primitives 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
@@ -2919,6 +2909,17 @@ dependencies = [
 name = "node-template-runtime"
 version = "2.0.0"
 dependencies = [
+ "paint-aura 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-executive 2.0.0",
+ "paint-grandpa 2.0.0",
+ "paint-indices 2.0.0",
+ "paint-randomness-collective-flip 2.0.0",
+ "paint-sudo 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "paint-transaction-payment 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2927,17 +2928,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
  "sr-version 2.0.0",
- "srml-aura 2.0.0",
- "srml-balances 2.0.0",
- "srml-executive 2.0.0",
- "srml-grandpa 2.0.0",
- "srml-indices 2.0.0",
- "srml-randomness-collective-flip 2.0.0",
- "srml-sudo 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "srml-transaction-payment 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-consensus-aura-primitives 2.0.0",
  "substrate-inherents 2.0.0",
@@ -2945,7 +2935,7 @@ dependencies = [
  "substrate-primitives 2.0.0",
  "substrate-session 2.0.0",
  "substrate-transaction-pool-runtime-api 2.0.0",
- "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-wasm-builder-runner 1.0.4",
 ]
 
 [[package]]
@@ -2955,20 +2945,20 @@ dependencies = [
  "node-executor 2.0.0",
  "node-primitives 2.0.0",
  "node-runtime 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-contracts 2.0.0",
+ "paint-grandpa 2.0.0",
+ "paint-indices 2.0.0",
+ "paint-session 2.0.0",
+ "paint-staking 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "paint-transaction-payment 2.0.0",
+ "paint-treasury 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
- "srml-balances 2.0.0",
- "srml-contracts 2.0.0",
- "srml-grandpa 2.0.0",
- "srml-indices 2.0.0",
- "srml-session 2.0.0",
- "srml-staking 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "srml-transaction-payment 2.0.0",
- "srml-treasury 2.0.0",
  "substrate-client 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-keyring 2.0.0",
@@ -3117,2036 +3107,2008 @@ dependencies = [
 ]
 
 [[package]]
-name = "parity-bytes"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
-
-[[package]]
-name = "parity-multiaddr"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-assets"
+version = "2.0.0"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-multihash"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-aura"
+version = "2.0.0"
 dependencies = [
- "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-consensus-aura-primitives 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-scale-codec"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-authority-discovery"
+version = "0.1.0"
 dependencies = [
- "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-slice-cast 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec-derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-authority-discovery-primitives 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-scale-codec-derive"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-authorship"
+version = "0.1.0"
 dependencies = [
- "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-send-wrapper"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-babe"
+version = "2.0.0"
+dependencies = [
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-consensus-babe-primitives 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-test-runtime 2.0.0",
+]
 
 [[package]]
-name = "parity-util-mem"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-balances"
+version = "2.0.0"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-transaction-payment 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-keyring 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-wasm"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-collective"
+version = "2.0.0"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parity-wasm"
-version = "0.40.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-contracts"
+version = "2.0.0"
+dependencies = [
+ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-randomness-collective-flip 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-sandbox 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmi-validation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "parity-wasm"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-contracts-rpc"
+version = "2.0.0"
+dependencies = [
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-contracts-rpc-runtime-api 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 2.0.0",
+ "substrate-client 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-rpc-primitives 2.0.0",
+]
 
 [[package]]
-name = "parking_lot"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-contracts-rpc-runtime-api"
+version = "2.0.0"
 dependencies = [
- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-democracy"
+version = "2.0.0"
 dependencies = [
- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-elections"
+version = "2.0.0"
 dependencies = [
- "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-elections-phragmen"
+version = "2.0.0"
 dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-phragmen 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-evm"
+version = "2.0.0"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "evm 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-example"
+version = "2.0.0"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-executive"
+version = "2.0.0"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-indices 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-transaction-payment 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-finality-tracker"
+version = "2.0.0"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "paste"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-generic-asset"
+version = "2.0.0"
 dependencies = [
- "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "paste-impl"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-grandpa"
+version = "2.0.0"
 dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-finality-tracker 2.0.0",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-finality-grandpa-primitives 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "pbkdf2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-im-online"
+version = "0.1.0"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-authorship 0.1.0",
+ "paint-session 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-offchain 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "pdqselect"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-indices"
+version = "2.0.0"
+dependencies = [
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ref_thread_local 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-keyring 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-membership"
+version = "2.0.0"
+dependencies = [
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-metadata"
+version = "2.0.0"
+dependencies = [
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-nicks"
+version = "2.0.0"
+dependencies = [
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "petgraph"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-offences"
+version = "1.0.0"
 dependencies = [
- "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "pin-utils"
-version = "0.1.0-alpha.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-randomness-collective-flip"
+version = "2.0.0"
+dependencies = [
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "pkg-config"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-scored-pool"
+version = "1.0.0"
+dependencies = [
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-session"
+version = "2.0.0"
+dependencies = [
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-trie 2.0.0",
+]
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-staking"
+version = "2.0.0"
+dependencies = [
+ "paint-authorship 0.1.0",
+ "paint-balances 2.0.0",
+ "paint-session 2.0.0",
+ "paint-staking-reward-curve 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-timestamp 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-staking-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-keyring 2.0.0",
+ "substrate-phragmen 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "pretty_assertions"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-staking-reward-curve"
+version = "2.0.0"
 dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 2.0.0",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "primitive-types"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-sudo"
+version = "2.0.0"
 dependencies = [
- "fixed-hash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "impl-rlp 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "uint 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "proc-macro-crate"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support"
+version = "2.0.0"
 dependencies = [
- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-metadata 2.0.0",
+ "paint-support-procedural 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-state-machine 2.0.0",
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support-procedural"
+version = "2.0.0"
 dependencies = [
+ "paint-support-procedural-tools 2.0.0",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "proc-macro-hack"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support-procedural-tools"
+version = "2.0.0"
 dependencies = [
+ "paint-support-procedural-tools-derive 2.0.0",
+ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "proc-macro-nested"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support-procedural-tools-derive"
+version = "2.0.0"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support-rpc"
+version = "2.0.0"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-primitives-storage 2.0.0",
+ "substrate-rpc-api 2.0.0",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-support-test"
+version = "2.0.0"
 dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-state-machine 2.0.0",
+ "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "prost"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-system"
+version = "2.0.0"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "prost-build"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-system-rpc"
+version = "2.0.0"
 dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "multimap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-system-rpc-runtime-api 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 2.0.0",
+ "substrate-client 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-test-runtime-client 2.0.0",
+ "substrate-transaction-pool 2.0.0",
 ]
 
 [[package]]
-name = "prost-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-system-rpc-runtime-api"
+version = "2.0.0"
 dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-timestamp"
+version = "2.0.0"
 dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "protobuf"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-transaction-payment"
+version = "2.0.0"
+dependencies = [
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-transaction-payment-rpc-runtime-api 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
+]
 
 [[package]]
-name = "pwasm-utils"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-transaction-payment-rpc"
+version = "2.0.0"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-transaction-payment-rpc-runtime-api 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 2.0.0",
+ "substrate-client 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-rpc-primitives 2.0.0",
 ]
 
 [[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-transaction-payment-rpc-runtime-api"
+version = "2.0.0"
+dependencies = [
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+]
 
 [[package]]
-name = "quickcheck"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-treasury"
+version = "2.0.0"
 dependencies = [
- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "quickcheck"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "paint-utility"
+version = "2.0.0"
 dependencies = [
- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-balances 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "quote"
-version = "0.6.13"
+name = "parity-bytes"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
+
+[[package]]
+name = "parity-multiaddr"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-multihash 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.2"
+name = "parity-multihash"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand"
-version = "0.3.23"
+name = "parity-scale-codec"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-slice-cast 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec-derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand"
-version = "0.4.6"
+name = "parity-scale-codec-derive"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand"
-version = "0.5.6"
+name = "parity-send-wrapper"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rand"
-version = "0.6.5"
+name = "parity-util-mem"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.2"
+name = "parity-wasm"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.1.1"
+name = "parity-wasm"
+version = "0.40.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rand_chacha"
-version = "0.2.1"
+name = "parity-wasm"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rand_core"
-version = "0.3.1"
+name = "parking_lot"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.4.2"
+name = "parking_lot"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "rand_core"
-version = "0.5.1"
+name = "parking_lot"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.1.0"
+name = "parking_lot"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.2.0"
+name = "parking_lot_core"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_isaac"
-version = "0.1.1"
+name = "parking_lot_core"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_jitter"
-version = "0.1.4"
+name = "parking_lot_core"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_os"
-version = "0.1.3"
+name = "parking_lot_core"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_os"
-version = "0.2.2"
+name = "paste"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_pcg"
-version = "0.1.2"
+name = "paste-impl"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_xorshift"
-version = "0.1.1"
+name = "pbkdf2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_xoshiro"
+name = "pdqselect"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rand_xoshiro"
-version = "0.3.1"
+name = "peeking_take_while"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "raw-cpuid"
-version = "6.1.0"
+name = "percent-encoding"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rayon"
-version = "1.2.0"
+name = "percent-encoding"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "rayon-core"
-version = "1.6.0"
+name = "petgraph"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rdrand"
-version = "0.4.0"
+name = "pin-utils"
+version = "0.1.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "redox_syscall"
-version = "0.1.56"
+name = "pkg-config"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "redox_users"
-version = "0.3.1"
+name = "plain"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "ref_thread_local"
-version = "0.0.0"
+name = "ppv-lite86"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "regex"
-version = "1.3.1"
+name = "pretty_assertions"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "regex-automata"
-version = "0.1.8"
+name = "primitive-types"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fixed-hash 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-codec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-rlp 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uint 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "regex-syntax"
-version = "0.6.12"
+name = "proc-macro-crate"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "region"
-version = "2.1.2"
+name = "proc-macro-error"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.2"
+name = "proc-macro-hack"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rhododendron"
-version = "0.7.0"
+name = "proc-macro-nested"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "ring"
-version = "0.16.9"
+name = "proc-macro2"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rlp"
-version = "0.4.3"
+name = "proc-macro2"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rocksdb"
-version = "0.11.0"
+name = "prost"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prost-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rpassword"
-version = "4.0.1"
+name = "prost-build"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multimap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rust-argon2"
-version = "0.5.1"
+name = "prost-derive"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rustc-demangle"
-version = "0.1.16"
+name = "prost-types"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "rustc-hex"
-version = "2.0.1"
+name = "protobuf"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "rustc_version"
-version = "0.2.3"
+name = "pwasm-utils"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rustls"
-version = "0.16.0"
+name = "quick-error"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "quickcheck"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rustversion"
-version = "1.0.0"
+name = "quickcheck"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rw-stream-sink"
-version = "0.1.2"
+name = "quote"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ryu"
+name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "safe-mix"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "safemem"
-version = "0.3.3"
+name = "rand"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "same-file"
-version = "1.0.5"
+name = "rand"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "schannel"
-version = "0.1.16"
+name = "rand"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "schnorrkel"
-version = "0.8.5"
+name = "rand"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "merlin 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "scopeguard"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "scroll"
-version = "0.9.2"
+name = "rand"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "scroll_derive"
-version = "0.9.5"
+name = "rand_chacha"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sct"
-version = "0.6.0"
+name = "rand_chacha"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "security-framework"
-version = "0.3.3"
+name = "rand_core"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "0.3.3"
+name = "rand_core"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "semver"
-version = "0.6.0"
+name = "rand_core"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "semver"
-version = "0.9.0"
+name = "rand_hc"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "send_wrapper"
+name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.102"
+name = "rand_isaac"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "serde_json"
-version = "1.0.41"
+name = "rand_jitter"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.8.1"
+name = "rand_os"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "sha2"
-version = "0.8.0"
+name = "rand_os"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sha3"
-version = "0.8.2"
+name = "rand_pcg"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "shell32-sys"
-version = "0.1.2"
+name = "rand_xorshift"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "slab"
-version = "0.4.2"
+name = "rand_xoshiro"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "slog"
-version = "2.5.2"
+name = "rand_xoshiro"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "slog-async"
-version = "2.3.0"
-source = "git+https://github.com/paritytech/slog-async#107848e7ded5e80dc43f6296c2b96039eb92c0a5"
+name = "raw-cpuid"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "slog-json"
-version = "2.3.0"
+name = "rayon"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "slog-scope"
-version = "4.3.0"
+name = "rayon-core"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "slog_derive"
-version = "0.1.1"
+name = "rdrand"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "smallvec"
-version = "0.6.13"
+name = "redox_syscall"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_users"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "snow"
-version = "0.6.1"
+name = "ref_thread_local"
+version = "0.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "regex"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "soketto"
-version = "0.2.3"
+name = "regex-automata"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sourcefile"
-version = "0.1.4"
+name = "regex-syntax"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "spin"
-version = "0.5.2"
+name = "region"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "sr-api"
-version = "2.0.0"
+name = "remove_dir_all"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api-proc-macro 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "sr-version 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-state-machine 2.0.0",
- "substrate-test-runtime-client 2.0.0",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sr-api-proc-macro"
-version = "2.0.0"
+name = "ring"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
- "sr-primitives 2.0.0",
- "sr-version 2.0.0",
- "substrate-test-runtime-client 2.0.0",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sr-api-test"
-version = "2.0.0"
+name = "rlp"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
- "sr-primitives 2.0.0",
- "sr-version 2.0.0",
- "substrate-consensus-common 2.0.0",
- "substrate-state-machine 2.0.0",
- "substrate-test-runtime-client 2.0.0",
- "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sr-arithmetic"
-version = "2.0.0"
+name = "rocksdb"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 2.0.0",
- "substrate-debug-derive 2.0.0",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sr-io"
-version = "2.0.0"
+name = "rpassword"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 2.0.0",
- "substrate-externalities 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-runtime-interface 2.0.0",
- "substrate-state-machine 2.0.0",
- "substrate-trie 2.0.0",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "sr-primitives"
-version = "2.0.0"
+name = "rust-argon2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-arithmetic 2.0.0",
- "sr-io 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-application-crypto 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-offchain 2.0.0",
- "substrate-primitives 2.0.0",
-]
-
-[[package]]
-name = "sr-sandbox"
-version = "2.0.0"
-dependencies = [
- "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-std 2.0.0",
- "substrate-primitives 2.0.0",
- "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sr-staking-primitives"
-version = "2.0.0"
-dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
-]
-
-[[package]]
-name = "sr-std"
-version = "2.0.0"
-
-[[package]]
-name = "sr-version"
-version = "2.0.0"
-dependencies = [
- "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-assets"
-version = "2.0.0"
-dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "rustc-demangle"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-aura"
-version = "2.0.0"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-application-crypto 2.0.0",
- "substrate-consensus-aura-primitives 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "rustc-hex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-authority-discovery"
-version = "0.1.0"
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-application-crypto 2.0.0",
- "substrate-authority-discovery-primitives 2.0.0",
- "substrate-primitives 2.0.0",
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-authorship"
-version = "0.1.0"
+name = "rustls"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-babe"
-version = "2.0.0"
+name = "rustversion"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "sr-version 2.0.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-consensus-babe-primitives 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-test-runtime 2.0.0",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-balances"
-version = "2.0.0"
+name = "rw-stream-sink"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-transaction-payment 2.0.0",
- "substrate-keyring 2.0.0",
- "substrate-primitives 2.0.0",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-collective"
-version = "2.0.0"
-dependencies = [
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "ryu"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-contracts"
-version = "2.0.0"
+name = "safe-mix"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wasm 0.40.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pwasm-utils 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-sandbox 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-randomness-collective-flip 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-primitives 2.0.0",
- "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmi-validation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-contracts-rpc"
-version = "2.0.0"
-dependencies = [
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 2.0.0",
- "srml-contracts-rpc-runtime-api 2.0.0",
- "substrate-client 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-rpc-primitives 2.0.0",
-]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-contracts-rpc-runtime-api"
-version = "2.0.0"
+name = "same-file"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-democracy"
-version = "2.0.0"
+name = "schannel"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-elections"
-version = "2.0.0"
+name = "schnorrkel"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "merlin 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-elections-phragmen"
-version = "2.0.0"
-dependencies = [
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-phragmen 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-evm"
-version = "2.0.0"
-dependencies = [
- "evm 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "scopeguard"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-example"
-version = "2.0.0"
-dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+name = "scroll"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-executive"
-version = "2.0.0"
+name = "scroll_derive"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-indices 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-transaction-payment 2.0.0",
- "substrate-primitives 2.0.0",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-finality-tracker"
-version = "2.0.0"
+name = "sct"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-generic-asset"
-version = "2.0.0"
+name = "security-framework"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-grandpa"
-version = "2.0.0"
+name = "security-framework-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-finality-tracker 2.0.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-finality-grandpa-primitives 2.0.0",
- "substrate-primitives 2.0.0",
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-im-online"
-version = "0.1.0"
+name = "semver"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-authorship 0.1.0",
- "srml-session 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-application-crypto 2.0.0",
- "substrate-offchain 2.0.0",
- "substrate-primitives 2.0.0",
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-indices"
-version = "2.0.0"
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "ref_thread_local 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-keyring 2.0.0",
- "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "srml-membership"
-version = "2.0.0"
-dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
-]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "srml-metadata"
-version = "2.0.0"
+name = "send_wrapper"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 2.0.0",
- "substrate-primitives 2.0.0",
+ "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-nicks"
-version = "2.0.0"
+name = "serde_derive"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-offences"
-version = "1.0.0"
+name = "serde_json"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "srml-randomness-collective-flip"
-version = "2.0.0"
+name = "sha-1"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-scored-pool"
-version = "1.0.0"
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "sha2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-session"
-version = "2.0.0"
+name = "sha3"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-application-crypto 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-trie 2.0.0",
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-staking"
-version = "2.0.0"
+name = "shell32-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-staking-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-authorship 0.1.0",
- "srml-balances 2.0.0",
- "srml-session 2.0.0",
- "srml-staking-reward-curve 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-timestamp 2.0.0",
- "substrate-keyring 2.0.0",
- "substrate-phragmen 2.0.0",
- "substrate-primitives 2.0.0",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-staking-reward-curve"
-version = "2.0.0"
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "slog"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 2.0.0",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-sudo"
-version = "2.0.0"
+name = "slog-async"
+version = "2.3.0"
+source = "git+https://github.com/paritytech/slog-async#107848e7ded5e80dc43f6296c2b96039eb92c0a5"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support"
-version = "2.0.0"
+name = "slog-json"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-metadata 2.0.0",
- "srml-support-procedural 2.0.0",
- "srml-system 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-state-machine 2.0.0",
+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support-procedural"
-version = "2.0.0"
+name = "slog-scope"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "srml-support-procedural-tools 2.0.0",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support-procedural-tools"
-version = "2.0.0"
+name = "slog_derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "srml-support-procedural-tools-derive 2.0.0",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support-procedural-tools-derive"
-version = "2.0.0"
+name = "smallvec"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support-rpc"
-version = "2.0.0"
+name = "snow"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives-storage 2.0.0",
- "substrate-rpc-api 2.0.0",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-support-test"
-version = "2.0.0"
+name = "soketto"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "srml-support 2.0.0",
- "substrate-inherents 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-state-machine 2.0.0",
- "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-system"
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "sr-api"
 version = "2.0.0"
 dependencies = [
- "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
+ "sr-api-proc-macro 2.0.0",
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
  "sr-version 2.0.0",
- "srml-support 2.0.0",
  "substrate-primitives 2.0.0",
+ "substrate-state-machine 2.0.0",
+ "substrate-test-runtime-client 2.0.0",
 ]
 
 [[package]]
-name = "srml-system-rpc"
+name = "sr-api-proc-macro"
 version = "2.0.0"
 dependencies = [
- "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
  "sr-primitives 2.0.0",
- "srml-system-rpc-runtime-api 2.0.0",
- "substrate-client 2.0.0",
- "substrate-primitives 2.0.0",
+ "sr-version 2.0.0",
  "substrate-test-runtime-client 2.0.0",
- "substrate-transaction-pool 2.0.0",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-system-rpc-runtime-api"
+name = "sr-arithmetic"
 version = "2.0.0"
 dependencies = [
+ "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
+ "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-std 2.0.0",
+ "substrate-debug-derive 2.0.0",
 ]
 
 [[package]]
-name = "srml-timestamp"
+name = "sr-io"
 version = "2.0.0"
 dependencies = [
- "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
  "sr-std 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-inherents 2.0.0",
+ "substrate-externalities 2.0.0",
  "substrate-primitives 2.0.0",
+ "substrate-runtime-interface 2.0.0",
+ "substrate-state-machine 2.0.0",
+ "substrate-trie 2.0.0",
 ]
 
 [[package]]
-name = "srml-transaction-payment"
+name = "sr-primitives"
 version = "2.0.0"
 dependencies = [
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-arithmetic 2.0.0",
  "sr-io 2.0.0",
- "sr-primitives 2.0.0",
  "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-transaction-payment-rpc-runtime-api 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-offchain 2.0.0",
  "substrate-primitives 2.0.0",
 ]
 
 [[package]]
-name = "srml-transaction-payment-rpc"
+name = "sr-sandbox"
 version = "2.0.0"
 dependencies = [
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 2.0.0",
- "srml-transaction-payment-rpc-runtime-api 2.0.0",
- "substrate-client 2.0.0",
+ "sr-io 2.0.0",
+ "sr-std 2.0.0",
  "substrate-primitives 2.0.0",
- "substrate-rpc-primitives 2.0.0",
+ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "srml-transaction-payment-rpc-runtime-api"
+name = "sr-staking-primitives"
 version = "2.0.0"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api 2.0.0",
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
 ]
 
 [[package]]
-name = "srml-treasury"
+name = "sr-std"
 version = "2.0.0"
-dependencies = [
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
-]
 
 [[package]]
-name = "srml-utility"
+name = "sr-version"
 version = "2.0.0"
 dependencies = [
+ "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
- "srml-balances 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-primitives 2.0.0",
 ]
 
 [[package]]
@@ -5234,13 +5196,13 @@ dependencies = [
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-primitives 2.0.0",
  "node-runtime 2.0.0",
+ "paint-balances 2.0.0",
+ "paint-system 2.0.0",
+ "paint-transaction-payment 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
- "srml-balances 2.0.0",
- "srml-system 2.0.0",
- "srml-transaction-payment 2.0.0",
  "substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-primitives 2.0.0",
  "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5277,7 +5239,7 @@ dependencies = [
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
  "substrate-authority-discovery-primitives 2.0.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
  "substrate-peerset 2.0.0",
@@ -5306,6 +5268,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5397,7 +5360,7 @@ dependencies = [
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-header-metadata 2.0.0",
  "substrate-keyring 2.0.0",
  "substrate-network 2.0.0",
@@ -5414,6 +5377,43 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "2.0.0"
+dependencies = [
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
+ "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-std 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-block-builder 2.0.0",
+ "substrate-client-api 2.0.0",
+ "substrate-client-db 2.0.0",
+ "substrate-consensus-common 2.0.0",
+ "substrate-executor 2.0.0",
+ "substrate-header-metadata 2.0.0",
+ "substrate-inherents 2.0.0",
+ "substrate-keyring 2.0.0",
+ "substrate-panic-handler 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-state-machine 2.0.0",
+ "substrate-telemetry 2.0.0",
+ "substrate-test-runtime-client 2.0.0",
+ "substrate-trie 2.0.0",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "substrate-client-api"
+version = "2.0.0"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5442,6 +5442,7 @@ dependencies = [
  "substrate-primitives 2.0.0",
  "substrate-state-machine 2.0.0",
  "substrate-telemetry 2.0.0",
+ "substrate-test-primitives 2.0.0",
  "substrate-test-runtime-client 2.0.0",
  "substrate-trie 2.0.0",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5463,6 +5464,7 @@ dependencies = [
  "quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-header-metadata 2.0.0",
@@ -5484,17 +5486,17 @@ dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-aura 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-api 2.0.0",
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
- "srml-aura 2.0.0",
- "srml-support 2.0.0",
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-aura-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-slots 2.0.0",
@@ -5537,6 +5539,7 @@ dependencies = [
  "num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-babe 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pdqselect 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5546,12 +5549,11 @@ dependencies = [
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
- "srml-babe 2.0.0",
- "srml-support 2.0.0",
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-slots 2.0.0",
@@ -5609,11 +5611,11 @@ dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-timestamp 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
- "srml-timestamp 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-consensus-pow-primitives 2.0.0",
  "substrate-inherents 2.0.0",
@@ -5631,30 +5633,6 @@ dependencies = [
  "substrate-primitives 2.0.0",
 ]
 
-[[package]]
-name = "substrate-consensus-rhd"
-version = "2.0.0"
-dependencies = [
- "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rhododendron 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 2.0.0",
- "sr-primitives 2.0.0",
- "sr-version 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "substrate-client 2.0.0",
- "substrate-consensus-common 2.0.0",
- "substrate-keyring 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-transaction-pool 2.0.0",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "substrate-consensus-slots"
 version = "2.0.0"
@@ -5665,7 +5643,7 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5678,9 +5656,9 @@ name = "substrate-consensus-uncles"
 version = "2.0.0"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-authorship 0.1.0",
  "sr-primitives 2.0.0",
- "srml-authorship 0.1.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-inherents 2.0.0",
  "substrate-primitives 2.0.0",
@@ -5715,7 +5693,7 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-version 2.0.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-externalities 2.0.0",
  "substrate-offchain 2.0.0",
  "substrate-panic-handler 2.0.0",
@@ -5754,14 +5732,15 @@ dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-finality-tracker 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
- "srml-finality-tracker 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-finality-grandpa-primitives 2.0.0",
@@ -5868,9 +5847,11 @@ dependencies = [
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-arithmetic 2.0.0",
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-header-metadata 2.0.0",
@@ -5907,7 +5888,7 @@ dependencies = [
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-api 2.0.0",
  "sr-primitives 2.0.0",
- "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
@@ -5952,12 +5933,12 @@ dependencies = [
 name = "substrate-phragmen"
 version = "2.0.0"
 dependencies = [
+ "paint-support 2.0.0",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
- "srml-support 2.0.0",
 ]
 
 [[package]]
@@ -6032,6 +6013,7 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-version 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-executor 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
@@ -6179,6 +6161,7 @@ dependencies = [
  "substrate-application-crypto 2.0.0",
  "substrate-chain-spec 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
  "substrate-consensus-babe-primitives 2.0.0",
  "substrate-consensus-common 2.0.0",
@@ -6291,6 +6274,7 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-client-db 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-executor 2.0.0",
@@ -6299,6 +6283,17 @@ dependencies = [
  "substrate-state-machine 2.0.0",
 ]
 
+[[package]]
+name = "substrate-test-primitives"
+version = "2.0.0"
+dependencies = [
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 2.0.0",
+ "substrate-application-crypto 2.0.0",
+ "substrate-primitives 2.0.0",
+]
+
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
@@ -6306,6 +6301,12 @@ dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paint-babe 2.0.0",
+ "paint-executive 2.0.0",
+ "paint-support 2.0.0",
+ "paint-system 2.0.0",
+ "paint-system-rpc-runtime-api 2.0.0",
+ "paint-timestamp 2.0.0",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-api 2.0.0",
@@ -6313,12 +6314,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
  "sr-version 2.0.0",
- "srml-babe 2.0.0",
- "srml-executive 2.0.0",
- "srml-support 2.0.0",
- "srml-system 2.0.0",
- "srml-system-rpc-runtime-api 2.0.0",
- "srml-timestamp 2.0.0",
  "substrate-application-crypto 2.0.0",
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-client 2.0.0",
@@ -6346,6 +6341,8 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0",
  "substrate-block-builder 2.0.0",
+ "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-test-client 2.0.0",
  "substrate-test-runtime 2.0.0",
@@ -6431,11 +6428,6 @@ dependencies = [
 name = "substrate-wasm-builder-runner"
 version = "1.0.4"
 
-[[package]]
-name = "substrate-wasm-builder-runner"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "substrate-wasm-interface"
 version = "2.0.0"
@@ -6869,6 +6861,7 @@ dependencies = [
  "substrate-block-builder-runtime-api 2.0.0",
  "substrate-cli 2.0.0",
  "substrate-client 2.0.0",
+ "substrate-client-api 2.0.0",
  "substrate-consensus-common 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-service 2.0.0",
@@ -7700,7 +7693,6 @@ dependencies = [
 "checksum erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3beee4bc16478a1b26f2e80ad819a52d24745e292f521a63c16eea5f74b7eb60"
 "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
 "checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
-"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
 "checksum evm 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1138816a9b7f9a9d1fcabb1b8a7afed2687d035692baf297bd3fea122acdc96f"
 "checksum evm-core 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bcde5af3d542874ddeb53de0919302d57586ea04b3f76f54d865f8a6cdc70ae"
 "checksum evm-gasometer 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b82bc9f275cb59d2bcc05d85c98736ddfaba003a7ef7b73893fa7c1c1fab29dc"
@@ -7960,7 +7952,6 @@ dependencies = [
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rhododendron 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36542aafc2429a4c010fafa079a20dee953b663cb2427f51d86cf1d436846b4d"
 "checksum ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6747f8da1f2b1fabbee1aaa4eb8a11abf9adef0bf58a41cee45db5d59cecdfac"
 "checksum rlp 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8376a3f725ebb53f69263bbebb42196361fdfd551212409c8a721239aab4f09f"
 "checksum rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1651697fefd273bfb4fd69466cc2a9d20de557a0213b97233b22b5e95924b5e"
@@ -8019,7 +8010,6 @@ dependencies = [
 "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f"
 "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e"
 "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5"
-"checksum substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bd48273fe9d7f92c1f7d6c1c537bb01c8068f925b47ad2cd8367e11dc32f8550"
 "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 "checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
diff --git a/Cargo.toml b/Cargo.toml
index c3d8776396d10..0182427ce2339 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ members = [
 	"client/transaction-pool/graph",
 	"utils/fork-tree",
 	"utils/wasm-builder",
-	"utils/wasm-builder",
+	"client/utils/wasm-builder-runner",
 	"paint/assets",
 	"paint/aura",
 	"paint/authority-discovery",
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
index 1c412c36acc6b..17b1c59106cd7 100644
--- a/bin/node-template/runtime/Cargo.toml
+++ b/bin/node-template/runtime/Cargo.toml
@@ -33,7 +33,7 @@ tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../.
 version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }
 
 [build-dependencies]
-wasm-builder = { package = "substrate-wasm-builder", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = ["std"]
diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
index bcafe2993bd03..2cc7f84e8574c 100644
--- a/bin/node/runtime/Cargo.toml
+++ b/bin/node/runtime/Cargo.toml
@@ -63,7 +63,7 @@ transaction-payment = { package = "paint-transaction-payment", path = "../../../
 transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", default-features = false }
 
 [build-dependencies]
-wasm-builder = { package = "substrate-wasm-builder", version = "1.0.4", path = "../../../utils/wasm-builder" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
 
 [dev-dependencies]
 runtime_io = { package = "sr-io", path = "../../../primitives/sr-io" }
diff --git a/bin/node/runtime/build.rs b/bin/node/runtime/build.rs
index c86d3a1eee517..d6b0ae626facb 100644
--- a/bin/node/runtime/build.rs
+++ b/bin/node/runtime/build.rs
@@ -20,7 +20,7 @@ fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
 		WasmBuilderSource::CratesOrPath {
-			path: "../../../client/utils/wasm-builder",
+			path: "../../../utils/wasm-builder",
 			version: "1.0.8",
 		},
 		// This instructs LLD to export __heap_base as a global variable, which is used by the
diff --git a/client/executor/runtime-test/Cargo.toml b/client/executor/runtime-test/Cargo.toml
index 752fc74500b4b..610db4545800e 100644
--- a/client/executor/runtime-test/Cargo.toml
+++ b/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,7 @@ primitives = { package = "substrate-primitives",  path = "../../../primitives/co
 sr-primitives = { package = "sr-primitives",  path = "../../../primitives/sr-primitives", default-features = false }
 
 [build-dependencies]
-wasm-builder = { package = "substrate-wasm-builder", version = "1.0.4", path = "../../../utils/wasm-builder" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = [ "std" ]
diff --git a/client/executor/runtime-test/build.rs b/client/executor/runtime-test/build.rs
index 68e5205f0c7a8..d6b0ae626facb 100644
--- a/client/executor/runtime-test/build.rs
+++ b/client/executor/runtime-test/build.rs
@@ -20,7 +20,7 @@ fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
 		WasmBuilderSource::CratesOrPath {
-			path: "../../utils/wasm-builder",
+			path: "../../../utils/wasm-builder",
 			version: "1.0.8",
 		},
 		// This instructs LLD to export __heap_base as a global variable, which is used by the
diff --git a/client/utils/wasm-builder-runner/Cargo.toml b/client/utils/wasm-builder-runner/Cargo.toml
index f362eb52b7c2b..ab8a539054820 100644
--- a/client/utils/wasm-builder-runner/Cargo.toml
+++ b/client/utils/wasm-builder-runner/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "substrate-wasm-builder"
+name = "substrate-wasm-builder-runner"
 version = "1.0.4"
 authors = ["Parity Technologies "]
 description = "Runner for substrate-wasm-builder"
diff --git a/primitives/runtime-interface/test-wasm/Cargo.toml b/primitives/runtime-interface/test-wasm/Cargo.toml
index 296239d395192..13d6e2591421b 100644
--- a/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -12,7 +12,7 @@ runtime-io = { package = "sr-io", path = "../../sr-io", default-features = false
 primitives = { package = "substrate-primitives", path = "../../core", default-features = false }
 
 [build-dependencies]
-wasm-builder = { package = "substrate-wasm-builder", version = "1.0.3", path = "../../../utils/wasm-builder" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.3", path = "../../../client/utils/wasm-builder-runner" }
 
 [features]
 default = [ "std" ]
diff --git a/primitives/runtime-interface/test-wasm/build.rs b/primitives/runtime-interface/test-wasm/build.rs
index 5268f86d6dfc2..ef2650dd5afe8 100644
--- a/primitives/runtime-interface/test-wasm/build.rs
+++ b/primitives/runtime-interface/test-wasm/build.rs
@@ -20,7 +20,7 @@ fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
 		WasmBuilderSource::CratesOrPath {
-			path: "../../../client/utils/wasm-builder",
+			path: "../../../utils/wasm-builder",
 			version: "1.0.6",
 		},
 		// This instructs LLD to export __heap_base as a global variable, which is used by the
diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml
index 986866dd050c6..c405451fa8602 100644
--- a/test/utils/runtime/Cargo.toml
+++ b/test/utils/runtime/Cargo.toml
@@ -43,7 +43,7 @@ substrate-test-runtime-client = { path = "./client" }
 state_machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" }
 
 [build-dependencies]
-wasm-builder = { package = "substrate-wasm-builder", version = "1.0.4", path = "../../../utils/wasm-builder" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = [
diff --git a/test/utils/runtime/build.rs b/test/utils/runtime/build.rs
index 587e9fbe0e82e..cd2c502e78c45 100644
--- a/test/utils/runtime/build.rs
+++ b/test/utils/runtime/build.rs
@@ -20,7 +20,7 @@ fn main() {
 	build_current_project_with_rustflags(
 		"wasm_binary.rs",
 		WasmBuilderSource::CratesOrPath {
-			path: "../../../client/utils/wasm-builder",
+			path: "../../../utils/wasm-builder",
 			version: "1.0.8",
 		},
 		// Note that we set the stack-size to 1MB explicitly even though it is set

From 444d41e6d54e807fa4e5a08c384e63ce44f43e4d Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 17:54:41 +0100
Subject: [PATCH 56/61] fix imports for authority discovery

---
 bin/node/cli/Cargo.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index d9a75e605a81a..54556ca32030a 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -57,6 +57,7 @@ substrate-rpc = { package = "substrate-rpc", path = "../../../client/rpc" }
 substrate-basic-authorship = { path = "../../../client/basic-authorship" }
 substrate-service = { path = "../../../client/service", default-features = false }
 substrate-telemetry = { package = "substrate-telemetry", path = "../../../client/telemetry" }
+authority-discovery = { package = "substrate-authority-discovery", path = "../../../client/authority-discovery"}
 
 # paint dependencies
 indices = { package = "paint-indices", path = "../../../paint/indices" }
@@ -67,7 +68,9 @@ system = { package = "paint-system", path = "../../../paint/system" }
 balances = { package = "paint-balances", path = "../../../paint/balances" }
 transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment" }
 support = { package = "paint-support", path = "../../../paint/support", default-features = false }
-im_online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false }
+im_online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false }authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../../primitives/authority-discovery"}
+authority-discovery = { package = "paint-authority-discovery", path = "../../../paint/authority-discovery"}
+
 
 # node-specific dependencies
 node-runtime = { path = "../runtime" }

From be9be036b9c00c4c9e4f340f2ab8314b37f4765a Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 17:56:24 +0100
Subject: [PATCH 57/61] fix typo

---
 bin/node/cli/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
index 54556ca32030a..ba7568f571e83 100644
--- a/bin/node/cli/Cargo.toml
+++ b/bin/node/cli/Cargo.toml
@@ -68,8 +68,8 @@ system = { package = "paint-system", path = "../../../paint/system" }
 balances = { package = "paint-balances", path = "../../../paint/balances" }
 transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment" }
 support = { package = "paint-support", path = "../../../paint/support", default-features = false }
-im_online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false }authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../../primitives/authority-discovery"}
-authority-discovery = { package = "paint-authority-discovery", path = "../../../paint/authority-discovery"}
+im_online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false }
+sr-authority-discovery = { package = "paint-authority-discovery", path = "../../../paint/authority-discovery"}
 
 
 # node-specific dependencies

From 7b68eda19b3e41bab2541bb4bb4bf6285d99800f Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 18:17:01 +0100
Subject: [PATCH 58/61] update cargo.lock

---
 Cargo.lock | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 56940a0e537b6..e29c5875afdbb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2698,6 +2698,7 @@ dependencies = [
  "node-primitives 2.0.0",
  "node-rpc 2.0.0",
  "node-runtime 2.0.0",
+ "paint-authority-discovery 0.1.0",
  "paint-balances 2.0.0",
  "paint-contracts 2.0.0",
  "paint-finality-tracker 2.0.0",
@@ -2714,6 +2715,7 @@ dependencies = [
  "sr-io 2.0.0",
  "sr-primitives 2.0.0",
  "structopt 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-authority-discovery 2.0.0",
  "substrate-authority-discovery-primitives 2.0.0",
  "substrate-basic-authorship 2.0.0",
  "substrate-build-script-utils 2.0.0",

From cc85b0b398ce47ea9bf1043c2132b27a6a04b7d8 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 19:22:26 +0100
Subject: [PATCH 59/61] fixing imports

---
 client/authority-discovery/src/lib.rs           | 2 +-
 client/basic-authorship/src/basic_authorship.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/authority-discovery/src/lib.rs b/client/authority-discovery/src/lib.rs
index 8d77145799d02..57805d0add18b 100644
--- a/client/authority-discovery/src/lib.rs
+++ b/client/authority-discovery/src/lib.rs
@@ -591,7 +591,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<()>,
 			_: Vec,
-		) -> std::result::Result>, client::error::Error> {
+		) -> std::result::Result>, client_api::error::Error> {
 			return Ok(NativeOrEncoded::Native(self.authorities.clone()));
 		}
 	}
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index dbe914c89422e..7d8956152c13f 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -55,7 +55,7 @@ where
 	RA: Send + Sync + 'static,
 	SubstrateClient: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
-		BlockBuilderApi,
+		BlockBuilderApi,
 {
 	type Proposer = Proposer, A>;
 	type Error = error::Error;
@@ -103,7 +103,7 @@ where
 	RA: Send + Sync + 'static,
 	SubstrateClient: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
-		BlockBuilderApi,
+		BlockBuilderApi,
 {
 	type Create = futures::future::Ready>;
 	type Error = error::Error;
@@ -128,7 +128,7 @@ impl Proposer, A>	wh
 	RA: Send + Sync + 'static,
 	SubstrateClient: ProvideRuntimeApi,
 	 as ProvideRuntimeApi>::Api:
-		BlockBuilderApi,
+		BlockBuilderApi,
 {
 	fn propose_with(
 		&self,

From 9e849bcbc240580fc05dacc1423fdce6a45d5a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= 
Date: Thu, 14 Nov 2019 20:46:31 +0100
Subject: [PATCH 60/61] Fix paths and add missing crates

---
 Cargo.lock                        | 15 +++++++++++++++
 Cargo.toml                        |  2 ++
 primitives/sr-api/test/Cargo.toml |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index e29c5875afdbb..5fe1e3003edc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5025,6 +5025,21 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sr-api-test"
+version = "2.0.0"
+dependencies = [
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-api 2.0.0",
+ "sr-primitives 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-consensus-common 2.0.0",
+ "substrate-state-machine 2.0.0",
+ "substrate-test-runtime-client 2.0.0",
+ "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sr-arithmetic"
 version = "2.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0182427ce2339..f05cf57c84fbd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,6 +99,8 @@ members = [
 	"primitives/serializer",
 	"primitives/session",
 	"primitives/sr-api",
+	"primitives/sr-api/test",
+	"primitives/sr-api/proc-macro",
 	"primitives/sr-arithmetic",
 	"primitives/sr-io",
 	"primitives/sr-primitives",
diff --git a/primitives/sr-api/test/Cargo.toml b/primitives/sr-api/test/Cargo.toml
index e9ae309b6986c..7915266cca107 100644
--- a/primitives/sr-api/test/Cargo.toml
+++ b/primitives/sr-api/test/Cargo.toml
@@ -9,7 +9,7 @@ sr-api = { path = "../" }
 test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
 sr-version = { path = "../../sr-version" }
 sr-primitives = { path = "../../sr-primitives" }
-consensus_common = { package = "substrate-consensus-common", path = "../../../client/consensus/common" }
+consensus_common = { package = "substrate-consensus-common", path = "../../../primitives/consensus/common" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 state-machine = { package = "substrate-state-machine", path = "../../../primitives/state-machine" }
 trybuild = "1.0.17"

From a94ed575570ce56994e3c66ec17e752ac19bf38a Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann 
Date: Thu, 14 Nov 2019 21:05:30 +0100
Subject: [PATCH 61/61] re-add missing crates

---
 Cargo.toml | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f05cf57c84fbd..f35cab80144e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,17 +1,19 @@
 [workspace]
 members = [
 	"bin/node-template",
+	"bin/node-template/runtime",
 	"bin/node/cli",
 	"bin/node/executor",
 	"bin/node/primitives",
-	"bin/node/rpc",
 	"bin/node/rpc-client",
+	"bin/node/rpc",
 	"bin/node/runtime",
 	"bin/node/testing",
 	"bin/subkey",
-	"client/",
+	"client",
 	"client/api",
 	"client/authority-discovery",
+	"client/basic-authorship",
 	"client/block-builder",
 	"client/chain-spec",
 	"client/chain-spec/derive",
@@ -28,27 +30,30 @@ members = [
 	"client/header-metadata",
 	"client/keystore",
 	"client/network",
-	"client/rpc",
+	"client/offchain",
 	"client/rpc-servers",
+	"client/rpc",
+	"client/rpc/api",
 	"client/service",
 	"client/service/test",
+	"client/state-db",
 	"client/telemetry",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
-	"utils/fork-tree",
-	"utils/wasm-builder",
 	"client/utils/wasm-builder-runner",
 	"paint/assets",
 	"paint/aura",
 	"paint/authority-discovery",
 	"paint/authorship",
+	"paint/babe",
 	"paint/balances",
 	"paint/collective",
 	"paint/contracts",
 	"paint/contracts/rpc",
+	"paint/contracts/rpc/runtime-api",
 	"paint/democracy",
-	"paint/elections",
 	"paint/elections-phragmen",
+	"paint/elections",
 	"paint/evm",
 	"paint/example",
 	"paint/executive",
@@ -75,23 +80,31 @@ members = [
 	"paint/support/test",
 	"paint/system",
 	"paint/system/rpc",
+	"paint/system/rpc/runtime-api",
 	"paint/timestamp",
 	"paint/transaction-payment",
 	"paint/transaction-payment/rpc",
+	"paint/transaction-payment/rpc/runtime-api",
 	"paint/treasury",
 	"paint/utility",
 	"primitives/application-crypto",
+	"primitives/authority-discovery",
 	"primitives/block-builder/runtime-api",
 	"primitives/consensus/aura",
 	"primitives/consensus/babe",
 	"primitives/consensus/common",
 	"primitives/consensus/pow",
 	"primitives/core",
+	"primitives/core/debug-derive",
+	"primitives/core/storage",
 	"primitives/externalities",
 	"primitives/finality-grandpa",
 	"primitives/inherents",
 	"primitives/keyring",
+	"primitives/offchain",
 	"primitives/panic-handler",
+	"primitives/peerset",
+	"primitives/phragmen",
 	"primitives/rpc",
 	"primitives/runtime-interface",
 	"primitives/runtime-interface/proc-macro",
@@ -99,8 +112,8 @@ members = [
 	"primitives/serializer",
 	"primitives/session",
 	"primitives/sr-api",
-	"primitives/sr-api/test",
 	"primitives/sr-api/proc-macro",
+	"primitives/sr-api/test",
 	"primitives/sr-arithmetic",
 	"primitives/sr-io",
 	"primitives/sr-primitives",
@@ -117,6 +130,10 @@ members = [
 	"test/utils/primitives",
 	"test/utils/runtime",
 	"test/utils/runtime/client",
+	"test/utils/transaction-factory",
+	"utils/build-script-utils",
+	"utils/fork-tree",
+	"utils/wasm-builder",
 ]
 
 [profile.release]