Backport frame crate fixes

prdoc/pr_4413.prdoc

@@ -0,0 +1,13 @@
+title: Backport `polkadot-sdk-frame` crate fixes 
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Adds benchmarking and try-runtime support in `polkadot-sdk-frame` crate. Also, fixes 
+      runtime macro usage with the `polkadot-sdk-frame` crate.
+
+crates:
+  - name: polkadot-sdk-frame
+    bump: minor
+  - name: frame-support-procedural
+    bump: patch

substrate/frame/Cargo.toml

@@ -46,10 +46,18 @@ sp-session = { default-features = false, path = "../primitives/session", optiona
 sp-consensus-aura = { default-features = false, path = "../primitives/consensus/aura", optional = true, version = "0.37.0" }
 sp-consensus-grandpa = { default-features = false, path = "../primitives/consensus/grandpa", optional = true, version = "18.0.0" }
 sp-inherents = { default-features = false, path = "../primitives/inherents", optional = true, version = "31.0.0" }
+sp-storage = { default-features = false, path = "../primitives/storage", optional = true, version = "21.0.0" }
 
 frame-executive = { default-features = false, path = "executive", optional = true, version = "33.0.0" }
 frame-system-rpc-runtime-api = { default-features = false, path = "system/rpc/runtime-api", optional = true, version = "31.0.0" }
 
+# Used for runtime benchmarking
+frame-benchmarking = { default-features = false, path = "../frame/benchmarking", optional = true, version = "33.0.0" }
+frame-system-benchmarking = { default-features = false, path = "../frame/system/benchmarking", optional = true, version = "33.0.0" }
+
+# Used for try-runtime
+frame-try-runtime = { default-features = false, path = "../frame/try-runtime", optional = true, version = "0.39.0" }
+
 docify = "0.2.8"
 log = { workspace = true }
 
@@ -67,17 +75,21 @@ runtime = [
 	"sp-inherents",
 	"sp-offchain",
 	"sp-session",
+	"sp-storage",
 	"sp-transaction-pool",
 	"sp-version",
 
 	"frame-executive",
 	"frame-system-rpc-runtime-api",
 ]
 std = [
+	"frame-benchmarking?/std",
 	"frame-executive?/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api?/std",
 	"frame-system/std",
+	"frame-try-runtime?/std",
 	"log/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
@@ -93,6 +105,22 @@ std = [
 	"sp-runtime/std",
 	"sp-session?/std",
 	"sp-std/std",
+	"sp-storage/std",
 	"sp-transaction-pool?/std",
 	"sp-version?/std",
 ]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system-benchmarking/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-executive/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"pallet-examples/try-runtime",
+	"sp-runtime/try-runtime",
+]

substrate/frame/src/lib.rs

@@ -363,5 +363,15 @@ pub mod deps {
 	#[cfg(feature = "runtime")]
 	pub use sp_offchain;
 	#[cfg(feature = "runtime")]
+	pub use sp_storage;
+	#[cfg(feature = "runtime")]
 	pub use sp_version;
+
+	#[cfg(feature = "runtime-benchmarks")]
+	pub use frame_benchmarking;
+	#[cfg(feature = "runtime-benchmarks")]
+	pub use frame_system_benchmarking;
+
+	#[cfg(feature = "frame-try-runtime")]
+	pub use frame_try_runtime;
 }

substrate/frame/support/procedural/src/pallet/expand/tt_default_parts.rs

@@ -198,9 +198,9 @@ pub fn expand_tt_default_parts(def: &mut Def) -> proc_macro2::TokenStream {
 		macro_rules! #default_parts_unique_id_v2 {
 			{
 				$caller:tt
-				frame_support = [{ $($frame_support:ident)::* }]
+				your_tt_return = [{ $my_tt_return:path }]
 			} => {
-				$($frame_support)*::__private::tt_return! {
+				$my_tt_return! {
 					$caller
 					tokens = [{
 						+ Pallet #call_part_v2 #storage_part_v2 #event_part_v2 #error_part_v2 #origin_part_v2 #config_part_v2

substrate/frame/support/procedural/src/runtime/expand/mod.rs

@@ -93,7 +93,7 @@ fn construct_runtime_implicit_to_explicit(
 	let frame_support = generate_access_from_frame_or_crate("frame-support")?;
 	let attr = if legacy_ordering { quote!((legacy_ordering)) } else { quote!() };
 	let mut expansion = quote::quote!(
-		#[frame_support::runtime #attr]
+		#[#frame_support::runtime #attr]
 		#input
 	);
 	for pallet in definition.pallet_decls.iter() {
@@ -103,7 +103,7 @@ fn construct_runtime_implicit_to_explicit(
 		expansion = quote::quote!(
 			#frame_support::__private::tt_call! {
 				macro = [{ #pallet_path::tt_default_parts_v2 }]
-				frame_support = [{ #frame_support }]
+				your_tt_return = [{ #frame_support::__private::tt_return }]
 				~~> #frame_support::match_and_insert! {
 					target = [{ #expansion }]
 					pattern = [{ #pallet_name = #pallet_path #pallet_instance  }]