quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't auto-attach lookup to registry (#4599)

Browse Source 
* Don't auto-attach lookup to registry

* CHANGELOG

* Add base u* types

* s/compatTypes/specs/

* CHANGELOG

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
Jaco
2022-02-24 06:31:06 +00:00
committed by GitHub
co-authored by mergify[bot]
parent 00147df500
commit ed2f512cfc
4 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/types/src/create/registry.ts
+8 -4
View File
@@ -230,13 +230,11 @@ export class TypeRegistry implements Registry {
}
public get lookup (): PortableRegistry {
return this.#lookup || this.metadata.lookup;
return assertReturn(this.#lookup, 'Lookup has not been set on this registry');
}
public get metadata (): MetadataLatest {
assert(this.#metadata, 'Metadata has not been set on this registry');
return this.#metadata;
return assertReturn(this.#metadata, 'Metadata has not been set on this registry');
}
public get unknownTypes (): string[] {
@@ -485,6 +483,9 @@ export class TypeRegistry implements Registry {
setLookup (lookup: PortableRegistry): void {
this.#lookup = lookup;
// register all applicable types found
lookup.register();
}
// sets the metadata
@@ -492,6 +493,9 @@ export class TypeRegistry implements Registry {
this.#metadata = metadata.asLatest;
this.#metadataVersion = metadata.version;
// attach the lookup at this point (before injecting)
this.setLookup(this.#metadata.lookup);
injectExtrinsics(this, this.#metadata, this.#metadataVersion, this.#metadataCalls);
injectErrors(this, this.#metadata, this.#metadataVersion, this.#metadataErrors);
injectEvents(this, this.#metadata, this.#metadataVersion, this.#metadataEvents);
packages/types/src/metadata/PortableRegistry/PortableRegistry.ts
+8 -2
View File
@@ -345,7 +345,9 @@ function extractTypeInfo (lookup: PortableRegistry, portable: PortableType[]): [
export class PortableRegistry extends Struct implements ILookup {
#alias: Record<number, string>;
#lookups: Record<string, string>;
#names: Record<number, string>;
#params: Record<string, SiTypeParameter[]>;
#typeDefs: Record<number, TypeDef> = {};
#types: Record<number, PortableType>;
@@ -359,11 +361,11 @@ export class PortableRegistry extends Struct implements ILookup {
const [types, lookups, names, params] = extractTypeInfo(this, this.types);
this.#alias = extractAliases(params, isContract);
this.#lookups = lookups;
this.#names = names;
this.#params = params;
this.#types = types;
registerTypes(this, lookups, names, params);
// console.timeEnd('PortableRegistry')
}
@@ -378,6 +380,10 @@ export class PortableRegistry extends Struct implements ILookup {
return this.getT('types');
}
public register (): void {
registerTypes(this, this.#lookups, this.#names, this.#params);
}
/**
* @description Returns the name for a specific lookup
*/
packages/types/src/metadata/v13/toV14.ts
+43 -36
View File
@@ -34,9 +34,9 @@ const BOXES = [['<', '>'], ['<', ','], [',', '>'], ['(', ')'], ['(', ','], [',',
* Creates a compatible type mapping
* @internal
**/
function compatType (compatTypes: TypeSpec[], _type: Text | string): number {
function compatType (specs: TypeSpec[], _type: Text | string): number {
const type = _type.toString();
const index = compatTypes.findIndex(({ def }) =>
const index = specs.findIndex(({ def }) =>
def.HistoricMetaCompat === type
);
@@ -44,23 +44,29 @@ function compatType (compatTypes: TypeSpec[], _type: Text | string): number {
return index;
}
return compatTypes.push({
return specs.push({
def: {
HistoricMetaCompat: type
}
}) - 1;
}
function makeTupleType (compatTypes: TypeSpec[], entries: number[]): number {
return compatTypes.push({
function compatTypes (specs: TypeSpec[], ...types: (Text | string)[]): void {
for (let i = 0; i < types.length; i++) {
compatType(specs, types[i]);
}
}
function makeTupleType (specs: TypeSpec[], entries: number[]): number {
return specs.push({
def: {
Tuple: entries
}
}) - 1;
}
function makeVariantType (modName: Text, variantType: string, compatTypes: TypeSpec[], variants: SiVariant[]): number {
return compatTypes.push({
function makeVariantType (modName: Text, variantType: string, specs: TypeSpec[], variants: SiVariant[]): number {
return specs.push({
def: {
Variant: { variants }
},
@@ -126,14 +132,14 @@ function setTypeOverride (sectionTypes: OverrideModuleType, types: Type[]): void
* Apply module-specific type overrides (always be done as part of toV14)
* @internal
**/
function convertCalls (compatTypes: TypeSpec[], registry: Registry, modName: Text, calls: FunctionMetadataV13[], sectionTypes: OverrideModuleType): PalletCallMetadataV14 {
function convertCalls (specs: TypeSpec[], registry: Registry, modName: Text, calls: FunctionMetadataV13[], sectionTypes: OverrideModuleType): PalletCallMetadataV14 {
const variants = calls.map(({ args, docs, name }, index): SiVariant => {
setTypeOverride(sectionTypes, args.map(({ type }) => type));
return registry.createTypeUnsafe('SiVariant', [{
docs,
fields: args.map(({ name, type }) =>
registry.createTypeUnsafe('SiField', [{ name, type: compatType(compatTypes, type) }])
registry.createTypeUnsafe('SiField', [{ name, type: compatType(specs, type) }])
),
index,
name
@@ -141,7 +147,7 @@ function convertCalls (compatTypes: TypeSpec[], registry: Registry, modName: Tex
});
return registry.createTypeUnsafe('PalletCallMetadataV14', [{
type: makeVariantType(modName, 'Call', compatTypes, variants)
type: makeVariantType(modName, 'Call', specs, variants)
}]);
}
@@ -149,14 +155,14 @@ function convertCalls (compatTypes: TypeSpec[], registry: Registry, modName: Tex
* Apply module-specific type overrides (always be done as part of toV14)
* @internal
*/
function convertConstants (compatTypes: TypeSpec[], registry: Registry, constants: ModuleConstantMetadataV13[], sectionTypes: OverrideModuleType): PalletConstantMetadataV14[] {
function convertConstants (specs: TypeSpec[], registry: Registry, constants: ModuleConstantMetadataV13[], sectionTypes: OverrideModuleType): PalletConstantMetadataV14[] {
return constants.map(({ docs, name, type, value }): PalletConstantMetadataV14 => {
setTypeOverride(sectionTypes, [type]);
return registry.createTypeUnsafe('PalletConstantMetadataV14', [{
docs,
name,
type: compatType(compatTypes, type),
type: compatType(specs, type),
value
}]);
});
@@ -167,7 +173,7 @@ function convertConstants (compatTypes: TypeSpec[], registry: Registry, constant
* @internal
*/
// eslint-disable-next-line @typescript-eslint/no-unused-vars
function convertErrors (compatTypes: TypeSpec[], registry: Registry, modName: Text, errors: ErrorMetadataV13[], _sectionTypes: OverrideModuleType): PalletErrorMetadataV14 {
function convertErrors (specs: TypeSpec[], registry: Registry, modName: Text, errors: ErrorMetadataV13[], _sectionTypes: OverrideModuleType): PalletErrorMetadataV14 {
const variants = errors.map(({ docs, name }, index): SiVariant =>
registry.createTypeUnsafe('SiVariant', [{
docs,
@@ -178,7 +184,7 @@ function convertErrors (compatTypes: TypeSpec[], registry: Registry, modName: Te
);
return registry.createTypeUnsafe('PalletErrorMetadataV14', [{
type: makeVariantType(modName, 'Error', compatTypes, variants)
type: makeVariantType(modName, 'Error', specs, variants)
}]);
}
@@ -186,14 +192,14 @@ function convertErrors (compatTypes: TypeSpec[], registry: Registry, modName: Te
* Apply module-specific type overrides (always be done as part of toV14)
* @internal
**/
function convertEvents (compatTypes: TypeSpec[], registry: Registry, modName: Text, events: EventMetadataV13[], sectionTypes: OverrideModuleType): PalletEventMetadataV14 {
function convertEvents (specs: TypeSpec[], registry: Registry, modName: Text, events: EventMetadataV13[], sectionTypes: OverrideModuleType): PalletEventMetadataV14 {
const variants = events.map(({ args, docs, name }, index): SiVariant => {
setTypeOverride(sectionTypes, args);
return registry.createTypeUnsafe('SiVariant', [{
docs,
fields: args.map((t) =>
registry.createTypeUnsafe('SiField', [{ type: compatType(compatTypes, t) }])
registry.createTypeUnsafe('SiField', [{ type: compatType(specs, t) }])
),
index,
name
@@ -201,20 +207,20 @@ function convertEvents (compatTypes: TypeSpec[], registry: Registry, modName: Te
});
return registry.createTypeUnsafe('PalletEventMetadataV14', [{
type: makeVariantType(modName, 'Event', compatTypes, variants)
type: makeVariantType(modName, 'Event', specs, variants)
}]);
}
function createMapEntry (compatTypes: TypeSpec[], registry: Registry, sectionTypes: OverrideModuleType, { hashers, keys, value }: MapDef): StorageEntryTypeV14 {
function createMapEntry (specs: TypeSpec[], registry: Registry, sectionTypes: OverrideModuleType, { hashers, keys, value }: MapDef): StorageEntryTypeV14 {
setTypeOverride(sectionTypes, [value, ...(Array.isArray(keys) ? keys : [keys])]);
return registry.createTypeUnsafe('StorageEntryTypeV14', [{
Map: {
hashers,
key: hashers.length === 1
? compatType(compatTypes, keys[0])
: makeTupleType(compatTypes, keys.map((t) => compatType(compatTypes, t))),
value: compatType(compatTypes, value)
? compatType(specs, keys[0])
: makeTupleType(specs, keys.map((t) => compatType(specs, t))),
value: compatType(specs, value)
}
}]);
}
@@ -223,7 +229,7 @@ function createMapEntry (compatTypes: TypeSpec[], registry: Registry, sectionTyp
* Apply module-specific storage type overrides (always part of toV14)
* @internal
**/
function convertStorage (compatTypes: TypeSpec[], registry: Registry, { items, prefix }: StorageMetadataV13, sectionTypes: OverrideModuleType): PalletStorageMetadataV14 {
function convertStorage (specs: TypeSpec[], registry: Registry, { items, prefix }: StorageMetadataV13, sectionTypes: OverrideModuleType): PalletStorageMetadataV14 {
return registry.createTypeUnsafe('PalletStorageMetadataV14', [{
items: items.map(({ docs, fallback, modifier, name, type }): StorageEntryMetadataV14 => {
let entryType: StorageEntryTypeV14;
@@ -234,12 +240,12 @@ function convertStorage (compatTypes: TypeSpec[], registry: Registry, { items, p
setTypeOverride(sectionTypes, [plain]);
entryType = registry.createTypeUnsafe('StorageEntryTypeV14', [{
Plain: compatType(compatTypes, plain)
Plain: compatType(specs, plain)
}]);
} else if (type.isMap) {
const map = type.asMap;
entryType = createMapEntry(compatTypes, registry, sectionTypes, {
entryType = createMapEntry(specs, registry, sectionTypes, {
hashers: [map.hasher],
keys: [map.key],
value: map.value
@@ -247,7 +253,7 @@ function convertStorage (compatTypes: TypeSpec[], registry: Registry, { items, p
} else if (type.isDoubleMap) {
const dm = type.asDoubleMap;
entryType = createMapEntry(compatTypes, registry, sectionTypes, {
entryType = createMapEntry(specs, registry, sectionTypes, {
hashers: [dm.hasher, dm.key2Hasher],
keys: [dm.key1, dm.key2],
value: dm.value
@@ -255,7 +261,7 @@ function convertStorage (compatTypes: TypeSpec[], registry: Registry, { items, p
} else {
const nm = type.asNMap;
entryType = createMapEntry(compatTypes, registry, sectionTypes, {
entryType = createMapEntry(specs, registry, sectionTypes, {
hashers: nm.hashers,
keys: nm.keyVec,
value: nm.value
@@ -288,17 +294,17 @@ function convertExtrinsic (registry: Registry, { signedExtensions, version }: Ex
}
/** @internal */
function createPallet (compatTypes: TypeSpec[], registry: Registry, mod: ModuleMetadataV13, { calls, constants, errors, events, storage }: { calls: FunctionMetadataV13[] | null, constants: ModuleConstantMetadataV13[], errors: ErrorMetadataV13[] | null, events: EventMetadataV13[] | null, storage: StorageMetadataV13 | null }): PalletMetadataV14 {
function createPallet (specs: TypeSpec[], registry: Registry, mod: ModuleMetadataV13, { calls, constants, errors, events, storage }: { calls: FunctionMetadataV13[] | null, constants: ModuleConstantMetadataV13[], errors: ErrorMetadataV13[] | null, events: EventMetadataV13[] | null, storage: StorageMetadataV13 | null }): PalletMetadataV14 {
const sectionTypes = getAliasTypes(registry, stringCamelCase(mod.name));
return registry.createTypeUnsafe('PalletMetadataV14', [{
calls: calls && convertCalls(compatTypes, registry, mod.name, calls, sectionTypes),
constants: convertConstants(compatTypes, registry, constants, sectionTypes),
errors: errors && convertErrors(compatTypes, registry, mod.name, errors, sectionTypes),
events: events && convertEvents(compatTypes, registry, mod.name, events, sectionTypes),
calls: calls && convertCalls(specs, registry, mod.name, calls, sectionTypes),
constants: convertConstants(specs, registry, constants, sectionTypes),
errors: errors && convertErrors(specs, registry, mod.name, errors, sectionTypes),
events: events && convertEvents(specs, registry, mod.name, events, sectionTypes),
index: mod.index,
name: mod.name,
storage: storage && convertStorage(compatTypes, registry, storage, sectionTypes)
storage: storage && convertStorage(specs, registry, storage, sectionTypes)
}]);
}
@@ -307,14 +313,15 @@ function createPallet (compatTypes: TypeSpec[], registry: Registry, mod: ModuleM
* @internal
**/
export function toV14 (registry: Registry, v13: MetadataV13, metaVersion: number): MetadataV14 {
const compatTypes: TypeSpec[] = [];
const specs: TypeSpec[] = [];
compatType(compatTypes, 'Null'); // position 0 always has Null
// position 0 always has Null, additionally add internal defaults
compatTypes(specs, 'Null', 'u8', 'u16', 'u32', 'u64');
registerOriginCaller(registry, v13.modules, metaVersion);
const extrinsic = convertExtrinsic(registry, v13.extrinsic);
const pallets = v13.modules.map((mod) =>
createPallet(compatTypes, registry, mod, {
createPallet(specs, registry, mod, {
calls: mod.calls.unwrapOr(null),
constants: mod.constants,
errors: mod.errors.length ? mod.errors : null,
@@ -326,7 +333,7 @@ export function toV14 (registry: Registry, v13: MetadataV13, metaVersion: number
return registry.createTypeUnsafe('MetadataV14', [{
extrinsic,
lookup: {
types: compatTypes.map((type, id) =>
types: specs.map((type, id) =>
registry.createTypeUnsafe('PortableType', [{ id, type }])
)
},