From d50742c6ba6746c97cbdf1f6f10e9f3786353743 Mon Sep 17 00:00:00 2001 From: hammeWang Date: Wed, 27 Nov 2019 17:44:10 +0800 Subject: [PATCH] fix error while compling no_std wasm --- Cargo.lock | 5 ++--- core/sr-eth-primitives/Cargo.toml | 6 +++--- srml/ethereum-bridge/Cargo.toml | 4 ++-- srml/ethereum-bridge/src/lib.rs | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c90f05c2..091895354 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,6 +699,7 @@ version = "0.2.0" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-eth-primitives 0.2.0", "sr-std 2.0.0 (git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop)", "srml-support 2.0.0 (git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop)", "srml-system 2.0.0 (git+https://github.com/darwinia-network/substrate.git?branch=darwinia-develop)", @@ -927,7 +928,6 @@ dependencies = [ "ethbloom 0.8.1 (git+https://github.com/darwinia-network/parity-common.git)", "fixed-hash 0.5.1 (git+https://github.com/darwinia-network/parity-common.git)", "impl-rlp 0.2.1 (git+https://github.com/darwinia-network/parity-common.git)", - "impl-serde 0.2.3 (git+https://github.com/darwinia-network/parity-common.git)", "primitive-types 0.6.1 (git+https://github.com/darwinia-network/parity-common.git)", "uint 0.8.2 (git+https://github.com/darwinia-network/parity-common.git)", ] @@ -3190,7 +3190,6 @@ dependencies = [ "fixed-hash 0.5.1 (git+https://github.com/darwinia-network/parity-common.git)", "impl-codec 0.4.2 (git+https://github.com/darwinia-network/parity-common.git)", "impl-rlp 0.2.1 (git+https://github.com/darwinia-network/parity-common.git)", - "impl-serde 0.2.3 (git+https://github.com/darwinia-network/parity-common.git)", "uint 0.8.2 (git+https://github.com/darwinia-network/parity-common.git)", ] @@ -6220,7 +6219,7 @@ name = "twox-hash" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/core/sr-eth-primitives/Cargo.toml b/core/sr-eth-primitives/Cargo.toml index 852169e9c..3c612eb16 100644 --- a/core/sr-eth-primitives/Cargo.toml +++ b/core/sr-eth-primitives/Cargo.toml @@ -10,14 +10,14 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = rstd = { package = "sr-std", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false } #substrate-primitives = {git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false } rlp = { package = "rlp", git = "https://github.com/darwinia-network/parity-common.git", default-features = false} -rlp_derive = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false } +rlp_derive = { git = "https://github.com/darwinia-network/parity-common.git" } primitive-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["codec", "rlp"] } -ethereum-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["serialize"] } +ethereum-types = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false } keccak-hash = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false} impl-codec = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false} fixed-hash = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false} impl-rlp = { git = "https://github.com/darwinia-network/parity-common.git", default-features = false} -ethbloom = { git ="https://github.com/darwinia-network/parity-common.git", default-features = false, features = ["serialize"]} +ethbloom = { git ="https://github.com/darwinia-network/parity-common.git", default-features = false} [dev-dependencies] support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop"} diff --git a/srml/ethereum-bridge/Cargo.toml b/srml/ethereum-bridge/Cargo.toml index a5622682f..bfe68396a 100644 --- a/srml/ethereum-bridge/Cargo.toml +++ b/srml/ethereum-bridge/Cargo.toml @@ -15,7 +15,7 @@ rstd = { package = "sr-std", git = "https://github.com/darwinia-network/substrat system = { package = "srml-system", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false } #sr-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false } support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false } -#sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false } +sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false } #merkle-mountain-range = { path = "../../core/merkle-mountain-range", default-features = false } #web3 = {git = "https://github.com/ABMatrix/rust-web3.git", branch = "develop", default-features = false } @@ -30,5 +30,5 @@ std = [ # "sr-primitives/std", "support/std", "system/std", -# "sr-eth-primitives/std" + "sr-eth-primitives/std" ] diff --git a/srml/ethereum-bridge/src/lib.rs b/srml/ethereum-bridge/src/lib.rs index ce01b0b63..274357c2a 100644 --- a/srml/ethereum-bridge/src/lib.rs +++ b/srml/ethereum-bridge/src/lib.rs @@ -6,9 +6,9 @@ // use blake2::Blake2b; use codec::{Decode, Encode}; use rstd::vec::Vec; +use sr_eth_primitives::pow::EthHeader; use support::{decl_event, decl_module, decl_storage, dispatch::Result, traits::Currency}; use system::ensure_signed; - //use sr_eth_primitives::{pow::EthHeader, H160, H256, H64, U128, U256, U512}; //use sr_primitives::RuntimeDebug;