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

export xcm_pallet config #4116

Merged
merged 5 commits into from
Oct 22, 2021
Merged

export xcm_pallet config #4116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87da125
export xcm_pallet config
GopherJ Oct 21, 2021
398d125
run format
GopherJ Oct 21, 2021
dd09741
fix typo
GopherJ Oct 21, 2021
4405ea9
add generic parameter to support different runtimes
GopherJ Oct 21, 2021
0c01dda
Revert "add generic parameter to support different runtimes"
GopherJ Oct 22, 2021
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
6 changes: 6 additions & 0 deletions node/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
registrar: westend_runtime::RegistrarConfig {
next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID,
},
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
GopherJ marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -755,6 +756,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
},
gilt: Default::default(),
paras: Default::default(),
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
}
}

Expand Down Expand Up @@ -1054,6 +1056,7 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
registrar: rococo_runtime::RegistrarConfig {
next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID,
},
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
GopherJ marked this conversation as resolved.
Show resolved Hide resolved
// bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig {
// owner: Some(endowed_accounts[0].clone()),
// ..Default::default()
Expand Down Expand Up @@ -1411,6 +1414,7 @@ pub fn kusama_testnet_genesis(
},
gilt: Default::default(),
paras: Default::default(),
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
}
}

Expand Down Expand Up @@ -1492,6 +1496,7 @@ pub fn westend_testnet_genesis(
registrar: westend_runtime::RegistrarConfig {
next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID,
},
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
GopherJ marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -1568,6 +1573,7 @@ pub fn rococo_testnet_genesis(
registrar: rococo_runtime::RegistrarConfig {
next_free_para_id: polkadot_primitives::v1::LOWEST_PUBLIC_ID,
},
xcm_pallet: kusama::XcmPalletConfig { safe_xcm_version: Some(2) },
GopherJ marked this conversation as resolved.
Show resolved Hide resolved
// bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig {
// owner: Some(root_key.clone()),
// ..Default::default()
Expand Down
6 changes: 2 additions & 4 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use beefy_primitives::crypto::AuthorityId as BeefyId;
use frame_support::{
construct_runtime, parameter_types,
traits::{
Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing,
},
traits::{Contains, Everything, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing},
weights::Weight,
PalletId, RuntimeDebug,
};
Expand Down Expand Up @@ -1523,7 +1521,7 @@ construct_runtime! {
Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,

// Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
}
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ construct_runtime! {
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},

// Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,

}
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ construct_runtime! {
Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 64,

// Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
}
}

Expand Down