Skip to content

Commit 161bfaf

Browse files
committed
feat(system-parachains/collectives): Configure Collectives Polkadot
- `XcmFeeToAccount` -> `SendXcmFeeToAccount` - add possibility to inject non-authorities session-keys in genesis (SDK #5078)
1 parent 6f42f23 commit 161bfaf

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

integration-tests/emulated/chains/parachains/collectives/collectives-polkadot/src/genesis.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ pub fn genesis() -> Storage {
5151
)
5252
})
5353
.collect(),
54+
// TODO: Any keys to add here?
55+
non_authority_keys: vec![],
5456
},
5557
polkadot_xcm: collectives_polkadot_runtime::PolkadotXcmConfig {
5658
safe_xcm_version: Some(SAFE_XCM_VERSION),

system-parachains/collectives/collectives-polkadot/src/genesis_config_presets.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ fn collectives_polkadot_genesis(
5656
)
5757
})
5858
.collect(),
59+
// TODO: Any keys to add here?
60+
non_authority_keys: vec![],
5961
},
6062
"polkadotXcm": {
6163
"safeXcmVersion": Some(SAFE_XCM_VERSION),

system-parachains/collectives/collectives-polkadot/src/xcm_config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use xcm_builder::{
4545
RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
4646
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
4747
TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
48-
XcmFeeManagerFromComponents, XcmFeeToAccount,
48+
XcmFeeManagerFromComponents, SendXcmFeeToAccount,
4949
};
5050
use xcm_executor::{traits::ConvertLocation, XcmExecutor};
5151

@@ -233,7 +233,7 @@ impl xcm_executor::Config for XcmConfig {
233233
type AssetExchanger = ();
234234
type FeeManager = XcmFeeManagerFromComponents<
235235
WaivedLocations,
236-
XcmFeeToAccount<Self::AssetTransactor, AccountId, RelayTreasuryPalletAccount>,
236+
SendXcmFeeToAccount<Self::AssetTransactor, RelayTreasuryPalletAccount>,
237237
>;
238238
type MessageExporter = ();
239239
type UniversalAliases = Nothing;

0 commit comments

Comments
 (0)