From 85e13cc2b1c94c0a21d7fc80a56b7254f8f56f09 Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 17 Dec 2021 05:38:54 +0100 Subject: [PATCH] Split @polkadot/types-known (#4342) * Re-split types-known correctly * yarn install * circular :( * combine? * It builds... ship it ... --- packages/typegen/scripts/aliases.cjs | 19 ++++++++++++++ packages/types-create/src/util/index.ts | 1 + .../known => types-create/src/util}/xcm.ts | 2 +- packages/types-known/src/bundle.ts | 4 ++- .../known => types-known/src}/chain/index.ts | 2 +- .../src}/spec/centrifuge-chain.ts | 2 +- .../known => types-known/src}/spec/index.ts | 2 +- .../known => types-known/src}/spec/kusama.ts | 5 ++-- .../src}/spec/node-template.ts | 2 +- .../known => types-known/src}/spec/node.ts | 2 +- .../src}/spec/polkadot.ts | 2 +- .../known => types-known/src}/spec/rococo.ts | 5 ++-- .../known => types-known/src}/spec/shell.ts | 2 +- .../src}/spec/statemint.ts | 5 ++-- .../known => types-known/src}/spec/westend.ts | 5 ++-- .../src}/upgrades/index.spec.ts | 0 .../src}/upgrades/index.ts | 2 +- .../src}/upgrades/kusama.ts | 0 .../src}/upgrades/polkadot.ts | 0 .../src}/upgrades/types.ts | 0 .../src}/upgrades/westend.ts | 0 .../index.ts => types-known/src/util.ts} | 20 +++----------- packages/types-known/tsconfig.json | 3 ++- packages/types/src/bundle.ts | 1 - .../alias.spec.ts} | 10 +++---- .../{known/modules.ts => interfaces/alias.ts} | 16 +++++++++--- .../src/interfaces/runtime/definitions.ts | 21 +++++++++++++++ .../types/src/interfaces/xcm/definitions.ts | 2 +- packages/types/src/known/knownOrigins.ts | 26 ------------------- packages/types/src/metadata/v13/toV14.ts | 5 ++-- rollup.config.mjs | 2 +- 31 files changed, 89 insertions(+), 79 deletions(-) create mode 100644 packages/typegen/scripts/aliases.cjs rename packages/{types/src/known => types-create/src/util}/xcm.ts (88%) rename packages/{types/src/known => types-known/src}/chain/index.ts (78%) rename packages/{types/src/known => types-known/src}/spec/centrifuge-chain.ts (96%) rename packages/{types/src/known => types-known/src}/spec/index.ts (92%) rename packages/{types/src/known => types-known/src}/spec/kusama.ts (97%) rename packages/{types/src/known => types-known/src}/spec/node-template.ts (81%) rename packages/{types/src/known => types-known/src}/spec/node.ts (81%) rename packages/{types/src/known => types-known/src}/spec/polkadot.ts (96%) rename packages/{types/src/known => types-known/src}/spec/rococo.ts (90%) rename packages/{types/src/known => types-known/src}/spec/shell.ts (81%) rename packages/{types/src/known => types-known/src}/spec/statemint.ts (86%) rename packages/{types/src/known => types-known/src}/spec/westend.ts (95%) rename packages/{types/src/known => types-known/src}/upgrades/index.spec.ts (100%) rename packages/{types/src/known => types-known/src}/upgrades/index.ts (96%) rename packages/{types/src/known => types-known/src}/upgrades/kusama.ts (100%) rename packages/{types/src/known => types-known/src}/upgrades/polkadot.ts (100%) rename packages/{types/src/known => types-known/src}/upgrades/types.ts (100%) rename packages/{types/src/known => types-known/src}/upgrades/westend.ts (100%) rename packages/{types/src/known/index.ts => types-known/src/util.ts} (89%) rename packages/types/src/{known/index.spec.ts => interfaces/alias.spec.ts} (77%) rename packages/types/src/{known/modules.ts => interfaces/alias.ts} (83%) delete mode 100644 packages/types/src/known/knownOrigins.ts diff --git a/packages/typegen/scripts/aliases.cjs b/packages/typegen/scripts/aliases.cjs new file mode 100644 index 0000000000..fe6802b5c0 --- /dev/null +++ b/packages/typegen/scripts/aliases.cjs @@ -0,0 +1,19 @@ +// Copyright 2017-2021 @polkadot/typegen authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +/* eslint-disable sort-keys */ + +module.exports = { + alias: { + '^@polkadot/api-derive(.*)': './packages/api-derive/src\\1', + '^@polkadot/api(.*)': './packages/api/src/\\1', + '^@polkadot/rpc-core(.*)': './packages/rpc-core/src\\1', + '^@polkadot/rpc-provider(.*)': './packages/rpc-provider/src\\1', + '^@polkadot/types-codec(.*)': './packages/types-codec/src\\1', + '^@polkadot/types-create(.*)': './packages/types-create/src\\1', + '^@polkadot/types-known(.*)': './packages/types-known/src\\1', + '^@polkadot/types-metadata(.*)': './packages/types-metadata/src\\1', + '^@polkadot/types-support(.*)': './packages/types-support/src\\1', + '^@polkadot/types(.*)': './packages/types/src\\1' + } +}; diff --git a/packages/types-create/src/util/index.ts b/packages/types-create/src/util/index.ts index 6e484377ec..0184bf8507 100644 --- a/packages/types-create/src/util/index.ts +++ b/packages/types-create/src/util/index.ts @@ -4,3 +4,4 @@ export * from './encodeTypes'; export * from './getTypeDef'; export * from './typeSplit'; +export * from './xcm'; diff --git a/packages/types/src/known/xcm.ts b/packages/types-create/src/util/xcm.ts similarity index 88% rename from packages/types/src/known/xcm.ts rename to packages/types-create/src/util/xcm.ts index c9e690bd71..47d00bdd05 100644 --- a/packages/types/src/known/xcm.ts +++ b/packages/types-create/src/util/xcm.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2021 @polkadot/types-known authors & contributors +// Copyright 2017-2021 @polkadot/types-create authors & contributors // SPDX-License-Identifier: Apache-2.0 import { objectSpread } from '@polkadot/util'; diff --git a/packages/types-known/src/bundle.ts b/packages/types-known/src/bundle.ts index 95bfc92a4c..c994ce20cf 100644 --- a/packages/types-known/src/bundle.ts +++ b/packages/types-known/src/bundle.ts @@ -1,6 +1,8 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -export { getSpecAlias, getSpecExtensions, getSpecHasher, getSpecRpc, getSpecTypes, getUpgradeVersion } from '@polkadot/types'; +export { mapXcmTypes } from '@polkadot/types-create'; export { packageInfo } from './packageInfo'; + +export * from './util'; diff --git a/packages/types/src/known/chain/index.ts b/packages/types-known/src/chain/index.ts similarity index 78% rename from packages/types/src/known/chain/index.ts rename to packages/types-known/src/chain/index.ts index 45ce685cbd..2fb923c89b 100644 --- a/packages/types/src/known/chain/index.ts +++ b/packages/types-known/src/chain/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; // Type overrides based on specific nodes const typesChain: Record = {}; diff --git a/packages/types/src/known/spec/centrifuge-chain.ts b/packages/types-known/src/spec/centrifuge-chain.ts similarity index 96% rename from packages/types/src/known/spec/centrifuge-chain.ts rename to packages/types-known/src/spec/centrifuge-chain.ts index bb3948462f..21b17e2a28 100644 --- a/packages/types/src/known/spec/centrifuge-chain.ts +++ b/packages/types-known/src/spec/centrifuge-chain.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types/src/known/spec/index.ts b/packages/types-known/src/spec/index.ts similarity index 92% rename from packages/types/src/known/spec/index.ts rename to packages/types-known/src/spec/index.ts index 1ee47d5584..941029435a 100644 --- a/packages/types/src/known/spec/index.ts +++ b/packages/types-known/src/spec/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; import centrifugeChain from './centrifuge-chain'; import kusama from './kusama'; diff --git a/packages/types/src/known/spec/kusama.ts b/packages/types-known/src/spec/kusama.ts similarity index 97% rename from packages/types/src/known/spec/kusama.ts rename to packages/types-known/src/spec/kusama.ts index 336bd232d9..09a619d039 100644 --- a/packages/types/src/known/spec/kusama.ts +++ b/packages/types-known/src/spec/kusama.ts @@ -3,12 +3,11 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; +import { mapXcmTypes } from '@polkadot/types-create'; import { objectSpread } from '@polkadot/util'; -import { mapXcmTypes } from '../xcm'; - const sharedTypes = { CompactAssignments: 'CompactAssignmentsWith24', RawSolution: 'RawSolutionWith24', diff --git a/packages/types/src/known/spec/node-template.ts b/packages/types-known/src/spec/node-template.ts similarity index 81% rename from packages/types/src/known/spec/node-template.ts rename to packages/types-known/src/spec/node-template.ts index 86c525d213..1f55f46b10 100644 --- a/packages/types/src/known/spec/node-template.ts +++ b/packages/types-known/src/spec/node-template.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types/src/known/spec/node.ts b/packages/types-known/src/spec/node.ts similarity index 81% rename from packages/types/src/known/spec/node.ts rename to packages/types-known/src/spec/node.ts index 86c525d213..1f55f46b10 100644 --- a/packages/types/src/known/spec/node.ts +++ b/packages/types-known/src/spec/node.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types/src/known/spec/polkadot.ts b/packages/types-known/src/spec/polkadot.ts similarity index 96% rename from packages/types/src/known/spec/polkadot.ts rename to packages/types-known/src/spec/polkadot.ts index d588f5a03f..91a626025e 100644 --- a/packages/types/src/known/spec/polkadot.ts +++ b/packages/types-known/src/spec/polkadot.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; import { objectSpread } from '@polkadot/util'; diff --git a/packages/types/src/known/spec/rococo.ts b/packages/types-known/src/spec/rococo.ts similarity index 90% rename from packages/types/src/known/spec/rococo.ts rename to packages/types-known/src/spec/rococo.ts index 607e96b3e0..7b8840ad57 100644 --- a/packages/types/src/known/spec/rococo.ts +++ b/packages/types-known/src/spec/rococo.ts @@ -3,12 +3,11 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; +import { mapXcmTypes } from '@polkadot/types-create'; import { objectSpread } from '@polkadot/util'; -import { mapXcmTypes } from '../xcm'; - // structs need to be in order /* eslint-disable sort-keys */ diff --git a/packages/types/src/known/spec/shell.ts b/packages/types-known/src/spec/shell.ts similarity index 81% rename from packages/types/src/known/spec/shell.ts rename to packages/types-known/src/spec/shell.ts index a6f24146a7..c394430099 100644 --- a/packages/types/src/known/spec/shell.ts +++ b/packages/types-known/src/spec/shell.ts @@ -3,7 +3,7 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; const versioned: OverrideVersionedType[] = [ { diff --git a/packages/types/src/known/spec/statemint.ts b/packages/types-known/src/spec/statemint.ts similarity index 86% rename from packages/types/src/known/spec/statemint.ts rename to packages/types-known/src/spec/statemint.ts index 118a93ec2b..bbdfd9ae4f 100644 --- a/packages/types/src/known/spec/statemint.ts +++ b/packages/types-known/src/spec/statemint.ts @@ -3,12 +3,11 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; +import { mapXcmTypes } from '@polkadot/types-create'; import { objectSpread } from '@polkadot/util'; -import { mapXcmTypes } from '../xcm'; - const sharedTypes = { TAssetBalance: 'u128', ProxyType: { diff --git a/packages/types/src/known/spec/westend.ts b/packages/types-known/src/spec/westend.ts similarity index 95% rename from packages/types/src/known/spec/westend.ts rename to packages/types-known/src/spec/westend.ts index 8ca872291a..d02bea8fdb 100644 --- a/packages/types/src/known/spec/westend.ts +++ b/packages/types-known/src/spec/westend.ts @@ -3,12 +3,11 @@ /* eslint-disable sort-keys */ -import type { OverrideVersionedType } from '../../types'; +import type { OverrideVersionedType } from '@polkadot/types/types'; +import { mapXcmTypes } from '@polkadot/types-create'; import { objectSpread } from '@polkadot/util'; -import { mapXcmTypes } from '../xcm'; - const sharedTypes = { // 16 validators CompactAssignments: 'CompactAssignmentsWith16', diff --git a/packages/types/src/known/upgrades/index.spec.ts b/packages/types-known/src/upgrades/index.spec.ts similarity index 100% rename from packages/types/src/known/upgrades/index.spec.ts rename to packages/types-known/src/upgrades/index.spec.ts diff --git a/packages/types/src/known/upgrades/index.ts b/packages/types-known/src/upgrades/index.ts similarity index 96% rename from packages/types/src/known/upgrades/index.ts rename to packages/types-known/src/upgrades/index.ts index 056baa3175..6cf0db3f8d 100644 --- a/packages/types/src/known/upgrades/index.ts +++ b/packages/types-known/src/upgrades/index.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { ChainUpgrades } from '../../types'; +import type { ChainUpgrades } from '@polkadot/types/types'; import type { ChainUpgradesRaw } from './types'; import { selectableNetworks } from '@polkadot/networks'; diff --git a/packages/types/src/known/upgrades/kusama.ts b/packages/types-known/src/upgrades/kusama.ts similarity index 100% rename from packages/types/src/known/upgrades/kusama.ts rename to packages/types-known/src/upgrades/kusama.ts diff --git a/packages/types/src/known/upgrades/polkadot.ts b/packages/types-known/src/upgrades/polkadot.ts similarity index 100% rename from packages/types/src/known/upgrades/polkadot.ts rename to packages/types-known/src/upgrades/polkadot.ts diff --git a/packages/types/src/known/upgrades/types.ts b/packages/types-known/src/upgrades/types.ts similarity index 100% rename from packages/types/src/known/upgrades/types.ts rename to packages/types-known/src/upgrades/types.ts diff --git a/packages/types/src/known/upgrades/westend.ts b/packages/types-known/src/upgrades/westend.ts similarity index 100% rename from packages/types/src/known/upgrades/westend.ts rename to packages/types-known/src/upgrades/westend.ts diff --git a/packages/types/src/known/index.ts b/packages/types-known/src/util.ts similarity index 89% rename from packages/types/src/known/index.ts rename to packages/types-known/src/util.ts index 82ff60a120..763b626f5b 100644 --- a/packages/types/src/known/index.ts +++ b/packages/types-known/src/util.ts @@ -1,22 +1,18 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types'; +import type { Hash } from '@polkadot/types/interfaces'; +import type { ChainUpgradeVersion, CodecHasher, DefinitionRpc, DefinitionRpcSub, OverrideModuleType, OverrideVersionedType, Registry, RegistryTypes } from '@polkadot/types/types'; import type { Text } from '@polkadot/types-codec'; import type { BN } from '@polkadot/util'; -import type { ExtDef } from '../extrinsic/signedExtensions/types'; -import type { Hash } from '../interfaces'; -import type { ChainUpgradeVersion, CodecHasher, DefinitionRpc, DefinitionRpcSub, OverrideModuleType, OverrideVersionedType, Registry, RegistryTypes } from '../types'; import { bnToBn, isNull, isUndefined, objectSpread } from '@polkadot/util'; import typesChain from './chain'; -import typesModules from './modules'; import typesSpec from './spec'; import upgrades from './upgrades'; -export { knownOrigins } from './knownOrigins'; -export { mapXcmTypes } from './xcm'; - function withNames (chainName: Text | string, specName: Text | string, fn: (c: string, s: string) => T): T { return fn(chainName.toString(), specName.toString()); } @@ -34,16 +30,6 @@ function filterVersions (versions: OverrideVersionedType[] = [], specVersion: nu ); } -/** - * @description Get types for specific modules (metadata override) - */ -export function getModuleTypes ({ knownTypes }: Registry, section: string): OverrideModuleType { - return objectSpread({}, - typesModules[section], - knownTypes.typesAlias?.[section] - ); -} - /** * @description Based on the chain and runtimeVersion, get the applicable signed extensions (ready for registration) */ diff --git a/packages/types-known/tsconfig.json b/packages/types-known/tsconfig.json index 062eb84f27..44e0540f69 100644 --- a/packages/types-known/tsconfig.json +++ b/packages/types-known/tsconfig.json @@ -6,6 +6,7 @@ "rootDir": "./src" }, "references": [ - { "path": "../types" } + { "path": "../types" }, + { "path": "../types-create" } ] } diff --git a/packages/types/src/bundle.ts b/packages/types/src/bundle.ts index a297c66742..b57e44974d 100644 --- a/packages/types/src/bundle.ts +++ b/packages/types/src/bundle.ts @@ -7,7 +7,6 @@ import rpcDefinitions from './interfaces/jsonrpc'; export * from './codec'; export * from './create'; export * from './index.types'; -export * from './known'; export * from './metadata'; export { TypeDefInfo } from '@polkadot/types-create'; diff --git a/packages/types/src/known/index.spec.ts b/packages/types/src/interfaces/alias.spec.ts similarity index 77% rename from packages/types/src/known/index.spec.ts rename to packages/types/src/interfaces/alias.spec.ts index 34acda6e5d..083397d5ed 100644 --- a/packages/types/src/known/index.spec.ts +++ b/packages/types/src/interfaces/alias.spec.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { TypeRegistry } from '../create/registry'; -import { getModuleTypes } from '.'; +import { getAliasTypes } from './alias'; const registry = new TypeRegistry(); @@ -22,25 +22,25 @@ registry.setKnownTypes({ describe('getModuleTypes', (): void => { it('collects the pre-defined types for contracts', (): void => { - expect(getModuleTypes(registry, 'contracts')).toEqual({ + expect(getAliasTypes(registry, 'contracts')).toEqual({ StorageKey: 'ContractStorageKey' }); }); it('collects the user-defined types for testModule', (): void => { - expect(getModuleTypes(registry, 'testModule')).toEqual({ + expect(getAliasTypes(registry, 'testModule')).toEqual({ Proposal: 'TestProposal' }); }); it('overrides pre-defined with user-defined for treasury', (): void => { - expect(getModuleTypes(registry, 'treasury')).toEqual({ + expect(getAliasTypes(registry, 'treasury')).toEqual({ Proposal: 'TreasuryProposals2' }); }); it('merges pre-defined and user-defined for identity', (): void => { - expect(getModuleTypes(registry, 'identity')).toEqual({ + expect(getAliasTypes(registry, 'identity')).toEqual({ Id: 'IdentityId', Judgement: 'IdentityJudgement' }); diff --git a/packages/types/src/known/modules.ts b/packages/types/src/interfaces/alias.ts similarity index 83% rename from packages/types/src/known/modules.ts rename to packages/types/src/interfaces/alias.ts index 148ba37b40..c8f5184446 100644 --- a/packages/types/src/known/modules.ts +++ b/packages/types/src/interfaces/alias.ts @@ -1,10 +1,12 @@ // Copyright 2017-2021 @polkadot/types-known authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { OverrideModuleType } from '../types'; +import type { OverrideModuleType, Registry } from '../types'; + +import { objectSpread } from '@polkadot/util'; // type overrides for modules (where duplication between modules exist) -const typesModules: Record = { +const typesAlias: Record = { assets: { Approval: 'AssetApproval', ApprovalKey: 'AssetApprovalKey', @@ -105,4 +107,12 @@ const typesModules: Record = { } }; -export default typesModules; +/** + * @description Get types for specific modules (metadata override) + */ +export function getAliasTypes ({ knownTypes }: Registry, section: string): OverrideModuleType { + return objectSpread({}, + typesAlias[section], + knownTypes.typesAlias?.[section] + ); +} diff --git a/packages/types/src/interfaces/runtime/definitions.ts b/packages/types/src/interfaces/runtime/definitions.ts index 3e2ab778ed..32f7dc766d 100644 --- a/packages/types/src/interfaces/runtime/definitions.ts +++ b/packages/types/src/interfaces/runtime/definitions.ts @@ -24,6 +24,27 @@ const numberTypes = { Perquintill: 'UInt<64, Perquintill>' }; +// Since we don't have insight into the origin specification, we can only define what we know about +// in a pure Substrate/Polkadot implementation, any other custom origins won't be handled at all +export const knownOrigins: Record = { + // + // (1) Defaults from Substrate + // + Council: 'CollectiveOrigin', + System: 'SystemOrigin', + TechnicalCommittee: 'CollectiveOrigin', + // + // (2) Defaults from Polkadot + // + Xcm: 'XcmOrigin', + XcmPallet: 'XcmOrigin', + // + // (3) Defaults from Acala + // + Authority: 'AuthorityOrigin', + GeneralCouncil: 'CollectiveOrigin' +}; + export default { rpc: {}, types: objectSpread({}, numberTypes, { diff --git a/packages/types/src/interfaces/xcm/definitions.ts b/packages/types/src/interfaces/xcm/definitions.ts index e701c5a3c4..973ebf3780 100644 --- a/packages/types/src/interfaces/xcm/definitions.ts +++ b/packages/types/src/interfaces/xcm/definitions.ts @@ -6,9 +6,9 @@ import type { Definitions } from '../../types'; +import { mapXcmTypes } from '@polkadot/types-create'; import { objectSpread } from '@polkadot/util'; -import { mapXcmTypes } from '../../known'; import { v0 } from './v0'; import { v1 } from './v1'; import { v2 } from './v2'; diff --git a/packages/types/src/known/knownOrigins.ts b/packages/types/src/known/knownOrigins.ts deleted file mode 100644 index 062fcad1ff..0000000000 --- a/packages/types/src/known/knownOrigins.ts +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-known authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// We want predictive ordering (manually managed) -/* eslint-disable sort-keys */ - -// Since we don't have insight into the origin specification, we can only define what we know about -// in a pure Substrate/Polkadot implementation, any other custom origins won't be handled at all -export const knownOrigins: Record = { - // - // (1) Defaults from Substrate - // - Council: 'CollectiveOrigin', - System: 'SystemOrigin', - TechnicalCommittee: 'CollectiveOrigin', - // - // (2) Defaults from Polkadot - // - Xcm: 'XcmOrigin', - XcmPallet: 'XcmOrigin', - // - // (3) Defaults from Acala - // - Authority: 'AuthorityOrigin', - GeneralCouncil: 'CollectiveOrigin' -}; diff --git a/packages/types/src/metadata/v13/toV14.ts b/packages/types/src/metadata/v13/toV14.ts index e0afe9a1a7..9cbb77303c 100644 --- a/packages/types/src/metadata/v13/toV14.ts +++ b/packages/types/src/metadata/v13/toV14.ts @@ -9,7 +9,8 @@ import type { OverrideModuleType, Registry } from '../../types'; import { stringCamelCase } from '@polkadot/util'; -import { getModuleTypes, knownOrigins } from '../../known'; +import { getAliasTypes } from '../../interfaces/alias'; +import { knownOrigins } from '../../interfaces/runtime/definitions'; interface MapDef { hashers: StorageHasherV13[]; @@ -289,7 +290,7 @@ function convertExtrinsic (registry: CodecRegistry, { signedExtensions, version /** @internal */ function createPallet (compatTypes: TypeSpec[], registry: CodecRegistry, mod: ModuleMetadataV13, { calls, constants, errors, events, storage }: { calls: FunctionMetadataV13[] | null, constants: ModuleConstantMetadataV13[], errors: ErrorMetadataV13[] | null, events: EventMetadataV13[] | null, storage: StorageMetadataV13 | null }): PalletMetadataV14 { - const sectionTypes = getModuleTypes(registry as Registry, stringCamelCase(mod.name)); + const sectionTypes = getAliasTypes(registry as Registry, stringCamelCase(mod.name)); return registry.createTypeUnsafe('PalletMetadataV14', [{ calls: calls && convertCalls(compatTypes, registry, mod.name, calls, sectionTypes), diff --git a/rollup.config.mjs b/rollup.config.mjs index 0e8476eaf0..daaf388c5f 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -25,7 +25,7 @@ function expand (prefix, all) { const entries = [ 'api-derive', ...expand('rpc', ['core', 'provider']), - ...expand('types', ['codec', 'create', 'known']) + ...expand('types', ['codec', 'create', 'helpers', 'known']) ].reduce((all, p) => ({ ...all, [`@polkadot/${p}`]: path.resolve(process.cwd(), `packages/${p}/build/bundle.js`)