mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 12:48:00 +00:00
Enrich metadata with type information (#8615)
* Cargo.lock after merge * Restore scale-info feature * Fully qualify TypeInfo derive * Skip PendingSwap T * Add missing skip_type_params attr * metadata docs features * Reduce pallet event attribute to struct * Cargo.lock * Update frame/balances/src/tests_composite.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Line widths check * Cargo.lock * Add scale-info/std * Update frame/system/src/lib.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Use `skip_type_params` to remove `TypeInfo` requirements on checks * Revert "Remove unused Call metadata stuff" This reverts commit 41311f85 * Skip BalanceSwapAction type parameter * Remove unused event metadata macro * Update frame-metadata * Update primitives/npos-elections/compact/src/codec.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Manual TypeInfo for Header * Remove TypeInfo requirement for consts in BoundedVec etc. * Another TypeInfo bound removed * review: fix indentation * TypeInfo impls for Identity types * Add some todos to add custom TypeInfo impls * Update frame/support/procedural/src/pallet/expand/pallet_struct.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Add some todos to add custom TypeInfo impls * Add a test for manual Data TypeInfo impl * Add custom TypeInfo impl for Vote * Era custom TypeInfo crimes * Revert finality-grandpa version to 0.14.z * review: renamed module to pallet_constants_metadata * New line at end of file * Add missing scale-info/std * Update frame/support/src/storage/types/mod.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Remove StorageEntryType::Map unused flag * Add missing scale-info dependency after merge * SignedExtension::AdditionalSigned metadata * Update frame-metadata, use abbreviated docs and args fields * Update frame/example/Cargo.toml Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Add scale_info/std and remove unused scale-info dependency * Remove scale-info dependency * Remove treasury pallet::metadata * Remove redundant Event test * Add back scale-info as dev dependency * fix error metadata when no error defined in decl_module * Add Module3 to tests * Fix metadata test * Add docs feature to frame-support test * WIP fixing pallet metadata test * Remove redundant FunctionMetadata, FunctionArgumentMetadata as per https://github.com/paritytech/frame-metadata/pull/20 * Use main branch of frame-metadata * Use patch of scale-info for latest changes * Use latest patched scale-info * Manual TypeInfo for DigestItem * Manual TypeInfo for DigestItem * Update scale-info * Skip __Ignore variants for Error, depends on https://github.com/paritytech/scale-info/pull/117 * Named fields for FRAME v2 pallet Call variants * Named fields for FRAME v1 pallet Call variants * Add missing scale-info dependency * WIP expand benchmark call variant * fix benchmark with new function create a new function for each variant of a pallet call. This function is called by benchmarking macro in order not to break call creation with unnamed argument * fix tests * more fix * Fix staking tests * Fix offchain workers calls * Cherry pick rustfmt.toml from master * cargo +nightly-2021-06-22 fmt --all * Update to new call variant structs * More call variant struct updates * Remove unused import * More call variant structs * More call variant structs * Even more call variant structs * Mooar variant structs * Evermore variant structs * Call variant structs ad infinitum * Fmt * More call variants * Last call variant * Call variants all done? * Fix SS58Prefix type * Potential workaround for BitFlags<IdentityFields> TypeInfo * Enable docs capturing for Call, Event, and Error types * Fix IdentityFields TypeInfo * Remove metadata-docs feature * Add capture_docs = true for legacy Call, Event and Error types * Fmt * Fix metadata test type * Update benchmarks with call struct variants * Fmt * More test fixes * Fmt * Fix benches * Use latest capture_docs attr * Latest scale_info * Fmt * review: change &Vec to &[] * Remove pallet metadata attr * review: remove commented out test code * review: skip_type_params trailing comma suggestion * Update to scale-info 0.10.0 * Update construct_runtime ui tests, different because of metadata TypeInfo impls * Add some TypeInfo derives for UI tests * Update storage ensure span ui stderrs * Update call argument bound ui tests Possibly changed because change from tuple to struct variants? * Add scale-info dev dependency * Update to latest finality-grandpa release * review: missing newline * review: missing scale-info/std * review: remove duplicate scale-info/std * review: remove fully qualified TypeInfo * review: add missing scale-info/std * review: remove unnecessary imports. * Fmt * Use crates.io RC version of frame-metadata * Remove scale-info/std because it is a dev dependency * Add missing scale_info dev-dependency for test * Delete empty metadata folder * Fix sp_std import * review: improve manual UncheckedExtrinsic TypeInfo impl * review: use full scale-info for dev-dependency * Remove DefaultByteGetter impl * review: derive TypeInfo for generic header * Fmt * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update primitives/runtime/src/generic/unchecked_extrinsic.rs Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> * Update bin/node/executor/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/identity/src/types.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update frame/support/src/dispatch.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Remove redundant derive * Simplify scale-info dependency * Strip underscore prefix from call variant struct names * Another underscore field * More underscore fields * Another underscore field * Update to frame-metadata 14.0.0-rc.2 with combined StorageEntryType::Map * Fmt * Revert weights formatting * Fix up some tests * Fix up some tests for StorageEntryTypeMetadata * scale-info dev dependency * Fix test error * Add missing TypeInfo derives * Add back missing scale-info dependency * Add back missing scale-info dependency * Fix npos compact impls * Cargo.lock * Fmt * Fix errors * Fmt * Fix renamed raw_solution field * Fix error * Fmt * Fix some benchmarks * Fmt * Stray R * Fix * Add missing TypeInfos * ui test fix * Fix line widths * Revert "ui test fix" This reverts commit 2d15ec058a216e3f92d713f1174603a2bb1eac65. * Upgrade to scale-info 0.11.0 * Revert "Upgrade to scale-info 0.11.0" This reverts commit 047bb179085a0059c36cd20ab405f55cf0867e28. * Add Runtime type * Update to scale-info 0.12 * Update to scale-info 1.0 * Update frame-metadata to version 14.0.0 * Patch finality-grandpa until release available * Fix metadata tests * Fix metadata tests * Fmt * Remove patched finality-grandpa * Fix tests, use scale_info imports * Fix pallet tests * Add BlockNumber TypeInfo bound * ui test fix * Cargo.lock * Remove pallet metadata * Cargo.lock * Add missing scale-info dependency * Remove pallet event metadata * Fix error * Fix collective errors * Semicolol * Fmt * Remove another metadata attribute * Add new variant to custom digest TypeInfo * Fmt * Cargo.lock from master * Remove comma lol * Fix example call error * Fix example call error properly Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Keith Yeung <kungfukeith11@gmail.com> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Andrew Jones
@@ -54,6 +54,7 @@ pub fn expand_outer_dispatch(
|
||||
Clone, PartialEq, Eq,
|
||||
#scrate::codec::Encode,
|
||||
#scrate::codec::Decode,
|
||||
#scrate::scale_info::TypeInfo,
|
||||
#scrate::RuntimeDebug,
|
||||
)]
|
||||
pub enum Call {
|
||||
|
||||
@@ -75,6 +75,7 @@ pub fn expand_outer_event(
|
||||
Clone, PartialEq, Eq,
|
||||
#scrate::codec::Encode,
|
||||
#scrate::codec::Decode,
|
||||
#scrate::scale_info::TypeInfo,
|
||||
#scrate::RuntimeDebug,
|
||||
)]
|
||||
#[allow(non_camel_case_types)]
|
||||
|
||||
@@ -26,7 +26,7 @@ pub fn expand_runtime_metadata(
|
||||
scrate: &TokenStream,
|
||||
extrinsic: &TypePath,
|
||||
) -> TokenStream {
|
||||
let modules = pallet_declarations
|
||||
let pallets = pallet_declarations
|
||||
.iter()
|
||||
.filter_map(|pallet_declaration| {
|
||||
pallet_declaration.find_part("Pallet").map(|_| {
|
||||
@@ -42,21 +42,21 @@ pub fn expand_runtime_metadata(
|
||||
.map(|(decl, filtered_names)| {
|
||||
let name = &decl.name;
|
||||
let index = &decl.index;
|
||||
let storage = expand_pallet_metadata_storage(&filtered_names, runtime, scrate, decl);
|
||||
let calls = expand_pallet_metadata_calls(&filtered_names, runtime, scrate, decl);
|
||||
let storage = expand_pallet_metadata_storage(&filtered_names, runtime, decl);
|
||||
let calls = expand_pallet_metadata_calls(&filtered_names, runtime, decl);
|
||||
let event = expand_pallet_metadata_events(&filtered_names, runtime, scrate, decl);
|
||||
let constants = expand_pallet_metadata_constants(runtime, scrate, decl);
|
||||
let errors = expand_pallet_metadata_errors(runtime, scrate, decl);
|
||||
let constants = expand_pallet_metadata_constants(runtime, decl);
|
||||
let errors = expand_pallet_metadata_errors(runtime, decl);
|
||||
|
||||
quote! {
|
||||
#scrate::metadata::ModuleMetadata {
|
||||
name: #scrate::metadata::DecodeDifferent::Encode(stringify!(#name)),
|
||||
#scrate::metadata::PalletMetadata {
|
||||
name: stringify!(#name),
|
||||
index: #index,
|
||||
storage: #storage,
|
||||
calls: #calls,
|
||||
event: #event,
|
||||
constants: #constants,
|
||||
errors: #errors,
|
||||
error: #errors,
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -65,20 +65,26 @@ pub fn expand_runtime_metadata(
|
||||
quote! {
|
||||
impl #runtime {
|
||||
pub fn metadata() -> #scrate::metadata::RuntimeMetadataPrefixed {
|
||||
#scrate::metadata::RuntimeMetadataLastVersion {
|
||||
modules: #scrate::metadata::DecodeDifferent::Encode(&[ #(#modules),* ]),
|
||||
extrinsic: #scrate::metadata::ExtrinsicMetadata {
|
||||
#scrate::metadata::RuntimeMetadataLastVersion::new(
|
||||
#scrate::sp_std::vec![ #(#pallets),* ],
|
||||
#scrate::metadata::ExtrinsicMetadata {
|
||||
ty: #scrate::scale_info::meta_type::<#extrinsic>(),
|
||||
version: <#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata>::VERSION,
|
||||
signed_extensions: <
|
||||
<
|
||||
#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata
|
||||
>::SignedExtensions as #scrate::sp_runtime::traits::SignedExtension
|
||||
>::identifier()
|
||||
>::metadata()
|
||||
.into_iter()
|
||||
.map(#scrate::metadata::DecodeDifferent::Encode)
|
||||
.map(|meta| #scrate::metadata::SignedExtensionMetadata {
|
||||
identifier: meta.identifier,
|
||||
ty: meta.ty,
|
||||
additional_signed: meta.additional_signed,
|
||||
})
|
||||
.collect(),
|
||||
},
|
||||
}.into()
|
||||
#scrate::scale_info::meta_type::<#runtime>()
|
||||
).into()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,7 +93,6 @@ pub fn expand_runtime_metadata(
|
||||
fn expand_pallet_metadata_storage(
|
||||
filtered_names: &[&'static str],
|
||||
runtime: &Ident,
|
||||
scrate: &TokenStream,
|
||||
decl: &Pallet,
|
||||
) -> TokenStream {
|
||||
if filtered_names.contains(&"Storage") {
|
||||
@@ -95,11 +100,7 @@ fn expand_pallet_metadata_storage(
|
||||
let path = &decl.path;
|
||||
|
||||
quote! {
|
||||
Some(#scrate::metadata::DecodeDifferent::Encode(
|
||||
#scrate::metadata::FnEncode(
|
||||
#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata
|
||||
)
|
||||
))
|
||||
Some(#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata())
|
||||
}
|
||||
} else {
|
||||
quote!(None)
|
||||
@@ -109,7 +110,6 @@ fn expand_pallet_metadata_storage(
|
||||
fn expand_pallet_metadata_calls(
|
||||
filtered_names: &[&'static str],
|
||||
runtime: &Ident,
|
||||
scrate: &TokenStream,
|
||||
decl: &Pallet,
|
||||
) -> TokenStream {
|
||||
if filtered_names.contains(&"Call") {
|
||||
@@ -117,11 +117,7 @@ fn expand_pallet_metadata_calls(
|
||||
let path = &decl.path;
|
||||
|
||||
quote! {
|
||||
Some(#scrate::metadata::DecodeDifferent::Encode(
|
||||
#scrate::metadata::FnEncode(
|
||||
#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions
|
||||
)
|
||||
))
|
||||
Some(#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions())
|
||||
}
|
||||
} else {
|
||||
quote!(None)
|
||||
@@ -150,45 +146,31 @@ fn expand_pallet_metadata_events(
|
||||
};
|
||||
|
||||
quote! {
|
||||
Some(#scrate::metadata::DecodeDifferent::Encode(
|
||||
#scrate::metadata::FnEncode(#pallet_event::metadata)
|
||||
))
|
||||
Some(
|
||||
#scrate::metadata::PalletEventMetadata {
|
||||
ty: #scrate::scale_info::meta_type::<#pallet_event>()
|
||||
}
|
||||
)
|
||||
}
|
||||
} else {
|
||||
quote!(None)
|
||||
}
|
||||
}
|
||||
|
||||
fn expand_pallet_metadata_constants(
|
||||
runtime: &Ident,
|
||||
scrate: &TokenStream,
|
||||
decl: &Pallet,
|
||||
) -> TokenStream {
|
||||
fn expand_pallet_metadata_constants(runtime: &Ident, decl: &Pallet) -> TokenStream {
|
||||
let path = &decl.path;
|
||||
let instance = decl.instance.as_ref().into_iter();
|
||||
|
||||
quote! {
|
||||
#scrate::metadata::DecodeDifferent::Encode(
|
||||
#scrate::metadata::FnEncode(
|
||||
#path::Pallet::<#runtime #(, #path::#instance)*>::module_constants_metadata
|
||||
)
|
||||
)
|
||||
#path::Pallet::<#runtime #(, #path::#instance)*>::pallet_constants_metadata()
|
||||
}
|
||||
}
|
||||
|
||||
fn expand_pallet_metadata_errors(
|
||||
runtime: &Ident,
|
||||
scrate: &TokenStream,
|
||||
decl: &Pallet,
|
||||
) -> TokenStream {
|
||||
fn expand_pallet_metadata_errors(runtime: &Ident, decl: &Pallet) -> TokenStream {
|
||||
let path = &decl.path;
|
||||
let instance = decl.instance.as_ref().into_iter();
|
||||
|
||||
quote! {
|
||||
#scrate::metadata::DecodeDifferent::Encode(
|
||||
#scrate::metadata::FnEncode(
|
||||
<#path::Pallet::<#runtime #(, #path::#instance)*> as #scrate::metadata::ModuleErrorMetadata>::metadata
|
||||
)
|
||||
)
|
||||
#path::Pallet::<#runtime #(, #path::#instance)*>::error_metadata()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -171,7 +171,10 @@ pub fn expand_outer_origin(
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, #scrate::RuntimeDebug, #scrate::codec::Encode, #scrate::codec::Decode)]
|
||||
#[derive(
|
||||
Clone, PartialEq, Eq, #scrate::RuntimeDebug, #scrate::codec::Encode,
|
||||
#scrate::codec::Decode, #scrate::scale_info::TypeInfo,
|
||||
)]
|
||||
#[allow(non_camel_case_types)]
|
||||
pub enum OriginCaller {
|
||||
#[codec(index = #system_index)]
|
||||
|
||||
@@ -151,7 +151,10 @@ fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream
|
||||
type __hidden_use_of_unchecked_extrinsic = #unchecked_extrinsic;
|
||||
};
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug)]
|
||||
#[derive(
|
||||
Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug,
|
||||
#scrate::scale_info::TypeInfo
|
||||
)]
|
||||
pub struct #name;
|
||||
impl #scrate::sp_runtime::traits::GetNodeBlockType for #name {
|
||||
type NodeBlock = #node_block;
|
||||
|
||||
Reference in New Issue
Block a user