paritytech · gavofyork · Sep 17, 2018 · Sep 14, 2018 · Sep 14, 2018 · Sep 14, 2018
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/bft/Cargo.toml b/core/bft/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 futures = "0.1.17"
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 substrate-primitives = { path = "../primitives" }
 sr-primitives = { path = "../sr-primitives" }
 sr-version = { path = "../sr-version" }

diff --git a/core/client/Cargo.toml b/core/client/Cargo.toml
@@ -14,7 +14,7 @@ futures = "0.1.17"
 slog = "^2"
 heapsize = "0.4"
 substrate-bft = { path = "../bft" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 substrate-executor = { path = "../executor" }
 substrate-primitives = { path = "../primitives" }
 sr-io = { path = "../sr-io" }

diff --git a/core/client/db/Cargo.toml b/core/client/db/Cargo.toml
@@ -14,7 +14,7 @@ substrate-primitives = { path = "../../../core/primitives" }
 sr-primitives = { path = "../../../core/sr-primitives" }
 substrate-client = { path = "../../../core/client" }
 substrate-state-machine = { path = "../../../core/state-machine" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 parity-codec-derive = { version = "~1.0" }
 substrate-executor = { path = "../../../core/executor" }
 substrate-state-db = { path = "../../../core/state-db" }

diff --git a/core/executor/Cargo.toml b/core/executor/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 error-chain = "0.12"
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 sr-io = { path = "../sr-io" }
 substrate-primitives = { path = "../primitives" }
 substrate-serializer = { path = "../serializer" }

diff --git a/core/executor/wasm/Cargo.lock b/core/executor/wasm/Cargo.lock
diff --git a/core/extrinsic-pool/Cargo.toml b/core/extrinsic-pool/Cargo.toml
@@ -16,4 +16,4 @@ sr-primitives = { path = "../../core/sr-primitives" }
 [dev-dependencies]
 substrate-test-client = { path = "../../core/test-client" }
 substrate-keyring = { path = "../../core/keyring" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
diff --git a/core/metadata/Cargo.toml b/core/metadata/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 
 [features]
 default = ["std"]

diff --git a/core/misbehavior-check/Cargo.toml b/core/misbehavior-check/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-parity-codec = { version = "~1.0", default-features = false }
+parity-codec = { version = "1.1", default-features = false }
 substrate-primitives = { path = "../primitives", default-features = false }
 sr-primitives = { path = "../sr-primitives", default-features = false }
 sr-io = { path = "../sr-io", default-features = false }

diff --git a/core/network/Cargo.toml b/core/network/Cargo.toml
@@ -18,7 +18,7 @@ rustc-hex = "1.0"
 substrate-primitives = { path = "../../core/primitives" }
 substrate-client = { path = "../../core/client" }
 sr-primitives = { path = "../../core/sr-primitives" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 parity-codec-derive = { version = "~1.0" }
 substrate-network-libp2p = { path = "../../core/network-libp2p" }
 

diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 crunchy = "0.1"
 sr-std = { path = "../sr-std", default_features = false }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 parity-codec-derive = { version = "~1.0", default_features = false }
 elastic-array = {version = "0.10", optional = true }
 fixed-hash = { version = "0.2.2", default_features = false }

diff --git a/core/rpc/Cargo.toml b/core/rpc/Cargo.toml
@@ -10,7 +10,7 @@ jsonrpc-macros = { git="https://github.com/paritytech/jsonrpc.git" }
 jsonrpc-pubsub = { git="https://github.com/paritytech/jsonrpc.git" }
 log = "0.3"
 parking_lot = "0.4"
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 substrate-client = { path = "../client" }
 substrate-executor = { path = "../executor" }
 substrate-extrinsic-pool = { path = "../extrinsic-pool" }

diff --git a/core/rpc/src/chain/tests.rs b/core/rpc/src/chain/tests.rs
@@ -202,6 +202,7 @@ fn should_return_runtime_version() {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
+			apis: (&[][..]).into()
 		}
 	);
 }
diff --git a/core/service/Cargo.toml b/core/service/Cargo.toml
@@ -23,7 +23,7 @@ substrate-primitives = { path = "../../core/primitives" }
 substrate-network = { path = "../../core/network" }
 substrate-client = { path = "../../core/client" }
 substrate-client-db = { path = "../../core/client/db" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 substrate-executor = { path = "../../core/executor" }
 substrate-extrinsic-pool = { path = "../../core/extrinsic-pool" }
 substrate-rpc = { path = "../../core/rpc" }

diff --git a/core/sr-io/Cargo.toml b/core/sr-io/Cargo.toml
@@ -12,7 +12,7 @@ sr-std = { path = "../sr-std", default_features = false }
 environmental = { version = "~1.0", optional = true }
 substrate-state-machine = { path = "../state-machine", optional = true }
 substrate-primitives = { path = "../primitives", default_features = false }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 triehash = { version = "0.2", optional = true }
 hashdb = { version = "0.2", default_features = false }
 rlp = { version = "0.2", optional = true, default_features = false }

diff --git a/core/sr-primitives/Cargo.toml b/core/sr-primitives/Cargo.toml
@@ -8,7 +8,7 @@ num-traits = { version = "0.2", default_features = false }
 integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 parity-codec-derive = { version = "~1.0", default_features = false }
 substrate-primitives = { path = "../primitives", default_features = false }
 sr-std = { path = "../sr-std", default_features = false }

diff --git a/core/sr-primitives/src/lib.rs b/core/sr-primitives/src/lib.rs
@@ -58,6 +58,7 @@ pub mod testing;
 pub mod traits;
 pub mod generic;
 pub mod bft;
+pub mod transaction_validity;
 
 use traits::{Verify, Lazy};
 

diff --git a/core/sr-primitives/src/transaction_validity.rs b/core/sr-primitives/src/transaction_validity.rs
@@ -0,0 +1,37 @@
+// Copyright 2017 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 <http://www.gnu.org/licenses/>.
+
+//! Transaction validity interface.
+
+use rstd::prelude::*;
+
+/// Priority for a transaction. Additive. Higher is better.
+pub type TransactionPriority = u64;
+
+/// Minimum number of blocks a transaction will remain valid for.
+/// `TransactionLongevity::max_value()` means "forever".
+pub type TransactionLongevity = u64;
+
+/// Tag for a transaction. No two transactions with the same tag should be placed on-chain.
+pub type TransactionTag = Vec<u8>;
+
+/// Information on a transaction's validity and, if valid, on how it relates to other transactions.
+#[derive(Clone, PartialEq, Eq, Encode, Decode)]
+pub enum TransactionValidity {
+	Invalid,
+	Valid(TransactionPriority, Vec<TransactionTag>, Vec<TransactionTag>, TransactionLongevity),
+	Unknown,
+}
diff --git a/core/sr-sandbox/Cargo.toml b/core/sr-sandbox/Cargo.toml
@@ -12,7 +12,7 @@ wasmi = { version = "0.4", optional = true }
 substrate-primitives = { path = "../primitives", default_features = false }
 sr-std = { path = "../sr-std", default_features = false }
 sr-io = { path = "../sr-io", default_features = false }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 
 [dev-dependencies]
 wabt = "0.4"

diff --git a/core/sr-version/Cargo.toml b/core/sr-version/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 parity-codec-derive = { version = "~1.0", default_features = false }
 sr-std = { path = "../sr-std", default_features = false }
 

diff --git a/core/sr-version/src/lib.rs b/core/sr-version/src/lib.rs
@@ -42,6 +42,18 @@ pub type VersionString = ::std::borrow::Cow<'static, str>;
 #[cfg(not(feature = "std"))]
 pub type VersionString = &'static str;
 
+/// The identity of a particular API interface that the runtime might provide.
+pub type ApiId = [u8; 8];
+
+/// A vector of pairs of `ApiId` and a `u32` for version. For `"std"` builds, this
+/// is a `Cow`.
+#[cfg(feature = "std")]
+pub type ApisVec = ::std::borrow::Cow<'static, [(ApiId, u32)]>;
+/// A vector of pairs of `ApiId` and a `u32` for version. For `"no-std"` builds, this
+/// is just a reference.
+#[cfg(not(feature = "std"))]
+pub type ApisVec = &'static [(ApiId, u32)];
+
 #[cfg(feature = "std")]
 #[macro_export]
 macro_rules! ver_str {
@@ -54,6 +66,12 @@ macro_rules! ver_str {
 	( $y:expr ) => {{ $y }}
 }
 
+/// Create a vector of Api declarations.
+#[macro_export]
+macro_rules! apis_vec {
+	( $y:expr ) => { ver_str!(& $y) }
+}
+
 /// Runtime version.
 /// This should not be thought of as classic Semver (major/minor/tiny).
 /// This triplet have different semantics and mis-interpretation could cause problems.
@@ -90,20 +108,9 @@ pub struct RuntimeVersion {
 	/// Non-consensus-breaking optimisations are about the only changes that could be made which
 	/// would result in only the `impl_version` changing.
 	pub impl_version: u32,
-}
 
-// TODO: remove this after PoC-2
-#[cfg(feature = "std")]
-impl Default for RuntimeVersion {
-	fn default() -> RuntimeVersion {
-		RuntimeVersion {
-			spec_name: ver_str!("polkadot"),
-			impl_name: ver_str!("parity-polkadot"),
-			authoring_version: 0,
-			spec_version: 0,
-			impl_version: 0,
-		}
-	}
+	/// List of supported API "features" along with their versions.
+	pub apis: ApisVec,
 }
 
 #[cfg(feature = "std")]
@@ -127,4 +134,9 @@ impl RuntimeVersion {
 		self.authoring_version == other.authoring_version &&
 		self.spec_name == other.spec_name
 	}
+
+	/// Check if this version supports a particular API.
+	pub fn has_api(&self, api: ApiId, version: u32) -> bool {
+		self.apis.iter().any(|&(ref s, v)| &api == s && version == v)
+	}
 }
diff --git a/core/state-db/Cargo.toml b/core/state-db/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 parking_lot = "0.5"
 log = "0.4"
 substrate-primitives = { path = "../../core/primitives" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 parity-codec-derive = { version = "~1.0" }
 
 [dev-dependencies]

diff --git a/core/state-machine/Cargo.toml b/core/state-machine/Cargo.toml
@@ -17,5 +17,5 @@ triehash = "0.2"
 rlp = "0.2.4"
 
 substrate-primitives = { path = "../primitives", version = "0.1.0" }
-parity-codec = { version = "~1.0", default_features = false }
+parity-codec = { version = "1.1", default_features = false }
 
diff --git a/core/test-client/Cargo.toml b/core/test-client/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 rhododendron = "0.3"
 substrate-bft = { path = "../bft" }
 substrate-client = { path = "../client" }
-parity-codec = { version = "~1.0" }
+parity-codec = { version = "1.1" }
 substrate-executor = { path = "../executor" }
 substrate-keyring = { path = "../../core/keyring" }
 substrate-primitives = { path = "../primitives" }

diff --git a/core/test-runtime/Cargo.toml b/core/test-runtime/Cargo.toml
@@ -8,7 +8,7 @@ log = { version = "0.3", optional = true }
 hex-literal = { version = "0.1.0", optional = true }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "~1.0", default-features = false }
+parity-codec = { version = "1.1", default-features = false }
 parity-codec-derive = { version = "~1.0", default-features = false }
 substrate-keyring = { path = "../keyring", optional = true }
 substrate-primitives = { path = "../primitives", default-features = false }

diff --git a/core/test-runtime/src/lib.rs b/core/test-runtime/src/lib.rs
@@ -67,6 +67,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	authoring_version: 1,
 	spec_version: 1,
 	impl_version: 1,
+	apis: apis_vec!([]),
 };
 
 fn version() -> RuntimeVersion {