Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix treasury minting #707

Merged
merged 6 commits into from
Sep 11, 2018
Merged

Fix treasury minting #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cccb16
Fix minting to do what it's meant to.
gavofyork Sep 10, 2018
fc9b89d
Merge remote-tracking branch 'origin/master' into gav-fix-minting
gavofyork Sep 10, 2018
2cb1e45
Fix tests
gavofyork Sep 10, 2018
bf5ad98
Note and fix total issuance.
gavofyork Sep 10, 2018
a52d839
Undo last non-fix.
gavofyork Sep 10, 2018
cb42d70
More doc
gavofyork Sep 10, 2018
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 demo/executor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ mod tests {
validator_count: 3,
minimum_validator_count: 0,
bonding_duration: 0,
early_era_slash: 0,
offline_slash: 0,
session_reward: 0,
offline_slash_grace: 0,
}),
Expand Down Expand Up @@ -262,7 +262,7 @@ mod tests {
construct_block(
1,
[69u8; 32].into(),
hex!("b7d85f23689ae4ae7951eda80e817dffb1c0925e77f5c0de8c94b265df80b9cf").into(),
hex!("efdd1840ae46b687fc59fc730892d412a0fb051ef120f9e6dfcf1c416d0fc2cb").into(),
vec![
CheckedExtrinsic {
signed: None,
Expand All @@ -282,7 +282,7 @@ mod tests {
construct_block(
2,
block1().1,
hex!("a17d6006e9bb4292b8ebea3b14995672a88caff2c99eeef1d84aeb234e5a0534").into(),
hex!("e360ad4a43929e521fd41cdabf8d772eb39f9cbf71fe95bada685e24bd3bbbbb").into(),
vec![
CheckedExtrinsic {
signed: None,
Expand All @@ -307,7 +307,7 @@ mod tests {
construct_block(
1,
[69u8; 32].into(),
hex!("27555b6e51bfdb689457fc076a54153a4f5188f47a17607da75e180d844db527").into(),
hex!("989ebec4920fe4a99edcd3766eee35a31de92dff20427920ae68d15471afba9a").into(),
vec![
CheckedExtrinsic {
signed: None,
Expand Down
4 changes: 2 additions & 2 deletions demo/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
staking: Some(StakingConfig {
current_era: 0,
intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
early_era_slash: 10000,
offline_slash: 10000,
session_reward: 100,
validator_count: 12,
sessions_per_era: 12, // 1 hour per era
Expand Down Expand Up @@ -148,7 +148,7 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
validator_count: 2,
sessions_per_era: 5,
bonding_duration: 2 * 60 * 12,
early_era_slash: 0,
offline_slash: 0,
session_reward: 0,
offline_slash_grace: 0,
}),
Expand Down
Loading