mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-23 06:08:01 +00:00
Merge v0.50.x to master (#2127)
* v0.50.0: Integrate frame-decode, redo storage APIs and break up Error. (#2100) * WIP integrating new frame-decode and working out new storage APIS * WIP: first pass adding new storage things to subxt-core * Second pass over Address type and start impl in Subxt * WIP new storage APIs * WIP New storage APIs roughly completed, lots of errors still * Remove PlainorMap enum; plain and map values now use same struct to simplify usage * Begin 'fixing' errors * WIP splitting errors and tidying payload/address traits * Get subxt-core compiling * Small fixes in subxt-core and remove metadata mod * subxt-core: cargo check --all-targets passes * Fix test * WIP starting to update subxt from subxt-core changes * WIP splitting up subxt errors into smaller variants * WIP errors: add DispatchError errors * Port new Storage APIs to subxt-core * cargo check -p subxt passes * Quick-fix errors in subxt-cli (explore subcommand) * fmt * Finish fixing codegen up and start fixing examples * get Subxt examples compiling and bytes_at for constants * Add some arcs to limit lifetimes in subxt/subxt-core storage APIs * A little Arcing to allow more method chaining in Storage APIs, aligning with Subxt * Update codegen test * cargo check --all-targets passing * cargo check --features 'unstable-light-client' passing * clippy * Remove unused dep in subxt * use published frame-decode * fix wasm-example * Add new tx extension to fix daily tests * Remove unused subxt_core::dynamic::DecodedValue type * Update book to match changes * Update docs to fix more broken bits * Add missing docs * fmt * allow larger result errs for now * Add missing alloc imports in subxt-core * Fix doc tests and fix bug getting constant info * Fix V14 -> Metadata transform for storage & constants * Fix parachain example * Fix FFI example * BlockLength decodes t ostruct, not u128 * use fetch/iter shorthands rather than entry in most storage tests * Fix some integration tests * Fix Runtime codegen tests * Expose the dynamic custom_value selecter and use in a UI test * Update codegen metadata * Tidy CLI storage query and support (str,str) as a storage address * Add (str,str) as valid constant address too * Show string tuple in constants example * Via the magic of traits, avoid needing any clones of queries/addresses and accept references to them * clippy * [v0.50] update scale-info-legacy and frame-decode to latest (#2119) * bump scale-info-legacy and frame-decode to latest * Remove something we don't need in this PR * Fully remove unused for now dep * [v0.50] Convert historic metadata to subxt::Metadata (#2120) * First pass converting historic metadatas to our subxt::Metadata type * use published frame-decode * fmt and rename legacy metadata macro * Enable legacy feature where needed in subxt_metadata so it compiles on its own * Use cargo hack more in CI and fix subxt-metadata features * Add tests for metadata conversion (need to optimise; some too expensive right now * Address performance and equality issues in metadata conversion testing * fmt * fmt all * clippy * Fix a doc link * Test codegen and fixes to make it work * Remove local frame-decode patch * bump frame-decode to latest * [v0.50.0] Allow visiting extrinsic fields in subxt_historic (#2124) * Allow visiting extrinsic fields * fmt * Don't use local scale-decode dep * Clippy and tidy * Extend 'subxt codegen' CLI to work with legacy metadatas * Simplify historic extrinsics example now that AccountId32s have paths/names * clippy * clippy * clippy.. * Allow visiting storage values, too, and clean up extrinsic visiting a little by narrowing lifetime * Try to fix flaky test * Add custom value decode to extrinsics example * Remove useless else branch ra thought I needed * Simplify examples * Prep to release v0.0.5 (#2126)
This commit is contained in:
James Wilson
@@ -4,12 +4,12 @@
|
||||
|
||||
use crate::utils::{FileOrUrl, validate_url_security};
|
||||
use clap::Parser as ClapParser;
|
||||
use codec::Decode;
|
||||
use color_eyre::eyre::eyre;
|
||||
use scale_typegen_description::scale_typegen::typegen::{
|
||||
settings::substitutes::path_segments,
|
||||
validation::{registry_contains_type_path, similar_type_paths_in_registry},
|
||||
};
|
||||
use std::path::PathBuf;
|
||||
use subxt_codegen::CodegenBuilder;
|
||||
use subxt_metadata::Metadata;
|
||||
|
||||
@@ -28,6 +28,12 @@ pub struct Opts {
|
||||
/// Additional attributes
|
||||
#[clap(long = "attribute")]
|
||||
attributes: Vec<String>,
|
||||
/// Path to legacy type definitions (required for metadatas pre-V14)
|
||||
#[clap(long)]
|
||||
legacy_types: Option<PathBuf>,
|
||||
/// The spec version of the legacy metadata (required for metadatas pre-V14)
|
||||
#[clap(long)]
|
||||
legacy_spec_version: Option<u64>,
|
||||
/// Additional derives for a given type.
|
||||
///
|
||||
/// Example 1: `--derive-for-type my_module::my_type=serde::Serialize`.
|
||||
@@ -145,9 +151,20 @@ pub async fn run(opts: Opts, output: &mut impl std::io::Write) -> color_eyre::Re
|
||||
validate_url_security(opts.file_or_url.url.as_ref(), opts.allow_insecure)?;
|
||||
|
||||
let bytes = opts.file_or_url.fetch().await?;
|
||||
let legacy_types = opts
|
||||
.legacy_types
|
||||
.map(|path| {
|
||||
let bytes = std::fs::read(path).map_err(|e| eyre!("Cannot read legacy_types: {e}"))?;
|
||||
let types = frame_decode::legacy_types::from_bytes(&bytes)
|
||||
.map_err(|e| eyre!("Cannot deserialize legacy_types: {e}"))?;
|
||||
Ok::<_, color_eyre::eyre::Error>(types)
|
||||
})
|
||||
.transpose()?;
|
||||
|
||||
codegen(
|
||||
&bytes,
|
||||
legacy_types,
|
||||
opts.legacy_spec_version,
|
||||
opts.derives,
|
||||
opts.attributes,
|
||||
opts.derives_for_type,
|
||||
@@ -175,6 +192,8 @@ impl syn::parse::Parse for OuterAttribute {
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn codegen(
|
||||
metadata_bytes: &[u8],
|
||||
legacy_types: Option<scale_info_legacy::ChainTypeRegistry>,
|
||||
legacy_spec_version: Option<u64>,
|
||||
raw_derives: Vec<String>,
|
||||
raw_attributes: Vec<String>,
|
||||
derives_for_type: Vec<DeriveForType>,
|
||||
@@ -211,8 +230,79 @@ fn codegen(
|
||||
}
|
||||
|
||||
let metadata = {
|
||||
let mut metadata = subxt_metadata::Metadata::decode(&mut &*metadata_bytes)
|
||||
.map_err(|e| eyre!("Cannot decode the provided metadata: {e}"))?;
|
||||
let runtime_metadata = subxt_metadata::decode_runtime_metadata(metadata_bytes)?;
|
||||
let mut metadata = match runtime_metadata {
|
||||
// Too old to work with:
|
||||
frame_metadata::RuntimeMetadata::V0(_)
|
||||
| frame_metadata::RuntimeMetadata::V1(_)
|
||||
| frame_metadata::RuntimeMetadata::V2(_)
|
||||
| frame_metadata::RuntimeMetadata::V3(_)
|
||||
| frame_metadata::RuntimeMetadata::V4(_)
|
||||
| frame_metadata::RuntimeMetadata::V5(_)
|
||||
| frame_metadata::RuntimeMetadata::V6(_)
|
||||
| frame_metadata::RuntimeMetadata::V7(_) => {
|
||||
Err(eyre!("Metadata V1-V7 cannot be decoded from"))
|
||||
}
|
||||
// Converting legacy metadatas:
|
||||
frame_metadata::RuntimeMetadata::V8(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V8 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V8 metadata"))?;
|
||||
Metadata::from_v8(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V8 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V9(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V9 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V9 metadata"))?;
|
||||
Metadata::from_v9(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V9 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V10(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V10 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V10 metadata"))?;
|
||||
Metadata::from_v10(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V10 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V11(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V11 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V11 metadata"))?;
|
||||
Metadata::from_v11(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V11 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V12(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V12 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V12 metadata"))?;
|
||||
Metadata::from_v12(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V12 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V13(md) => {
|
||||
let legacy_types = legacy_types
|
||||
.ok_or_else(|| eyre!("--legacy-types needed to load V13 metadata"))?;
|
||||
let legacy_spec = legacy_spec_version
|
||||
.ok_or_else(|| eyre!("--legacy-spec-version needed to load V13 metadata"))?;
|
||||
Metadata::from_v13(&md, &legacy_types.for_spec_version(legacy_spec))
|
||||
.map_err(|e| eyre!("Cannot load V13 metadata: {e}"))
|
||||
}
|
||||
// Converting modern metadatas:
|
||||
frame_metadata::RuntimeMetadata::V14(md) => {
|
||||
Metadata::from_v14(md).map_err(|e| eyre!("Cannot load V14 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V15(md) => {
|
||||
Metadata::from_v15(md).map_err(|e| eyre!("Cannot load V15 metadata: {e}"))
|
||||
}
|
||||
frame_metadata::RuntimeMetadata::V16(md) => {
|
||||
Metadata::from_v16(md).map_err(|e| eyre!("Cannot load V16 metadata: {e}"))
|
||||
}
|
||||
}?;
|
||||
|
||||
// Run this first to ensure type paths are unique (which may result in 1,2,3 suffixes being added
|
||||
// to type paths), so that when we validate derives/substitutions below, they are allowed for such
|
||||
|
||||
Reference in New Issue
Block a user