From b88d057230f677b46c91772e6e9e396e85c11a12 Mon Sep 17 00:00:00 2001 From: haerdib Date: Fri, 20 May 2022 14:50:12 +0200 Subject: [PATCH 1/2] bump spec version --- Cargo.lock | 4 ++-- polkadot-parachains/Cargo.toml | 2 +- polkadot-parachains/integritee-runtime/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df883cbf..d6343b83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3537,7 +3537,7 @@ dependencies = [ [[package]] name = "integritee-collator" -version = "1.5.25" +version = "1.5.26" dependencies = [ "assert_cmd", "async-trait", @@ -3618,7 +3618,7 @@ dependencies = [ [[package]] name = "integritee-runtime" -version = "1.5.21" +version = "1.5.22" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index 84332f8e..ffc1cba9 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -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 "] homepage = "https://integritee.network/" repository = "https://github.com/integritee-network/parachain" diff --git a/polkadot-parachains/integritee-runtime/Cargo.toml b/polkadot-parachains/integritee-runtime/Cargo.toml index 36ce3b5e..d0681bea 100644 --- a/polkadot-parachains/integritee-runtime/Cargo.toml +++ b/polkadot-parachains/integritee-runtime/Cargo.toml @@ -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 "] homepage = "https://integritee.network/" repository = "https://github.com/integritee-network/parachain" From cdbbb41815044a3105125273fa282dd4c5a1ad27 Mon Sep 17 00:00:00 2001 From: haerdib Date: Fri, 20 May 2022 15:49:45 +0200 Subject: [PATCH 2/2] remove sudo --- Cargo.lock | 1 - polkadot-parachains/integritee-runtime/Cargo.toml | 4 +--- polkadot-parachains/integritee-runtime/src/lib.rs | 8 +------- polkadot-parachains/src/chain_spec.rs | 12 ++++++++---- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6343b83..10f7c2e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3650,7 +3650,6 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-sudo", "pallet-teeracle", "pallet-teerex", "pallet-timestamp", diff --git a/polkadot-parachains/integritee-runtime/Cargo.toml b/polkadot-parachains/integritee-runtime/Cargo.toml index d0681bea..91ee25a3 100644 --- a/polkadot-parachains/integritee-runtime/Cargo.toml +++ b/polkadot-parachains/integritee-runtime/Cargo.toml @@ -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" } @@ -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" } @@ -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", diff --git a/polkadot-parachains/integritee-runtime/src/lib.rs b/polkadot-parachains/integritee-runtime/src/lib.rs index 82c0ef51..23127bec 100644 --- a/polkadot-parachains/integritee-runtime/src/lib.rs +++ b/polkadot-parachains/integritee-runtime/src/lib.rs @@ -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, @@ -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); @@ -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, Event} = 5, Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 6, Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 7, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 8, diff --git a/polkadot-parachains/src/chain_spec.rs b/polkadot-parachains/src/chain_spec.rs index c0132b3a..f74fd523 100644 --- a/polkadot-parachains/src/chain_spec.rs +++ b/polkadot-parachains/src/chain_spec.rs @@ -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}; @@ -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 },