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

Companion for #11649: Bound uses of Call #5729

Merged
merged 27 commits into from
Oct 5, 2022
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d3df76b
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
gavofyork Jun 24, 2022
1ff70d0
Fixes
gavofyork Jun 24, 2022
2257459
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
ggwpez Sep 6, 2022
a09b0b9
Clear out old weights
ggwpez Sep 6, 2022
5b158f5
Resolve merges
ggwpez Sep 6, 2022
30ed4c8
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
ggwpez Sep 12, 2022
1246fed
Fix weight traits
ggwpez Sep 12, 2022
bfa473b
polkadot runtime: Clippy
ggwpez Sep 12, 2022
9254b89
rococo runtime: update pallet configs
ggwpez Sep 12, 2022
bc732fe
Merge branch 'master' into gav-no-stored-calls
ggwpez Sep 13, 2022
6e5aa99
Add preimage migration
ggwpez Sep 13, 2022
a8de0ec
Add all migrations
ggwpez Sep 14, 2022
8f615bd
Democracy is not on Westend
ggwpez Sep 14, 2022
8828a08
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
ggwpez Sep 21, 2022
9c69b44
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
ggwpez Sep 21, 2022
36f96db
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
ggwpez Sep 27, 2022
32addaf
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
Sep 29, 2022
3a9097e
[Migration] Refund stored multisig calls (#6075)
ruseinov Sep 30, 2022
da2a4b4
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
Sep 30, 2022
59f1631
Merge remote-tracking branch 'origin/master' into gav-no-stored-calls
Oct 3, 2022
579e267
Merge branch 'master' into gav-no-stored-calls
ggwpez Oct 3, 2022
4a555a7
Add Preimages to referenda config
ggwpez Oct 3, 2022
ba262dd
Update weights
ggwpez Oct 3, 2022
f2367eb
Add multisig migration to Westend+Rococo
ggwpez Oct 4, 2022
8529d9e
Merge branch 'master' into gav-no-stored-calls
ggwpez Oct 5, 2022
7b7ca0e
Fix Executive syntax
ggwpez Oct 5, 2022
954d16c
Bump Substrate
gavofyork Oct 5, 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
1 change: 1 addition & 0 deletions runtime/kusama/src/governance/fellowship.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
type UndecidingTimeout = UndecidingTimeout;
type AlarmInterval = AlarmInterval;
type Tracks = TracksInfo;
type Preimages = Preimage;
}

pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
Expand Down
1 change: 1 addition & 0 deletions runtime/kusama/src/governance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@ impl pallet_referenda::Config for Runtime {
type UndecidingTimeout = UndecidingTimeout;
type AlarmInterval = AlarmInterval;
type Tracks = TracksInfo;
type Preimages = Preimage;
}
6 changes: 3 additions & 3 deletions runtime/kusama/src/governance/old.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ parameter_types! {
}

impl pallet_democracy::Config for Runtime {
type Proposal = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type EnactmentPeriod = EnactmentPeriod;
Expand Down Expand Up @@ -74,14 +73,15 @@ impl pallet_democracy::Config for Runtime {
// only do it once and it lasts only for the cooloff period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit;
type OperationalPreimageOrigin = pallet_collective::EnsureMember<AccountId, CouncilCollective>;
type Slash = Treasury;
type Scheduler = Scheduler;
type PalletsOrigin = OriginCaller;
type MaxVotes = MaxVotes;
type WeightInfo = weights::pallet_democracy::WeightInfo<Runtime>;
type MaxProposals = MaxProposals;
type Preimages = Preimage;
type MaxDeposits = ConstU32<100>;
type MaxBlacklisted = ConstU32<100>;
}

parameter_types! {
Expand Down
12 changes: 7 additions & 5 deletions runtime/kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,10 @@ impl pallet_scheduler::Config for Runtime {
type MaxScheduledPerBlock = MaxScheduledPerBlock;
type WeightInfo = weights::pallet_scheduler::WeightInfo<Runtime>;
type OriginPrivilegeCmp = OriginPrivilegeCmp;
type PreimageProvider = Preimage;
type NoPreimagePostponement = NoPreimagePostponement;
type Preimages = Preimage;
}

parameter_types! {
pub const PreimageMaxSize: u32 = 4096 * 1024;
pub const PreimageBaseDeposit: Balance = deposit(2, 64);
pub const PreimageByteDeposit: Balance = deposit(0, 1);
}
Expand All @@ -239,8 +237,7 @@ impl pallet_preimage::Config for Runtime {
type WeightInfo = weights::pallet_preimage::WeightInfo<Runtime>;
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type ManagerOrigin = EnsureRoot<AccountId>; // This might be too strong a requirenent?
type MaxSize = PreimageMaxSize;
type ManagerOrigin = EnsureRoot<AccountId>;
type BaseDeposit = PreimageBaseDeposit;
type ByteDeposit = PreimageByteDeposit;
}
Expand Down Expand Up @@ -1471,6 +1468,11 @@ pub type Executive = frame_executive::Executive<
StakingMigrationV11OldPallet,
>,
pallet_staking::migrations::v12::MigrateToV12<Runtime>,
// "Bound uses of call" <https://github.com/paritytech/polkadot/pull/5729>
pallet_preimage::migration::v1::Migration<Runtime>,
pallet_scheduler::migration::v3::MigrateToV4<Runtime>,
pallet_democracy::migrations::v1::Migration<Runtime>,
pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
),
>;
/// The payload being signed in the transactions.
Expand Down
Loading