pezkuwichain/pezframe-metadata
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezframe-metadata.git synced 2026-06-15 17:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure extrinsic types are collected before pallet types (#110)

Browse Source
This commit is contained in:
Carlo Sala
2025-12-09 12:14:00 +01:00
committed by GitHub
parent fb487bc85d
commit 560f2cae43
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frame-metadata/src/v15.rs
+6 -2
View File
@@ -73,8 +73,10 @@ impl RuntimeMetadataV15 {
custom: CustomMetadata, custom: CustomMetadata,
) -> Self { ) -> Self {
let mut registry = Registry::new(); let mut registry = Registry::new();
let pallets = registry.map_into_portable(pallets); // extrinsic types need to be collected first to ensure CheckMetadataHash hash
// is stable across different metadata versions
let extrinsic = extrinsic.into_portable(&mut registry); let extrinsic = extrinsic.into_portable(&mut registry);
let pallets = registry.map_into_portable(pallets);
let ty = registry.register_type(&runtime_type); let ty = registry.register_type(&runtime_type);
let apis = registry.map_into_portable(apis); let apis = registry.map_into_portable(apis);
let outer_enums = outer_enums.into_portable(&mut registry); let outer_enums = outer_enums.into_portable(&mut registry);
@@ -206,13 +208,15 @@ impl IntoPortable for ExtrinsicMetadata {
type Output = ExtrinsicMetadata<PortableForm>; type Output = ExtrinsicMetadata<PortableForm>;
fn into_portable(self, registry: &mut Registry) -> Self::Output { fn into_portable(self, registry: &mut Registry) -> Self::Output {
// the collection order needs to be stable across different metadata versions
// to ensure CheckMetadataHash hash is invariant
ExtrinsicMetadata { ExtrinsicMetadata {
version: self.version, version: self.version,
address_ty: registry.register_type(&self.address_ty), address_ty: registry.register_type(&self.address_ty),
call_ty: registry.register_type(&self.call_ty), call_ty: registry.register_type(&self.call_ty),
signature_ty: registry.register_type(&self.signature_ty), signature_ty: registry.register_type(&self.signature_ty),
extra_ty: registry.register_type(&self.extra_ty),
signed_extensions: registry.map_into_portable(self.signed_extensions), signed_extensions: registry.map_into_portable(self.signed_extensions),
extra_ty: registry.register_type(&self.extra_ty),
} }
} }
} }
frame-metadata/src/v16.rs
+5 -1
View File
@@ -72,8 +72,10 @@ impl RuntimeMetadataV16 {
custom: CustomMetadata, custom: CustomMetadata,
) -> Self { ) -> Self {
let mut registry = Registry::new(); let mut registry = Registry::new();
let pallets = registry.map_into_portable(pallets); // extrinsic types need to be collected first to ensure CheckMetadataHash hash
// is stable across different metadata versions
let extrinsic = extrinsic.into_portable(&mut registry); let extrinsic = extrinsic.into_portable(&mut registry);
let pallets = registry.map_into_portable(pallets);
let apis = registry.map_into_portable(apis); let apis = registry.map_into_portable(apis);
let outer_enums = outer_enums.into_portable(&mut registry); let outer_enums = outer_enums.into_portable(&mut registry);
let custom = custom.into_portable(&mut registry); let custom = custom.into_portable(&mut registry);
@@ -191,6 +193,8 @@ impl IntoPortable for ExtrinsicMetadata {
type Output = ExtrinsicMetadata<PortableForm>; type Output = ExtrinsicMetadata<PortableForm>;
fn into_portable(self, registry: &mut Registry) -> Self::Output { fn into_portable(self, registry: &mut Registry) -> Self::Output {
// the collection order needs to be stable across different metadata versions
// to ensure CheckMetadataHash hash is invariant
ExtrinsicMetadata { ExtrinsicMetadata {
versions: self.versions, versions: self.versions,
address_ty: registry.register_type(&self.address_ty), address_ty: registry.register_type(&self.address_ty),