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

allow governance body on parachain to have sovereign account on Polkadot #7518

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

allow governance body on parachain to have sovereign account on Polkadot #7518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31769de
allow governance body on parachain to have sovereign account on Polkadot
xlc Jul 19, 2023
33ced79
Merge remote-tracking branch 'origin/master' into body-sovereign-account
xlc Jul 19, 2023
f8837af
Merge remote-tracking branch 'origin/master' into body-sovereign-account
xlc Aug 20, 2023
c257a42
Merge remote-tracking branch 'origin/master' into body-sovereign-account
xlc Aug 20, 2023
0adfaea
Merge remote-tracking branch 'origin/master' into body-sovereign-account
xlc Aug 21, 2023
d004ad7
update
xlc Aug 21, 2023
2a7b45e
enable for Kusama and Westend first
xlc Aug 23, 2023
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
241 changes: 122 additions & 119 deletions runtime/polkadot/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ use xcm_builder::{
AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, BackingToPlurality,
ChildParachainAsNative, ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter,
IsConcrete, MintLocation, OriginToPluralityVoice, SignedAccountId32AsNative,
SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
WeightInfoBounds, WithComputedOrigin,
DescribeBodyTerminal, DescribeFamily, HashedDescription, IsConcrete, MintLocation,
OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds,
WithComputedOrigin,
};
use xcm_executor::traits::WithOriginFilter;

Expand All @@ -70,6 +71,8 @@ pub type SovereignAccountOf = (
ChildParachainConvertsVia<ParaId, AccountId>,
// We can directly alias an `AccountId32` into a local account.
AccountId32Aliases<ThisNetwork, AccountId>,
// Allow governance body to be used as a sovereign account.
HashedDescription<AccountId, DescribeFamily<DescribeBodyTerminal>>,
xlc marked this conversation as resolved.
Show resolved Hide resolved
);

/// Our asset transactor. This is what allows us to interact with the runtime assets from the point of
Expand Down Expand Up @@ -185,129 +188,129 @@ impl Contains<RuntimeCall> for SafeCallFilter {
#[cfg(feature = "runtime-benchmarks")]
{
if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
return true
return true;
}
}

match call {
RuntimeCall::System(
frame_system::Call::kill_prefix { .. } | frame_system::Call::set_heap_pages { .. },
) |
RuntimeCall::Babe(..) |
RuntimeCall::Timestamp(..) |
RuntimeCall::Indices(..) |
RuntimeCall::Balances(..) |
RuntimeCall::Crowdloan(
crowdloan::Call::create { .. } |
crowdloan::Call::contribute { .. } |
crowdloan::Call::withdraw { .. } |
crowdloan::Call::refund { .. } |
crowdloan::Call::dissolve { .. } |
crowdloan::Call::edit { .. } |
crowdloan::Call::poke { .. } |
crowdloan::Call::contribute_all { .. },
) |
RuntimeCall::Staking(
pallet_staking::Call::bond { .. } |
pallet_staking::Call::bond_extra { .. } |
pallet_staking::Call::unbond { .. } |
pallet_staking::Call::withdraw_unbonded { .. } |
pallet_staking::Call::validate { .. } |
pallet_staking::Call::nominate { .. } |
pallet_staking::Call::chill { .. } |
pallet_staking::Call::set_payee { .. } |
pallet_staking::Call::set_controller { .. } |
pallet_staking::Call::set_validator_count { .. } |
pallet_staking::Call::increase_validator_count { .. } |
pallet_staking::Call::scale_validator_count { .. } |
pallet_staking::Call::force_no_eras { .. } |
pallet_staking::Call::force_new_era { .. } |
pallet_staking::Call::set_invulnerables { .. } |
pallet_staking::Call::force_unstake { .. } |
pallet_staking::Call::force_new_era_always { .. } |
pallet_staking::Call::payout_stakers { .. } |
pallet_staking::Call::rebond { .. } |
pallet_staking::Call::reap_stash { .. } |
pallet_staking::Call::set_staking_configs { .. } |
pallet_staking::Call::chill_other { .. } |
pallet_staking::Call::force_apply_min_commission { .. },
) |
RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
RuntimeCall::Grandpa(..) |
RuntimeCall::ImOnline(..) |
RuntimeCall::Treasury(..) |
RuntimeCall::ConvictionVoting(..) |
RuntimeCall::Referenda(
pallet_referenda::Call::place_decision_deposit { .. } |
pallet_referenda::Call::refund_decision_deposit { .. } |
pallet_referenda::Call::cancel { .. } |
pallet_referenda::Call::kill { .. } |
pallet_referenda::Call::nudge_referendum { .. } |
pallet_referenda::Call::one_fewer_deciding { .. },
) |
RuntimeCall::Claims(
super::claims::Call::claim { .. } |
super::claims::Call::mint_claim { .. } |
super::claims::Call::move_claim { .. },
) |
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
RuntimeCall::Identity(
pallet_identity::Call::add_registrar { .. } |
pallet_identity::Call::set_identity { .. } |
pallet_identity::Call::clear_identity { .. } |
pallet_identity::Call::request_judgement { .. } |
pallet_identity::Call::cancel_request { .. } |
pallet_identity::Call::set_fee { .. } |
pallet_identity::Call::set_account_id { .. } |
pallet_identity::Call::set_fields { .. } |
pallet_identity::Call::provide_judgement { .. } |
pallet_identity::Call::kill_identity { .. } |
pallet_identity::Call::add_sub { .. } |
pallet_identity::Call::rename_sub { .. } |
pallet_identity::Call::remove_sub { .. } |
pallet_identity::Call::quit_sub { .. },
) |
RuntimeCall::Vesting(..) |
RuntimeCall::Bounties(
pallet_bounties::Call::propose_bounty { .. } |
pallet_bounties::Call::approve_bounty { .. } |
pallet_bounties::Call::propose_curator { .. } |
pallet_bounties::Call::unassign_curator { .. } |
pallet_bounties::Call::accept_curator { .. } |
pallet_bounties::Call::award_bounty { .. } |
pallet_bounties::Call::claim_bounty { .. } |
pallet_bounties::Call::close_bounty { .. },
) |
RuntimeCall::ChildBounties(..) |
RuntimeCall::ElectionProviderMultiPhase(..) |
RuntimeCall::VoterList(..) |
RuntimeCall::NominationPools(
pallet_nomination_pools::Call::join { .. } |
pallet_nomination_pools::Call::bond_extra { .. } |
pallet_nomination_pools::Call::claim_payout { .. } |
pallet_nomination_pools::Call::unbond { .. } |
pallet_nomination_pools::Call::pool_withdraw_unbonded { .. } |
pallet_nomination_pools::Call::withdraw_unbonded { .. } |
pallet_nomination_pools::Call::create { .. } |
pallet_nomination_pools::Call::create_with_pool_id { .. } |
pallet_nomination_pools::Call::set_state { .. } |
pallet_nomination_pools::Call::set_configs { .. } |
pallet_nomination_pools::Call::update_roles { .. } |
pallet_nomination_pools::Call::chill { .. },
) |
RuntimeCall::Hrmp(..) |
RuntimeCall::Registrar(
paras_registrar::Call::deregister { .. } |
paras_registrar::Call::swap { .. } |
paras_registrar::Call::remove_lock { .. } |
paras_registrar::Call::reserve { .. } |
paras_registrar::Call::add_lock { .. },
) |
RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
)
| RuntimeCall::Babe(..)
| RuntimeCall::Timestamp(..)
| RuntimeCall::Indices(..)
| RuntimeCall::Balances(..)
| RuntimeCall::Crowdloan(
crowdloan::Call::create { .. }
| crowdloan::Call::contribute { .. }
| crowdloan::Call::withdraw { .. }
| crowdloan::Call::refund { .. }
| crowdloan::Call::dissolve { .. }
| crowdloan::Call::edit { .. }
| crowdloan::Call::poke { .. }
| crowdloan::Call::contribute_all { .. },
)
| RuntimeCall::Staking(
pallet_staking::Call::bond { .. }
| pallet_staking::Call::bond_extra { .. }
| pallet_staking::Call::unbond { .. }
| pallet_staking::Call::withdraw_unbonded { .. }
| pallet_staking::Call::validate { .. }
| pallet_staking::Call::nominate { .. }
| pallet_staking::Call::chill { .. }
| pallet_staking::Call::set_payee { .. }
| pallet_staking::Call::set_controller { .. }
| pallet_staking::Call::set_validator_count { .. }
| pallet_staking::Call::increase_validator_count { .. }
| pallet_staking::Call::scale_validator_count { .. }
| pallet_staking::Call::force_no_eras { .. }
| pallet_staking::Call::force_new_era { .. }
| pallet_staking::Call::set_invulnerables { .. }
| pallet_staking::Call::force_unstake { .. }
| pallet_staking::Call::force_new_era_always { .. }
| pallet_staking::Call::payout_stakers { .. }
| pallet_staking::Call::rebond { .. }
| pallet_staking::Call::reap_stash { .. }
| pallet_staking::Call::set_staking_configs { .. }
| pallet_staking::Call::chill_other { .. }
| pallet_staking::Call::force_apply_min_commission { .. },
)
| RuntimeCall::Session(pallet_session::Call::purge_keys { .. })
| RuntimeCall::Grandpa(..)
| RuntimeCall::ImOnline(..)
| RuntimeCall::Treasury(..)
| RuntimeCall::ConvictionVoting(..)
| RuntimeCall::Referenda(
pallet_referenda::Call::place_decision_deposit { .. }
| pallet_referenda::Call::refund_decision_deposit { .. }
| pallet_referenda::Call::cancel { .. }
| pallet_referenda::Call::kill { .. }
| pallet_referenda::Call::nudge_referendum { .. }
| pallet_referenda::Call::one_fewer_deciding { .. },
)
| RuntimeCall::Claims(
super::claims::Call::claim { .. }
| super::claims::Call::mint_claim { .. }
| super::claims::Call::move_claim { .. },
)
| RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. })
| RuntimeCall::Identity(
pallet_identity::Call::add_registrar { .. }
| pallet_identity::Call::set_identity { .. }
| pallet_identity::Call::clear_identity { .. }
| pallet_identity::Call::request_judgement { .. }
| pallet_identity::Call::cancel_request { .. }
| pallet_identity::Call::set_fee { .. }
| pallet_identity::Call::set_account_id { .. }
| pallet_identity::Call::set_fields { .. }
| pallet_identity::Call::provide_judgement { .. }
| pallet_identity::Call::kill_identity { .. }
| pallet_identity::Call::add_sub { .. }
| pallet_identity::Call::rename_sub { .. }
| pallet_identity::Call::remove_sub { .. }
| pallet_identity::Call::quit_sub { .. },
)
| RuntimeCall::Vesting(..)
| RuntimeCall::Bounties(
pallet_bounties::Call::propose_bounty { .. }
| pallet_bounties::Call::approve_bounty { .. }
| pallet_bounties::Call::propose_curator { .. }
| pallet_bounties::Call::unassign_curator { .. }
| pallet_bounties::Call::accept_curator { .. }
| pallet_bounties::Call::award_bounty { .. }
| pallet_bounties::Call::claim_bounty { .. }
| pallet_bounties::Call::close_bounty { .. },
)
| RuntimeCall::ChildBounties(..)
| RuntimeCall::ElectionProviderMultiPhase(..)
| RuntimeCall::VoterList(..)
| RuntimeCall::NominationPools(
pallet_nomination_pools::Call::join { .. }
| pallet_nomination_pools::Call::bond_extra { .. }
| pallet_nomination_pools::Call::claim_payout { .. }
| pallet_nomination_pools::Call::unbond { .. }
| pallet_nomination_pools::Call::pool_withdraw_unbonded { .. }
| pallet_nomination_pools::Call::withdraw_unbonded { .. }
| pallet_nomination_pools::Call::create { .. }
| pallet_nomination_pools::Call::create_with_pool_id { .. }
| pallet_nomination_pools::Call::set_state { .. }
| pallet_nomination_pools::Call::set_configs { .. }
| pallet_nomination_pools::Call::update_roles { .. }
| pallet_nomination_pools::Call::chill { .. },
)
| RuntimeCall::Hrmp(..)
| RuntimeCall::Registrar(
paras_registrar::Call::deregister { .. }
| paras_registrar::Call::swap { .. }
| paras_registrar::Call::remove_lock { .. }
| paras_registrar::Call::reserve { .. }
| paras_registrar::Call::add_lock { .. },
)
| RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
..
}) |
RuntimeCall::Whitelist(pallet_whitelist::Call::whitelist_call { .. }) |
RuntimeCall::Proxy(..) => true,
})
| RuntimeCall::Whitelist(pallet_whitelist::Call::whitelist_call { .. })
| RuntimeCall::Proxy(..) => true,
_ => false,
}
}
Expand Down
7 changes: 4 additions & 3 deletions xcm/xcm-builder/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ pub use location_conversion::ForeignChainAliasAccount;
pub use location_conversion::{
Account32Hash, AccountId32Aliases, AccountKey20Aliases, AliasesIntoAccountId32,
ChildParachainConvertsVia, DescribeAccountId32Terminal, DescribeAccountIdTerminal,
DescribeAccountKey20Terminal, DescribeAllTerminal, DescribeFamily, DescribeLocation,
DescribePalletTerminal, DescribeTerminus, GlobalConsensusParachainConvertsFor,
HashedDescription, ParentIsPreset, SiblingParachainConvertsVia,
DescribeAccountKey20Terminal, DescribeAllTerminal, DescribeBodyTerminal, DescribeFamily,
DescribeLocation, DescribePalletTerminal, DescribeTerminus,
GlobalConsensusParachainConvertsFor, HashedDescription, ParentIsPreset,
SiblingParachainConvertsVia,
};

mod origin_conversion;
Expand Down
11 changes: 11 additions & 0 deletions xcm/xcm-builder/src/location_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,22 @@ impl DescribeLocation for DescribeAccountKey20Terminal {

pub type DescribeAccountIdTerminal = (DescribeAccountId32Terminal, DescribeAccountKey20Terminal);

pub struct DescribeBodyTerminal;
impl DescribeLocation for DescribeBodyTerminal {
fn describe_location(l: &MultiLocation) -> Option<Vec<u8>> {
match (l.parents, &l.interior) {
(0, X1(Plurality { id, part })) => Some((b"Body", id, part).encode()),
xlc marked this conversation as resolved.
Show resolved Hide resolved
_ => return None,
}
}
}

pub type DescribeAllTerminal = (
DescribeTerminus,
DescribePalletTerminal,
DescribeAccountId32Terminal,
DescribeAccountKey20Terminal,
DescribeBodyTerminal,
);

pub struct DescribeFamily<DescribeInterior>(PhantomData<DescribeInterior>);
Expand Down
Loading