diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 140b21dbda..c25d04393b 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -1064,7 +1064,6 @@ version = "0.1.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.1.3 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", "polkadot-runtime-codec 0.1.0", "polkadot-serializer 0.1.0", diff --git a/substrate/wasm-runtime/Cargo.lock b/substrate/wasm-runtime/Cargo.lock index 4c46282755..3373ebcc9b 100644 --- a/substrate/wasm-runtime/Cargo.lock +++ b/substrate/wasm-runtime/Cargo.lock @@ -88,6 +88,16 @@ name = "crunchy" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "ed25519" +version = "0.1.0" +dependencies = [ + "polkadot-primitives 0.1.0", + "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hex 2.0.0 (git+https://github.com/rphmeier/rustc-hex.git)", + "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "either" version = "1.4.0" @@ -151,7 +161,7 @@ dependencies = [ [[package]] name = "fixed-hash" version = "0.1.3" -source = "git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm#853bb53158497914f1837f5186e31e5b29f77cee" +source = "git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm#8dc457899afdaf968ff7f16140b03d1e37b01d71" dependencies = [ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -389,16 +399,15 @@ version = "0.1.0" name = "polkadot-runtime-std" version = "0.1.0" dependencies = [ + "ed25519 0.1.0", "environmental 0.1.0", "polkadot-primitives 0.1.0", "polkadot-runtime-codec 0.1.0", "polkadot-state-machine 0.1.0", "pwasm-alloc 0.1.0", "pwasm-libc 0.1.0", - "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -542,6 +551,7 @@ dependencies = [ name = "runtime-polkadot" version = "0.1.0" dependencies = [ + "polkadot-primitives 0.1.0", "polkadot-runtime-codec 0.1.0", "polkadot-runtime-std 0.1.0", ] @@ -696,7 +706,7 @@ dependencies = [ [[package]] name = "uint" version = "0.1.2" -source = "git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm#853bb53158497914f1837f5186e31e5b29f77cee" +source = "git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm#8dc457899afdaf968ff7f16140b03d1e37b01d71" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/substrate/wasm-runtime/build.sh b/substrate/wasm-runtime/build.sh index 697fd27ee6..83f46d5a04 100755 --- a/substrate/wasm-runtime/build.sh +++ b/substrate/wasm-runtime/build.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -xargo +nightly build --target=wasm32-unknown-unknown --release +cargo +nightly build --target=wasm32-unknown-unknown --release dirs=`find * -maxdepth 0 -type d | grep -v pwasm- | grep -v std` for i in $dirs do diff --git a/substrate/wasm-runtime/polkadot/Cargo.toml b/substrate/wasm-runtime/polkadot/Cargo.toml index 24715e8c99..b0bc7a480b 100644 --- a/substrate/wasm-runtime/polkadot/Cargo.toml +++ b/substrate/wasm-runtime/polkadot/Cargo.toml @@ -9,7 +9,8 @@ crate-type = ["cdylib"] [dependencies] polkadot-runtime-codec = { path = "../../runtime-codec", version = "0.1", default-features = false } polkadot-runtime-std = { path = "../../runtime-std", version = "0.1", default-features = false } +polkadot-primitives = { path = "../../primitives", version = "0.1", default-features = false } [features] default = [] -std = ["polkadot-runtime-codec/std", "polkadot-runtime-std/std"] +std = ["polkadot-runtime-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std"] diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm index 1e0d5c637b..e5b9227348 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm differ diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm index 31e295da64..f8b91cc61f 100644 Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm differ