paritytech · paritytech-processbot · Jun 28, 2023 · May 11, 2023 · May 12, 2023 · May 12, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.136", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-frame-metadata = { version = "15.1.0", default-features = false, features = ["v14", "v15-unstable"] }
+frame-metadata = { git = "https://github.com/paritytech/frame-metadata.git", branch = "lexnv/metadata_outer_enums", default-features = false, features = ["v14", "v15-unstable"] }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
 sp-std = { version = "5.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "7.0.0", default-features = false, path = "../../primitives/io" }

diff --git a/frame/support/procedural/src/construct_runtime/expand/event.rs b/frame/support/procedural/src/construct_runtime/expand/event.rs
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -115,6 +115,15 @@ pub fn expand_runtime_metadata(
 					},
 					ty: #scrate::scale_info::meta_type::<#runtime>(),
 					apis: (&rt).runtime_metadata(),
+					call_enum_ty: #scrate::scale_info::meta_type::<
+							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeCall
+						>(),
+					event_enum_ty: #scrate::scale_info::meta_type::<
+							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeEvent
+						>(),
+					error_enum_ty: #scrate::scale_info::meta_type::<
+							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeError
+						>(),
 				}
 			}
 

diff --git a/frame/support/procedural/src/construct_runtime/expand/mod.rs b/frame/support/procedural/src/construct_runtime/expand/mod.rs
@@ -17,24 +17,24 @@
 
 mod call;
 mod config;
-mod event;
 mod freeze_reason;
 mod hold_reason;
 mod inherent;
 mod lock_id;
 mod metadata;
 mod origin;
+mod outer_enums;
 mod slash_reason;
 mod unsigned;
 
 pub use call::expand_outer_dispatch;
 pub use config::expand_outer_config;
-pub use event::expand_outer_event;
 pub use freeze_reason::expand_outer_freeze_reason;
 pub use hold_reason::expand_outer_hold_reason;
 pub use inherent::expand_outer_inherent;
 pub use lock_id::expand_outer_lock_id;
 pub use metadata::expand_runtime_metadata;
 pub use origin::expand_outer_origin;
+pub use outer_enums::{expand_outer_enum, OuterEnumType};
 pub use slash_reason::expand_outer_slash_reason;
 pub use unsigned::expand_outer_validate_unsigned;