metadata: Use v15 internally (#912)

* Update frame-metadata to v15.1.0 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Enable V15 unstable metadata in frame-metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Move validation hashing to dedicated file Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Use sp-metadata-ir from substrate to work with metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Revert using sp-metadata-ir in favor of conversion to v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Convert v14 to v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Use v15 for validation Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * codegen: Use v15 for codegen Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata/bench: Use v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust to v15 metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Improve documentation Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * force CI Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Address feedback Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Use HASH_LEN Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadta: Remove `LatestRuntimeMetadata` type alias Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Remove `metadata_to_latest` to avoid pancis Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
2026-06-20 11:41:02 +00:00 · 2023-04-20 17:59:28 +03:00
parent 2f1b67b384
commit 59d195d4ad
30 changed files with 1087 additions and 920 deletions
@@ -430,7 +430,7 @@ pub(crate) mod test_utils {
    use crate::{Config, SubstrateConfig};
    use codec::Encode;
    use frame_metadata::{
-        v14::{ExtrinsicMetadata, PalletEventMetadata, PalletMetadata, RuntimeMetadataV14},
+        v15::{ExtrinsicMetadata, PalletEventMetadata, PalletMetadata, RuntimeMetadataV15},
        RuntimeMetadataPrefixed,
    };
    use scale_info::{meta_type, TypeInfo};
@@ -503,6 +503,7 @@ pub(crate) mod test_utils {
            constants: vec![],
            error: None,
            index: 0,
+            docs: vec![],
        }];

        let extrinsic = ExtrinsicMetadata {
@@ -511,8 +512,8 @@ pub(crate) mod test_utils {
            signed_extensions: vec![],
        };

-        let v14 = RuntimeMetadataV14::new(pallets, extrinsic, meta_type::<()>());
-        let runtime_metadata: RuntimeMetadataPrefixed = v14.into();
+        let meta = RuntimeMetadataV15::new(pallets, extrinsic, meta_type::<()>(), vec![]);
+        let runtime_metadata: RuntimeMetadataPrefixed = meta.into();

        Metadata::try_from(runtime_metadata).unwrap()
    }
@@ -5,8 +5,8 @@
 use super::hash_cache::HashCache;
 use codec::Error as CodecError;
 use frame_metadata::{
-    PalletConstantMetadata, RuntimeMetadata, RuntimeMetadataPrefixed, RuntimeMetadataV14,
-    StorageEntryMetadata, META_RESERVED,
+    v15::PalletConstantMetadata, v15::RuntimeMetadataV15, v15::StorageEntryMetadata,
+    RuntimeMetadata, RuntimeMetadataPrefixed, META_RESERVED,
 };
 use parking_lot::RwLock;
 use scale_info::{form::PortableForm, PortableRegistry, Type};
@@ -65,7 +65,7 @@ pub enum MetadataError {
 // We hide the innards behind an Arc so that it's easy to clone and share.
 #[derive(Debug)]
 struct MetadataInner {
-    metadata: RuntimeMetadataV14,
+    metadata: RuntimeMetadataV15,

    // Events are hashed by pallet an error index (decode oriented)
    events: HashMap<(u8, u8), EventMetadata>,
@@ -147,7 +147,7 @@ impl Metadata {
    }

    /// Return the runtime metadata.
-    pub fn runtime_metadata(&self) -> &RuntimeMetadataV14 {
+    pub fn runtime_metadata(&self) -> &RuntimeMetadataV15 {
        &self.inner.metadata
    }

@@ -371,7 +371,8 @@ impl TryFrom<RuntimeMetadataPrefixed> for Metadata {
            return Err(InvalidMetadataError::InvalidPrefix);
        }
        let metadata = match metadata.1 {
-            RuntimeMetadata::V14(meta) => meta,
+            RuntimeMetadata::V14(v14) => subxt_metadata::metadata_v14_to_latest(v14),
+            RuntimeMetadata::V15(v15) => v15,
            _ => return Err(InvalidMetadataError::InvalidVersion),
        };

@@ -503,8 +504,9 @@ impl TryFrom<RuntimeMetadataPrefixed> for Metadata {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use frame_metadata::{
-        ExtrinsicMetadata, PalletStorageMetadata, StorageEntryModifier, StorageEntryType,
+    use frame_metadata::v15::{
+        ExtrinsicMetadata, PalletCallMetadata, PalletMetadata, PalletStorageMetadata,
+        StorageEntryModifier, StorageEntryType,
    };
    use scale_info::{meta_type, TypeInfo};

@@ -531,19 +533,20 @@ mod tests {
            value: vec![1, 2, 3],
            docs: vec![],
        };
-        let pallet = frame_metadata::PalletMetadata {
+        let pallet = PalletMetadata {
            index: 0,
            name: "System",
-            calls: Some(frame_metadata::PalletCallMetadata {
+            calls: Some(PalletCallMetadata {
                ty: meta_type::<Call>(),
            }),
            storage: Some(storage),
            constants: vec![constant],
            event: None,
            error: None,
+            docs: vec![],
        };

-        let metadata = RuntimeMetadataV14::new(
+        let metadata = RuntimeMetadataV15::new(
            vec![pallet],
            ExtrinsicMetadata {
                ty: meta_type::<()>(),
@@ -551,6 +554,7 @@ mod tests {
                signed_extensions: vec![],
            },
            meta_type::<()>(),
+            vec![],
        );
        let prefixed = RuntimeMetadataPrefixed::from(metadata);

@@ -8,7 +8,7 @@ use crate::{
    metadata::{DecodeWithMetadata, EncodeWithMetadata, Metadata},
    utils::{Encoded, Static},
 };
-use frame_metadata::{StorageEntryType, StorageHasher};
+use frame_metadata::v15::{StorageEntryType, StorageHasher};
 use scale_info::TypeDef;
 use std::borrow::Cow;

@@ -11,7 +11,7 @@ use crate::{
    Config,
 };
 use derivative::Derivative;
-use frame_metadata::StorageEntryType;
+use frame_metadata::v15::StorageEntryType;
 use scale_info::form::PortableForm;
 use std::{future::Future, marker::PhantomData};