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

Add sudo module to polkadot-runtime #735

Merged
gavofyork merged 2 commits into from
Jan 7, 2020
Merged

Add sudo module to polkadot-runtime #735

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
1125250
Add sudo module to `polkadot-runtime`
bkchr Jan 7, 2020
80d70d9
Merge remote-tracking branch 'origin/master' into bkchr-bring-back-sudo
bkchr Jan 7, 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
16 changes: 16 additions & 0 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.

2 changes: 2 additions & 0 deletions runtime/polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ system = { package = "frame-system", git = "https://github.com/paritytech/substr
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }

runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
Expand Down Expand Up @@ -126,4 +127,5 @@ std = [
"sp-session/std",
"randomness-collective-flip/std",
"runtime-common/std",
"sudo/std",
]
8 changes: 8 additions & 0 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ impl claims::Trait for Runtime {
type Prefix = Prefix;
}

impl sudo::Trait for Runtime {
type Event = Event;
type Proposal = Call;
}

construct_runtime! {
pub enum Runtime where
Block = Block,
Expand Down Expand Up @@ -534,6 +539,9 @@ construct_runtime! {
ImOnline: im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
AuthorityDiscovery: authority_discovery::{Module, Call, Config},

// Sudo. Usable initially.
Sudo: sudo,

// Governance stuff; uncallable initially.
Democracy: democracy::{Module, Call, Storage, Config, Event<T>},
Council: collective::<Instance1>::{Module, Call, Storage, Origin<T>, Event<T>, Config<T>},
Expand Down
10 changes: 8 additions & 2 deletions service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ fn staging_testnet_config_genesis() -> polkadot::GenesisConfig {
claims: Some(polkadot::ClaimsConfig {
claims: vec![],
vesting: vec![],
}),
sudo: Some(polkadot::SudoConfig {
key: endowed_accounts[0].clone(),
})
}
}
Expand Down Expand Up @@ -275,7 +278,7 @@ pub fn get_authority_keys_from_seed(seed: &str) -> (
/// Helper function to create GenesisConfig for testing
pub fn testnet_genesis(
initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>,
_root_key: AccountId,
root_key: AccountId,
endowed_accounts: Option<Vec<AccountId>>,
) -> polkadot::GenesisConfig {
let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
Expand Down Expand Up @@ -354,7 +357,10 @@ pub fn testnet_genesis(
claims: Some(polkadot::ClaimsConfig {
claims: vec![],
vesting: vec![],
})
}),
sudo: Some(polkadot::SudoConfig {
key: root_key,
}),
}
}

Expand Down