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

Use safer template defaults for polkadot-v0.9.12, move to recognize, comment on Override for AdvertisedXcmVersion default #690

Merged
merged 7 commits into from
Oct 23, 2021

Conversation

nuke-web3
Copy link
Contributor

@nuke-web3 nuke-web3 commented Oct 20, 2021

Based on discussion & review here: https://github.com/substrate-developer-hub/substrate-parachain-template/pull/80

A start (but not a full fix) for #683 targeting polkadot-v0.9.12 release, should also be used in master if merged here.
Please commit directly anything that you (Cumulus core team) feels should be added/amended 🙏

@@ -516,7 +512,7 @@ impl pallet_xcm::Config for Runtime {
type XcmExecuteFilter = Everything;
type XcmExecutor = XcmExecutor<XcmConfig>;
type XcmTeleportFilter = Everything;
type XcmReserveTransferFilter = Everything;
type XcmReserveTransferFilter = ();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
type XcmReserveTransferFilter = ();
type XcmReserveTransferFilter = Nothing;

Wasn't there a Nothing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, updated now in template and in rococo FYI, please quick review again
I tested to build locally & run, I did not explicitly check if behavior of these was working (no reason to think otherwise)

type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;
type LocationInverter = LocationInverter<Ancestry>;
type Origin = Origin;
type Call = Call;

const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; // Override for CurrentXcmVersion default
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be moved below to the AdvertisedXcmVersion?

@nuke-web3 nuke-web3 requested a review from bkchr October 21, 2021 20:26
@nuke-web3 nuke-web3 changed the title Use safer template defaults for polkadot-v0.9.12 Use safer template defaults for polkadot-v0.9.12, move to recognize Oct 21, 2021
@nuke-web3
Copy link
Contributor Author

nuke-web3 commented Oct 21, 2021

https://writingexplained.org/recognise-or-recognize-difference I think the z is now common enough? 😅
it's in the license already this way https://github.com/paritytech/cumulus/blob/master/LICENSE#L119

type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;
type LocationInverter = LocationInverter<Ancestry>;
type Origin = Origin;
type Call = Call;

const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; // Override for CurrentXcmVersion default
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be moved below to the AdvertisedXcmVersion?

polkadot-parachains/rococo/src/lib.rs Outdated Show resolved Hide resolved
@nuke-web3 nuke-web3 changed the title Use safer template defaults for polkadot-v0.9.12, move to recognize Use safer template defaults for polkadot-v0.9.12, move to recognize, comment on Override for AdvertisedXcmVersion default Oct 22, 2021
@bkchr bkchr requested a review from KiChjang October 23, 2021 15:19
@nuke-web3 nuke-web3 merged commit f5926c2 into polkadot-v0.9.12 Oct 23, 2021
@nuke-web3 nuke-web3 deleted the ds/fix-template-defaults-9.12 branch October 23, 2021 15:40
@nuke-web3
Copy link
Contributor Author

Let me know if there is any issues after this merge, and please let's still continue #683

@nuke-web3 nuke-web3 restored the ds/fix-template-defaults-9.12 branch October 23, 2021 15:41
@nuke-web3 nuke-web3 deleted the ds/fix-template-defaults-9.12 branch October 23, 2021 15:59
nuke-web3 added a commit that referenced this pull request Oct 23, 2021
* use safer defaults in template for sovereign paraobjects
* Nothing trait, fix XcmTeleportFilter
* rm unused traits, update rococo and template runtimes
* https://writingexplained.org/recognise-or-recognize-difference
* Override for AdvertisedXcmVersion default ->  to match all runtimes
* cargo +nightly fmt
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants