diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c87cdae7c3562ad2a90ce0b8cbcace2aec64b620..51ee7bcb1ef2a2d4c5d045bd77f142de712425f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,59 +1,65 @@
+# .gitlab-ci.yml
+
+
+
stages:
- test
- build
+ - publish
image: parity/rust:nightly
variables:
CI_SERVER_NAME: "GitLab CI"
- CARGO_HOME: "${CI_PROJECT_DIR}/cargo"
+ CARGO_HOME: "${CI_PROJECT_DIR}/.cargo"
+ # have OS based build containers in the future
+ DOCKER_OS: "ubuntu:xenial"
+ ARCH: "x86_64"
- BUILD_TARGET: ubuntu
- BUILD_ARCH: amd64
- CARGO_TARGET: x86_64-unknown-linux-gnu
-.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries")
- only: &releaseable_branches
- - master
- - stable
- - beta
- - tags
- - gitlab-next
-.publishable_branches: # list of git refs for publishing builds to the "production" locations
- only: &publishable_branches
- - nightly # Our nightly builds from schedule, on `master`
- - "v*" # Our version tags
- - gitlab-next
+cache:
+ key: "${CI_JOB_NAME}"
+ paths:
+ - ${CARGO_HOME}
+ - ./target
.collect_artifacts: &collect_artifacts
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
when: on_success
- expire_in: 1 mos
+ expire_in: 7 days
paths:
- - target/release/substrate
+ - artifacts/
+
-.determine_version: &determine_version |
- export VERSION=$(grep -m 1 "version =" Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
- echo "Version" $VERSION
#### stage: test
+
test:rust:stable: &test
stage: test
variables:
RUST_TOOLCHAIN: stable
+ # Enable debug assertions since we are running optimized builds for testing
+ # but still want to have debug assertions.
+ RUSTFLAGS: -Cdebug-assertions=y
TARGET: native
- script:
- - ./scripts/init.sh
- - export PATH="${CI_PROJECT_DIR}/cargo/bin/:$PATH"
- - export RUST_BACKTRACE=1
- - ./scripts/build.sh
- - time cargo test --all --release --locked
+ only:
+ - triggers
+ - tags
+ - master
+ - schedules
+ - web
+ - /^pr-[0-9]+$/
+ - /^[0-9]+$/
tags:
- - rust-stable
+ - linux-docker
+ before_script:
+ - ./scripts/build.sh
+ script:
+ - time cargo test --all --release --verbose --locked
.optional_test: &optional_test
<<: *test
@@ -61,21 +67,144 @@ test:rust:stable: &test
only:
- master
+
+
+
+
+.build_only: &build_only
+ only:
+ - master
+ - tags
+ - web
+
+
#### stage: build
-build:linux:ubuntu:amd64: &build
+build:rust:linux:release: &build
stage: build
- only: *releaseable_branches
+ <<: *collect_artifacts
+ <<: *build_only
+ tags:
+ - linux-docker
+ before_script:
+ - ./scripts/build.sh
+ script:
+ - time cargo build --release --verbose
+ - mkdir -p ./artifacts
+ - mv ./target/release/substrate ./artifacts/.
+ - echo -n "Substrate version = "
+ - ./artifacts/substrate --version |
+ sed -n -r 's/^substrate ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p' |
+ tee ./artifacts/VERSION
+ - sha256sum ./artifacts/substrate | tee ./artifacts/substrate.sha256
+
+
+
+build:rust:doc:release: &build
+ stage: build
+ artifacts:
+ name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
+ when: on_success
+ expire_in: 7 days
+ paths:
+ - ./crate-docs
+ only:
+ - master
+ - tags
+ - web
+ - publish-rustdoc
+ tags:
+ - linux-docker
+ script:
+ - time cargo doc --release --verbose
+ - cp -R ./target/doc ./crate-docs
+ - echo "" > ./crate-docs/index.html
+
+
+
+
+#### stage: publish
+
+.publish_build: &publish_build
+ stage: publish
+ dependencies:
+ - build:rust:linux:release
+ cache: {}
+ <<: *build_only
+
+
+
+publish:docker:release:
+ <<: *publish_build
+ tags:
+ - shell
variables:
- CARGO_TARGET: x86_64-unknown-linux-gnu
- TARGET: native
- RUST_TOOLCHAIN: stable
+ GIT_STRATEGY: none
+ DOCKERFILE: scripts/docker/Dockerfile
+ CONTAINER_IMAGE: parity/substrate
script:
- - ./scripts/init.sh
- - export PATH="${CI_PROJECT_DIR}/cargo/bin/:$PATH"
- - ./scripts/build.sh
- - cargo build --release
- <<: *collect_artifacts
+ - VERSION="$(cat ./artifacts/VERSION)"
+ - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity"
+ || ( echo "no docker credentials provided"; exit 1 )
+ - docker login -u "$Docker_Hub_User_Parity" -p "$Docker_Hub_Pass_Parity"
+ - docker info
+ - docker build --tag $CONTAINER_IMAGE:$VERSION --tag $CONTAINER_IMAGE:latest -f $DOCKERFILE ./artifacts/
+ - docker push $CONTAINER_IMAGE:$VERSION
+ - docker push $CONTAINER_IMAGE:latest
+ after_script:
+ - docker logout
+
+
+publish:s3:release:
+ <<: *publish_build
+ image: parity/awscli:latest
+ variables:
+ GIT_STRATEGY: none
+ BUCKET: "releases.parity.io"
+ PREFIX: "substrate/${ARCH}-${DOCKER_OS}"
+ script:
+ - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/
+ after_script:
+ - aws s3 ls s3://${BUCKET}/${PREFIX}/
tags:
- - rust-stable
- allow_failure: true
+ - linux-docker
+
+
+
+publish:s3:doc:
+ stage: publish
+ dependencies:
+ - build:rust:doc:release
+ cache: {}
+ only:
+ - master
+ - tags
+ - web
+ - publish-rustdoc
+ variables:
+ GIT_STRATEGY: none
+ BUCKET: "releases.parity.io"
+ PREFIX: "substrate-rustdoc"
+ before_script:
+ - mkdir -p ${HOME}/.aws
+ - |
+ cat > ${HOME}/.aws/config <"
+"checksum data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97"
"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
+"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+"checksum dns-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
"checksum ed25519-dalek 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cd66d8a16ef71c23cf5eeb2140d8d3cd293457c6c7fd6804b593397a933fcf1e"
"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
"checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb"
"checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+"checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
"checksum environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db746025e3ea695bfa0ae744dbacd5fcfc8db51b9760cf8bd0ab69708bb93c49"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
-"checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = ""
"checksum etrace 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f17311e68ea07046ee809b8513f6c259518bc10173681d98c21f8c3926f56f40"
-"checksum exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9aa7b56cef68c4182db7212dece19cc9f6e2916cf9412e57e6cea53ec02f316d"
-"checksum failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7efb22686e4a466b1ec1a15c2898f91fa9cb340452496dca654032de20ff95b9"
-"checksum failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "946d0e98a50d9831f5d589038d2ca7f8f455b1c21028c0db0e84116a12696426"
+"checksum exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "87559b08e99a81a92bbb867d237543e43495857749f688e0773390a20d56c61c"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
"checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa"
-"checksum finality-grandpa 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "20d8cf871510f0d57630e75f9e65f87cba29581ccab1f78666d8b2e422d0baa6"
-"checksum fixed-hash 0.3.0-beta.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e71c99c903a9fe54baed1bc701b43daba8c6dc6d4aec89a32f667ab6b3094c4"
+"checksum finality-grandpa 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a1dffe3c9d4c59d964f25cea31880e56c20414cdae7efe2269411238f850ad39"
+"checksum fixed-hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a557e80084b05c32b455963ff565a9de6f2866da023d6671705c6aff6f65e01c"
"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"
@@ -4400,31 +4995,38 @@ dependencies = [
"checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
-"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
"checksum getset 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "54c7f36a235738bb25904d6a2b3dbb28f6f5736cd3918c4bf80d6bb236200782"
+"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865"
-"checksum h2 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "7dd33bafe2e6370e6c8eb0cf1b8c5f93390b90acde7e9b03723f166b28b648ed"
+"checksum h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac030ae20dee464c5d0f36544d8b914a6bc606da44a57e052d2b0f5dae129e0"
+"checksum handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d89ec99d1594f285d4590fc32bac5f75cdab383f1123d504d27862c644a807dd"
"checksum hash-db 0.9.0 (git+https://github.com/paritytech/trie)" = ""
"checksum hash256-std-hasher 0.9.0 (git+https://github.com/paritytech/trie)" = ""
"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 hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
"checksum hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4da5f0e01bd8a71a224a4eedecaacfcabda388dbb7a80faf04d3514287572d95"
"checksum hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d340b6514f232f6db1bd16db65302a5278a04fef9ce867cb932e7e5fa21130a"
"checksum hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "733e1b3ac906631ca01ebb577e9bb0f5e37a454032b9036b5eaea4013ed6f99a"
-"checksum http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "24f58e8c2d8e886055c3ead7b28793e1455270b5fb39650984c224bc538ba581"
+"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
-"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
-"checksum hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)" = "368cb56b2740ebf4230520e2b90ebb0461e69034d85d1945febd9b3971426db2"
-"checksum hyper 0.12.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4aca412c241a2dd53af261efc7adf7736fdebd67dc0d1cc1ffdbcb9407e0e810"
+"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c"
+"checksum hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f1ebec079129e43af5e234ef36ee3d7e6085687d145b7ea653b262d16c6b65f1"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum indexmap 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08173ba1e906efb6538785a8844dd496f5d34f0a2d88038e95195172fc667220"
+"checksum impl-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c88568d828291c50eed30cd7fb9f8e688ad0013620186fa3e777b9f206c79f2"
+"checksum impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5158079de9d4158e0ce1de3ae0bd7be03904efc40b3d7dd8b8c301cbf6b52b56"
+"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
"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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
"checksum itertools 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f"
"checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc"
+"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d"
+"checksum itertools-num 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a872a22f9e6f7521ca557660adb96dd830e54f0f490fa115bb55dd69d38b27e7"
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
"checksum jsonrpc-core 9.0.0 (git+https://github.com/paritytech/jsonrpc.git)" = ""
"checksum jsonrpc-http-server 9.0.0 (git+https://github.com/paritytech/jsonrpc.git)" = ""
@@ -4434,41 +5036,43 @@ dependencies = [
"checksum jsonrpc-ws-server 9.0.0 (git+https://github.com/paritytech/jsonrpc.git)" = ""
"checksum keccak-hasher 0.1.0 (git+https://github.com/paritytech/trie)" = ""
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72ae89206cea31c32014b39d5a454b96135894221610dbfd19cf4d2d044fa546"
-"checksum kvdb-memorydb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45bcdf5eb083602cff61a6f8438dce2a7900d714e893fc48781c39fb119d37aa"
-"checksum kvdb-rocksdb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "06cf755dc587839ba34d3cbe3f12b6ad55850fbcdfe67336157a021a1a5c43ae"
+"checksum kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = ""
+"checksum kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = ""
+"checksum kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = ""
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
-"checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0"
-"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"
"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2"
-"checksum libp2p 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-dns 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-floodsub 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-identify 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-kad 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-mplex 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-peerstore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-ping 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-ratelimit 0.1.1 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-relay 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-secio 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-tcp-transport 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-transport-timeout 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-uds 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-websocket 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum libp2p-yamux 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
+"checksum libp2p 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a92f6f1c0bd32ac7bb23c33af667149df5518e38f9ad2f517df71e52f1f0bbc"
+"checksum libp2p-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bdcd726ea75447b332288169581c921e49e893e34ca9925d49fd28dda16afe3"
+"checksum libp2p-core-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e52a2262f187aa45d07054bc80e39f0da582eb0288ca5f2dc0074b372e4b7eaa"
+"checksum libp2p-dns 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f7ad92f9711efece48bb7ce30e3f1e662cd3524dc5d9f96b8f68b6e4e7cde96"
+"checksum libp2p-floodsub 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4feda0ff3afcf84dfee9ea088835293829d199a34491d7f0990a4ccfd627816c"
+"checksum libp2p-identify 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "548f9180101bd5846f4f60e060a00032ba3671a77fc735c48a85b7d1016d28ef"
+"checksum libp2p-kad 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91c28bf179a22fd1bfa3bad28ed86b8657ed2d193b76caa6f632ea83356d3a40"
+"checksum libp2p-mdns 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1bbcb82063545605abf697967d919d418b1725f7d3688973fa26c98f81e8cda8"
+"checksum libp2p-mplex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9406ea58ce4fef47820f7d2d6aa62b7e42b4972c30cc87de577d4da40852d4b1"
+"checksum libp2p-ping 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c1ca7b60c2edb0cae7f9db56fbe6c21ca6960e96ec92cd1ed265ac06db24a1fe"
+"checksum libp2p-plaintext 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84bdbdd4700d5edea10214e4733ab5ac5be87862bac8a9b259c987bc9c15004"
+"checksum libp2p-ratelimit 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3001ea6afed5ccd1e5934715aa388b60b23e7587117db36b89d697e8ea43ff3"
+"checksum libp2p-secio 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc2bee2dce0d0d054d81447b06f7e923f1a98e6b240e42674e0fdf2e4a4924f"
+"checksum libp2p-tcp 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fcb2bcb9402f5fe42441dd4558306ff83a28624f67c6066bdbaa98928c180e3"
+"checksum libp2p-uds 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3e88ac8f419f8d9487aaee9ef8785f592b37d78067c6764fe0adc1874a72c6c"
+"checksum libp2p-websocket 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b60b65b8d7053220a0c78a09eda0a162db410067639d2b24432a9f1dc06230"
+"checksum libp2p-yamux 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71b4fd69a1c038152d017366d759177e2580fb4fbb56ce65429a642e011a07b1"
+"checksum librocksdb-sys 5.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b9024327233e7fac7982440f73301c00046d438c5b1011e8f4e394226ce19007"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
"checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
-"checksum local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66"
-"checksum lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775751a3e69bde4df9b38dd00a1b5d6ac13791e4223d4a0506577f0dd27cfb7a"
+"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"
+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3"
"checksum mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f2d82b34c7fb11bb41719465c060589e291d505ca4735ea30016a91f6fc79c3b"
"checksum mashup-impl 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "aa607bfb674b4efb310512527d64266b065de3f894fc52f84efcbf7eaa5965fb"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b3629fe9fdbff6daa6c33b90f7c08355c1aca05a3d01fa8063b822fcf185f3b"
+"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
"checksum memory-db 0.9.0 (git+https://github.com/paritytech/trie)" = ""
"checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
@@ -4477,155 +5081,169 @@ dependencies = [
"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"
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum multihash 0.8.1-pre (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum multistream-select 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
+"checksum multistream-select 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "886fe7ba983a194afdd9074323171c8e313b2c145561da69464d5443f1a3d121"
"checksum names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
-"checksum nan-preserving-float 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34d4f00fcc2f4c9efa8cc971db0da9e28290e28e97af47585e48691ef10ff31f"
-"checksum native-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0a7bd714e83db15676d31caf968ad7318e9cc35f93c85a90231c8f22867549"
+"checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2"
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17"
-"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
-"checksum nohash-hasher 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "27593c72432b8cec9ae79e92792a73c38341064d525b6b612a9fccf8b7d17407"
+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nohash-hasher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d138afcce92d219ccb6eb53d9b1e8a96ac0d633cfd3c53cd9856d96d1741bb8"
+"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
"checksum num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cee7e88156f3f9e19bdd598f8d6c9db7bf4078f99f8381f43a55b09648d1a6e3"
-"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
+"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
+"checksum once_cell 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d7ce3535d54560c937c1652ba4a0da66bfc63e0f8e07bed127483afb6e5ee925"
"checksum opaque-debug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d620c9c26834b34f039489ac0dfdb12c7ac15ccaf818350a64c9b5334a452ad7"
-"checksum openssl 0.10.14 (registry+https://github.com/rust-lang/crates.io-index)" = "6285ab297861546af7a2753593b3160bfc09f0ab9d1f5bb009e39d81a169b499"
+"checksum opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51ecbcb821e1bd256d456fe858aaa7f380b63863eab2eb86eee1bd9f33dd6682"
+"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"
"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.39 (registry+https://github.com/rust-lang/crates.io-index)" = "278c1ad40a89aa1e741a1eed089a2f60b18fab8089c3139b542140fc7d674106"
-"checksum owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d52571ddcb42e9c900c901a18d8d67e393df723fcd51dd59c5b1a85d0acb6cc"
+"checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
-"checksum parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5168b4cf41f3835e4bc6ffb32f51bc9365dc50cb351904595b3931d917fd0c"
-"checksum parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dca389ea5e1632c89b2ce54f7e2b4a8a8c9d278042222a91e0bf95451218cb4c"
+"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-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b6a1290fe78aa6bbb5f3338ecede3062687a98b9e40cd1dbcaa47261d44097"
"checksum parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffa42c2cb493b60b12c75b26e8c94cb734af4df4d7f2cc229dc04c1953dac189"
-"checksum parity-crypto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c1117f6574377d21309bfa1f7d69ff734120685d92b02c3f362b122585758840"
-"checksum parity-rocksdb 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd55d2d6d6000ec99f021cf52c9acc7d2a402e14f95ced4c5de230696fabe00b"
-"checksum parity-rocksdb-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0e59eda423021494a6cf1be74f6989add403f53157409993f794e17b123cab51"
-"checksum parity-snappy-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c2086caac40c79289cb70d7e1c64f5888e1c53f5d38399d3e95101493739f423"
+"checksum parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8adf489acb31f1922db0ce43803b6f48a425241a8473611be3cc625a8e4a4c47"
+"checksum parity-multiaddr 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9a8e5d637787fe097ec1bfca2aa3eb687396518003df991c6c7216d86682d5ff"
+"checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076"
"checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc"
-"checksum parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fa12d706797d42551663426a45e2db2e0364bd1dbf6aeada87e89c5f981f43e9"
"checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
+"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
+"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
+"checksum pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3294f437119209b084c797604295f40227cffa35c57220b1e99a6ff3bf8ee4"
"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
"checksum pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28ea5118e2f41bfbc974b28d88c07621befd1fa5d6ec23549be96302a1a59dd2"
"checksum pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6"
+"checksum primitive-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f47c18b4601125931d69fcf7b000c2c16a304e4f84d58218d6470b4502e00b58"
"checksum proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c725b36c99df7af7bf9324e9c999b9e37d92c8f8caf106d82e1d7953218d2d8"
"checksum proc-macro-hack-impl 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2b753ad9ed99dd8efeaa7d2fb8453c8f6bc3e54b97966d35f1bc77ca6865254a"
-"checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-"checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee"
-"checksum protobuf 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "56c363dfc36e450457f4fa05a91d8c3f0fed00fc21142b4ce2cb7b525675eaeb"
-"checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
-"checksum pwasm-utils 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "efd695333cfae6e9dbe2703a6d040e252b57a6fc3b9a65c712615ac042b2e0c5"
+"checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4"
+"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
+"checksum protobuf 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eae0479da11de87d371fa47eb033059715ffa8f714748da20aa364d56ec5bee2"
+"checksum pwasm-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "efb0dcbddbb600f47a7098d33762a00552c671992171637f5bb310b37fe1f0e4"
"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 quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
-"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
+"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
+"checksum rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b65e163105a6284f841bd23100a015895f54340e88a5ffc9ca7b8b33827cfce0"
+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
-"checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8"
-"checksum rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df7a791f788cb4c516f0e091301a29c2b71ef680db5e644a7d68835c8ae6dbfa"
+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+"checksum rand_os 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de5ac4de1c2973e1391dc305cb0fbf8788cb58068e98255439b7485a77022273"
+"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"
"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
-"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
+"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum ref_thread_local 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d813022b2e00774a48eaf43caaa3c20b45f040ba8cbf398e2e8911a06668dbe6"
"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
-"checksum regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2069749032ea3ec200ca51e4a31df41759190a88edca0d2d86ee8bedf7073341"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
-"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
+"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
"checksum rhododendron 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a09bc21b21795c366c8bf0e87afb71175f5f736b3a5b279b6f4e81839d0a877b"
-"checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c"
+"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
+"checksum rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1651697fefd273bfb4fd69466cc2a9d20de557a0213b97233b22b5e95924b5e"
"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
-"checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
"checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e"
"checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rw-stream-sink 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=d961e656a74d1bab5366d371a06f9e10d5f4a6c5)" = ""
-"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7"
+"checksum rw-stream-sink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108ad7c3d65ba866ec50a224b7b3b0cb6c682c3d805015cea859d491232346a5"
+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
"checksum safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f7bf422d23a88c16d5090d455f182bc99c60af4df6a345c63428acf5129e347"
-"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
+"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+"checksum secp256k1 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4070f3906e65249228094cf97b04a90799fba04468190bbbcfa812309cf86e32"
"checksum security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697d3f3c23a618272ead9e1fb259c1411102b31c6af8b93f1d64cca9c3b0e8e0"
-"checksum security-framework-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab01dfbe5756785b5b4d46e0289e5a18071dfa9a7c2b24213ea00b9ef9b665bf"
+"checksum security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "40d95f3d7da09612affe897f320d78264f0d2320f3e8eea27d12bd1bd94445e2"
"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 serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "15c141fc7027dd265a47c090bf864cf62b42c4d228bbcf4e51a0c9e2b0d3f7ef"
-"checksum serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "225de307c6302bec3898c51ca302fc94a7a1697ef0845fcee6448f33c032249c"
-"checksum serde_json 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" = "43344e7ce05d0d8280c5940cabb4964bea626aa58b1ec0e8c73fa2a8512a38ce"
-"checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
-"checksum sha1 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "171698ce4ec7cbb93babeb3190021b4d72e96ccb98e33d277ae4ea959d6f2d9e"
+"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b"
+"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545"
"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
"checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
+"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c"
"checksum simplelog 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "24b615b1a3cc51ffa565d9a1d0cfcc49fe7d64737ada84eca284cddb0292d125"
-"checksum skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a"
-"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
+"checksum simplelog 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e95345f185d5adeb8ec93459d2dc99654e294cc6ccf5b75414d8ea262de9a13"
"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
"checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
"checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
-"checksum slog-json 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddd14b8df2df39378b3e933c79784350bf715b11444d99f903df0253bbe524e5"
-"checksum slog-scope 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "053344c94c0e2b22da6305efddb698d7c485809427cf40555dc936085f67a9df"
-"checksum smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d"
+"checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
+"checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
+"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
"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 stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-"checksum stdweb 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "22203527a18dc1c5c83bbd247fb005f5877d040783b6626571d6b7ed7a6f5e75"
+"checksum stdweb 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "b84f9c829ef7d2e6abf1965393b231c0fd495f0293d612f32dbadd637e91fd0d"
"checksum stdweb-derive 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e21ebd9179de08f2300a65454268a17ea3de204627458588c84319c4def3930"
-"checksum stdweb-internal-macros 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcbc9155af9606d44c740197d7d6672b49c4ee93a176c7cecde8b49322677604"
-"checksum stdweb-internal-runtime 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b74fe9de4c0d07e91987f4d798b95f27f3cb7769fbc222fa951fa386908297b5"
+"checksum stdweb-internal-macros 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d60e306bddd5d213f86f7b417b6cdcefbf742917414ac9dda6e9750ef4553dce"
+"checksum stdweb-internal-runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a2a2f4a2eb556337b2d1a302630bbddf989ae383c70393e89b48152b9896cbda"
"checksum stream-cipher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "30dc6118470d69ce0fdcf7e6f95e95853f7f4f72f80d835d4519577c323814ab"
-"checksum string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00caf261d6f90f588f8450b8e1230fa0d5be49ee6140fdfbcb55335aff350970"
+"checksum string 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98998cced76115b1da46f63388b909d118a37ae0be0f82ad35773d4a4bc9d18d"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7f6353c2ee5407358d063a14cccc1630804527090a6fb5a9489ce4924280fb"
+"checksum structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3"
+"checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04"
"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
+"checksum subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "702662512f3ddeb74a64ce2fbbf3707ee1b6bb663d28bb054e0779bbc720d926"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
-"checksum syn 0.15.12 (registry+https://github.com/rust-lang/crates.io-index)" = "34ab9797e47d24cb76b8dc4d24ff36807018c7cc549c4cba050b068be0c586b0"
-"checksum synstructure 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85bb9b7550d063ea184027c9b8c20ac167cd36d3e06b3a40bceb9d746dc1a7b7"
-"checksum sysinfo 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "11c5f6e8a7a7146f26ffed9a5ff8bab2706f1ac8a413a415e1d211b819d5c24d"
+"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
+"checksum sysinfo 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c747a1fbe091faa7bf76c19f40099f9f12495384c811485d81cf3d60c0eae62"
"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
"checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "55c1195ef8513f3273d55ff59fe5da6940287a0d7a98331254397f464833675b"
+"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
+"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
-"checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
"checksum thread-scoped 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99"
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
+"checksum time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "847da467bf0db05882a9e2375934a8a55cffdc9db0d128af1518200260ba1f6c"
"checksum tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e9175261fbdb60781fcd388a4d6cc7e14764a2b629a7ad94abb439aed223a44f"
-"checksum tk-listen 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dec7ba6a80b7695fc2abb21af18bed445a362ffd80b64704771ce142d6d2151d"
-"checksum tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6e93c78d23cc61aa245a8acd2c4a79c4d7fa7fb5c3ca90d5737029f043a84895"
+"checksum tk-listen 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5462b0f968c0457efe38fcd2df7e487096b992419e4f5337b06775a614bbda4b"
+"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
"checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71"
-"checksum tokio-current-thread 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f90fcd90952f0a496d438a976afba8e5c205fb12123f813d8ab3aa1c8436638c"
-"checksum tokio-dns-unofficial 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb9bf62ca2c53bf2f2faec3e48a98b6d8c9577c27011cb0203a4beacdc8ab328"
-"checksum tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde"
-"checksum tokio-fs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cbe4ca6e71cb0b62a66e4e6f53a8c06a6eefe46cc5f665ad6f274c9906f135"
-"checksum tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "8b8a85fffbec3c5ab1ab62324570230dcd37ee5996a7859da5caf7b9d45e3e8c"
-"checksum tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4b26fd37f1125738b2170c80b551f69ff6fecb277e6e5ca885e53eec2b005018"
-"checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912"
-"checksum tokio-threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bbd8a8b911301c60cbfaa2a6588fb210e5c1038375b8bdecc47aa09a94c3c05f"
-"checksum tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3a52f00c97fedb6d535d27f65cccb7181c8dd4c6edc3eda9ea93f6d45d05168e"
-"checksum tokio-tls 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e53fdbf3156f588be1676022fe794232b24922d426e8c14f4e46891c1e31c440"
-"checksum tokio-udp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "da941144b816d0dcda4db3a1ba87596e4df5e860a72b70783fe435891f80601c"
-"checksum tokio-uds 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "22e3aa6d1fcc19e635418dc0a30ab5bd65d347973d6f43f1a37bf8d9d1335fc9"
+"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
+"checksum tokio-dns-unofficial 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "82c65483db54eb91b4ef3a9389a3364558590faf30ce473141707c0e16fda975"
+"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
+"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
+"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
+"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
+"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
+"checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
+"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
+"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
"checksum trie-bench 0.9.0 (git+https://github.com/paritytech/trie)" = ""
"checksum trie-db 0.9.0 (git+https://github.com/paritytech/trie)" = ""
@@ -4633,33 +5251,36 @@ dependencies = [
"checksum trie-standardmap 0.9.0 (git+https://github.com/paritytech/trie)" = ""
"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
"checksum twofish 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eef327f05b0d0ec1b9d7d119d8f4d9f602ceee37e0540aff8071e8e66c2e22e"
-"checksum twox-hash 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f85be565a110ed72ed7048cf56570db04ce0a592c98aa59b7dacde3e5718750"
+"checksum twox-hash 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "555cd4909480122bbbf21e34faac4cb08a171f324775670447ed116726c474af"
"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
-"checksum uint 0.5.0-beta.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4630460173a57c0af94b8306091e018025d988473f641a4af754b6cde980e1e3"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum uint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "082df6964410f6aa929a61ddfafc997e4f32c62c22490e439ac351cec827f436"
"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-"checksum unsigned-varint 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5c1441164e5da61f00acd15f5a9e61939693c2c6e8b9fae36a220b82de7e212"
"checksum unsigned-varint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8abc4b7d8158bdfbbaaccc35331ed3c30c2673e99000d7ae665a2eb6576f4"
-"checksum untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f392d7819dbe58833e26872f5f6f0d68b7bbbe90fc3667e98731c4a15ad9a7ae"
-"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
-"checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum vergen 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "93fb2d57fbc535fcd45548c99b141d2d960995daaf04b864c4d9fe1ea011c819"
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wabt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "182ae543249ccf2705f324d233891c1176fca142e137b55ba43d9dbfe93f18a2"
-"checksum wabt-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca77c6b934a2b32618941b2f565aac43b8cb7141378c3b4fba4d8fcdcd57da3"
+"checksum wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "74e463a508e390cc7447e70f640fbf44ad52e1bd095314ace1fdf99516d32add"
+"checksum wabt-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "462336bb61096e64761730e0dea1bc8b777bd4e3689c7e813c81f1cfdf4e8a51"
+"checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
"checksum want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3"
-"checksum wasmi 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d184c4b7081f30316f74f8d73c197314dcb56ea7af9323522b42a2fa9cb19453"
+"checksum wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "21ef487a11df1ed468cf613c78798c26282da5c30e9d49f824872d4c77b47d1d"
"checksum websocket 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c9faed2bff8af2ea6b9f8b917d3d00b467583f6781fe3def174a9e33c879703"
+"checksum which 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e84a603e7e0b1ce1aa1ee2b109c7be00155ce52df5081590d1ffb93f4f515cb2"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
@@ -4667,9 +5288,9 @@ dependencies = [
"checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
-"checksum ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)" = ""
+"checksum ws 0.7.9 (git+https://github.com/tomusdrw/ws-rs)" = ""
"checksum ws 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "329d3e6dd450a9c5c73024e1047f0be7e24121a68484eb0b5368977bee3cf8c3"
"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61"
+"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.1.0 (git+https://github.com/paritytech/yamux)" = ""
+"checksum yamux 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e25561b512df3c287cf52404cab0b07ea43d095cb96230e9e2cb635db72d75f0"
diff --git a/Cargo.toml b/Cargo.toml
index 54ae7d9d82355cd57ee0b61404a3c6c8a32a6329..d67f32ed3c4fe52c8c5ed7e33e5212220d94016f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ path = "node/src/main.rs"
[package]
name = "substrate"
-version = "0.1.0"
+version = "0.10.0"
authors = ["Parity Technologies "]
build = "build.rs"
@@ -27,20 +27,34 @@ members = [
"core/consensus/rhd",
"core/executor",
"core/finality-grandpa",
+ "core/finality-grandpa/primitives",
"core/keyring",
"core/network",
"core/primitives",
"core/rpc",
"core/rpc-servers",
- "core/sr-api",
+ "core/serializer",
+ "core/service",
+ "core/service/test",
+ "core/sr-api-macros",
"core/sr-io",
+ "core/sr-primitives",
"core/sr-sandbox",
"core/sr-std",
"core/sr-version",
+ "core/state-machine",
+ "core/test-runtime",
+ "core/telemetry",
+ "core/trie",
+ "core/keystore",
"core/transaction-pool",
"core/transaction-pool/graph",
"srml/support",
+ "srml/support/procedural",
+ "srml/support/procedural/tools",
+ "srml/support/procedural/tools/derive",
"srml/assets",
+ "srml/aura",
"srml/balances",
"srml/consensus",
"srml/contract",
@@ -48,23 +62,16 @@ members = [
"srml/democracy",
"srml/example",
"srml/executive",
+ "srml/grandpa",
+ "srml/indices",
"srml/metadata",
- "core/sr-primitives",
"srml/session",
"srml/staking",
+ "srml/sudo",
"srml/system",
"srml/timestamp",
"srml/treasury",
"srml/upgrade-key",
- "core/serializer",
- "core/service",
- "core/service/test",
- "core/state-db",
- "core/state-machine",
- "core/test-runtime",
- "core/telemetry",
- "core/trie",
- "core/keystore",
"node/cli",
"node/executor",
"node/primitives",
@@ -74,8 +81,8 @@ members = [
exclude = [
"node/runtime/wasm",
"core/executor/wasm",
- "pwasm-alloc",
"core/test-runtime/wasm",
+ "test-utils/chain-spec-builder"
]
[badges]
diff --git a/Dockerfile b/Dockerfile
index d4a43eda8d5417972e5dfb7ef00e374270741c73..5c78740d5ea847f055021e3afbd332fda2647796 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ RUN apk add build-base \
cmake \
linux-headers \
openssl-dev \
+ clang-dev \
cargo
ARG PROFILE=release
@@ -17,7 +18,7 @@ RUN cargo build --$PROFILE
# ===== SECOND STAGE ======
-FROM alpine:3.8
+FROM alpine:edge
LABEL maintainer="chevdor@gmail.com"
LABEL description="This is the 2nd stage: a very small image where we copy the Substrate binary."
ARG PROFILE=release
@@ -34,4 +35,4 @@ RUN rm -rf /usr/lib/python* && \
EXPOSE 30333 9933 9944
VOLUME ["/data"]
-CMD ["/usr/local/bin/substrate"]
+ENTRYPOINT ["/usr/local/bin/substrate"]
diff --git a/README.adoc b/README.adoc
index dc51bee6afd71e53f85fbf6738e36fd26be97aba..f51a94a4b79370b3f3ca86c1ce61e28f85b4497f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -48,38 +48,35 @@ Other examples include the parachain-heads extrinsic in Polkadot and the "note-m
=== 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. In short these two sets are:
+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.
-The runtime is API entry points are expected to be in the runtime's `api` module. There is a specific ABI based upon the Substrate Simple Codec (`codec`), which is used to encode and decode the arguments for these functions and specify where and how they should be passed. A special macro is provided called `impl_stubs`, which prepares all functionality for marshalling arguments and basically just allows you to write the functions as you would normally (except for the fact that there must be example one argument - tuples are allowed to workaround).
+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 the Polkadot API implementation as of PoC-2:
+Here's a snippet of the Polkadot API implementation as of PoC-3:
```rust
-pub mod api {
- impl_stubs!(
-
- // Standard: Required.
- version => |()| super::Version::version(),
- authorities => |()| super::Consensus::authorities(),
- execute_block => |block| super::Executive::execute_block(block),
-
- // Conventional: Needed for Substrate client's reference block authoring logic to work.
- initialise_block => |header| super::Executive::initialise_block(&header),
- apply_extrinsic => |extrinsic| super::Executive::apply_extrinsic(extrinsic),
- finalise_block => |()| super::Executive::finalise_block(),
- inherent_extrinsics => |inherent| super::inherent_extrinsics(inherent),
-
- // Non-standard (Polkadot-specific). This just exposes some stuff that Polkadot client
- // finds useful.
- validator_count => |()| super::Session::validator_count(),
- validators => |()| super::Session::validators()
- );
+impl_runtime_apis! {
+ impl client_api::Core for Runtime {
+ fn version() -> RuntimeVersion {
+ VERSION
+ }
+
+ fn authorities() -> Vec {
+ Consensus::authorities()
+ }
+
+ fn execute_block(block: Block) {
+ Executive::execute_block(block)
+ }
+
+ fn initialise_block(header: ::Header) {
+ Executive::initialise_block(&header)
+ }
+ }
+ // ---snip---
}
```
-As you can see, at the minimum there are only three API calls to implement. If you want to reuse as much of Substrate's reference block authoring client code, then you'll want to provide the next four entrypoints (though three of them you probably already implemented as part of `execute_block`).
-
-Of the first three, there is `execute_block`, which contains the actions to be taken to execute a block and pretty much defines the blockchain. Then there is `authorities` which tells the AfG consensus algorithm sitting in the Substrate client who the given authorities (known as "validators" in some contexts) are that can finalise the next block. Finally, there is `version`, which is a fairly sophisticated version identifier. This includes a key distinction between *specification version* and *authoring version*, with the former essentially versioning the logic of `execute_block` and the latter versioning only the logic of `inherent_extrinsics` and core aspects of extrinsic validity.
=== Inherent Extrinsics
@@ -124,7 +121,7 @@ To get going as fast as possible, there is a simple script that installs all req
[source, shell]
----
-curl getsubstrate.io -sSf | bash
+curl https://getsubstrate.io -sSf | bash
----
You can start a local Substrate development chain with running `substrate --dev`.
@@ -135,7 +132,7 @@ First let's get a template chainspec that you can edit. We'll use the "staging"
[source, shell]
----
-substrate build-spec --chain=staging > ~/chainspec.json
+substrate --chain=staging build-spec > ~/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):
@@ -151,7 +148,7 @@ Now with this new chainspec file, you can build a "raw" chain definition for you
[source, shell]
----
-substrate build-spec --chain ~/chainspec.json --raw > ~/mychain.json
+substrate --chain ~/chainspec.json build-spec --raw > ~/mychain.json
----
This can be fed into Substrate:
@@ -175,12 +172,15 @@ You can distribute `mychain.json` so that everyone can synchronise and (dependin
=== Hacking on Substrate
-If you'd actually like hack on Substrate, you can just grab the source code and
+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:
[source, shell]
----
curl https://sh.rustup.rs -sSf | sh
+# on Windows download and run rustup-init.exe
+# from https://rustup.rs instead
+
rustup update nightly
rustup target add wasm32-unknown-unknown --toolchain nightly
rustup update stable
@@ -191,11 +191,33 @@ You will also need to install the following packages:
- Linux:
[source, shell]
-sudo apt install cmake pkg-config libssl-dev git
+sudo apt install cmake pkg-config libssl-dev git clang libclang-dev
- Mac:
[source, shell]
-brew install cmake pkg-config openssl git
+brew install cmake pkg-config openssl git llvm
+
+ - Windows (PowerShell):
++
+[source, shell]
+----
+# Install LLVM
+# Download and install the Pre Build Windows binaries
+# of LLVM from http://releases.llvm.org/download.html
+
+# Install OpenSSL (through 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
+
+$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)
+----
Then, grab the Substrate source code:
@@ -223,22 +245,69 @@ You can start a development chain with:
[source, shell]
cargo run -- --dev
-Or you can join the BBQ Birch Testnet with:
+Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run \-- --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 [Telemetry](https://telemetry.polkadot.io/#/Local%20Testnet). You'll need two terminals 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 `QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN`, which is generated from the `--node-key` value that we specify below:
+
+[source, shell]
+cargo run -- \
+ --base-path /tmp/alice \
+ --chain=local \
+ --key Alice \
+ --name "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 -- \
+ --base-path /tmp/bob \
+ --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN \
+ --chain=local \
+ --key Bob \
+ --name "BOB" \
+ --port 30334 \
+ --telemetry-url ws://telemetry.polkadot.io:1024 \
+ --validator
+
+Additional Substate CLI usage options are available and may be shown by running `cargo run \-- --help`.
+
+=== Joining the Charred Cherry Testnet
+
+Charred Cherry is the new testnet for Substrate 1.0 beta. Please note that 1.0 beta is not compatible with the BBQ-Birch testnet. Ensure you have the dependencies listed above before compiling.
+
+[source, shell]
+----
+git clone https://github.com/paritytech/substrate.git
+cd substrate
+----
+
+You can run the tests if you like:
+
+[source, shell]
+cargo test --all
+
+Start your node:
+
[source, shell]
-cargo run
+cargo run --release
-If you want to see the multi-node consensus algorithm in action locally, then
-you can create a local testnet. You'll need two terminals open. In one, run:
+To see a list of command line options, enter:
[source, shell]
-cargo run -- --chain=local --validator --key Alice -d /tmp/alice --node-key 0000000000000000000000000000000000000000000000000000000000000001
+cargo run --release -- --help
-and in the other, run:
+For example, you can choose a custom node name:
[source, shell]
-cargo run -- --chain=local --validator --key Bob -d /tmp/bob --port 30334 --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN
+cargo run --release -- --name my_custom_name
+
+If you are successful, you will see your node syncing at https://telemetry.polkadot.io/#/Charred%20Cherry
-include::doc/packages/packages.adoc[]
== Documentation
@@ -251,13 +320,16 @@ You can generate documentation for a Substrate Rust package and have it automati
cargo doc --package --open
```
-Replacing `` with one of the following (i.e. `cargo doc --package node-cli --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-bft, substrate-cli, substrate-client, substrate-client-db,
-substrate-executor, substrate-finality-grandpa, substrate-keyring, substrate-keystore,
-substrate-metadata, substrate-misbehavior-check, substrate-network,
+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,
@@ -268,17 +340,16 @@ substrate-trie
sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version
* Substrate Runtime Module Library (SRML)
[source, shell]
-srml-balances, srml-consensus, srml-contract, srml-council, srml-democracy, srml-example,
-srml-executive, srml-session, srml-staking, srml-support, srml-system, srml-timestamp,
+srml-assets, srml-balances, srml-consensus, srml-contract, 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, node-service
+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.
diff --git a/core/basic-authorship/Cargo.toml b/core/basic-authorship/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..6a5ef1087dab023012d9da63870de1b543354800
--- /dev/null
+++ b/core/basic-authorship/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "substrate-basic-authorship"
+version = "0.1.0"
+authors = ["Parity Technologies "]
+
+[dependencies]
+log = "0.4"
+parity-codec = "2.2"
+sr-primitives = { path = "../../core/sr-primitives" }
+substrate-client = { path = "../../core/client" }
+substrate-consensus-aura-primitives = { path = "../../core/consensus/aura/primitives" }
+substrate-consensus-common = { path = "../../core/consensus/common" }
+substrate-primitives = { path = "../../core/primitives" }
+substrate-transaction-pool = { path = "../../core/transaction-pool" }
diff --git a/core/service/src/consensus.rs b/core/basic-authorship/src/basic_authorship.rs
similarity index 54%
rename from core/service/src/consensus.rs
rename to core/basic-authorship/src/basic_authorship.rs
index c9a528dd2735ae907763cfdce82221286d2b15d6..d3b6421e6ab2c7d29b31c95e2f0b66cf7332aa0c 100644
--- a/core/service/src/consensus.rs
+++ b/core/basic-authorship/src/basic_authorship.rs
@@ -14,27 +14,27 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see .
-//! provide consensus service to substrate.
+//! A consensus proposer for "basic" chains which use the primitive inherent-data.
// FIXME: move this into substrate-consensus-common - https://github.com/paritytech/substrate/issues/1021
use std::sync::Arc;
-use std::time::{self, Duration, Instant};
+use std::time;
use std;
-use client::{self, error, Client as SubstrateClient, CallExecutor};
-use client::runtime_api::{Core, BlockBuilder as BlockBuilderAPI, id::BLOCK_BUILDER};
+use client::{
+ self, error, Client as SubstrateClient, CallExecutor,
+ block_builder::api::BlockBuilder as BlockBuilderApi, runtime_api::{Core, ApiExt}
+};
use codec::{Decode, Encode};
-use consensus_common::{self, InherentData, evaluation, offline_tracker::OfflineTracker};
-use primitives::{H256, AuthorityId, ed25519, Blake2Hasher};
-use runtime_primitives::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
+use consensus_common::{self, evaluation};
+use primitives::{H256, Blake2Hasher};
+use runtime_primitives::traits::{Block as BlockT, Hash as HashT, Header as HeaderT, ProvideRuntimeApi, AuthorityIdFor};
use runtime_primitives::generic::BlockId;
+use runtime_primitives::BasicInherentData;
use transaction_pool::txpool::{self, Pool as TransactionPool};
+use aura_primitives::AuraConsensusData;
-use parking_lot::RwLock;
-
-/// Shared offline validator tracker.
-pub type SharedOfflineTracker = Arc>;
type Timestamp = u64;
// block size limit.
@@ -47,11 +47,8 @@ pub trait BlockBuilder {
}
/// Local client abstraction for the consensus.
-pub trait AuthoringApi:
- Send
- + Sync
- + BlockBuilderAPI<::Block, Error=::Error>
- + Core<::Block, AuthorityId, Error=::Error>
+pub trait AuthoringApi: Send + Sync + ProvideRuntimeApi where
+ ::Api: Core
{
/// The block used for this API type.
type Block: BlockT;
@@ -62,25 +59,33 @@ pub trait AuthoringApi:
fn build_block) -> ()>(
&self,
at: &BlockId,
- inherent_data: InherentData,
+ inherent_data: BasicInherentData,
build_ctx: F,
) -> Result;
}
-impl<'a, B, E, Block> BlockBuilder for client::block_builder::BlockBuilder<'a, B, E, Block, Blake2Hasher> where
- B: client::backend::Backend + Send + Sync + 'static,
+impl<'a, B, E, Block, RA> BlockBuilder
+ for client::block_builder::BlockBuilder<'a, Block, BasicInherentData, SubstrateClient>
+where
+ B: client::backend::Backend + 'static,
E: CallExecutor + Send + Sync + Clone + 'static,
Block: BlockT,
+ RA: Send + Sync + 'static,
+ SubstrateClient : ProvideRuntimeApi,
+ as ProvideRuntimeApi>::Api: BlockBuilderApi,
{
fn push_extrinsic(&mut self, extrinsic: ::Extrinsic) -> Result<(), error::Error> {
client::block_builder::BlockBuilder::push(self, extrinsic).map_err(Into::into)
}
}
-impl<'a, B, E, Block> AuthoringApi for SubstrateClient where
+impl AuthoringApi for SubstrateClient where
B: client::backend::Backend + Send + Sync + 'static,
E: CallExecutor + Send + Sync + Clone + 'static,
Block: BlockT,
+ RA: Send + Sync + 'static,
+ SubstrateClient : ProvideRuntimeApi,
+ as ProvideRuntimeApi>::Api: BlockBuilderApi,
{
type Block = Block;
type Error = client::error::Error;
@@ -88,14 +93,14 @@ impl<'a, B, E, Block> AuthoringApi for SubstrateClient where
fn build_block) -> ()>(
&self,
at: &BlockId,
- inherent_data: InherentData,
+ inherent_data: BasicInherentData,
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(BLOCK_BUILDER, 1) {
- self.inherent_extrinsics(at, &inherent_data)?
+
+ let runtime_api = self.runtime_api();
+ if runtime_api.has_api::>(at)? {
+ runtime_api.inherent_extrinsics(at, inherent_data)?
.into_iter().try_for_each(|i| block_builder.push(i))?;
}
@@ -106,105 +111,105 @@ impl<'a, B, E, Block> AuthoringApi for SubstrateClient where
}
/// Proposer factory.
-pub struct ProposerFactory where
- C: AuthoringApi,
- A: txpool::ChainApi,
-{
+pub struct ProposerFactory where A: txpool::ChainApi {
/// The client instance.
pub client: Arc,
/// The transaction pool.
pub transaction_pool: Arc>,
- /// Offline-tracker.
- pub offline: SharedOfflineTracker,
- /// Force delay in evaluation this long.
- pub force_delay: Timestamp,
}
-impl consensus_common::Environment<::Block> for ProposerFactory where
+impl consensus_common::Environment<::Block, ConsensusData> for ProposerFactory where
C: AuthoringApi,
+ ::Api: BlockBuilderApi<::Block, BasicInherentData>,
A: txpool::ChainApi::Block>,
- client::error::Error: From<::Error>
+ client::error::Error: From<::Error>,
+ Proposer<::Block, C, A>: consensus_common::Proposer<::Block, ConsensusData>,
{
- type Proposer = Proposer;
+ type Proposer = Proposer<::Block, C, A>;
type Error = error::Error;
fn init(
&self,
parent_header: &<::Block as BlockT>::Header,
- _: &[AuthorityId],
- _: Arc,
+ _: &[AuthorityIdFor<::Block>],
) -> Result {
let parent_hash = parent_header.hash();
let id = BlockId::hash(parent_hash);
- let authorities: Vec = self.client.authorities(&id)?;
- self.offline.write().note_new_block(&authorities[..]);
-
info!("Starting consensus session on top of parent {:?}", parent_hash);
- let now = Instant::now();
let proposer = Proposer {
client: self.client.clone(),
- start: now,
parent_hash,
parent_id: id,
parent_number: *parent_header.number(),
transaction_pool: self.transaction_pool.clone(),
- offline: self.offline.clone(),
- authorities,
- minimum_timestamp: current_timestamp() + self.force_delay,
};
Ok(proposer)
}
}
+struct ConsensusData {
+ timestamp: Option,
+}
+
/// The proposer logic.
-pub struct Proposer {
+pub struct Proposer {
client: Arc,
- start: Instant,
- parent_hash: <::Block as BlockT>::Hash,
- parent_id: BlockId<::Block>,
- parent_number: <<::Block as BlockT>::Header as HeaderT>::Number,
+ parent_hash: ::Hash,
+ parent_id: BlockId,
+ parent_number: <::Header as HeaderT>::Number,
transaction_pool: Arc>,
- offline: SharedOfflineTracker,
- authorities: Vec,
- minimum_timestamp: u64,
}
-impl consensus_common::Proposer<::Block> for Proposer where
- C: AuthoringApi,
- A: txpool::ChainApi::Block>,
+impl consensus_common::Proposer<::Block, AuraConsensusData> for Proposer where
+ Block: BlockT,
+ C: AuthoringApi,
+ ::Api: BlockBuilderApi,
+ A: txpool::ChainApi,
client::error::Error: From<::Error>
{
type Create = Result<::Block, error::Error>;
type Error = error::Error;
- fn propose(&self) -> Result<::Block, error::Error> {
- use runtime_primitives::traits::BlakeTwo256;
-
- const MAX_VOTE_OFFLINE_SECONDS: Duration = Duration::from_secs(60);
+ fn propose(&self, consensus_data: AuraConsensusData)
+ -> Result<::Block, error::Error>
+ {
+ self.propose_with(ConsensusData { timestamp: Some(consensus_data.timestamp) })
+ }
+}
- let timestamp = ::std::cmp::max(self.minimum_timestamp, current_timestamp());
+impl consensus_common::Proposer<::Block, ()> for Proposer where
+ Block: BlockT,
+ C: AuthoringApi,
+ ::Api: BlockBuilderApi,
+ A: txpool::ChainApi,
+ client::error::Error: From<::Error>
+{
+ type Create = Result<::Block, error::Error>;
+ type Error = error::Error;
- 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.authorities[..])
- };
+ fn propose(&self, _consensus_data: ()) -> Result<::Block, error::Error> {
+ self.propose_with(ConsensusData { timestamp: None })
+ }
+}
- if !offline_indices.is_empty() {
- info!("Submitting offline authorities {:?} for slash-vote",
- offline_indices.iter().map(|&i| self.authorities[i as usize]).collect::>(),
- )
- }
+impl Proposer where
+ Block: BlockT,
+ C: AuthoringApi,
+ ::Api: BlockBuilderApi,
+ A: txpool::ChainApi,
+ client::error::Error: From<::Error>,
+{
+ fn propose_with(&self, consensus_data: ConsensusData)
+ -> Result<::Block, error::Error>
+ {
+ use runtime_primitives::traits::BlakeTwo256;
- let inherent_data = InherentData {
- timestamp,
- offline_indices,
- };
+ let timestamp = consensus_data.timestamp.unwrap_or_else(current_timestamp);
+ let inherent_data = BasicInherentData::new(timestamp, 0);
let block = self.client.build_block(
&self.parent_id,
@@ -233,15 +238,16 @@ impl consensus_common::Proposer<::Block> for Proposer::Block as BlockT>::Hash::from(block.header().hash()),
- block.header().parent_hash(),
- block.extrinsics().iter()
- .map(|xt| format!("{}", BlakeTwo256::hash_of(xt)))
- .collect::>()
- .join(", ")
- );
+ info!("Prepared block for proposing at {} [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");
diff --git a/core/basic-authorship/src/lib.rs b/core/basic-authorship/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0d7e31075084eca660cd7d960bdd95dfb356a9b8
--- /dev/null
+++ b/core/basic-authorship/src/lib.rs
@@ -0,0 +1,34 @@
+// Copyright 2017-2018 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 .
+
+//! Basic implementation of block-authoring logic.
+
+#![warn(unused_extern_crates)]
+
+extern crate substrate_consensus_aura_primitives as aura_primitives;
+extern crate substrate_primitives as primitives;
+extern crate sr_primitives as runtime_primitives;
+extern crate substrate_consensus_common as consensus_common;
+extern crate substrate_client as client;
+extern crate parity_codec as codec;
+extern crate substrate_transaction_pool as transaction_pool;
+
+#[macro_use]
+extern crate log;
+
+mod basic_authorship;
+
+pub use basic_authorship::{ProposerFactory, BlockBuilder, AuthoringApi, Proposer};
diff --git a/core/cli/Cargo.toml b/core/cli/Cargo.toml
index 4fc17e34cb09aae732da8f6c8a8cdb305f0f5b67..88db4d87c0c5c967eb4c39a0045201a6e49e7be6 100644
--- a/core/cli/Cargo.toml
+++ b/core/cli/Cargo.toml
@@ -3,10 +3,9 @@ name = "substrate-cli"
version = "0.3.0"
authors = ["Parity Technologies "]
description = "Substrate CLI interface."
-build = "build.rs"
[dependencies]
-clap = { version = "~2.32", features = ["yaml"] }
+clap = "~2.32"
backtrace = "0.3"
env_logger = "0.5"
error-chain = "0.12"
@@ -22,15 +21,12 @@ tokio = "0.1.7"
futures = "0.1.17"
fdlimit = "0.1"
exit-future = "0.1"
-sysinfo = "0.6.2"
+sysinfo = "0.7"
substrate-client = { path = "../../core/client" }
substrate-network = { path = "../../core/network" }
-substrate-network-libp2p = { path = "../../core/network-libp2p" }
sr-primitives = { path = "../../core/sr-primitives" }
substrate-primitives = { path = "../../core/primitives" }
substrate-service = { path = "../../core/service" }
substrate-telemetry = { path = "../../core/telemetry" }
names = "0.11.0"
-
-[build-dependencies]
-clap = "~2.32"
+structopt = "0.2.13"
diff --git a/core/cli/README.adoc b/core/cli/README.adoc
index f847930dab1cd368cd958e3601727127bfabfddc..fc58908fdf23d750409fc5ac8ce20fc40b3800e8 100644
--- a/core/cli/README.adoc
+++ b/core/cli/README.adoc
@@ -1,13 +1,6 @@
= Substrate CLI
-.Summary
-[source, toml]
-----
-include::Cargo.toml[lines=2..5]
-----
-
-.Description
Substrate CLI library
include::doc/shell-completion.adoc[]
diff --git a/core/cli/src/cli.yml b/core/cli/src/cli.yml
deleted file mode 100644
index fed66ad91d2a2fe5e6649210b5251b48aff9d274..0000000000000000000000000000000000000000
--- a/core/cli/src/cli.yml
+++ /dev/null
@@ -1,253 +0,0 @@
-name: {name}
-author: {author}
-about: {description}
-args:
- - log:
- short: l
- long: log
- value_name: LOG_PATTERN
- help: Sets a custom logging filter
- takes_value: true
- - base-path:
- long: base-path
- short: d
- value_name: PATH
- help: Specify custom base path
- takes_value: true
- - keystore-path:
- long: keystore-path
- value_name: PATH
- help: Specify custom keystore path
- takes_value: true
- - key:
- long: key
- value_name: STRING
- help: Specify additional key seed
- takes_value: true
- - node-key:
- long: node-key
- value_name: KEY
- help: Specify node secret key (64-character hex string)
- takes_value: true
- - validator:
- long: validator
- help: Enable validator mode
- takes_value: false
- - light:
- long: light
- help: Run in light client mode
- takes_value: false
- - dev:
- long: dev
- help: Run in development mode; implies --chain=dev --validator --key Alice
- takes_value: false
- - listen-addr:
- long: listen-addr
- value_name: LISTEN_ADDR
- help: Listen on this multiaddress
- takes_value: true
- multiple: true
- - port:
- long: port
- value_name: PORT
- help: Specify p2p protocol TCP port. Only used if --listen-addr is not specified.
- takes_value: true
- - rpc-external:
- long: rpc-external
- help: Listen to all RPC interfaces (default is local)
- takes_value: false
- - ws-external:
- long: ws-external
- help: Listen to all Websocket interfaces (default is local)
- takes_value: false
- - rpc-port:
- long: rpc-port
- value_name: PORT
- help: Specify HTTP RPC server TCP port
- takes_value: true
- - ws-port:
- long: ws-port
- value_name: PORT
- help: Specify WebSockets RPC server TCP port
- takes_value: true
- - bootnodes:
- long: bootnodes
- value_name: URL
- help: Specify a list of bootnodes
- takes_value: true
- multiple: true
- - reserved-nodes:
- long: reserved-nodes
- value_name: URL
- help: Specify a list of reserved node addresses
- takes_value: true
- multiple: true
- - out-peers:
- long: out-peers
- value_name: OUT_PEERS
- help: Specify the number of outgoing connections we're trying to maintain
- takes_value: true
- - in-peers:
- long: in-peers
- value_name: IN_PEERS
- help: Specify the maximum number of incoming connections we're accepting
- takes_value: true
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification (one of dev, local or staging)
- takes_value: true
- - pruning:
- long: pruning
- value_name: PRUNING_MODE
- help: Specify the pruning mode, a number of blocks to keep or "archive". Default is 256.
- takes_value: true
- - name:
- long: name
- value_name: NAME
- help: The human-readable name for this node, as reported to the telemetry server, if enabled
- takes_value: true
- - telemetry:
- short: t
- long: telemetry
- help: Should connect to the Substrate telemetry server (telemetry is off by default on local chains)
- takes_value: false
- - no-telemetry:
- long: no-telemetry
- help: Should not connect to the Substrate telemetry server (telemetry is on by default on global chains)
- takes_value: false
- - telemetry-url:
- long: telemetry-url
- value_name: TELEMETRY_URL
- help: The URL of the telemetry server. Implies --telemetry
- takes_value: true
- - execution:
- long: execution
- value_name: STRATEGY
- help: The means of execution used when calling into the runtime. Can be either wasm, native or both.
-subcommands:
- - build-spec:
- about: Build a spec.json file, outputing to stdout
- args:
- - raw:
- long: raw
- help: Force raw genesis storage output.
- takes_value: false
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification (one of dev, local or staging)
- takes_value: true
- - dev:
- long: dev
- help: Specify the development chain
- takes_value: false
- - export-blocks:
- about: Export blocks to a file
- args:
- - OUTPUT:
- index: 1
- help: Output file name or stdout if unspecified.
- required: false
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification.
- takes_value: true
- - dev:
- long: dev
- help: Specify the development chain
- takes_value: false
- - base-path:
- long: base-path
- short: d
- value_name: PATH
- help: Specify custom base path.
- takes_value: true
- - from:
- long: from
- value_name: BLOCK
- help: Specify starting block number. 1 by default.
- takes_value: true
- - to:
- long: to
- value_name: BLOCK
- help: Specify last block number. Best block by default.
- takes_value: true
- - json:
- long: json
- help: Use JSON output rather than binary.
- takes_value: false
- - import-blocks:
- about: Import blocks from file.
- args:
- - INPUT:
- index: 1
- help: Input file or stdin if unspecified.
- required: false
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification.
- takes_value: true
- - dev:
- long: dev
- help: Specify the development chain
- takes_value: false
- - base-path:
- long: base-path
- short: d
- value_name: PATH
- help: Specify custom base path.
- takes_value: true
- - execution:
- long: execution
- value_name: STRATEGY
- help: The means of execution used when executing blocks. Can be either wasm, native or both.
- - api-execution:
- long: api-execution
- value_name: STRATEGY
- help: The means of execution used when calling into the runtime. Can be either wasm, native or both.
- - max-heap-pages:
- long: max-heap-pages
- value_name: COUNT
- help: The maximum number of 64KB pages to ever allocate for Wasm execution. Don't alter this unless you know what you're doing.
- - revert:
- about: Revert chain to the previous state
- args:
- - NUM:
- index: 1
- help: Number of blocks to revert. Default is 256.
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification.
- takes_value: true
- - dev:
- long: dev
- help: Specify the development chain
- takes_value: false
- - base-path:
- long: base-path
- short: d
- value_name: PATH
- help: Specify custom base path.
- takes_value: true
- - purge-chain:
- about: Remove the whole chain data.
- args:
- - chain:
- long: chain
- value_name: CHAIN_SPEC
- help: Specify the chain specification.
- takes_value: true
- - dev:
- long: dev
- help: Specify the development chain
- takes_value: false
- - base-path:
- long: base-path
- short: d
- value_name: PATH
- help: Specify custom base path.
- takes_value: true
diff --git a/core/cli/src/informant.rs b/core/cli/src/informant.rs
index 85d82132b4f3f5dafa78f331f7d452242a483f8e..0f24f5f6e69f7b5791f2d39b70c33886b1589882 100644
--- a/core/cli/src/informant.rs
+++ b/core/cli/src/informant.rs
@@ -24,15 +24,16 @@ use tokio::runtime::TaskExecutor;
use tokio::timer::Interval;
use sysinfo::{get_current_pid, ProcessExt, System, SystemExt};
use network::{SyncState, SyncProvider};
-use client::BlockchainEvents;
+use client::{backend::Backend, BlockchainEvents};
+
+use runtime_primitives::generic::BlockId;
use runtime_primitives::traits::{Header, As};
const TIMER_INTERVAL_MS: u64 = 5000;
/// Spawn informant on the event loop
-pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExecutor)
- where
- C: Components,
+pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExecutor) where
+ C: Components,
{
let interval = Interval::new(Instant::now(), Duration::from_millis(TIMER_INTERVAL_MS));
@@ -47,10 +48,10 @@ pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExe
let display_notifications = interval.map_err(|e| debug!("Timer error: {:?}", e)).for_each(move |_| {
let sync_status = network.status();
- if let Ok(best_block) = client.best_block_header() {
- let hash = best_block.hash();
+ if let Ok(info) = client.info() {
+ let best_number: u64 = info.chain.best_number.as_();
+ let best_hash = info.chain.best_hash;
let num_peers = sync_status.num_peers;
- let best_number: u64 = best_block.number().as_();
let speed = move || speed(best_number, last_number);
let (status, target) = match (sync_status.sync.state, sync_status.sync.best_seen_block) {
(SyncState::Idle, _) => ("Idle".into(), "".into()),
@@ -59,14 +60,17 @@ pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExe
};
last_number = Some(best_number);
let txpool_status = txpool.status();
+ let finalized_number: u64 = info.chain.finalized_number.as_();
info!(
target: "substrate",
- "{}{} ({} peers), best: #{} ({})",
+ "{}{} ({} peers), best: #{} ({}), finalized #{} ({})",
Colour::White.bold().paint(&status),
target,
Colour::White.bold().paint(format!("{}", sync_status.num_peers)),
Colour::White.paint(format!("{}", best_number)),
- hash
+ best_hash,
+ Colour::White.paint(format!("{}", finalized_number)),
+ info.chain.finalized_hash,
);
// get cpu usage and memory usage of this process
@@ -80,10 +84,12 @@ pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExe
"status" => format!("{}{}", status, target),
"peers" => num_peers,
"height" => best_number,
- "best" => ?hash,
+ "best" => ?best_hash,
"txcount" => txpool_status.ready,
"cpu" => cpu_usage,
- "memory" => memory
+ "memory" => memory,
+ "finalized_height" => finalized_number,
+ "finalized_hash" => ?info.chain.finalized_hash,
);
} else {
warn!("Error getting best block information");
@@ -93,7 +99,36 @@ pub fn start(service: &Service, exit: ::exit_future::Exit, handle: TaskExe
});
let client = service.client();
- let display_block_import = client.import_notification_stream().for_each(|n| {
+ let mut last = match client.info() {
+ Ok(info) => Some((info.chain.best_number, info.chain.best_hash)),
+ Err(e) => { warn!("Error getting best block information: {:?}", e); None }
+ };
+
+ let display_block_import = client.import_notification_stream().for_each(move |n| {
+ // detect and log reorganizations.
+ if let Some((ref last_num, ref last_hash)) = last {
+ if n.header.parent_hash() != last_hash {
+ let tree_route = ::client::blockchain::tree_route(
+ client.backend().blockchain(),
+ BlockId::Hash(last_hash.clone()),
+ BlockId::Hash(n.hash),
+ );
+
+ match tree_route {
+ Ok(ref t) if !t.retracted().is_empty() => info!(
+ "Reorg from #{},{} to #{},{}, common ancestor #{},{}",
+ last_num, last_hash,
+ n.header.number(), n.hash,
+ t.common_block().number, t.common_block().hash,
+ ),
+ Ok(_) => {},
+ Err(e) => warn!("Error computing tree route: {}", e),
+ }
+ }
+ }
+
+ last = Some((n.header.number().clone(), n.hash.clone()));
+
info!(target: "substrate", "Imported #{} ({})", n.header.number(), n.hash);
Ok(())
});
@@ -121,4 +156,3 @@ fn speed(best_number: u64, last_number: Option) -> String {
format!(" {:4.1} bps", speed / 10.0)
}
}
-
diff --git a/core/cli/src/lib.rs b/core/cli/src/lib.rs
index 59d653bfed7529ab95a2539aecfa6ba1982f0c7c..3205269faf726346be044545607a7b06312f4c47 100644
--- a/core/cli/src/lib.rs
+++ b/core/cli/src/lib.rs
@@ -14,9 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see .
-// tag::description[]
//! Substrate CLI library.
-// end::description[]
#![warn(missing_docs)]
#![warn(unused_extern_crates)]
@@ -36,7 +34,6 @@ extern crate sysinfo;
extern crate substrate_client as client;
extern crate substrate_network as network;
-extern crate substrate_network_libp2p as network_libp2p;
extern crate sr_primitives as runtime_primitives;
extern crate substrate_service as service;
extern crate substrate_primitives as primitives;
@@ -53,18 +50,22 @@ extern crate clap;
extern crate error_chain;
#[macro_use]
extern crate log;
+extern crate structopt;
+mod params;
pub mod error;
pub mod informant;
mod panic_hook;
-use network_libp2p::Protocol;
use runtime_primitives::traits::As;
use service::{
ServiceFactory, FactoryFullConfiguration, RuntimeGenesis,
FactoryGenesis, PruningMode, ChainSpec,
};
-use network::NonReservedPeerMode;
+use network::{
+ Protocol, config::{NetworkConfiguration, NonReservedPeerMode},
+ multiaddr,
+};
use primitives::H256;
use std::io::{Write, Read, stdin, stdout};
@@ -76,11 +77,16 @@ use std::path::{Path, PathBuf};
use std::str::FromStr;
use names::{Generator, Name};
use regex::Regex;
+use structopt::StructOpt;
+pub use params::{CoreParams, CoreCommands, ExecutionStrategy};
+use app_dirs::{AppInfo, AppDataType};
use futures::Future;
/// Executable version. Used to pass version information from the root crate.
pub struct VersionInfo {
+ /// Implemtation name.
+ pub name: &'static str,
/// Implementation version.
pub version: &'static str,
/// SCM Commit hash.
@@ -94,11 +100,11 @@ pub struct VersionInfo {
}
/// CLI Action
-pub enum Action {
+pub enum Action {
/// Substrate handled the command. No need to do anything.
ExecutedInternally,
/// Service mode requested. Caller should start the service.
- RunService((FactoryFullConfiguration, E)),
+ RunService(E),
}
/// Something that can be converted into an exit signal.
@@ -109,21 +115,39 @@ pub trait IntoExit {
fn into_exit(self) -> Self::Exit;
}
+fn get_chain_key(matches: &clap::ArgMatches) -> String {
+ matches.value_of("chain").unwrap_or_else(
+ || if matches.is_present("dev") { "dev" } else { "" }
+ ).into()
+}
+
fn load_spec(matches: &clap::ArgMatches, factory: F) -> Result, String>
where G: RuntimeGenesis, F: FnOnce(&str) -> Result>, String>,
{
- let chain_key = matches.value_of("chain").unwrap_or_else(|| if matches.is_present("dev") { "dev" } else { "" });
- let spec = match factory(chain_key)? {
+ let chain_key = get_chain_key(matches);
+ let spec = match factory(&chain_key)? {
Some(spec) => spec,
None => ChainSpec::from_json_file(PathBuf::from(chain_key))?
};
Ok(spec)
}
-fn base_path(matches: &clap::ArgMatches) -> PathBuf {
- matches.value_of("base-path")
+fn base_path(matches: &clap::ArgMatches, version: &VersionInfo) -> PathBuf {
+ matches.value_of("base_path")
.map(|x| Path::new(x).to_owned())
- .unwrap_or_else(default_base_path)
+ .unwrap_or_else(||
+ app_dirs::get_app_root(
+ AppDataType::UserData,
+ &AppInfo {
+ name: version.executable_name,
+ author: version.author
+ }
+ ).expect("app directories exist on all supported platforms; qed")
+ )
+}
+
+fn create_input_err>(msg: T) -> error::Error {
+ error::ErrorKind::Input(msg.into()).into()
}
/// Check whether a node name is considered as valid
@@ -149,84 +173,42 @@ fn is_node_name_valid(_name: &str) -> Result<(), &str> {
Ok(())
}
-/// Parse command line arguments and execute commands or return service configuration.
-///
-/// IANA unassigned port ranges that we could use:
-/// 6717-6766 Unassigned
-/// 8504-8553 Unassigned
-/// 9556-9591 Unassigned
-/// 9803-9874 Unassigned
-/// 9926-9949 Unassigned
-pub fn prepare_execution(
- args: I,
- exit: E,
- version: VersionInfo,
- spec_factory: S,
- impl_name: &'static str,
-) -> error::Result>
+/// Parse command line arguments
+pub fn parse_args_default<'a, I, T>(args: I, version: VersionInfo) -> clap::ArgMatches<'a>
where
I: IntoIterator- ,
T: Into + Clone,
- E: IntoExit,
- F: ServiceFactory,
- S: FnOnce(&str) -> Result>>, String>,
{
- panic_hook::set();
-
let full_version = service::config::full_version_from_strs(
version.version,
version.commit
);
- let yaml = format!(include_str!("./cli.yml"),
- name = version.executable_name,
- description = version.description,
- author = version.author,
- );
- let yaml = &clap::YamlLoader::load_from_str(&yaml).expect("Invalid yml file")[0];
- let matches = match clap::App::from_yaml(yaml)
+
+ match CoreParams::clap()
+ .name(version.executable_name)
+ .author(version.author)
+ .about(version.description)
.version(&(full_version + "\n")[..])
.get_matches_from_safe(args) {
Ok(m) => m,
Err(e) => e.exit(),
- };
-
- // TODO [ToDr] Split parameters parsing from actual execution.
- let log_pattern = matches.value_of("log").unwrap_or("");
- init_logger(log_pattern);
- fdlimit::raise_fd_limit();
-
- if let Some(matches) = matches.subcommand_matches("build-spec") {
- let spec = load_spec(&matches, spec_factory)?;
- build_spec::(matches, spec)?;
- return Ok(Action::ExecutedInternally);
- }
-
- if let Some(matches) = matches.subcommand_matches("export-blocks") {
- let spec = load_spec(&matches, spec_factory)?;
- export_blocks::(matches, spec, exit.into_exit())?;
- return Ok(Action::ExecutedInternally);
- }
-
- if let Some(matches) = matches.subcommand_matches("import-blocks") {
- let spec = load_spec(&matches, spec_factory)?;
- import_blocks::(matches, spec, exit.into_exit())?;
- return Ok(Action::ExecutedInternally);
- }
-
- if let Some(matches) = matches.subcommand_matches("revert") {
- let spec = load_spec(&matches, spec_factory)?;
- revert_chain::(matches, spec)?;
- return Ok(Action::ExecutedInternally);
}
+}
- if let Some(matches) = matches.subcommand_matches("purge-chain") {
- let spec = load_spec(&matches, spec_factory)?;
- purge_chain::(matches, spec)?;
- return Ok(Action::ExecutedInternally);
- }
+/// Parse clap::Matches into config and chain specification
+pub fn parse_matches<'a, F, S>(
+ spec_factory: S,
+ version: &VersionInfo,
+ impl_name: &'static str,
+ matches: &clap::ArgMatches<'a>,
+) -> error::Result<(ChainSpec<::Genesis>, FactoryFullConfiguration)>
+where
+ F: ServiceFactory,
+ S: FnOnce(&str) -> Result>>, String>,
+{
let spec = load_spec(&matches, spec_factory)?;
- let mut config = service::Configuration::default_with_spec(spec);
+ let mut config = service::Configuration::default_with_spec(spec.clone());
config.impl_name = impl_name;
config.impl_commit = version.commit;
@@ -238,11 +220,17 @@ where
};
match is_node_name_valid(&config.name) {
Ok(_) => (),
- Err(msg) => return Err(error::ErrorKind::Input(
- format!("Invalid node name '{}'. Reason: {}. If unsure, use none.", config.name, msg)).into())
+ Err(msg) => bail!(
+ create_input_err(
+ format!("Invalid node name '{}'. Reason: {}. If unsure, use none.",
+ config.name,
+ msg
+ )
+ )
+ )
}
- let base_path = base_path(&matches);
+ let base_path = base_path(&matches, version);
config.keystore_path = matches.value_of("keystore")
.map(|x| Path::new(x).to_owned())
@@ -251,12 +239,15 @@ where
.into();
config.database_path = db_path(&base_path, config.chain_spec.id()).to_string_lossy().into();
-
+ config.database_cache_size = match matches.value_of("database_cache_size") {
+ Some(s) => Some(s.parse().map_err(|_| "Invalid Database Cache size specified")?),
+ _=> None
+ };
config.pruning = match matches.value_of("pruning") {
Some("archive") => PruningMode::ArchiveAll,
None => PruningMode::default(),
Some(s) => PruningMode::keep_blocks(s.parse()
- .map_err(|_| error::ErrorKind::Input("Invalid pruning mode specified".to_owned()))?),
+ .map_err(|_| create_input_err("Invalid pruning mode specified"))?),
};
let role =
@@ -276,7 +267,7 @@ where
"both" => service::ExecutionStrategy::Both,
"native" => service::ExecutionStrategy::NativeWhenPossible,
"wasm" => service::ExecutionStrategy::AlwaysWasm,
- _ => return Err(error::ErrorKind::Input("Invalid execution mode specified".to_owned()).into()),
+ _ => bail!(create_input_err("Invalid execution mode specified")),
};
}
@@ -288,14 +279,14 @@ where
config.network.config_path = Some(network_path(&base_path, config.chain_spec.id()).to_string_lossy().into());
config.network.net_config_path = config.network.config_path.clone();
config.network.reserved_nodes.extend(matches
- .values_of("reserved-nodes")
+ .values_of("reserved_nodes")
.map_or(Default::default(), |v| v.map(|n| n.to_owned()).collect::>()));
if !config.network.reserved_nodes.is_empty() {
config.network.non_reserved_mode = NonReservedPeerMode::Deny;
}
config.network.listen_addresses = Vec::new();
- for addr in matches.values_of("listen-addr").unwrap_or_default() {
+ for addr in matches.values_of("listen_addr").unwrap_or_default() {
let addr = addr.parse().map_err(|_| "Invalid listen multiaddress")?;
config.network.listen_addresses.push(addr);
}
@@ -314,17 +305,18 @@ where
config.network.public_addresses = Vec::new();
config.network.client_version = config.client_id();
- config.network.use_secret = match matches.value_of("node-key").map(H256::from_str) {
+ config.network.node_name = config.name.clone();
+ config.network.use_secret = match matches.value_of("node_key").map(H256::from_str) {
Some(Ok(secret)) => Some(secret.into()),
- Some(Err(err)) => return Err(format!("Error parsing node key: {}", err).into()),
+ Some(Err(err)) => bail!(create_input_err(format!("Error parsing node key: {}", err))),
None => None,
};
- let in_peers = match matches.value_of("in-peers") {
+ let in_peers = match matches.value_of("in_peers") {
Some(in_peers) => in_peers.parse().map_err(|_| "Invalid in-peers value specified.")?,
None => 25,
};
- let out_peers = match matches.value_of("out-peers") {
+ let out_peers = match matches.value_of("out_peers") {
Some(out_peers) => out_peers.parse().map_err(|_| "Invalid out-peers value specified.")?,
None => 25,
};
@@ -338,38 +330,130 @@ where
config.keys.push("Alice".into());
}
- let rpc_interface: &str = if matches.is_present("rpc-external") { "0.0.0.0" } else { "127.0.0.1" };
- let ws_interface: &str = if matches.is_present("ws-external") { "0.0.0.0" } else { "127.0.0.1" };
+ let rpc_interface: &str = if matches.is_present("rpc_external") { "0.0.0.0" } else { "127.0.0.1" };
+ let ws_interface: &str = if matches.is_present("ws_external") { "0.0.0.0" } else { "127.0.0.1" };
- config.rpc_http = Some(parse_address(&format!("{}:{}", rpc_interface, 9933), "rpc-port", &matches)?);
- config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), "ws-port", &matches)?);
+ config.rpc_http = Some(parse_address(&format!("{}:{}", rpc_interface, 9933), "rpc_port", &matches)?);
+ config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), "ws_port", &matches)?);
// Override telemetry
- if matches.is_present("no-telemetry") {
+ if matches.is_present("no_telemetry") {
config.telemetry_url = None;
- } else if let Some(url) = matches.value_of("telemetry-url") {
+ } else if let Some(url) = matches.value_of("telemetry_url") {
config.telemetry_url = Some(url.to_owned());
}
- Ok(Action::RunService((config, exit)))
+ Ok((spec, config))
}
-fn build_spec(matches: &clap::ArgMatches, spec: ChainSpec>) -> error::Result<()>
- where F: ServiceFactory,
+//
+// IANA unassigned port ranges that we could use:
+// 6717-6766 Unassigned
+// 8504-8553 Unassigned
+// 9556-9591 Unassigned
+// 9803-9874 Unassigned
+// 9926-9949 Unassigned
+
+/// execute default commands or return service configuration
+pub fn execute_default<'a, F, E>(
+ spec: ChainSpec>,
+ exit: E,
+ matches: &clap::ArgMatches<'a>,
+ config: &FactoryFullConfiguration
+) -> error::Result>
+where
+ E: IntoExit,
+ F: ServiceFactory,
+{
+ panic_hook::set();
+
+ let log_pattern = matches.value_of("log").unwrap_or("");
+ init_logger(log_pattern);
+ fdlimit::raise_fd_limit();
+
+ if let Some(sub_matches) = matches.subcommand_matches("build-spec") {
+ build_spec::(sub_matches, spec, config)?;
+ return Ok(Action::ExecutedInternally);
+ } else if let Some(sub_matches) = matches.subcommand_matches("export-blocks") {
+ export_blocks::(
+ &config.database_path,
+ sub_matches,
+ spec,
+ exit.into_exit()
+ )?;
+ return Ok(Action::ExecutedInternally);
+ } else if let Some(sub_matches) = matches.subcommand_matches("import-blocks") {
+ import_blocks::(
+ &config.database_path,
+ sub_matches,
+ spec,
+ exit.into_exit()
+ )?;
+ return Ok(Action::ExecutedInternally);
+ } else if let Some(sub_matches) = matches.subcommand_matches("revert") {
+ revert_chain::(
+ &config.database_path,
+ sub_matches,
+ spec
+ )?;
+ return Ok(Action::ExecutedInternally);
+ } else if let Some(_sub_matches) = matches.subcommand_matches("purge-chain") {
+ purge_chain::(&config.database_path)?;
+ return Ok(Action::ExecutedInternally);
+ }
+
+ Ok(Action::RunService(exit))
+}
+
+fn with_default_boot_node(
+ spec: &ChainSpec>,
+ config: &NetworkConfiguration
+) -> error::Result>>
+where
+ F: ServiceFactory
+{
+ let mut spec = spec.clone();
+ if spec.boot_nodes().is_empty() {
+ let network_keys =
+ network::obtain_private_key(config)
+ .map_err(|err| format!("Error obtaining network key: {}", err))?;
+ let peer_id = network_keys.to_peer_id();
+ let addr = multiaddr![
+ Ip4([127, 0, 0, 1]),
+ Tcp(30333u16),
+ P2p(peer_id)
+ ];
+ spec.add_boot_node(addr)
+ }
+ Ok(spec)
+}
+
+fn build_spec(
+ matches: &clap::ArgMatches,
+ spec: ChainSpec>,
+ config: &FactoryFullConfiguration
+) -> error::Result<()>
+where
+ F: ServiceFactory
{
info!("Building chain spec");
let raw = matches.is_present("raw");
+ let spec = with_default_boot_node::(&spec, &config.network)?;
let json = service::chain_ops::build_spec::>(spec, raw)?;
print!("{}", json);
Ok(())
}
-fn export_blocks(matches: &clap::ArgMatches, spec: ChainSpec>, exit: E) -> error::Result<()>
+fn export_blocks(
+ db_path: &str,
+ matches: &clap::ArgMatches,
+ spec: ChainSpec>,
+ exit: E
+) -> error::Result<()>
where F: ServiceFactory, E: Future + Send + 'static,
{
- let base_path = base_path(matches);
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path(&base_path, config.chain_spec.id()).to_string_lossy().into();
+ config.database_path = db_path.to_string();
info!("DB path: {}", config.database_path);
let from: u64 = match matches.value_of("from") {
Some(v) => v.parse().map_err(|_| "Invalid --from argument")?,
@@ -382,7 +466,7 @@ fn export_blocks(matches: &clap::ArgMatches, spec: ChainSpec = match matches.value_of("OUTPUT") {
+ let file: Box = match matches.value_of("output") {
Some(filename) => Box::new(File::create(filename)?),
None => Box::new(stdout()),
};
@@ -390,12 +474,16 @@ fn export_blocks(matches: &clap::ArgMatches, spec: ChainSpec(config, exit, file, As::sa(from), to.map(As::sa), json)?)
}
-fn import_blocks(matches: &clap::ArgMatches, spec: ChainSpec>, exit: E) -> error::Result<()>
+fn import_blocks(
+ db_path: &str,
+ matches: &clap::ArgMatches,
+ spec: ChainSpec>,
+ exit: E
+) -> error::Result<()>
where F: ServiceFactory, E: Future + Send + 'static,
{
- let base_path = base_path(matches);
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path(&base_path, config.chain_spec.id()).to_string_lossy().into();
+ config.database_path = db_path.to_string();
if let Some(s) = matches.value_of("execution") {
config.block_execution_strategy = match s {
@@ -415,7 +503,7 @@ fn import_blocks(matches: &clap::ArgMatches, spec: ChainSpec = match matches.value_of("INPUT") {
+ let file: Box = match matches.value_of("input") {
Some(filename) => Box::new(File::open(filename)?),
None => Box::new(stdin()),
};
@@ -423,14 +511,17 @@ fn import_blocks(matches: &clap::ArgMatches, spec: ChainSpec(config, exit, file)?)
}
-fn revert_chain(matches: &clap::ArgMatches, spec: ChainSpec>) -> error::Result<()>
+fn revert_chain(
+ db_path: &str,
+ matches: &clap::ArgMatches,
+ spec: ChainSpec>
+) -> error::Result<()>
where F: ServiceFactory,
{
- let base_path = base_path(matches);
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path(&base_path, config.chain_spec.id()).to_string_lossy().into();
+ config.database_path = db_path.to_string();
- let blocks = match matches.value_of("NUM") {
+ let blocks = match matches.value_of("num") {
Some(v) => v.parse().map_err(|_| "Invalid block count specified")?,
None => 256,
};
@@ -438,13 +529,12 @@ fn revert_chain(matches: &clap::ArgMatches, spec: ChainSpec
Ok(service::chain_ops::revert_chain::(config, As::sa(blocks))?)
}
-fn purge_chain(matches: &clap::ArgMatches, spec: ChainSpec>) -> error::Result<()>
+fn purge_chain(
+ db_path: &str,
+) -> error::Result<()>
where F: ServiceFactory,
{
- let base_path = base_path(matches);
- let database_path = db_path(&base_path, spec.id());
-
- print!("Are you sure to remove {:?}? (y/n)", &database_path);
+ print!("Are you sure to remove {:?}? (y/n)", &db_path);
stdout().flush().expect("failed to flush stdout");
let mut input = String::new();
@@ -453,8 +543,8 @@ fn purge_chain(matches: &clap::ArgMatches, spec: ChainSpec>
match input.chars().nth(0) {
Some('y') | Some('Y') => {
- fs::remove_dir_all(&database_path)?;
- println!("{:?} removed.", &database_path);
+ fs::remove_dir_all(&db_path)?;
+ println!("{:?} removed.", &db_path);
},
_ => println!("Aborted"),
}
@@ -462,10 +552,18 @@ fn purge_chain(matches: &clap::ArgMatches, spec: ChainSpec>
Ok(())
}
-fn parse_address(default: &str, port_param: &str, matches: &clap::ArgMatches) -> Result {
- let mut address: SocketAddr = default.parse().ok().ok_or_else(|| format!("Invalid address specified for --{}.", port_param))?;
+fn parse_address(
+ default: &str,
+ port_param: &str,
+ matches: &clap::ArgMatches
+) -> Result {
+ let mut address: SocketAddr = default.parse().ok().ok_or_else(
+ || format!("Invalid address specified for --{}.", port_param)
+ )?;
if let Some(port) = matches.value_of(port_param) {
- let port: u16 = port.parse().ok().ok_or_else(|| format!("Invalid port for --{} specified.", port_param))?;
+ let port: u16 = port.parse().ok().ok_or_else(
+ || format!("Invalid port for --{} specified.", port_param)
+ )?;
address.set_port(port);
}
@@ -496,20 +594,6 @@ fn network_path(base_path: &Path, chain_id: &str) -> PathBuf {
path
}
-fn default_base_path() -> PathBuf {
- use app_dirs::{AppInfo, AppDataType};
-
- let app_info = AppInfo {
- name: "Substrate",
- author: "Parity Technologies",
- };
-
- app_dirs::get_app_root(
- AppDataType::UserData,
- &app_info,
- ).expect("app directories exist on all supported platforms; qed")
-}
-
fn init_logger(pattern: &str) {
use ansi_term::Colour;
diff --git a/core/cli/src/params.rs b/core/cli/src/params.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a73c7cf65f8190cc9cea7333da30a2325e1f8a44
--- /dev/null
+++ b/core/cli/src/params.rs
@@ -0,0 +1,243 @@
+// Copyright 2018 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::path::PathBuf;
+use structopt::StructOpt;
+
+/// CLI Parameters provided by default
+#[derive(Debug, StructOpt)]
+#[structopt(name = "Substrate")]
+pub struct CoreParams {
+ ///Sets a custom logging filter
+ #[structopt(short = "l", long = "log", value_name = "LOG_PATTERN")]
+ log: Option,
+
+ /// Specify custom keystore path
+ #[structopt(long = "keystore-path", value_name = "PATH", parse(from_os_str))]
+ keystore_path: Option,
+
+ /// Specify additional key seed
+ #[structopt(long = "key", value_name = "STRING")]
+ key: Option,
+
+ /// Specify node secret key (64-character hex string)
+ #[structopt(long = "node-key", value_name = "KEY")]
+ node_key: Option