[stable2506] Backport #10592 (#10624)

Backport #10592 into `stable2506` from carlosala.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Carlo Sala <[email protected]>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Bastian Köcher <[email protected]>

Author: 4 people

Cargo.lock

@@ -813,7 +813,7 @@ frame-benchmarking-pallet-pov = { default-features = false, path = "substrate/fr
 frame-election-provider-solution-type = { path = "substrate/frame/election-provider-support/solution-type", default-features = false }
 frame-election-provider-support = { path = "substrate/frame/election-provider-support", default-features = false }
 frame-executive = { path = "substrate/frame/executive", default-features = false }
-frame-metadata = { version = "23.0.0", default-features = false }
+frame-metadata = { version = "23.0.1", default-features = false }
 frame-metadata-hash-extension = { path = "substrate/frame/metadata-hash-extension", default-features = false }
 frame-storage-access-test-runtime = { path = "substrate/utils/frame/storage-access-test-runtime", default-features = false }
 frame-support = { path = "substrate/frame/support", default-features = false }

Cargo.toml

@@ -0,0 +1,23 @@
+title: 'fix: ensure metadata v15 is generated by frame-metadata'
+doc:
+- audience: Runtime Dev
+  description: |-
+    This is a companion PR to https://github.com/paritytech/frame-metadata/pull/110.
+    This PR ensures that `CheckMetadataHash` generated with both v15 and v16 are the same.
+
+    cc @bkchr
+crates:
+- name: sp-metadata-ir
+  bump: patch
+  validate: false
+- name: frame-support
+  bump: patch
+  validate: false
+- name: substrate-wasm-builder
+  bump: patch
+  validate: false
+- name: pallet-example-view-functions
+  bump: patch
+  validate: false
+- name: sc-tracing
+  bump: patch

prdoc/pr_10592.prdoc

@@ -27,21 +27,17 @@ use frame_metadata::v15::{
 	RuntimeApiMethodMetadata, RuntimeApiMethodParamMetadata, RuntimeMetadataV15,
 	SignedExtensionMetadata,
 };
-use scale_info::{IntoPortable, Registry};
 
 impl From<MetadataIR> for RuntimeMetadataV15 {
 	fn from(ir: MetadataIR) -> Self {
-		let mut registry = Registry::new();
-		let pallets =
-			registry.map_into_portable(ir.pallets.into_iter().map(Into::<PalletMetadata>::into));
-		let extrinsic = Into::<ExtrinsicMetadata>::into(ir.extrinsic).into_portable(&mut registry);
-		let ty = registry.register_type(&ir.ty);
-		let apis =
-			registry.map_into_portable(ir.apis.into_iter().map(Into::<RuntimeApiMetadata>::into));
-		let outer_enums = Into::<OuterEnums>::into(ir.outer_enums).into_portable(&mut registry);
-		let custom = CustomMetadata { map: Default::default() };
-
-		Self { types: registry.into(), pallets, extrinsic, ty, apis, outer_enums, custom }
+		RuntimeMetadataV15::new(
+			ir.pallets.into_iter().map(Into::into).collect(),
+			ir.extrinsic.into(),
+			ir.ty,
+			ir.apis.into_iter().map(Into::into).collect(),
+			ir.outer_enums.into(),
+			CustomMetadata { map: Default::default() },
+		)
 	}
 }