Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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,134 changes: 522 additions & 612 deletions Cargo.lock

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ cumulus-pallet-xcmp-queue = { version = "0.20.0", default-features = false }
cumulus-primitives-aura = { version = "0.17.0", default-features = false }
cumulus-primitives-core = { version = "0.18.1", default-features = false }
cumulus-primitives-utility = { version = "0.20.0", default-features = false }
emulated-integration-tests-common = { version = "20.0.0" }
emulated-integration-tests-common = { version = "20.0.1" }
#encointer-balances-tx-payment = { version = "~15.1.0", default-features = false }
#encointer-balances-tx-payment-rpc-runtime-api = { version = "~15.1.0", default-features = false }
#encointer-kusama-runtime = { path = "system-parachains/encointer" }
Expand Down Expand Up @@ -175,7 +175,7 @@ parachains-common = { version = "21.0.0", default-features = false }
parachains-runtimes-test-utils = { version = "22.0.0" }
paste = { version = "1.0.14" }
penpal-emulated-chain = { path = "integration-tests/emulated/chains/parachains/testing/penpal" }
penpal-runtime = { version = "0.28.0" }
penpal-runtime = { version = "0.28.1" }
people-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-kusama" }
people-kusama-runtime = { path = "system-parachains/people/people-kusama" }
people-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-polkadot" }
Expand All @@ -193,21 +193,23 @@ frame-metadata-hash-extension = { version = "0.8.0", default-features = false }
remote-externalities = { version = "0.50.0", package = "frame-remote-externalities" }
runtime-parachains = { version = "19.1.0", default-features = false, package = "polkadot-runtime-parachains" }
sc-chain-spec = { version = "42.0.0" }
sc-network = { version = "0.49.0" }
sc-network = { version = "0.49.1" }
scale-info = { version = "2.10.0", default-features = false }
separator = { version = "0.4.1" }
serde = { version = "1.0.196" }
serde_json = { version = "1.0.113", default-features = false }
smallvec = { version = "1.13.1" }
snowbridge-beacon-primitives = { version = "0.13.1", default-features = false }
snowbridge-core = { version = "0.13.1", default-features = false }
snowbridge-merkle-tree = { version = "0.2.0", default-features = false }
snowbridge-outbound-queue-runtime-api = { version = "0.13.0", default-features = false }
snowbridge-outbound-queue-primitives = { version = "0.2.1", default-features = false }
snowbridge-pallet-ethereum-client = { version = "0.13.0", default-features = false }
snowbridge-pallet-inbound-queue = { version = "0.13.1", default-features = false }
snowbridge-pallet-inbound-queue-fixtures = { version = "0.21.0" }
snowbridge-pallet-ethereum-client-fixtures = { version = "0.21.0" }
snowbridge-pallet-ethereum-client-fixtures = { version = "0.21.1" }
snowbridge-pallet-outbound-queue = { version = "0.13.0", default-features = false }
snowbridge-pallet-system = { version = "0.13.1", default-features = false }
snowbridge-pallet-system = { version = "0.13.2", default-features = false }
snowbridge-router-primitives = { version = "0.18.1", default-features = false }
snowbridge-runtime-common = { version = "0.13.0", default-features = false }
snowbridge-runtime-test-common = { version = "0.15.0" }
Expand All @@ -221,7 +223,7 @@ sp-core = { version = "36.1.0", default-features = false }
sp-debug-derive = { version = "14.0.0", default-features = false }
sp-genesis-builder = { version = "0.17.0", default-features = false }
sp-inherents = { version = "36.0.0", default-features = false }
sp-io = { version = "40.0.0", default-features = false }
sp-io = { version = "40.0.1", default-features = false }
sp-keyring = { version = "41.0.0" }
sp-npos-elections = { version = "36.1.0", default-features = false }
sp-offchain = { version = "36.0.0", default-features = false }
Expand All @@ -236,12 +238,12 @@ sp-transaction-pool = { version = "36.0.0", default-features = false }
sp-trie = { version = "39.1.0", default-features = false }
sp-version = { version = "39.0.0", default-features = false }
sp-weights = { version = "31.1.0", default-features = false }
substrate-wasm-builder = { version = "26.0.0" }
substrate-wasm-builder = { version = "26.0.1" }
system-parachains-constants = { path = "system-parachains/constants", default-features = false }
tokio = { version = "1.36.0" }
xcm = { version = "16.1.0", default-features = false, package = "staging-xcm" }
xcm-builder = { version = "20.0.0", default-features = false, package = "staging-xcm-builder" }
xcm-emulator = { version = "0.19.0" }
xcm-builder = { version = "20.1.0", default-features = false, package = "staging-xcm-builder" }
xcm-emulator = { version = "0.19.1" }
xcm-executor = { version = "19.1.0", default-features = false, package = "staging-xcm-executor" }
xcm-runtime-apis = { version = "0.7.0", default-features = false }
anyhow = { version = "1.0.82" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ runtime-benchmarks = [
"penpal-emulated-chain/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ runtime-benchmarks = [
"polkadot-emulated-chain/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"snowbridge-router-primitives/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ runtime-benchmarks = [
"bridge-hub-kusama-runtime/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ runtime-benchmarks = [
"bridge-hub-polkadot-runtime/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ runtime-benchmarks = [
"parachains-common/runtime-benchmarks",
"penpal-runtime/runtime-benchmarks",
"polkadot-emulated-chain/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
1 change: 1 addition & 0 deletions integration-tests/emulated/helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ runtime-benchmarks = [
"pallet-balances/runtime-benchmarks",
"pallet-message-queue/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ runtime-benchmarks = [
"system-parachains-constants/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ runtime-benchmarks = [
"system-parachains-constants/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@ runtime-benchmarks = [
"system-parachains-constants/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@ runtime-benchmarks = [
"system-parachains-constants/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,5 @@ runtime-benchmarks = [
"system-parachains-constants/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
1 change: 1 addition & 0 deletions relay/kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
try-runtime = [
"frame-election-provider-support/try-runtime",
Expand Down
1 change: 1 addition & 0 deletions relay/kusama/src/governance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ impl pallet_conviction_voting::Config for Runtime {
frame_support::traits::tokens::currency::ActiveIssuanceOf<Balances, Self::AccountId>;
type Polls = Referenda;
type BlockNumberProvider = System;
type VotingHooks = ();
}

parameter_types! {
Expand Down
4 changes: 1 addition & 3 deletions relay/kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,6 @@ impl Get<InteriorLocation> for BrokerPot {
impl coretime::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type BrokerId = BrokerId;
type WeightInfo = weights::runtime_parachains_coretime::WeightInfo<Runtime>;
type SendXcm = crate::xcm_config::XcmRouter;
Expand Down Expand Up @@ -1731,8 +1730,7 @@ impl pallet_nomination_pools::Config for Runtime {
type PalletId = PoolsPalletId;
type MaxPointsToBalance = MaxPointsToBalance;
type AdminOrigin = EitherOf<EnsureRoot<AccountId>, StakingAdmin>;
// TODO: this will come back later (stable25XY)
// type Filter = pallet_staking::AllStakers<Runtime>;
type Filter = pallet_staking::AllStakers<Runtime>;
type BlockNumberProvider = System;
}

Expand Down
5 changes: 4 additions & 1 deletion relay/kusama/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use super::{
};
use frame_support::{
parameter_types,
traits::{Contains, Equals, Everything, Nothing},
traits::{Contains, Disabled, Equals, Everything, Nothing},
};
use frame_system::EnsureRoot;
use kusama_runtime_constants::{currency::CENTS, system_parachain::*};
Expand Down Expand Up @@ -226,6 +226,7 @@ impl xcm_executor::Config for XcmConfig {
type HrmpNewChannelOpenRequestHandler = ();
type HrmpChannelAcceptedHandler = ();
type HrmpChannelClosingHandler = ();
type XcmEventEmitter = XcmPallet;
}

parameter_types! {
Expand Down Expand Up @@ -304,4 +305,6 @@ impl pallet_xcm::Config for Runtime {
type RemoteLockConsumerIdentifier = ();
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
type AdminOrigin = EnsureRoot<AccountId>;
// Aliasing is disabled: xcm_executor::Config::Aliasers allows `Nothing`.
type AuthorizedAliasConsideration = Disabled;
}
1 change: 1 addition & 0 deletions relay/polkadot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
try-runtime = [
"frame-election-provider-support/try-runtime",
Expand Down
1 change: 1 addition & 0 deletions relay/polkadot/src/governance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ impl pallet_conviction_voting::Config for Runtime {
frame_support::traits::tokens::currency::ActiveIssuanceOf<Balances, Self::AccountId>;
type Polls = Referenda;
type BlockNumberProvider = System;
type VotingHooks = ();
}

parameter_types! {
Expand Down
4 changes: 1 addition & 3 deletions relay/polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,6 @@ impl Get<InteriorLocation> for BrokerPot {
impl coretime::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type BrokerId = BrokerId;
type WeightInfo = weights::runtime_parachains_coretime::WeightInfo<Runtime>;
type SendXcm = crate::xcm_config::XcmRouter;
Expand Down Expand Up @@ -1466,8 +1465,7 @@ impl pallet_nomination_pools::Config for Runtime {
type MaxPointsToBalance = MaxPointsToBalance;
type WeightInfo = weights::pallet_nomination_pools::WeightInfo<Self>;
type AdminOrigin = EitherOf<EnsureRoot<AccountId>, StakingAdmin>;
// TODO: this will come back later (stable25XY)
// type Filter = pallet_staking::AllStakers<Runtime>;
type Filter = pallet_staking::AllStakers<Runtime>;
type BlockNumberProvider = System;
}

Expand Down
5 changes: 4 additions & 1 deletion relay/polkadot/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use super::{
};
use frame_support::{
parameter_types,
traits::{Contains, Equals, Everything, Nothing},
traits::{Contains, Disabled, Equals, Everything, Nothing},
};
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough;
Expand Down Expand Up @@ -245,6 +245,7 @@ impl xcm_executor::Config for XcmConfig {
type HrmpNewChannelOpenRequestHandler = ();
type HrmpChannelAcceptedHandler = ();
type HrmpChannelClosingHandler = ();
type XcmEventEmitter = XcmPallet;
}

parameter_types! {
Expand Down Expand Up @@ -328,4 +329,6 @@ impl pallet_xcm::Config for Runtime {
type RemoteLockConsumerIdentifier = ();
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
type AdminOrigin = EnsureRoot<AccountId>;
// Aliasing is disabled: xcm_executor::Config::Aliasers allows `Nothing`.
type AuthorizedAliasConsideration = Disabled;
}
1 change: 1 addition & 0 deletions system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
try-runtime = [
"cumulus-pallet-aura-ext/try-runtime",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ std = [
runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"system-parachains-constants/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
5 changes: 4 additions & 1 deletion system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl frame_system::Config for Runtime {
type ExtensionsWeightInfo = weights::frame_system_extensions::WeightInfo<Runtime>;
type SS58Prefix = SS58Prefix;
type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
type MaxConsumers = frame_support::traits::ConstU32<256>;
w type MaxConsumers = ConstU32<256>;
type SingleBlockMigrations = ();
type MultiBlockMigrator = ();
type PreInherents = ();
Expand Down Expand Up @@ -323,6 +323,7 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = AssetsStringLimit;
type Freezer = ();
type Holder = ();
type Extra = ();
type WeightInfo = weights::pallet_assets_local::WeightInfo<Runtime>;
type CallbackHandle = pallet_assets::AutoIncAssetId<Runtime, TrustBackedAssetsInstance>;
Expand Down Expand Up @@ -364,6 +365,7 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = ConstU32<50>;
type Freezer = ();
type Holder = ();
type Extra = ();
type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
type CallbackHandle = ();
Expand Down Expand Up @@ -467,6 +469,7 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = ForeignAssetsAssetsStringLimit;
type Freezer = ();
type Holder = ();
type Extra = ();
type WeightInfo = weights::pallet_assets_foreign::WeightInfo<Runtime>;
type CallbackHandle = ();
Expand Down
1 change: 1 addition & 0 deletions system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
try-runtime = [
"cumulus-pallet-aura-ext/try-runtime",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ std = [
runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"system-parachains-constants/runtime-benchmarks",
"xcm/runtime-benchmarks"
]
3 changes: 3 additions & 0 deletions system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = AssetsStringLimit;
type Freezer = ();
type Holder = ();
type Extra = ();
type WeightInfo = weights::pallet_assets_local::WeightInfo<Runtime>;
type CallbackHandle = pallet_assets::AutoIncAssetId<Runtime, TrustBackedAssetsInstance>;
Expand Down Expand Up @@ -397,6 +398,7 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = ForeignAssetsAssetsStringLimit;
type Freezer = ();
type Holder = ();
type Extra = ();
type WeightInfo = weights::pallet_assets_foreign::WeightInfo<Runtime>;
type CallbackHandle = ();
Expand Down Expand Up @@ -902,6 +904,7 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
type ApprovalDeposit = ExistentialDeposit;
type StringLimit = ConstU32<50>;
type Freezer = ();
type Holder = ();
type Extra = ();
type CallbackHandle = ();
type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
Expand Down
1 change: 1 addition & 0 deletions system-parachains/bridge-hubs/bridge-hub-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"xcm-runtime-apis/runtime-benchmarks",
"xcm/runtime-benchmarks"
]

try-runtime = [
Expand Down
Loading