Skip to content

Commit

Permalink
Feature/2.0 init (paritytech#99)
Browse files Browse the repository at this point in the history
* chainx 2.0.0 project init

1. update substrate to v2.0.0
2. remove all old modules

* update substrate rc2 to rc3

* some typo

* change some desc
  • Loading branch information
atenjin committed Jun 15, 2020
1 parent 64de331 commit f81aedd
Show file tree
Hide file tree
Showing 235 changed files with 5,275 additions and 60,731 deletions.
8,133 changes: 4,120 additions & 4,013 deletions Cargo.lock

Large diffs are not rendered by default.

80 changes: 32 additions & 48 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,59 +1,43 @@
[package]
name = "chainx"
version = "1.1.0"
build = "build.rs"
authors = ["Chainpool <https://www.chainx.org>"]
version = "2.0.0"
authors = ["ChainX community <https://www.chainx.org>"]
edition = "2018"

[[bin]]
name = "chainx"
path = "src/main.rs"
description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"

[dependencies]
ctrlc = { version = "3.0", features = ["termination"] }
futures = "0.1.17"
serde_json = "1.0"
chainx-cli = { path = "./cli" }
futures = "0.3.4"
log = "0.4.8"
structopt = "0.3.8"
parking_lot = "0.10.0"
jsonrpc-core = "14.0.3"

[build-dependencies]
vergen = "3"
sc-cli = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-core = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-rpc = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-executor = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-service = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-inherents = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-network = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-consensus = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-consensus = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-client-api = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }

[features]
msgbus-log = ["chainx-cli/msgbus-log"]
msgbus-redis = ["chainx-cli/msgbus-redis"]
msgbus-redis-keyhash = ["msgbus-redis", "chainx-cli/msgbus-redis-keyhash"]
cache-lru = ["chainx-cli/cache-lru"]
chainx-runtime = { path = "./runtime" }
chainx-rpc = { path = "./rpc" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", tag = "v2.0.0-rc3" }

[workspace]
members = [
"primitives",
"executor",
"runtime",
"cli",
"rpc",
"rpc-servers",
"runtime-api",
"xr-primitives",
# ChainX runtime module libraries
"xrml/xbootstrap",
"xrml/xfisher",
"xrml/xsystem",
"xrml/xsupport",
"xrml/xaccounts",
"xrml/xsession",
"xrml/xgrandpa",
"xrml/xaura",
"xrml/xmultisig",
"xrml/xfee/manager",
"xrml/xassets/assets",
"xrml/xassets/records",
"xrml/xassets/process",
"xrml/xdex/spot",
"xrml/xmining/staking",
"xrml/xmining/tokens",
"xrml/xbridge/common",
"xrml/xbridge/bitcoin",
"xrml/xbridge/sdot",
"xrml/xbridge/features",
"xrml/xcontracts",
"runtime"
]
9 changes: 4 additions & 5 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use vergen::{generate_cargo_keys, ConstantsFlags};

const ERROR_MSG: &'static str = "Failed to generate metadata files";
use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};

fn main() {
generate_cargo_keys(ConstantsFlags::all()).expect(ERROR_MSG);
println!("cargo:rerun-if-changed=.git/HEAD");
generate_cargo_keys();

rerun_if_git_head_changed();
}
42 changes: 0 additions & 42 deletions ci/cmake.sh

This file was deleted.

63 changes: 0 additions & 63 deletions cli/Cargo.toml

This file was deleted.

169 changes: 0 additions & 169 deletions cli/src/chain_spec.rs

This file was deleted.

Loading

0 comments on commit f81aedd

Please sign in to comment.