cleanup, pull upstream, fix build

.gitlab-ci.yml

@@ -329,7 +329,7 @@ build-rust-doc-release:
     - rm -f ./crate-docs/index.html # use it as an indicator if the job succeeds
     - BUILD_DUMMY_WASM_BINARY=1 RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html" time cargo +nightly doc --release --all --verbose
     - cp -R ./target/doc ./crate-docs
-    - echo "<meta http-equiv=refresh content=0;url=substrate_service/index.html>" > ./crate-docs/index.html
+    - echo "<meta http-equiv=refresh content=0;url=sc_service/index.html>" > ./crate-docs/index.html
     - sccache -s
 
 check_warnings:

.maintain/rename-crates-for-2.0.sh

@@ -37,8 +37,12 @@ TO_RENAME=(
     # post initial rename fixes
     "sc-application-crypto sp-application-crypto"
     "sp-transaction-pool-api sp-transaction-pool"
+    "sp-transaction-pool-runtime-api sp-transaction-pool"
     "sp-core-storage sp-storage"
     "transaction-factory node-transaction-factory"
+    "sp-finality-granpda sp-finality-grandpa"
+    "sp-sesssion sp-session"
+    "sp-tracing-pool sp-transaction-pool"
 
     # PRIMITIVES
     "substrate-application-crypto sp-application-crypto"

Cargo.toml

@@ -33,6 +33,7 @@ members = [
 	"client/keystore",
 	"client/network",
 	"client/network/test",
+	"client/network-gossip",
 	"client/offchain",
 	"client/peerset",
 	"client/rpc-servers",

README.md

@@ -1,3 +1,14 @@
+# DatDot
+a p2p solution for hosting files with Dat protocol
+![](https://i.imgur.com/oGPIbZQ.jpg)
+
+datdot code is currently located in `bin/node`
+
+``` 
+
+    Datdot is built using Substrate - Original Readme
+
+```
 # Substrate · [![GitHub license](https://img.shields.io/github/license/paritytech/substrate)](LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/substrate/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/substrate/pipelines) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](docs/CONTRIBUTING.adoc)
 
 Substrate is a next-generation framework for blockchain innovation.

bin/node-template/src/service.rs

@@ -158,6 +158,7 @@ pub fn new_full<C: Send + Default + 'static>(config: Configuration<C, GenesisCon
 				grandpa_link,
 				service.network(),
 				service.on_exit(),
+				service.spawn_task_handle(),
 			)?);
 		},
 		(true, false) => {
@@ -170,6 +171,7 @@ pub fn new_full<C: Send + Default + 'static>(config: Configuration<C, GenesisCon
 				on_exit: service.on_exit(),
 				telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 				voting_rule: grandpa::VotingRulesBuilder::default().build(),
+				executor: service.spawn_task_handle(),
 			};
 
 			// the GRANDPA voter task is considered infallible, i.e.

bin/node/cli/bin/main.rs

@@ -43,15 +43,16 @@ impl sc_cli::IntoExit for Exit {
 	}
 }
 
+//TODO
 fn main() -> Result<(), sc_cli::error::Error> {
 	let version = VersionInfo {
-		name: "Substrate Node",
+		name: "Datdot Node",
 		commit: env!("VERGEN_SHA_SHORT"),
 		version: env!("CARGO_PKG_VERSION"),
-		executable_name: "substrate",
+		executable_name: "datdot-node",
 		author: "Parity Technologies <[email protected]>",
-		description: "Generic substrate node",
-		support_url: "https://github.com/paritytech/substrate/issues/new",
+		description: "Datdot Service Node",
+		support_url: "https://github.com/playproject-io/datdot",
 	};
 
 	node_cli::run(std::env::args(), Exit, version)

bin/node/cli/src/service.rs

@@ -231,6 +231,7 @@ macro_rules! new_full {
 					grandpa_link,
 					service.network(),
 					service.on_exit(),
+					service.spawn_task_handle(),
 				)?);
 			},
 			(true, false) => {
@@ -243,6 +244,7 @@ macro_rules! new_full {
 					on_exit: service.on_exit(),
 					telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 					voting_rule: grandpa::VotingRulesBuilder::default().build(),
+					executor: service.spawn_task_handle(),
 				};
 				// the GRANDPA voter task is considered infallible, i.e.
 				// if it fails we take down the service with it.