Use frame umbrella crate in `pallet-proxy` and `pallet-multisig` #5995

kianenigma · 2024-10-09T13:26:05Z

A step towards #4782

In order to nail down the right preludes in polkadot-sdk-frame, we need to migrate a number of pallets to be written with it. Moreover, migrating our pallets to this simpler patter will encourage the ecosystem to also follow along.

If this PR is approved and has no unwanted negative consequences, I will make a tracking issue to migrate all pallets to this umbrella crate.

TODO:

fix frame benchmarking template. Can we detect the umbrella crate in there and have an if else? cc @ggwpez
Migrate benchmarking to v2 @re-gius a good candidate for you, you can open a PR against my branch.
tracking issue with follow-ups

…frame-umbrella-in-pallets

substrate/frame/multisig/src/weights.rs

substrate/frame/Cargo.toml

gui1117 · 2024-10-12T15:51:15Z

substrate/frame/multisig/Cargo.toml

-frame-system = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }


do we actually need experimental? I don't see it used in the past AFAICT

I will remove it as soon as I am a bit more confident in the readiness of the frame crate 🙈

What we should try here is to see if removing the feature = runtime still works?

The idea in the frame umbrella crate was that for pallet development, you would only need crate itself, and for a runtime, the crate plus runtime feature.

gui1117 · 2024-10-12T15:54:57Z

substrate/frame/multisig/src/migrations.rs

@@ -42,15 +36,14 @@ pub mod v1 {
 	pub struct MigrateToV1<T>(core::marker::PhantomData<T>);
 	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		fn pre_upgrade() -> Result<Vec<u8>, frame::deps::sp_runtime::TryRuntimeError> {


Not related to the PR, but maybe we could introduce: TryRuntimeResult<T> = Result<T, TryRuntimeError>

substrate/frame/multisig/src/migrations.rs

substrate/frame/multisig/src/lib.rs

substrate/frame/proxy/Cargo.toml

substrate/frame/src/lib.rs

templates/minimal/runtime/Cargo.toml

Co-authored-by: Guillaume Thiolliere <[email protected]>

shawntabrizi · 2024-10-15T15:05:28Z

templates/minimal/pallets/template/src/lib.rs

+#[allow(unused_imports)]
+use frame::prelude::*;


why though? just for the template to be extended? perhaps you are better to find some way to just use it?

Good point, I was trying to keep this minimal.

@re-gius can you add one u32 storage value in this crate to fix this? then #[allow(unused_imports)] can be removed.

Added in 5918bef

shawntabrizi · 2024-10-15T15:07:39Z

substrate/frame/proxy/src/weights.rs

-use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use core::marker::PhantomData;
+use frame::weights_prelude::*;


this change doesn't make sense. it needs to be done at the template level, or handled later.

shawntabrizi

went through all the files, and changes look good except the benchmarks which need template level changes

Sub-task of PR #5995 ## Integration These changes should **not** require any integration effort. --------- Co-authored-by: Dónal Murray <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]>

substrate/frame/src/lib.rs

substrate/frame/support/src/lib.rs

kianenigma · 2024-10-24T09:41:40Z

templates/minimal/runtime/Cargo.toml

@@ -13,7 +13,6 @@ publish = false
 codec = { workspace = true }
 scale-info = { workspace = true }
 polkadot-sdk = { workspace = true, features = [
-	"experimental",


it works without this?

Need to figure out the relationship between polkadot-sdk parent umbrella, and how it can be used to pull in polkadot-sdk-frame only. I thought experimental was needed here.

build works, I don't know if there's anything else to check

kianenigma · 2024-10-25T10:21:40Z

Feel free to approve this on my behalf once all open converstaions are serviced one last time :)

re-gius

Approving on behalf of @kianenigma

substrate/frame/src/lib.rs

kianenigma · 2024-10-28T18:40:54Z

@pepoviola similar flaky ZN tests failing here.

ggwpez

Approving for Guiseppe.

re-gius · 2024-10-29T09:51:21Z

Solves #6160

@ggwpez

…itytech#5995) A step towards paritytech#4782 In order to nail down the right preludes in `polkadot-sdk-frame`, we need to migrate a number of pallets to be written with it. Moreover, migrating our pallets to this simpler patter will encourage the ecosystem to also follow along. If this PR is approved and has no unwanted negative consequences, I will make a tracking issue to migrate all pallets to this umbrella crate. TODO: - [x] fix frame benchmarking template. Can we detect the umbrella crate in there and have an `if else`? cc @ggwpez - [x] Migrate benchmarking to v2 @re-gius a good candidate for you, you can open a PR against my branch. - [x] tracking issue with follow-ups --------- Co-authored-by: Guillaume Thiolliere <[email protected]> Co-authored-by: Giuseppe Re <[email protected]> Co-authored-by: Dónal Murray <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]>

@ggwpez

…itytech#5995) A step towards paritytech#4782 In order to nail down the right preludes in `polkadot-sdk-frame`, we need to migrate a number of pallets to be written with it. Moreover, migrating our pallets to this simpler patter will encourage the ecosystem to also follow along. If this PR is approved and has no unwanted negative consequences, I will make a tracking issue to migrate all pallets to this umbrella crate. TODO: - [x] fix frame benchmarking template. Can we detect the umbrella crate in there and have an `if else`? cc @ggwpez - [x] Migrate benchmarking to v2 @re-gius a good candidate for you, you can open a PR against my branch. - [x] tracking issue with follow-ups --------- Co-authored-by: Guillaume Thiolliere <[email protected]> Co-authored-by: Giuseppe Re <[email protected]> Co-authored-by: Dónal Murray <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]>

kianenigma added 3 commits October 9, 2024 13:59

pallet-proxy

27df8ea

pallet-multisig

8eefc00

Merge branch 'master' of github.com:paritytech/polkadot-sdk into kiz-…

c151681

…frame-umbrella-in-pallets

kianenigma requested a review from a team as a code owner October 9, 2024 13:26

kianenigma added R0-silent Changes should not be mentioned in any release notes T1-FRAME This PR/Issue is related to core FRAME, the framework. and removed R0-silent Changes should not be mentioned in any release notes labels Oct 9, 2024

kianenigma mentioned this pull request Oct 9, 2024

Use the umbrella crate for the parachain template #5991

Merged

kianenigma added 3 commits October 9, 2024 15:55

better docs

78b52f2

Merge branch 'master' of github.com:paritytech/polkadot-sdk into kiz-…

0305c59

…frame-umbrella-in-pallets

also improve the minimal template

d253bc5

ggwpez reviewed Oct 9, 2024

View reviewed changes

substrate/frame/multisig/src/weights.rs Show resolved Hide resolved

fix

a4b1fd2

paritytech-review-bot bot requested a review from a team October 9, 2024 15:41

re-gius mentioned this pull request Oct 10, 2024

Upgrade Proxy and Multisig pallets to Benchmarking V2 #6018

Merged

gui1117 reviewed Oct 12, 2024

View reviewed changes

Update substrate/frame/multisig/src/migrations.rs

e0293d1

Co-authored-by: Guillaume Thiolliere <[email protected]>

paritytech-review-bot bot requested a review from a team October 15, 2024 14:58

shawntabrizi reviewed Oct 15, 2024

View reviewed changes

shawntabrizi approved these changes Oct 15, 2024

View reviewed changes

re-gius and others added 3 commits October 15, 2024 17:32

Upgrade Proxy and Multisig pallets to Benchmarking V2 (#6018)

253ce3f

Sub-task of PR #5995 ## Integration These changes should **not** require any integration effort. --------- Co-authored-by: Dónal Murray <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]>

cleanup

ff36c53

possibly how CI will look like

2d8323f

kianenigma requested review from a team as code owners October 15, 2024 17:13

Master.into()

687b61f

paritytech-review-bot bot requested a review from a team October 16, 2024 13:35

re-gius reviewed Oct 17, 2024

View reviewed changes

substrate/frame/src/lib.rs Show resolved Hide resolved

kianenigma commented Oct 17, 2024

View reviewed changes

substrate/frame/support/src/lib.rs Outdated Show resolved Hide resolved

undo snowbridge changes

88265e5

kianenigma commented Oct 24, 2024

View reviewed changes

re-gius added 5 commits October 24, 2024 17:38

expand frame docs

dc2973d

remove broken links from docs

8cd8c73

fix docs + add storage value to minimal template

5918bef

prdoc add missing pallet

325d62e

Merge branch 'master' into kiz-frame-umbrella-in-pallets

801156c

docs nit

48050fd

re-gius approved these changes Oct 25, 2024

View reviewed changes

kianenigma commented Oct 25, 2024

View reviewed changes

substrate/frame/src/lib.rs Outdated Show resolved Hide resolved

kianenigma commented Oct 25, 2024

View reviewed changes

substrate/frame/src/lib.rs Outdated Show resolved Hide resolved

Apply suggestions from code review

d9f132b

AurevoirXavier mentioned this pull request Oct 28, 2024

Refactor pallets to V2 bench syntax #6202

Open

44 tasks

kianenigma and others added 2 commits October 28, 2024 18:41

Merge branch 'master' into kiz-frame-umbrella-in-pallets

61db970

Merge branch 'master' into kiz-frame-umbrella-in-pallets

f5ba680

ggwpez approved these changes Oct 29, 2024

View reviewed changes

re-gius added this pull request to the merge queue Oct 29, 2024

re-gius mentioned this pull request Oct 29, 2024

run_all_benchmarks.sh script fails for asset-conversion-ops pallet #6160

Closed

2 tasks

Merged via the queue into master with commit 9584dbd Oct 29, 2024
181 of 194 checks passed

re-gius deleted the kiz-frame-umbrella-in-pallets branch October 29, 2024 10:42

programskillforverification mentioned this pull request Oct 29, 2024

Refactor pallet-proxy to use v2 benchmarks #6211

Closed

snowmead mentioned this pull request Nov 8, 2024

Use frame umbrella crate in pallet-babe & pallet-staking-reward-curve #6412

Open

kianenigma mentioned this pull request Nov 15, 2024

Migrate pallet-nis benchmark to v2 #6293

Open

re-gius mentioned this pull request Nov 15, 2024

[tracking] Migrate pallets to umbrella crate #6504

Open

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use frame umbrella crate in `pallet-proxy` and `pallet-multisig` #5995

Use frame umbrella crate in `pallet-proxy` and `pallet-multisig` #5995

kianenigma commented Oct 9, 2024 •

edited by re-gius

Loading

gui1117 Oct 12, 2024

kianenigma Oct 15, 2024

kianenigma Oct 24, 2024

gui1117 Oct 12, 2024

shawntabrizi Oct 15, 2024

kianenigma Oct 24, 2024

re-gius Oct 25, 2024

shawntabrizi Oct 15, 2024

shawntabrizi left a comment

kianenigma Oct 24, 2024

re-gius Oct 25, 2024

kianenigma commented Oct 25, 2024

re-gius left a comment

kianenigma commented Oct 28, 2024

ggwpez left a comment

re-gius commented Oct 29, 2024

Use frame umbrella crate in pallet-proxy and pallet-multisig #5995

Use frame umbrella crate in pallet-proxy and pallet-multisig #5995

Conversation

kianenigma commented Oct 9, 2024 • edited by re-gius Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shawntabrizi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kianenigma commented Oct 25, 2024

re-gius left a comment

Choose a reason for hiding this comment

kianenigma commented Oct 28, 2024

ggwpez left a comment

Choose a reason for hiding this comment

re-gius commented Oct 29, 2024

Use frame umbrella crate in `pallet-proxy` and `pallet-multisig` #5995

Use frame umbrella crate in `pallet-proxy` and `pallet-multisig` #5995

kianenigma commented Oct 9, 2024 •

edited by re-gius

Loading