Substrate.from() (#431)

* Update branches

* Bump runtime.

* Update again.
This commit is contained in:
Gavin Wood
2019-09-13 15:27:41 +02:00
committed by Robert Habermeier
parent cccfdee49b
commit 99c6d600c4
15 changed files with 674 additions and 644 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ tiny-keccak = "1.5.0"
dlmalloc = { version = "0.1.3", features = ["global"], optional = true }
# We need to make sure the global allocator is disabled until we have support of full substrate externalities
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }
@@ -9,7 +9,7 @@ adder = { path = ".." }
parachain = { package = "polkadot-parachain", path = "../../../parachain" }
collator = { package = "polkadot-collator", path = "../../../collator" }
primitives = { package = "polkadot-primitives", path = "../../../primitives" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
parking_lot = "0.9.0"
ctrlc = { version = "3.0", features = ["termination"] }
futures = "0.1"