From 6c87a6f0aff4b2a0045a87ecb37fbae614281f8a Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 13 Jul 2021 12:52:10 +0300 Subject: [PATCH] Partial latest to v14 mapping (#3767) --- packages/types/src/augment/registry.ts | 23 ++++++++++++++++++- .../src/interfaces/metadata/definitions.ts | 19 +++++++++++++++ .../types/src/interfaces/metadata/types.ts | 21 +++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/packages/types/src/augment/registry.ts b/packages/types/src/augment/registry.ts index 9314b8689e..099b03f440 100644 --- a/packages/types/src/augment/registry.ts +++ b/packages/types/src/augment/registry.ts @@ -32,7 +32,7 @@ import type { AuthorityIndex, AuthorityList, AuthoritySet, AuthoritySetChange, A import type { IdentityFields, IdentityInfo, IdentityInfoAdditional, IdentityJudgement, RegistrarIndex, RegistrarInfo, Registration, RegistrationJudgement } from '@polkadot/types/interfaces/identity'; import type { AuthIndex, AuthoritySignature, Heartbeat, HeartbeatTo244, OpaqueMultiaddr, OpaqueNetworkState, OpaquePeerId } from '@polkadot/types/interfaces/imOnline'; import type { CallIndex, LotteryConfig } from '@polkadot/types/interfaces/lottery'; -import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, ExtrinsicMetadataV14, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV14, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV14, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV14, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, PalletCallMetadataV14, PalletConstantMetadataV14, PalletErrorMetadataV14, PalletEventMetadataV14, PalletMetadataV14, PalletStorageMetadataV14, PortableRegistry, SignedExtensionMetadataV14, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV14, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV14, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV14, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV14, StorageHasherV9, StorageMetadataLatest, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata'; +import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, ExtrinsicMetadataV14, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV14, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV14, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV14, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, PalletCallMetadataLatest, PalletCallMetadataV14, PalletConstantMetadataLatest, PalletConstantMetadataV14, PalletErrorMetadataLatest, PalletErrorMetadataV14, PalletEventMetadataLatest, PalletEventMetadataV14, PalletMetadataLatest, PalletMetadataV14, PalletStorageMetadataLatest, PalletStorageMetadataV14, PortableRegistry, SignedExtensionMetadataLatest, SignedExtensionMetadataV14, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV14, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV14, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV14, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV14, StorageHasherV9, StorageMetadataLatest, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata'; import type { MmrLeafProof } from '@polkadot/types/interfaces/mmr'; import type { StorageKind } from '@polkadot/types/interfaces/offchain'; import type { DeferredOffenceOf, Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences'; @@ -675,13 +675,19 @@ declare module '@polkadot/types/types/registry' { 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; 'Option': Option; @@ -844,6 +850,7 @@ declare module '@polkadot/types/types/registry' { 'Option': Option; 'Option': Option; 'Option': Option; + 'Option': Option; 'Option': Option; 'Option': Option; 'Option': Option; @@ -1566,13 +1573,19 @@ declare module '@polkadot/types/types/registry' { 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; @@ -1735,6 +1748,7 @@ declare module '@polkadot/types/types/registry' { 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; + 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; 'Vec': Vec; @@ -2457,13 +2471,19 @@ declare module '@polkadot/types/types/registry' { Owner: Owner; PageCounter: PageCounter; PageIndexData: PageIndexData; + PalletCallMetadataLatest: PalletCallMetadataLatest; PalletCallMetadataV14: PalletCallMetadataV14; + PalletConstantMetadataLatest: PalletConstantMetadataLatest; PalletConstantMetadataV14: PalletConstantMetadataV14; + PalletErrorMetadataLatest: PalletErrorMetadataLatest; PalletErrorMetadataV14: PalletErrorMetadataV14; + PalletEventMetadataLatest: PalletEventMetadataLatest; PalletEventMetadataV14: PalletEventMetadataV14; PalletId: PalletId; + PalletMetadataLatest: PalletMetadataLatest; PalletMetadataV14: PalletMetadataV14; PalletsOrigin: PalletsOrigin; + PalletStorageMetadataLatest: PalletStorageMetadataLatest; PalletStorageMetadataV14: PalletStorageMetadataV14; PalletVersion: PalletVersion; ParachainDispatchOrigin: ParachainDispatchOrigin; @@ -2626,6 +2646,7 @@ declare module '@polkadot/types/types/registry' { SignedBlock: SignedBlock; SignedBlockWithJustification: SignedBlockWithJustification; SignedBlockWithJustifications: SignedBlockWithJustifications; + SignedExtensionMetadataLatest: SignedExtensionMetadataLatest; SignedExtensionMetadataV14: SignedExtensionMetadataV14; SignedSubmission: SignedSubmission; SignedSubmissionOf: SignedSubmissionOf; diff --git a/packages/types/src/interfaces/metadata/definitions.ts b/packages/types/src/interfaces/metadata/definitions.ts index a7964c28e6..955ecd2a5e 100644 --- a/packages/types/src/interfaces/metadata/definitions.ts +++ b/packages/types/src/interfaces/metadata/definitions.ts @@ -26,6 +26,25 @@ export default { ...v13, ...v14, + // + // will be available once v14 is the default + // TODO: Comment out all commented stuff below and remove block below + // + // ExtrinsicMetadataLatest: 'ExtrinsicMetadataV14', + // FunctionArgumentMetadataLatest: 'FunctionArgumentMetadataV13', + // FunctionMetadataLatest: 'FunctionMetadataV14', + // MetadataLatest: 'MetadataV14', + PalletCallMetadataLatest: 'PalletCallMetadataV14', + PalletConstantMetadataLatest: 'PalletConstantMetadataV14', + PalletErrorMetadataLatest: 'PalletErrorMetadataV14', + PalletEventMetadataLatest: 'PalletEventMetadataV14', + PalletMetadataLatest: 'PalletMetadataV14', + PalletStorageMetadataLatest: 'PalletStorageMetadataV14', + SignedExtensionMetadataLatest: 'SignedExtensionMetadataV14', + // StorageEntryMetadataLatest: 'StorageEntryMetadataV14', + // StorageEntryModifierLatest: 'StorageEntryModifierV14', + // StorageEntryTypeLatest: 'StorageEntryTypeV14', + // This always maps to the latest ErrorMetadataLatest: 'ErrorMetadataV13', EventMetadataLatest: 'EventMetadataV13', diff --git a/packages/types/src/interfaces/metadata/types.ts b/packages/types/src/interfaces/metadata/types.ts index 54481c988c..438e96c04d 100644 --- a/packages/types/src/interfaces/metadata/types.ts +++ b/packages/types/src/interfaces/metadata/types.ts @@ -255,12 +255,18 @@ export interface ModuleMetadataV9 extends Struct { readonly errors: Vec; } +/** @name PalletCallMetadataLatest */ +export interface PalletCallMetadataLatest extends PalletCallMetadataV14 {} + /** @name PalletCallMetadataV14 */ export interface PalletCallMetadataV14 extends Struct { readonly type: SiLookupTypeId; readonly calls: Vec; } +/** @name PalletConstantMetadataLatest */ +export interface PalletConstantMetadataLatest extends PalletConstantMetadataV14 {} + /** @name PalletConstantMetadataV14 */ export interface PalletConstantMetadataV14 extends Struct { readonly name: Text; @@ -269,16 +275,25 @@ export interface PalletConstantMetadataV14 extends Struct { readonly docs: Vec; } +/** @name PalletErrorMetadataLatest */ +export interface PalletErrorMetadataLatest extends PalletErrorMetadataV14 {} + /** @name PalletErrorMetadataV14 */ export interface PalletErrorMetadataV14 extends Struct { readonly type: SiLookupTypeId; } +/** @name PalletEventMetadataLatest */ +export interface PalletEventMetadataLatest extends PalletEventMetadataV14 {} + /** @name PalletEventMetadataV14 */ export interface PalletEventMetadataV14 extends Struct { readonly type: SiLookupTypeId; } +/** @name PalletMetadataLatest */ +export interface PalletMetadataLatest extends PalletMetadataV14 {} + /** @name PalletMetadataV14 */ export interface PalletMetadataV14 extends Struct { readonly name: Text; @@ -290,6 +305,9 @@ export interface PalletMetadataV14 extends Struct { readonly index: u8; } +/** @name PalletStorageMetadataLatest */ +export interface PalletStorageMetadataLatest extends PalletStorageMetadataV14 {} + /** @name PalletStorageMetadataV14 */ export interface PalletStorageMetadataV14 extends Struct { readonly prefix: Text; @@ -301,6 +319,9 @@ export interface PortableRegistry extends Struct { readonly types: Vec; } +/** @name SignedExtensionMetadataLatest */ +export interface SignedExtensionMetadataLatest extends SignedExtensionMetadataV14 {} + /** @name SignedExtensionMetadataV14 */ export interface SignedExtensionMetadataV14 extends Struct { readonly identifier: Text;