Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix error while compling no_std wasm #119

Merged
merged 1 commit into from
Nov 27, 2019
Merged

fix error while compling no_std wasm #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions core/sr-eth-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions srml/ethereum-bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -30,5 +30,5 @@ std = [
# "sr-primitives/std",
"support/std",
"system/std",
# "sr-eth-primitives/std"
"sr-eth-primitives/std"
]
2 changes: 1 addition & 1 deletion srml/ethereum-bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down