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

Add safe_xcm_version to Genesis Specs #743

Merged
merged 26 commits into from
Nov 12, 2021
Merged

Add safe_xcm_version to Genesis Specs #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2ff5f7c
fix runtime import formatting (#679)
apopiak Oct 19, 2021
95a453e
disable permissionless asset creation for Statemint (#669)
apopiak Oct 20, 2021
8159c2c
Companion for polkadot#3728 (#693)
slumber Oct 22, 2021
0793aa8
Ensure a bad datastream cannot cause problems (#701)
gavofyork Oct 27, 2021
41c597f
Allow Queries and Subscriptions (#700)
gavofyork Oct 27, 2021
ad51706
Bump syn to 1.0.81 (#707)
KiChjang Oct 27, 2021
f66be04
Update Substrate & Polkadot (#709)
bkchr Oct 29, 2021
faedf76
Udpate polkadot substrate (#713)
thiolliere Oct 31, 2021
caa1347
Bump subwasm version (#716)
chevdor Nov 3, 2021
d21c7fd
Companion for `dispatch_as` (#715)
shawntabrizi Nov 4, 2021
e304662
Upstream Statemine Release v5 Changes to Master (#720)
apopiak Nov 8, 2021
6b4fd91
Rework the runtime upgrade test (#727)
bkchr Nov 9, 2021
66310bd
Remove randomness collective flip new (#726)
NachoPal Nov 9, 2021
8301e17
adjust XCM unit weights to 1B (#735)
apopiak Nov 9, 2021
6146bd1
Align Call Indices between Westmint and Statemint (#731)
apopiak Nov 9, 2021
e65ee55
bump spec_version (#733)
apopiak Nov 9, 2021
33a1263
point back to Polkadot 0.9.12
apopiak Nov 9, 2021
e62ea55
adjust code to work with 0.9.12 again
apopiak Nov 9, 2021
8639ac6
adjust network test back to polkadot 0.9.12
apopiak Nov 9, 2021
cc87b64
Align the Statemint Runtimes (#736)
apopiak Nov 10, 2021
216e7dd
Merge branch 'apopiak/prepare-v6-release' into release-statemine-v6
chevdor Nov 10, 2021
6fbb85c
Remove unused import
chevdor Nov 10, 2021
0d587ce
Fix formatting
chevdor Nov 10, 2021
290d126
add safe_xcm_version to genesis specs
apopiak Nov 10, 2021
abe39a9
cargo +nightly fmt
apopiak Nov 10, 2021
a410887
Merge branch 'release-statemine-v6' of github.com:paritytech/cumulus …
apopiak Nov 11, 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
12 changes: 12 additions & 0 deletions polkadot-parachains/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ pub type ChainSpec =
/// Specialized `ChainSpec` for the shell parachain runtime.
pub type ShellChainSpec = sc_service::GenericChainSpec<shell_runtime::GenesisConfig, Extensions>;

/// The default XCM version to set in genesis config.
const SAFE_XCM_VERSION: u32 = 2;
NachoPal marked this conversation as resolved.
Show resolved Hide resolved
KiChjang marked this conversation as resolved.
Show resolved Hide resolved

/// Helper function to generate a crypto pair from seed
pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
Expand Down Expand Up @@ -351,6 +354,9 @@ fn statemint_genesis(
aura: Default::default(),
aura_ext: Default::default(),
parachain_system: Default::default(),
polkadot_xcm: statemint_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
},
}
}

Expand Down Expand Up @@ -527,6 +533,9 @@ fn statemine_genesis(
aura: Default::default(),
aura_ext: Default::default(),
parachain_system: Default::default(),
polkadot_xcm: statemine_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
},
}
}

Expand Down Expand Up @@ -711,5 +720,8 @@ fn westmint_genesis(
aura: Default::default(),
aura_ext: Default::default(),
parachain_system: Default::default(),
polkadot_xcm: westmint_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
},
}
}
1 change: 1 addition & 0 deletions polkadot-parachains/statemine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ std = [
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-uniques/std",
"pallet-utility/std",
"pallet-xcm/std",
"parachain-info/std",
"cumulus-pallet-aura-ext/std",
"pallet-asset-tx-payment/std",
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/statemine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ construct_runtime!(

// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 31,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,

Expand Down
1 change: 1 addition & 0 deletions polkadot-parachains/statemint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ std = [
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-uniques/std",
"pallet-utility/std",
"pallet-xcm/std",
"parachain-info/std",
"cumulus-pallet-aura-ext/std",
"pallet-asset-tx-payment/std",
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/statemint/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ construct_runtime!(

// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 31,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,

Expand Down
1 change: 1 addition & 0 deletions polkadot-parachains/westmint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ std = [
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-uniques/std",
"pallet-utility/std",
"pallet-xcm/std",
"parachain-info/std",
"cumulus-pallet-aura-ext/std",
"pallet-asset-tx-payment/std",
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/westmint/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ construct_runtime!(

// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 31,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,

Expand Down