Merge branch 'master' into td-signed-transactions

paritytech · Dec 3, 2019 · 3f38218 · 3f38218
2 parents f85b890 + 368318c
commit 3f38218
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 73 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ stages:
 
 variables:
   GIT_STRATEGY:                    fetch
+  GIT_DEPTH:                       "3"
   CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
   SCCACHE_DIR:                     "/ci-cache/${CI_PROJECT_NAME}/sccache"
   CARGO_INCREMENTAL:               0
@@ -55,6 +56,8 @@ variables:
       - runner_system_failure
       - unknown_failure
       - api_failure
+  dependencies:                    []
+  interruptible:                   true
   tags:
     - linux-docker
 
@@ -79,6 +82,7 @@ check-runtime:
     GITHUB_API_PROJECT:            "parity%2Finfrastructure%2Fgithub-api"
   script:
     - ./.maintain/gitlab/check_runtime.sh
+  interruptible:                   true
   allow_failure:                   true
 
 
@@ -90,6 +94,7 @@ check-line-width:
     - /^[0-9]+$/
   script:
     - ./.maintain/gitlab/check_line_width.sh
+  interruptible:                   true
   allow_failure:                   true
 
 
@@ -351,8 +356,6 @@ check_polkadot:
   stage:                           build
   <<:                              *docker-env
   allow_failure:                   true
-  dependencies:
-    - test-linux-stable
   script:
     - COMMIT_HASH=$(git rev-parse HEAD)
     - SUBSTRATE_PATH=$(pwd)

diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh
@@ -22,7 +22,7 @@ function rename() {
     rename_gitlabci $old $new
     # and it appears, we have the same syntax in rust files
     rust_rename $old $new
-    
+
     # but generally we have the snail case syntax in rust files
     old=$(echo $old | sed s/-/_/g );
     new=$(echo $new | sed s/-/_/g );
@@ -57,7 +57,7 @@ TO_RENAME=(
     "substrate-runtime-interface-proc-macro sp-runtime-interface-proc-macro"
     "substrate-runtime-interface-test-wasm sp-runtime-interface-test-wasm"
     "substrate-serializer sp-serializer"
-    "substrate-session sp-sesssion"
+    "substrate-session sp-session"
     "sr-api sp-api"
     "sr-api-proc-macro sp-api-proc-macro"
     "sr-api-test sp-api-test"
@@ -103,10 +103,10 @@ TO_RENAME=(
     "substrate-state-db sc-state-db"
     "substrate-telemetry sc-telemetry"
     "substrate-tracing sc-tracing"
-    
+
 );
 
 for rule in "${TO_RENAME[@]}"
 do
 	rename "$rule";
-done
+done
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -23,7 +23,7 @@ safe-mix = { version = "1.0.0", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { path = "../../../primitives/sr-api", default-features = false }
 sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
-sp-sesssion = { path = "../../../primitives/session", default-features = false }
+sp-session = { path = "../../../primitives/session", default-features = false }
 sudo = { package = "pallet-sudo", path = "../../../frame/sudo", default-features = false }
 support = { package = "frame-support", path = "../../../frame/support", default-features = false }
 system = { package = "frame-system", path = "../../../frame/system", default-features = false }
@@ -56,7 +56,7 @@ std = [
 	"serde",
 	"sp-api/std",
 	"sp-runtime/std",
-	"sp-sesssion/std",
+	"sp-session/std",
 	"sudo/std",
 	"support/std",
 	"system/std",

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -350,7 +350,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl sp_sesssion::SessionKeys<Block> for Runtime {
+	impl sp_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
 			opaque::SessionKeys::generate(seed)
 		}

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -26,7 +26,7 @@ sp-api = { path = "../../../primitives/sr-api", default-features = false }
 sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
 sp-staking = { path = "../../../primitives/sr-staking-primitives", default-features = false }
 sp-keyring = { path = "../../../primitives/keyring", optional = true }
-sp-sesssion = { path = "../../../primitives/session", default-features = false }
+sp-session = { path = "../../../primitives/session", default-features = false }
 txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
 version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false }
 
@@ -107,7 +107,7 @@ std = [
 	"sp-staking/std",
 	"staking/std",
 	"sp-keyring",
-	"sp-sesssion/std",
+	"sp-session/std",
 	"sudo/std",
 	"support/std",
 	"system-rpc-runtime-api/std",

diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -78,7 +78,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to equal spec_version. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 197,
+	spec_version: 198,
 	impl_version: 198,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -711,7 +711,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl sp_sesssion::SessionKeys<Block> for Runtime {
+	impl sp_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
 			SessionKeys::generate(seed)
 		}

diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -17,7 +17,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" }
 rpc = { package = "jsonrpc-core", version = "14.0.3" }
 runtime_version = { package = "sp-version", path = "../../primitives/sr-version" }
 serde_json = "1.0.41"
-session = { package = "sp-sesssion", path = "../../primitives/session" }
+session = { package = "sp-session", path = "../../primitives/session" }
 sp-runtime = { path = "../../primitives/sr-primitives" }
 rpc-primitives = { package = "sp-rpc", path = "../../primitives/rpc" }
 state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }

diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
@@ -33,7 +33,7 @@ sp-io = { path = "../../primitives/sr-io" }
 sp-runtime = { path = "../../primitives/sr-primitives" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
-session = { package = "sp-sesssion", path = "../../primitives/session" }
+session = { package = "sp-session", path = "../../primitives/session" }
 app-crypto = { package = "sc-application-crypto", path = "../../primitives/application-crypto" }
 consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
 network = { package = "sc-network", path = "../network" }

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
@@ -66,3 +66,7 @@
 
 # Support crates
 /frame/support/ @thiolliere @kianenigma
+
+# Authority discovery
+/client/authority-discovery/ @mxinden
+/frame/authority-discovery/ @mxinden
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
@@ -283,7 +283,7 @@ decl_storage! {
 			map ReferendumIndex => Option<(ReferendumInfo<T::BlockNumber, T::Hash>)>;
 		/// Queue of successful referenda to be dispatched.
 		pub DispatchQueue get(fn dispatch_queue):
-			map T::BlockNumber => Vec<Option<(T::Hash, ReferendumIndex)>>;
+			map hasher(twox_64_concat) T::BlockNumber => Vec<Option<(T::Hash, ReferendumIndex)>>;
 
 		/// Get the voters for the current proposal.
 		pub VotersFor get(fn voters_for): map ReferendumIndex => Vec<T::AccountId>;