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

Remove sudo #128

Merged
merged 2 commits into from
May 21, 2022
Merged

Remove sudo #128

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
b88d057
bump spec version
haerdib May 20, 2022
cdbbb41
remove sudo
haerdib May 20, 2022
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
5 changes: 2 additions & 3 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: 1 addition & 1 deletion polkadot-parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-collator"
description = "The Integritee parachain collator binary"
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
version = "1.5.25"
version = "1.5.26"
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
6 changes: 2 additions & 4 deletions polkadot-parachains/integritee-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = 'integritee-runtime'
description = "The Integritee parachain runtime"
# patch revision must match runtime spec_version
version = '1.5.21'
version = '1.5.22'
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand All @@ -15,7 +15,7 @@ log = { version = "0.4.14", default-features = false }
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }

parachains-common = { path = "../parachains-common" , default-features = false }
parachains-common = { path = "../parachains-common", default-features = false }

# Substrate dependencies
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
Expand Down Expand Up @@ -44,7 +44,6 @@ pallet-democracy = { git = "https://github.com/paritytech/substrate", default-fe
pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" }
Expand Down Expand Up @@ -122,7 +121,6 @@ std = [
"pallet-randomness-collective-flip/std",
"pallet-timestamp/std",
"pallet-treasury/std",
"pallet-sudo/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-vesting/std",
Expand Down
8 changes: 1 addition & 7 deletions polkadot-parachains/integritee-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("integritee-parachain"),
impl_name: create_runtime_str!("integritee-full"),
authoring_version: 2,
spec_version: 21,
spec_version: 22,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 3,
Expand Down Expand Up @@ -296,11 +296,6 @@ impl pallet_transaction_payment::Config for Runtime {
type OperationalFeeMultiplier = OperationalFeeMultiplier;
}

impl pallet_sudo::Config for Runtime {
type Call = Call;
type Event = Event;
}

parameter_types! {
// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
pub const DepositBase: Balance = deposit(1, 88);
Expand Down Expand Up @@ -688,7 +683,6 @@ construct_runtime! {
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2,
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 6,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 7,
Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 8,
Expand Down
12 changes: 8 additions & 4 deletions polkadot-parachains/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#![allow(clippy::inconsistent_digit_grouping)]

use cumulus_primitives_core::ParaId;
use parachain_runtime::{AccountId, AuraId, DemocracyConfig, TeerexConfig};
use parachain_runtime::{
AccountId, AuraId, CouncilConfig, DemocracyConfig, TechnicalCommitteeConfig, TeerexConfig,
};
use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
use sc_service::{ChainType, GenericChainSpec};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -232,9 +234,11 @@ fn integritee_genesis_config(
balances: endowed_accounts.iter().cloned().map(|k| (k, 10__000_000_000_000)).collect(),
},
democracy: DemocracyConfig::default(),
council: Default::default(),
technical_committee: Default::default(),
sudo: parachain_runtime::SudoConfig { key: Some(root_key) },
council: CouncilConfig { phantom: Default::default(), members: vec![root_key.clone()] },
technical_committee: TechnicalCommitteeConfig {
phantom: Default::default(),
members: vec![root_key],
},
vesting: Default::default(),
parachain_info: parachain_runtime::ParachainInfoConfig { parachain_id: id },
aura: parachain_runtime::AuraConfig { authorities: initial_authorities },
Expand Down