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

Refactor dependency and struct #108

Merged
merged 2 commits into from
Nov 25, 2019
Merged

Refactor dependency and struct #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd05778
anchoring the devependency to branch darwinia-develop for further dep…
hackfisher Nov 25, 2019
100013b
refactor ethereum bridge file struct
hackfisher Nov 25, 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
1,798 changes: 899 additions & 899 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@
cli = { package = "node-cli", path = "node/cli" }
futures = "0.1.29"
ctrlc = { version = "3.1.3", features = ["termination"] }
substrate-cli = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-client = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-client-db = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-aura = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-babe = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-common = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-rhd = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-slots = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-executor = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-finality-grandpa = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-finality-grandpa-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-inherents = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-keyring = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-keystore = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-network = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-panic-handler = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-rpc = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-rpc-servers = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-serializer = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-service = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-service-test = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-api = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-api-proc-macro = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-io = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-sandbox = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-std = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-version = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-state-machine = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-telemetry = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-transaction-pool = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-transaction-graph = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-trie = { git = 'https://github.com/darwinia-network/substrate.git' }
fork-tree = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-cli = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-client = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-client-db = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-consensus-aura = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-consensus-common = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-consensus-rhd = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-consensus-slots = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-executor = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-finality-grandpa-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-inherents = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-keyring = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-keystore = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-network = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-panic-handler = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-rpc = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-rpc-servers = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-serializer = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-service = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-service-test = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-api = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-api-proc-macro = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-io = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-primitives = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-sandbox = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-std = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
sr-version = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-state-machine = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-telemetry = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-transaction-graph = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-trie = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
fork-tree = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
#new
substrate-application-crypto = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-authority-discovery = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-basic-authorship = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-externalities = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-offchain = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-peerset = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-phragmen = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-session = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-wasm-interface = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-application-crypto = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-externalities = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-offchain = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-peerset = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-phragmen = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-session = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }
substrate-wasm-interface = { git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop" }

[build-dependencies]
vergen = "3.0.4"
Expand Down Expand Up @@ -79,7 +79,7 @@ members = [
"srml/kton",
"srml/staking",

"srml/chainrelay/bridge/ethereum",
"srml/ethereum-bridge",
]

exclude = ["node/runtime/wasm"]
Expand Down
4 changes: 2 additions & 2 deletions core/merkle-mountain-range/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ edition = "2018"
[dependencies]
blake2 = { version = "0.8.1", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
system = { package = "srml-system", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
rstd = { package = "sr-std", 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 }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 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,17 +10,17 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
sr-primitives = {git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
substrate-primitives = {git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
rstd = { package = "sr-std", 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 }
substrate-primitives = {git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop", default-features = false }
rlp = { version = "0.4.3", optional = true }
parity-crypto = { version = "0.4.2", features = ["publickey"] }
rlp_derive = { git = "https://github.com/paritytech/parity-ethereum.git" }
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"

[dev-dependencies]
support = { package = "srml-support", git = 'https://github.com/darwinia-network/substrate.git'}
support = { package = "srml-support", git = "https://github.com/darwinia-network/substrate.git", branch = "darwinia-develop"}
rustc-hex = "2.0"

[features]
Expand Down
Loading