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

re-introduce sudo to setup polkadot shell (DO NOT MERGE) #254

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

re-introduce sudo to setup polkadot shell (DO NOT MERGE) #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
850ffbc
re-introduce sudo to setup polkadot shell
brenzi Jan 29, 2024
8c607a1
fake-migrate to align storage versions of freshly added pallets
brenzi Jan 29, 2024
9e91d5e
try-runtime success
brenzi Jan 29, 2024
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
1 change: 1 addition & 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.

4 changes: 4 additions & 0 deletions polkadot-parachains/integritee-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pallet-multisig = { default-features = false, git = "https://github.com/parityte
pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-proxy = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
Expand Down Expand Up @@ -139,6 +140,7 @@ std = [
"pallet-proxy/std",
"pallet-scheduler/std",
"pallet-sidechain/std",
"pallet-sudo/std",
"pallet-teeracle/std",
"pallet-teerex/std",
"pallet-timestamp/std",
Expand Down Expand Up @@ -194,6 +196,7 @@ runtime-benchmarks = [
"pallet-preimage/runtime-benchmarks",
"pallet-scheduler/runtime-benchmarks",
"pallet-sidechain/runtime-benchmarks",
"pallet-sudo/runtime-benchmarks",
"pallet-teeracle/runtime-benchmarks",
"pallet-teerex/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
Expand Down Expand Up @@ -228,6 +231,7 @@ try-runtime = [
"pallet-preimage/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-sidechain/try-runtime",
"pallet-sudo/try-runtime",
"pallet-teeracle/try-runtime",
"pallet-teerex/try-runtime",
"pallet-timestamp/try-runtime",
Expand Down
26 changes: 25 additions & 1 deletion polkadot-parachains/integritee-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
use frame_support::traits::{
ConstBool, EqualPrivilegeOnly, Imbalance, InstanceFilter, OnUnbalanced,
};
mod migrations_fix;
pub use opaque::*;
use pallet_collective;
use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
Expand Down Expand Up @@ -740,6 +741,12 @@ impl orml_xcm::Config for Runtime {
type SovereignOrigin = EnsureRoot<AccountId>;
}

impl pallet_sudo::Config for Runtime {
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
}

construct_runtime!(
pub enum Runtime
{
Expand Down Expand Up @@ -768,6 +775,8 @@ construct_runtime!(
Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
TechnicalCommittee:
pallet_collective::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>, Config<T>} = 16,
// was at index 5 before, but storage prefix goes by name only
Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 17,
brenzi marked this conversation as resolved.
Show resolved Hide resolved
Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>} = 18,
ChildBounties: pallet_child_bounties = 19,

Expand Down Expand Up @@ -819,7 +828,22 @@ pub type UncheckedExtrinsic =
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;

/// Migrations to apply on runtime upgrade.
pub type Migrations = ();
pub type Migrations = (
migrations_fix::scheduler::v4::MigrateToV4<Runtime>,
migrations_fix::xcm::v1::MigrateToV1<Runtime>,
pallet_balances::migration::MigrateToTrackInactive<Runtime, xcm_config::CheckingAccount>,
migrations_fix::preimage::v1::MigrateToV1<Runtime>,
migrations_fix::bounties::v4::MigrateToV4<Runtime>,
pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
migrations_fix::collective::v4::MigrateToV4<Runtime, CouncilInstance>,
migrations_fix::collective::v4::MigrateToV4<Runtime, TechnicalCommitteeInstance>,
pallet_teerex::migrations::v1::MigrateV0toV1<Runtime>,
pallet_teerex::migrations::v2::MigrateV1toV2<Runtime>,
migrations_fix::dmp_queue::v2::MigrateToV2<Runtime>,
migrations_fix::xcmp_queue::v3::MigrateToV3<Runtime>,
migrations_fix::democracy::v1::MigrateToV1<Runtime>,
cumulus_pallet_parachain_system::migration::Migration<Runtime>,
clangenb marked this conversation as resolved.
Show resolved Hide resolved
);

/// Executive: handles dispatch to the various modules.
pub type Executive = frame_executive::Executive<
Expand Down
Loading
Loading