Update trie to v0.11 (paritytech#1704)

* Update trie to v0.11 * Update wasm runtimes
freedomfromfiat · Feb 6, 2019 · 2056e4c · 2056e4c
1 parent 64cde6f
commit 2056e4c
Show file tree

Hide file tree

Showing 21 changed files with 1,138 additions and 993 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -96,13 +96,3 @@ is-it-maintained-open-issues = { repository = "paritytech/substrate" }
 [profile.release]
 # Substrate runtime requires unwinding.
 panic = "unwind"
-
-[patch.crates-io]
-hash-db = { git = "https://github.com/paritytech/trie" }
-hash256-std-hasher = { git = "https://github.com/paritytech/trie" }
-keccak-hasher = { git = "https://github.com/paritytech/trie" }
-memory-db = { git = "https://github.com/paritytech/trie" }
-trie-bench = { git = "https://github.com/paritytech/trie" }
-trie-db = { git = "https://github.com/paritytech/trie" }
-trie-root = { git = "https://github.com/paritytech/trie" }
-trie-standardmap = { git = "https://github.com/paritytech/trie" }
diff --git a/core/client/Cargo.toml b/core/client/Cargo.toml
@@ -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 = { version = "0.9" , optional = true }
+hash-db = { version = "0.11", optional = true }
 kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 
 parity-codec = { version = "3.0", default-features = false }

diff --git a/core/client/db/Cargo.toml b/core/client/db/Cargo.toml
@@ -11,7 +11,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.1"
-hash-db = { version = "0.9" }
+hash-db = { version = "0.11" }
 primitives = { package = "substrate-primitives", path = "../../primitives" }
 runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" }
 client = { package = "substrate-client", path = "../../client" }

diff --git a/core/executor/wasm/Cargo.lock b/core/executor/wasm/Cargo.lock
diff --git a/core/executor/wasm/Cargo.toml b/core/executor/wasm/Cargo.toml
@@ -18,13 +18,3 @@ lto = true
 
 [workspace]
 members = []
-
-[patch.crates-io]
-hash-db = { git = "https://github.com/paritytech/trie" }
-hash256-std-hasher = { git = "https://github.com/paritytech/trie" }
-keccak-hasher = { git = "https://github.com/paritytech/trie" }
-memory-db = { git = "https://github.com/paritytech/trie" }
-trie-bench = { git = "https://github.com/paritytech/trie" }
-trie-db = { git = "https://github.com/paritytech/trie" }
-trie-root = { git = "https://github.com/paritytech/trie" }
-trie-standardmap = { git = "https://github.com/paritytech/trie" }
diff --git a/core/executor/wasm/build.sh b/core/executor/wasm/build.sh
@@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then
 else
 	CARGO_CMD="cargo +nightly"
 fi
-RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release
+CARGO_INCREMENTAL=0 RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release
 for i in test
 do
 	wasm-gc target/wasm32-unknown-unknown/release/runtime_$i.wasm target/wasm32-unknown-unknown/release/runtime_$i.compact.wasm

diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml
@@ -15,8 +15,8 @@ byteorder = { version = "1.1", default-features = false }
 primitive-types = { version = "0.2", default-features = false, features = ["codec"] }
 impl-serde = { version = "0.1", optional = true }
 wasmi = { version = "0.4.3", optional = true }
-hash-db = { version = "0.9", default-features = false }
-hash256-std-hasher = { version = "0.9", default-features = false }
+hash-db = { version = "0.11", default-features = false }
+hash256-std-hasher = { version = "0.11", default-features = false }
 ring = { version = "0.13", optional = true }
 untrusted = { version = "0.6", optional = true }
 hex-literal = { version = "0.1", optional = true }

diff --git a/core/sr-io/Cargo.toml b/core/sr-io/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 = "3.0", default-features = false }
-hash-db = { version = "0.9", default-features = false }
+hash-db = { version = "0.11", default-features = false }
 libsecp256k1 = { version = "0.2.1", optional = true }
 tiny-keccak = { version = "1.4.2", optional = true }
 environmental = { version = "~1.0", optional = true }

diff --git a/core/state-machine/Cargo.toml b/core/state-machine/Cargo.toml
@@ -10,9 +10,9 @@ hex-literal = "0.1.0"
 log = "0.4"
 parking_lot = "0.7.1"
 heapsize = "0.4"
-hash-db = "0.9"
-trie-db = "0.9"
-trie-root = "0.9"
+hash-db = "0.11"
+trie-db = "0.11"
+trie-root = "0.11"
 trie = { package = "substrate-trie", path = "../trie" }
 primitives = { package = "substrate-primitives", path = "../primitives" }
 panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }