fix

frame/support/procedural/src/pallet/expand/event.rs

@@ -127,11 +127,12 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		let trait_use_gen = &def.trait_use_generics(event.attr_span);
 		let type_impl_gen = &def.type_impl_generics(event.attr_span);
 		let type_use_gen = &def.type_use_generics(event.attr_span);
+		let pallet_ident = &def.pallet_struct.pallet;
 
 		let PalletEventDepositAttr { fn_vis, fn_span, .. } = deposit_event;
 
 		quote::quote_spanned!(*fn_span =>
-			impl<#type_impl_gen> Pallet<#type_use_gen> #completed_where_clause {
+			impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 				#fn_vis fn deposit_event(event: Event<#event_use_gen>) {
 					let event = <
 						<T as Config #trait_use_gen>::RuntimeEvent as

frame/support/procedural/src/pallet/expand/storage.rs

@@ -791,19 +791,26 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		let storage_names = def
 			.storages
 			.iter()
-			.map(|storage| {
-				let ident = &storage.ident;
-				let gen = &def.type_use_generics(storage.attr_span);
-				quote::quote_spanned!(storage.attr_span => #ident<#gen> )
+			.filter_map(|storage| {
+				if storage.cfg_attrs.is_empty() {
+					let ident = &storage.ident;
+					let gen = &def.type_use_generics(storage.attr_span);
+					Some(quote::quote_spanned!(storage.attr_span => #ident<#gen> ))
+				} else {
+					None
+				}
 			})
 			.collect::<Vec<_>>();
+
 		quote::quote!(
 			#[cfg(feature = "try-runtime")]
 			impl<#type_impl_gen> #frame_support::traits::TryDecodeEntireStorage
 			for #pallet_ident<#type_use_gen> #completed_where_clause
 			{
 				fn try_decode_entire_state() -> Result<usize, &'static str> {
 					// simply delegate impl to a tuple of all storage items we have.
+					//
+					// NOTE: for now, we have to exclude storage items that are feature gated.
 					<( #( #storage_names ),*) as frame_support::traits::TryDecodeEntireStorage>::try_decode_entire_state()
 				}
 			}