Skip to content

Patch #170

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

Merged
hackfisher merged 4 commits into from
Dec 17, 2019
Merged

Patch #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7110aa4
update: refactoring `redeem_ring`, `redeem_kton`
aurexav Dec 17, 2019
1352366
fix: typo
aurexav Dec 17, 2019
3a5eac7
update: format
aurexav Dec 17, 2019
f2c53e7
update: handle err
aurexav Dec 17, 2019
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
8 changes: 4 additions & 4 deletions node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ construct_runtime!(
{
// Basic stuff; balances is uncallable initially.
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},
System: system::{Module, Call, Storage, Config, Event},
System: system::{Module, Call, Storage, Event, Config},

// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
Expand All @@ -439,8 +439,8 @@ construct_runtime!(

// Consensus support.
Authorship: authorship::{Module, Call, Storage, Inherent},
Grandpa: grandpa::{Module, Call, Storage, Config, Event},
ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
Grandpa: grandpa::{Module, Call, Storage, Event, Config},
ImOnline: im_online::{default, ValidateUnsigned},
FinalityTracker: finality_tracker::{Module, Call, Inherent},
Offences: offences::{Module, Call, Storage, Event},
Session: session::{Module, Call, Storage, Event, Config<T>},
Expand All @@ -451,7 +451,7 @@ construct_runtime!(
Utility: utility::{Module, Call, Event},

EthRelay: eth_relay::{Module, Call, Storage, Event<T>, Config},
EthBacking: eth_backing::{Module, Call, Storage, Event<T>, Config<T>},
EthBacking: eth_backing,
}
);

Expand Down
22 changes: 10 additions & 12 deletions srml/eth-backing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,42 @@ edition = "2018"

[dependencies]
# crates.io
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
hex = { version = "0.4", default-features = false }
serde = { version = "1.0.101", optional = true }

# github.com
rstd = { package = "sr-std", 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 }
system = { package = "srml-system", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
timestamp = { package = "srml-timestamp", 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 }
primitives = { package = "substrate-primitives", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
ethabi = { git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std", default-features = false }

# darwinia
darwinia-support = { package = "darwinia-support", path = "../support", default-features = false }
darwinia-eth-relay = { package = "darwinia-eth-relay", path = "../eth-relay", default-features = false }
sr-eth-primitives = { path = "../../core/sr-eth-primitives", default-features = false }

sr-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }

primitives = { package = "substrate-primitives", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }

ethabi = { git = "https://github.com/darwinia-network/ethabi.git", branch = "with_no_std", default-features = false }

hex = { version = "0.4", default-features = false}

[dev-dependencies]
hex-literal = "0.2.1"

[features]
default = ["std"]
std = [
"codec/std",
"hex/std",
"serde/std",
"hex/std",

"ethabi/std",
"rstd/std",
"sr-primitives/std",
"support/std",
"system/std",
"timestamp/std",

"darwinia-support/std",
"darwinia-eth-relay/std",
"sr-eth-primitives/std",
"ethabi/std",
"sr-primitives/std",
]
Loading