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

Develop #305

Merged
merged 2 commits into from
Feb 28, 2020
Merged

Develop #305

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
1440d0e
remove: unused deps
AurevoirXavier Feb 28, 2020
6ece75b
update: chain spec for crab
AurevoirXavier Feb 28, 2020
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
24 changes: 10 additions & 14 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.

122 changes: 61 additions & 61 deletions bin/node/cli/res/crab.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bin/node/cli/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ pub fn darwinia_genesis(
.collect(),
invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
slash_reward_fraction: Perbill::from_percent(10),
payout_fraction: Perbill::from_percent(50),
..Default::default()
}),
pallet_treasury: Some(Default::default()),
Expand Down
10 changes: 5 additions & 5 deletions bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ build = "build.rs"
codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
integer-sqrt = { version = "0.1.2" }
rustc-hex = { version = "2.0", optional = true }
safe-mix = { version = "1.0", default-features = false }
serde = { version = "1.0.102", optional = true }

# primitives
Expand Down Expand Up @@ -72,6 +71,9 @@ wasm-builder-runner = { version = "1.0.4", package = "substrate-wasm-builder-run
default = ["std"]
std = [
"codec/std",
"rustc-hex",
"serde",

"frame-executive/std",
"frame-support/std",
"frame-system-rpc-runtime-api/std",
Expand Down Expand Up @@ -105,10 +107,8 @@ std = [
"pallet-staking/std",
"pallet-treasury/std",

"node-primitives/std",
"rustc-hex",
"safe-mix/std",
"serde",
"node-primitives/std",

"sp-api/std",
"sp-authority-discovery/std",
"sp-block-builder/std",
Expand Down
4 changes: 2 additions & 2 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to equal spec_version. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 86,
impl_version: 86,
spec_version: 87,
impl_version: 87,
apis: RUNTIME_API_VERSIONS,
};

Expand Down
2 changes: 0 additions & 2 deletions frame/balances/kton/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2018"
[dependencies]
# crates.io
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
safe-mix = { version = "1.0.0", default-features = false }
serde = { version = "1.0.101", optional = true }

# github.com
Expand All @@ -30,7 +29,6 @@ darwinia-ring = { path = "../ring" }
default = ["std"]
std = [
"codec/std",
"safe-mix/std",
"serde",

"frame-support/std",
Expand Down
2 changes: 0 additions & 2 deletions frame/balances/ring/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2018"
[dependencies]
# crates.io
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
safe-mix = { version = "1.0.0", default-features = false }
serde = { version = "1.0.101", optional = true }

# github.com
Expand All @@ -28,7 +27,6 @@ pallet-transaction-payment = { version = "2.0.0", git = "https://github.com/darw
default = ["std"]
std = [
"codec/std",
"safe-mix/std",
"serde",

"frame-support/std",
Expand Down
2 changes: 0 additions & 2 deletions frame/staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2018"
[dependencies]
# crates.io
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
safe-mix = { version = "1.0.0", default-features = false }
serde = { version = "1.0.101", optional = true }

# github.com
Expand Down Expand Up @@ -39,7 +38,6 @@ migrate = []
default = ["std", "equalize"]
std = [
"codec/std",
"safe-mix/std",
"serde",

"frame-support/std",
Expand Down
1 change: 1 addition & 0 deletions frame/staking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ impl ExtBuilder {
minimum_validator_count: self.minimum_validator_count,
invulnerables: self.invulnerables,
slash_reward_fraction: Perbill::from_percent(10),
payout_fraction: Perbill::from_percent(50),
..Default::default()
}
.assimilate_storage(&mut storage);
Expand Down