Skip to content

Have a pass over metadata validation #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsdw merged 6 commits into from
May 16, 2023
Merged

Have a pass over metadata validation #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ced0e25
Have a pass over metadata validation
jsdw May 15, 2023
33c01c5
trait metadata; fold instead of map+for
jsdw May 15, 2023
94042ee
remove a couple of other XORs, so all uses of it are now commented
jsdw May 15, 2023
e0bfb9f
appease clippy
jsdw May 15, 2023
d49d857
Merge branch 'master' into jsdw-metadata-validation
jsdw May 15, 2023
30f5dac
Merge branch 'master' into jsdw-metadata-validation
jsdw May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/commands/compatibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use jsonrpsee::client_transport::ws::Uri;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use subxt_codegen::utils::MetadataVersion;
use subxt_metadata::{get_metadata_hash, get_pallet_hash, metadata_v14_to_latest};
use subxt_metadata::{get_pallet_hash, metadata_v14_to_latest, MetadataHasher};

/// Verify metadata compatibility between substrate nodes.
#[derive(Debug, ClapParser)]
Expand Down Expand Up @@ -97,7 +97,7 @@ async fn handle_full_metadata(nodes: &[Uri], version: MetadataVersion) -> color_
let mut compatibility_map: HashMap<String, Vec<String>> = HashMap::new();
for node in nodes.iter() {
let metadata = fetch_runtime_metadata(node, version).await?;
let hash = get_metadata_hash(&metadata);
let hash = MetadataHasher::new().hash(&metadata);
let hex_hash = hex::encode(hash);
println!("Node {node:?} has metadata hash {hex_hash:?}",);

Expand Down
6 changes: 4 additions & 2 deletions codegen/src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod runtime_apis;
mod storage;

use frame_metadata::v15::RuntimeMetadataV15;
use subxt_metadata::{get_metadata_per_pallet_hash, metadata_v14_to_latest};
use subxt_metadata::{metadata_v14_to_latest, MetadataHasher};

use super::DerivesRegistry;
use crate::error::CodegenError;
Expand Down Expand Up @@ -291,7 +291,9 @@ impl RuntimeGenerator {
.collect();
let pallet_names_len = pallet_names.len();

let metadata_hash = get_metadata_per_pallet_hash(&self.metadata, &pallet_names);
let metadata_hash = MetadataHasher::new()
.only_these_pallets(&pallet_names)
.hash(&self.metadata);

let modules = pallets_with_mod_names
.iter()
Expand Down
6 changes: 3 additions & 3 deletions metadata/benches/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use frame_metadata::{v15::RuntimeMetadataV15, RuntimeMetadata, RuntimeMetadataPr
use scale_info::{form::PortableForm, TypeDef, TypeDefVariant};
use std::{fs, path::Path};
use subxt_metadata::{
get_call_hash, get_constant_hash, get_metadata_hash, get_pallet_hash, get_storage_hash,
metadata_v14_to_latest,
get_call_hash, get_constant_hash, get_pallet_hash, get_storage_hash, metadata_v14_to_latest,
MetadataHasher,
};

fn load_metadata() -> RuntimeMetadataV15 {
Expand All @@ -36,7 +36,7 @@ fn bench_get_metadata_hash(c: &mut Criterion) {
let metadata = load_metadata();

c.bench_function("get_metadata_hash", |b| {
b.iter(|| get_metadata_hash(&metadata))
b.iter(|| MetadataHasher::new().hash(&metadata))
});
}

Expand Down
4 changes: 2 additions & 2 deletions metadata/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use frame_metadata::{v14::RuntimeMetadataV14, v15::RuntimeMetadataV15};

pub use retain::retain_metadata_pallets;
pub use validation::{
get_call_hash, get_constant_hash, get_metadata_hash, get_metadata_per_pallet_hash,
get_pallet_hash, get_runtime_api_hash, get_runtime_trait_hash, get_storage_hash, NotFound,
get_call_hash, get_constant_hash, get_pallet_hash, get_runtime_api_hash, get_storage_hash,
MetadataHasher, NotFound,
};

/// Convert the metadata V14 to the latest metadata version.
Expand Down
Loading