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

Parachains inclusion.rs to Frame V2 #3440

Merged
10 commits merged into from
Jul 22, 2021
Merged

Parachains inclusion.rs to Frame V2 #3440

10 commits merged into from
Jul 22, 2021

Conversation

ferrell-code
Copy link
Contributor

@ferrell-code ferrell-code commented Jul 8, 2021 •
edited
Loading

relates: #2882

Following the upgrade guidelines here: https://crates.parity.io/frame_support/attr.pallet.html#upgrade-guidelines.

⚠️ Breaking Change ⚠️

From https://crates.parity.io/frame_support/attr.pallet.html#checking-upgrade-guidelines

storages now use PalletInfo for module_prefix instead of the one given to decl_storage: Thus any use of this pallet in construct_runtime! should be careful to update name in order not to break storage or to upgrade storage (moreover for instantiable pallet). If pallet is published, make sure to warn about this breaking change.

So users of the ParaInclusion pallet must be careful about the name they used in construct_runtime!. Hence the runtime-migration label, which might not be needed depending on the configuration of the ParaInclusion pallet.

westend and kusama use ParasInclusion so I changed them to ParaInclusion. rococo uses Inclusion also migrated to ParaInclusion.

polkadot does not us ParaInclusion

ferrell-code
ferrell-code commented Jul 8, 2021
View reviewed changes
runtime/parachains/src/runtime_api_impl/v1.rs
Comment on lines 301 to +304
RawEvent::<T>::CandidateTimedOut(c, h, core)
=> CandidateEvent::CandidateTimedOut(c, h, core),
RawEvent::<T>::__Ignore(_, _)
=> unreachable!("__Ignore cannot be used"),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe change frame_support to not expose __Ignore(_,_) in Event api?

Copy link
Member

@shawntabrizi shawntabrizi Jul 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

i think unavoidable unfortunately, hence the name and stuff

@thiolliere ?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is to capture the generics in case none of the fields capture it.

But it was more to make it handy we could not generate it like decl_event do.
Also right now there is a weird case that construct_runtime doesn't handle non generic or generic on T only for event when the pallet is instantiable. so in this case we sometime need an ignore variant.

@emostov emostov self-requested a review July 21, 2021 22:29
@KiChjang KiChjang added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. labels Jul 21, 2021
shawntabrizi
shawntabrizi reviewed Jul 22, 2021
View reviewed changes
Copy link
Member

@shawntabrizi shawntabrizi left a comment

Choose a reason for hiding this comment

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

With the import rename, this looks good to me

@shawntabrizi
Copy link
Member

bot merge

@ghost
Copy link

ghost commented Jul 22, 2021

Trying merge.

@ghost ghost merged commit 887f0a0 into paritytech:master Jul 22, 2021
@shawntabrizi
Copy link
Member

@ferrell-code can you please include your DOT / KSM address again?

@shawntabrizi shawntabrizi added E0-runtime_migration PR introduces code that might require downstream chains to run a runtime upgrade. E5-breaksapi labels Jul 22, 2021
@ferrell-code
Copy link
Contributor Author

Polka:
15zKd25HoSDPHCn1HjuuHTioXLT7PA2pZQ8gYjFsHW4r96qS

Or

Kusama:
DSSYqgJqdE6HmFAXpiq3y6eZ5FYZ3ZxmX3joRBkh345mxEN

Thanks @shawntabrizi 🦕, maybe I should just put it in my github bio haha

@ferrell-code ferrell-code deleted the fer-inclusion-framev2 branch July 22, 2021 05:02
ordian added a commit that referenced this pull request Jul 23, 2021
@ordian
Merge branch 'master' into ao-enable-disputes
e42346b 
* master:
  Reduce staking miner reward (companion `substrate/pull/9395`) (#3465)
  Parachains shared.rs to Frame V2 (#3425)
  Parachains hrmp.rs to Frame V2 (#3475)
  Migrate slots pallet to pallet attribute macro. (#3218)
  Improve test in bridge (#3507)
  parachain dmp.rs to Frame V2 (#3426)
  Parachains inclusion.rs to Frame V2 (#3440)
  Dispute coordinator - Recover disputes on startup (#3481)
  Use correct syntax for owning all files in a folder (#3510)
  Add wococo-local chain spec (#3509)
  Dispute vote filtering for block authors (#3498)
  Bump indexmap from 1.6.1 to 1.7.0 (#3497)
  Companion for substrate #9315 (#3477)
@shawntabrizi
Copy link
Member

@ferrell-code the tip has been opened on Polkadot.

Thank you again for your contributions!

@github-actions github-actions bot mentioned this pull request Aug 24, 2021
Closed
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gui1117 gui1117 gui1117 left review comments

@KiChjang KiChjang KiChjang approved these changes

@shawntabrizi shawntabrizi shawntabrizi approved these changes

@emostov emostov Awaiting requested review from emostov

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. E0-runtime_migration PR introduces code that might require downstream chains to run a runtime upgrade.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ferrell-code @shawntabrizi @KiChjang @gui1117