Merge remote-tracking branch 'origin/master' into joe1232b

Author: joepetrowski

Cargo.lock

@@ -19,7 +19,7 @@ state-machine = { package = "substrate-state-machine", path = "../state-machine"
 keyring = { package = "substrate-keyring", path = "../keyring", optional = true }
 trie = { package = "substrate-trie", path = "../trie", optional = true }
 substrate-telemetry = { path = "../telemetry", optional = true }
-hash-db = { git = "https://github.com/paritytech/trie", optional = true }
+hash-db = { version = "0.9" , optional = true }
 kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 
 codec = { package = "parity-codec", version = "2.1", default-features = false }

core/client/Cargo.toml

@@ -10,7 +10,7 @@ kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c
 # FIXME replace with release as soon as our rocksdb changes are released upstream https://github.com/paritytech/parity-common/issues/88
 kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 lru-cache = "0.1"
-hash-db = { git = "https://github.com/paritytech/trie" }
+hash-db = { version = "0.9" }
 substrate-primitives = { path = "../../primitives" }
 sr-primitives = { path = "../../sr-primitives" }
 substrate-client = { path = "../../client" }

core/client/db/Cargo.toml

@@ -15,8 +15,8 @@ byteorder = { version = "1.1", default-features = false }
 primitive-types = { version = "0.1", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.1", optional = true }
 wasmi = { version = "0.4.3", optional = true }
-hash-db = { git = "https://github.com/paritytech/trie", default-features = false }
-hash256-std-hasher = { git = "https://github.com/paritytech/trie", default-features = false }
+hash-db = { version = "0.9", default-features = false }
+hash256-std-hasher = { version = "0.9", default-features = false }
 ring = { version = "0.13", optional = true }
 untrusted = { version = "0.6", optional = true }
 hex-literal = { version = "0.1", optional = true }

core/primitives/Cargo.toml

@@ -11,7 +11,7 @@ rustc_version = "0.2"
 sr-std = { path = "../sr-std", default-features = false }
 substrate-primitives = { path = "../primitives", default-features = false }
 parity-codec = { version = "2.2", default-features = false }
-hash-db = { git = "https://github.com/paritytech/trie", default-features = false }
+hash-db = { version = "0.9", default-features = false }
 
 environmental = { version = "~1.0", optional = true }
 substrate-state-machine = { path = "../state-machine", optional = true }

core/sr-io/Cargo.toml

@@ -9,9 +9,9 @@ hex-literal = "0.1.0"
 log = "0.4"
 parking_lot = "0.7.1"
 heapsize = "0.4"
-hash-db = { git = "https://github.com/paritytech/trie" }
-trie-db = { git = "https://github.com/paritytech/trie" }
-trie-root = { git = "https://github.com/paritytech/trie" }
+hash-db = "0.9"
+trie-db = "0.9"
+trie-root = "0.9"
 substrate-trie = { path = "../trie" }
 substrate-primitives = { path = "../primitives" }
 parity-codec = "2.2"

core/state-machine/Cargo.toml

@@ -12,16 +12,16 @@ harness = false
 
 [dependencies]
 parity-codec = { version = "2.2" }
-hash-db = { git = "https://github.com/paritytech/trie", default-features = false }
-trie-db = { git = "https://github.com/paritytech/trie", optional = true }
-trie-root = { git = "https://github.com/paritytech/trie", default-features = false }
-memory-db = { git = "https://github.com/paritytech/trie", optional = true }
+hash-db = { version = "0.9", default-features = false }
+trie-db = { version = "0.9", optional = true }
+trie-root = { version = "0.9", default-features = false }
+memory-db = { version = "0.9", optional = true }
 
 [dev-dependencies]
 substrate-primitives = { path = "../primitives" }
-trie-bench = { git = "https://github.com/paritytech/trie" }
-trie-standardmap = { git = "https://github.com/paritytech/trie" }
-keccak-hasher = { git = "https://github.com/paritytech/trie" }
+trie-bench = { version = "0.9" }
+trie-standardmap = { version = "0.9" }
+keccak-hasher = { version = "0.2" }
 criterion = "0.1.2"
 hex-literal = "0.1.0"
 

core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm

@@ -6,7 +6,7 @@ description = "Substrate node implementation in Rust."
 
 [dependencies]
 hex-literal = "0.1"
-trie-root = { git = "https://github.com/paritytech/trie" }
+trie-root = "0.9"
 parity-codec = "2.2"
 sr-io = { path = "../../core/sr-io" }
 substrate-state-machine = { path = "../../core/state-machine" }

core/trie/Cargo.toml

@@ -206,9 +206,11 @@ impl treasury::Trait for Runtime {
 }
 
 impl contract::Trait for Runtime {
+	type Call = Call;
+	type Event = Event;
 	type Gas = u64;
 	type DetermineContractAddress = contract::SimpleAddressDeterminator<Runtime>;
-	type Event = Event;
+	type ComputeDispatchFee = contract::DefaultDispatchFeeComputor<Runtime>;
 }
 
 impl sudo::Trait for Runtime {