diff --git a/packages/api-derive/src/accounts/indexToId.ts b/packages/api-derive/src/accounts/indexToId.ts index 65ad27455a..37ab9444a2 100644 --- a/packages/api-derive/src/accounts/indexToId.ts +++ b/packages/api-derive/src/accounts/indexToId.ts @@ -8,7 +8,7 @@ import { ITuple } from '@polkadot/types/types'; import { Observable, of } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; -import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex'; +import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex'; import { ClassOf, Option, Vec, createType } from '@polkadot/types'; import { memo } from '../util'; diff --git a/packages/api-derive/src/accounts/indexes.ts b/packages/api-derive/src/accounts/indexes.ts index 0282329ecb..6f0d64dd2c 100644 --- a/packages/api-derive/src/accounts/indexes.ts +++ b/packages/api-derive/src/accounts/indexes.ts @@ -8,7 +8,7 @@ import { AccountIndexes } from '../types'; import { Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex'; +import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex'; import { Vec, createType } from '@polkadot/types'; import { memo } from '../util'; diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts index b2eb54c42e..e37452eb96 100644 --- a/packages/api/src/base/Decorate.ts +++ b/packages/api/src/base/Decorate.ts @@ -20,7 +20,7 @@ import RpcCore from '@polkadot/rpc-core'; import { WsProvider } from '@polkadot/rpc-provider'; import { Metadata, Null, Option, Text, TypeRegistry, u64, Vec } from '@polkadot/types'; import Linkage, { LinkageResult } from '@polkadot/types/codec/Linkage'; -import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/primitive/Extrinsic/constants'; +import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/extrinsic/constants'; import StorageKey, { StorageEntry } from '@polkadot/types/primitive/StorageKey'; import { assert, compactStripLength, isNull, isUndefined, u8aConcat, u8aToHex } from '@polkadot/util'; diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts index 651fba0fbc..3a37eebec5 100644 --- a/packages/api/src/base/Init.ts +++ b/packages/api/src/base/Init.ts @@ -8,8 +8,8 @@ import { ApiBase, ApiOptions, ApiTypes, DecorateMethod } from '../types'; import { Subscription, combineLatest, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { Metadata, Text } from '@polkadot/types'; +import { LATEST_EXTRINSIC_VERSION } from '@polkadot/types/extrinsic/Extrinsic'; import { getMetadataTypes, getSpecTypes, getUserTypes } from '@polkadot/types/known'; -import { LATEST_EXTRINSIC_VERSION } from '@polkadot/types/primitive/Extrinsic/Extrinsic'; import { logger } from '@polkadot/util'; import { cryptoWaitReady } from '@polkadot/util-crypto'; diff --git a/packages/typegen/src/metadataMd.ts b/packages/typegen/src/metadataMd.ts index b0b349d45d..4bbc201115 100644 --- a/packages/typegen/src/metadataMd.ts +++ b/packages/typegen/src/metadataMd.ts @@ -8,8 +8,8 @@ import fs from 'fs'; import interfaces from '@polkadot/jsonrpc'; import Decorated from '@polkadot/metadata/Decorated'; import rpcdata from '@polkadot/metadata/Metadata/static'; +import Call from '@polkadot/types/generic/Call'; import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey'; -import Call from '@polkadot/types/primitive/Generic/Call'; import { TypeRegistry } from '@polkadot/types/create'; import { Vec } from '@polkadot/types/codec'; import { Text } from '@polkadot/types/primitive'; diff --git a/packages/typegen/src/util/derived.ts b/packages/typegen/src/util/derived.ts index 1cb076511a..4f24461816 100644 --- a/packages/typegen/src/util/derived.ts +++ b/packages/typegen/src/util/derived.ts @@ -14,9 +14,9 @@ import Enum from '@polkadot/types/codec/Enum'; import Option from '@polkadot/types/codec/Option'; import Struct from '@polkadot/types/codec/Struct'; import Vec from '@polkadot/types/codec/Vec'; -import GenericAccountId from '@polkadot/types/primitive/Generic/AccountId'; -import GenericAddress from '@polkadot/types/primitive/Generic/Address'; -import Vote, { convictionNames as _voteConvictions } from '@polkadot/types/primitive/Generic/Vote'; +import GenericAccountId from '@polkadot/types/generic/AccountId'; +import GenericAddress from '@polkadot/types/generic/Address'; +import Vote, { convictionNames as _voteConvictions } from '@polkadot/types/generic/Vote'; import Null from '@polkadot/types/primitive/Null'; import * as primitiveClasses from '@polkadot/types/primitive'; diff --git a/packages/typegen/src/util/formatting.ts b/packages/typegen/src/util/formatting.ts index 406ca30467..dc9f07872a 100644 --- a/packages/typegen/src/util/formatting.ts +++ b/packages/typegen/src/util/formatting.ts @@ -28,6 +28,14 @@ export function createImportCode (header: string, imports: TypeImports, checks: .keys(imports.codecTypes) .filter((name): boolean => name !== 'Tuple') }, + { + file: '@polkadot/types/extrinsic', + types: Object.keys(imports.extrinsicTypes) + }, + { + file: '@polkadot/types/generic', + types: Object.keys(imports.genericTypes) + }, { file: '@polkadot/types/primitive', types: Object diff --git a/packages/typegen/src/util/imports.ts b/packages/typegen/src/util/imports.ts index 5c4c1b2216..ac8ca6b7c3 100644 --- a/packages/typegen/src/util/imports.ts +++ b/packages/typegen/src/util/imports.ts @@ -6,6 +6,8 @@ import { TypeDefInfo } from '@polkadot/types/create/types'; import * as codecClasses from '@polkadot/types/codec'; import { getTypeDef } from '@polkadot/types/create'; +import * as extrinsicClasses from '@polkadot/types/extrinsic'; +import * as genericClasses from '@polkadot/types/generic'; import * as primitiveClasses from '@polkadot/types/primitive'; // these map all the codec and primitive types for import, see the TypeImports below. If @@ -18,8 +20,10 @@ type TypeExistMap = Record; export interface TypeImports { codecTypes: TypeExist; // `import {} from '@polkadot/types/codec` - localTypes: TypeExistMap; // `import {} from '../something'` + extrinsicTypes: TypeExist; // `import {} from '@polkadot/types/extrinsic` + genericTypes: TypeExist; // `import {} from '@polkadot/types/generic` ignoredTypes: string[]; // No need to import these types + localTypes: TypeExistMap; // `import {} from '../something'` primitiveTypes: TypeExist; // `import {} from '@polkadot/types/primitive` typesTypes: TypeExist; // `import {} from '@polkadot/types/types` definitions: object; // all definitions @@ -31,7 +35,7 @@ export interface TypeImports { // imports in the output file, dep-duped and sorted /** @internal */ export function setImports (allDefs: object, imports: TypeImports, types: string[]): void { - const { codecTypes, localTypes, ignoredTypes, primitiveTypes, typesTypes } = imports; + const { codecTypes, extrinsicTypes, genericTypes, ignoredTypes, localTypes, primitiveTypes, typesTypes } = imports; types.forEach((type): void => { if (ignoredTypes.includes(type)) { @@ -40,6 +44,10 @@ export function setImports (allDefs: object, imports: TypeImports, types: string typesTypes[type] = true; } else if ((codecClasses as any)[type]) { codecTypes[type] = true; + } else if ((extrinsicClasses as any)[type]) { + extrinsicTypes[type] = true; + } else if ((genericClasses as any)[type]) { + genericTypes[type] = true; } else if ((primitiveClasses as any)[type] || type === 'Metadata') { primitiveTypes[type] = true; } else if (type.includes('<') || type.includes('(') || type.includes('[')) { @@ -97,12 +105,14 @@ export function createImports (importDefinitions: Record, { type return { codecTypes: {}, + extrinsicTypes: {}, + genericTypes: {}, + ignoredTypes: Object.keys(types), localTypes: Object.keys(definitions).reduce((local: Record, mod): Record => { local[mod] = {}; return local; }, {}), - ignoredTypes: Object.keys(types), primitiveTypes: {}, typesTypes: {}, definitions, diff --git a/packages/types/src/codec/Struct.spec.ts b/packages/types/src/codec/Struct.spec.ts index 9444e8174d..316dee6678 100644 --- a/packages/types/src/codec/Struct.spec.ts +++ b/packages/types/src/codec/Struct.spec.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { ClassOf, TypeRegistry } from '../create'; -import AccountId from '../primitive/Generic/AccountId'; +import AccountId from '../generic/AccountId'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; import { CodecTo } from '../types'; diff --git a/packages/types/src/codec/Vec.spec.ts b/packages/types/src/codec/Vec.spec.ts index eda11a5c1f..34afa06f0f 100644 --- a/packages/types/src/codec/Vec.spec.ts +++ b/packages/types/src/codec/Vec.spec.ts @@ -9,7 +9,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import { createTypeUnsafe, TypeRegistry } from '../create'; -import AccountId from '../primitive/Generic/AccountId'; +import AccountId from '../generic/AccountId'; import Text from '../primitive/Text'; import Vec from './Vec'; import Tuple from './Tuple'; diff --git a/packages/types/src/create/registry.ts b/packages/types/src/create/registry.ts index ded301a0d1..2d2c8925b6 100644 --- a/packages/types/src/create/registry.ts +++ b/packages/types/src/create/registry.ts @@ -10,8 +10,8 @@ import extrinsicsFromMeta from '@polkadot/metadata/Decorated/extrinsics/fromMeta import { assert, formatBalance, isFunction, isString, isU8a, isUndefined, stringCamelCase, u8aToHex } from '@polkadot/util'; import Raw from '../codec/Raw'; -import { EventData } from '../primitive/Generic/Event'; -import { defaultExtensions, expandExtensionTypes, findUnknownExtensions } from '../primitive/Extrinsic/signedExtensions'; +import { defaultExtensions, expandExtensionTypes, findUnknownExtensions } from '../extrinsic/signedExtensions'; +import { EventData } from '../generic/Event'; import Unconstructable from '../primitive/Unconstructable'; import { createClass, getTypeClass } from './createClass'; import { getTypeDef } from './getTypeDef'; diff --git a/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts b/packages/types/src/extrinsic/Extrinsic.spec.ts similarity index 99% rename from packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts rename to packages/types/src/extrinsic/Extrinsic.spec.ts index 7b9b0d8686..42184e695e 100644 --- a/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts +++ b/packages/types/src/extrinsic/Extrinsic.spec.ts @@ -6,7 +6,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import { hexToU8a } from '@polkadot/util'; -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/Extrinsic.ts b/packages/types/src/extrinsic/Extrinsic.ts similarity index 95% rename from packages/types/src/primitive/Extrinsic/Extrinsic.ts rename to packages/types/src/extrinsic/Extrinsic.ts index 8235540361..af62fce851 100644 --- a/packages/types/src/primitive/Extrinsic/Extrinsic.ts +++ b/packages/types/src/extrinsic/Extrinsic.ts @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { FunctionMetadataLatest } from '../../interfaces/metadata/types'; -import { Address, Balance, Call, EcdsaSignature, Ed25519Signature, ExtrinsicUnknown, ExtrinsicV1, ExtrinsicV2, ExtrinsicV3, ExtrinsicV4, Index, Sr25519Signature } from '../../interfaces/runtime'; -import { ArgsDef, AnyJsonObject, AnyU8a, Codec, ExtrinsicPayloadValue, IExtrinsic, IKeyringPair, InterfaceTypes, Registry, SignatureOptions } from '../../types'; +import { FunctionMetadataLatest } from '../interfaces/metadata/types'; +import { Address, Balance, Call, EcdsaSignature, Ed25519Signature, ExtrinsicUnknown, ExtrinsicV1, ExtrinsicV2, ExtrinsicV3, ExtrinsicV4, Index, Sr25519Signature } from '../interfaces/runtime'; +import { ArgsDef, AnyJsonObject, AnyU8a, Codec, ExtrinsicPayloadValue, IExtrinsic, IKeyringPair, InterfaceTypes, Registry, SignatureOptions } from '../types'; import { assert, isHex, isU8a, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../create'; -import Base from '../../codec/Base'; -import Compact from '../../codec/Compact'; +import { createType, ClassOf } from '../create'; +import Base from '../codec/Base'; +import Compact from '../codec/Compact'; import { ExtrinsicValueV1 } from './v1/Extrinsic'; import { ExtrinsicValueV2 } from './v2/Extrinsic'; import { ExtrinsicValueV3 } from './v3/Extrinsic'; @@ -89,7 +89,7 @@ export default class Extrinsic extends Base impl const [offset, length] = Compact.decodeU8a(value); const total = offset + length.toNumber(); - assert(total <= value.length, `Extrinsic: required length less than remainder, expected at least ${total}, found ${value.length}`); + assert(total <= value.length, `Extrinsic: length less than remainder, expected at least ${total}, found ${value.length}`); const data = value.subarray(offset, total); diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts b/packages/types/src/extrinsic/ExtrinsicEra.spec.ts similarity index 97% rename from packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts rename to packages/types/src/extrinsic/ExtrinsicEra.spec.ts index b622073069..c86294f36a 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts +++ b/packages/types/src/extrinsic/ExtrinsicEra.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import ExtrinsicEra from './ExtrinsicEra'; describe('ExtrinsicEra', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.ts b/packages/types/src/extrinsic/ExtrinsicEra.ts similarity index 97% rename from packages/types/src/primitive/Extrinsic/ExtrinsicEra.ts rename to packages/types/src/extrinsic/ExtrinsicEra.ts index 5b23d756dd..d51841609d 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.ts +++ b/packages/types/src/extrinsic/ExtrinsicEra.ts @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AnyU8a, IExtrinsicEra, Registry } from '../../types'; +import { AnyU8a, IExtrinsicEra, Registry } from '../types'; import BN from 'bn.js'; import { assert, bnToBn, formatNumber, hexToU8a, isHex, isU8a, isObject, u8aToBn } from '@polkadot/util'; -import Enum from '../../codec/Enum'; -import Tuple from '../../codec/Tuple'; -import Raw from '../../codec/Raw'; -import U64 from '../U64'; +import Enum from '../codec/Enum'; +import Tuple from '../codec/Tuple'; +import Raw from '../codec/Raw'; +import U64 from '../primitive/U64'; import { IMMORTAL_ERA } from './constants'; type MortalEraValue = [U64, U64]; diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts b/packages/types/src/extrinsic/ExtrinsicPayload.spec.ts similarity index 98% rename from packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts rename to packages/types/src/extrinsic/ExtrinsicPayload.spec.ts index 72a7436445..2cf3d1a35c 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts +++ b/packages/types/src/extrinsic/ExtrinsicPayload.spec.ts @@ -4,7 +4,7 @@ import { u8aToHex } from '@polkadot/util'; -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import ExtrinsicPayload from './ExtrinsicPayload'; describe('ExtrinsicPayload', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts b/packages/types/src/extrinsic/ExtrinsicPayload.ts similarity index 93% rename from packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts rename to packages/types/src/extrinsic/ExtrinsicPayload.ts index ad151ebba4..49e3f39087 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/ExtrinsicPayload.ts @@ -2,16 +2,16 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Balance, ExtrinsicPayloadV1, ExtrinsicPayloadV2, ExtrinsicPayloadV3, ExtrinsicPayloadV4, Hash, Index } from '../../interfaces/runtime'; -import { AnyJsonObject, BareOpts, ExtrinsicPayloadValue, IKeyringPair, InterfaceTypes, Registry } from '../../types'; +import { Balance, ExtrinsicPayloadV1, ExtrinsicPayloadV2, ExtrinsicPayloadV3, ExtrinsicPayloadV4, Hash, Index } from '../interfaces/runtime'; +import { AnyJsonObject, BareOpts, ExtrinsicPayloadValue, IKeyringPair, InterfaceTypes, Registry } from '../types'; import { u8aToHex } from '@polkadot/util'; -import { createType } from '../../create'; -import Base from '../../codec/Base'; -import Compact from '../../codec/Compact'; -import Raw from '../../codec/Raw'; -import u32 from '../../primitive/U32'; +import { createType } from '../create'; +import Base from '../codec/Base'; +import Compact from '../codec/Compact'; +import Raw from '../codec/Raw'; +import u32 from '../primitive/U32'; import ExtrinsicEra from './ExtrinsicEra'; import { DEFAULT_VERSION } from './constants'; diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayloadUnknown.ts b/packages/types/src/extrinsic/ExtrinsicPayloadUnknown.ts similarity index 89% rename from packages/types/src/primitive/Extrinsic/ExtrinsicPayloadUnknown.ts rename to packages/types/src/extrinsic/ExtrinsicPayloadUnknown.ts index 5b4d22616e..d698c9e47c 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayloadUnknown.ts +++ b/packages/types/src/extrinsic/ExtrinsicPayloadUnknown.ts @@ -2,10 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Registry } from '../../types'; +import { Registry } from '../types'; import { ExtrinsicPayloadOptions } from './types'; -import Struct from '../../codec/Struct'; +import Struct from '../codec/Struct'; /** * @name GenericExtrinsicPayloadUnknown diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicUnknown.ts b/packages/types/src/extrinsic/ExtrinsicUnknown.ts similarity index 90% rename from packages/types/src/primitive/Extrinsic/ExtrinsicUnknown.ts rename to packages/types/src/extrinsic/ExtrinsicUnknown.ts index ef10fdddd2..1197719f50 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicUnknown.ts +++ b/packages/types/src/extrinsic/ExtrinsicUnknown.ts @@ -2,10 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Registry } from '../../types'; +import { Registry } from '../types'; import { ExtrinsicOptions } from './types'; -import Struct from '../../codec/Struct'; +import Struct from '../codec/Struct'; import { UNMASK_VERSION } from './constants'; /** diff --git a/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts b/packages/types/src/extrinsic/SignerPayload.spec.ts similarity index 98% rename from packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts rename to packages/types/src/extrinsic/SignerPayload.spec.ts index d8b42dc70f..65c3219f78 100644 --- a/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts +++ b/packages/types/src/extrinsic/SignerPayload.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; -import { createType, TypeRegistry } from '../../create'; +import { createType, TypeRegistry } from '../create'; import SignerPayload from './SignerPayload'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/SignerPayload.ts b/packages/types/src/extrinsic/SignerPayload.ts similarity index 91% rename from packages/types/src/primitive/Extrinsic/SignerPayload.ts rename to packages/types/src/extrinsic/SignerPayload.ts index cc14b253ef..004d9fc390 100644 --- a/packages/types/src/primitive/Extrinsic/SignerPayload.ts +++ b/packages/types/src/extrinsic/SignerPayload.ts @@ -2,13 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { Address, Balance, BlockNumber, Call, ExtrinsicEra, Hash, Index, RuntimeVersion } from '../interfaces'; +import { Codec, Constructor, ISignerPayload, SignerPayloadJSON, SignerPayloadRaw } from '../types'; + import { u8aToHex } from '@polkadot/util'; -import { Address, Balance, BlockNumber, Call, ExtrinsicEra, Hash, Index, RuntimeVersion } from '../../interfaces'; -import Compact from '../../codec/Compact'; -import Struct from '../../codec/Struct'; -import { createType } from '../../create'; -import { Codec, Constructor, ISignerPayload, SignerPayloadJSON, SignerPayloadRaw } from '../../types'; -import u8 from '../U8'; + +import { createType } from '../create'; +import Compact from '../codec/Compact'; +import Struct from '../codec/Struct'; +import u8 from '../primitive/U8'; export interface SignerPayloadType extends Codec { address: Address; diff --git a/packages/types/src/primitive/Extrinsic/constants.ts b/packages/types/src/extrinsic/constants.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/constants.ts rename to packages/types/src/extrinsic/constants.ts diff --git a/packages/types/src/primitive/Extrinsic/index.ts b/packages/types/src/extrinsic/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/index.ts rename to packages/types/src/extrinsic/index.ts diff --git a/packages/types/src/primitive/Extrinsic/signedExtensions/index.ts b/packages/types/src/extrinsic/signedExtensions/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/signedExtensions/index.ts rename to packages/types/src/extrinsic/signedExtensions/index.ts diff --git a/packages/types/src/primitive/Extrinsic/signedExtensions/polkadot.ts b/packages/types/src/extrinsic/signedExtensions/polkadot.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/signedExtensions/polkadot.ts rename to packages/types/src/extrinsic/signedExtensions/polkadot.ts diff --git a/packages/types/src/primitive/Extrinsic/signedExtensions/substrate.ts b/packages/types/src/extrinsic/signedExtensions/substrate.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/signedExtensions/substrate.ts rename to packages/types/src/extrinsic/signedExtensions/substrate.ts diff --git a/packages/types/src/primitive/Extrinsic/signedExtensions/types.ts b/packages/types/src/extrinsic/signedExtensions/types.ts similarity index 88% rename from packages/types/src/primitive/Extrinsic/signedExtensions/types.ts rename to packages/types/src/extrinsic/signedExtensions/types.ts index 960f425602..fe0ca24abe 100644 --- a/packages/types/src/primitive/Extrinsic/signedExtensions/types.ts +++ b/packages/types/src/extrinsic/signedExtensions/types.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { InterfaceTypes } from '../../../types'; +import { InterfaceTypes } from '../../types'; export type ExtTypes = Record; diff --git a/packages/types/src/primitive/Extrinsic/types.ts b/packages/types/src/extrinsic/types.ts similarity index 92% rename from packages/types/src/primitive/Extrinsic/types.ts rename to packages/types/src/extrinsic/types.ts index e89f20af99..2d139f9405 100644 --- a/packages/types/src/primitive/Extrinsic/types.ts +++ b/packages/types/src/extrinsic/types.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AnyNumber } from '../../types'; +import { AnyNumber } from '../types'; export interface ExtrinsicOptions { isSigned: boolean; diff --git a/packages/types/src/primitive/Extrinsic/util.ts b/packages/types/src/extrinsic/util.ts similarity index 93% rename from packages/types/src/primitive/Extrinsic/util.ts rename to packages/types/src/extrinsic/util.ts index e7f62acfbf..bf4057c0e2 100644 --- a/packages/types/src/primitive/Extrinsic/util.ts +++ b/packages/types/src/extrinsic/util.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { SignOptions } from '@polkadot/keyring/types'; -import { IKeyringPair } from '../../types'; +import { IKeyringPair } from '../types'; import { blake2AsU8a } from '@polkadot/util-crypto'; diff --git a/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts b/packages/types/src/extrinsic/v1/Extrinsic.ts similarity index 92% rename from packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts rename to packages/types/src/extrinsic/v1/Extrinsic.ts index f6f3a7ac58..f6491cb14f 100644 --- a/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts +++ b/packages/types/src/extrinsic/v1/Extrinsic.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Call, ExtrinsicSignatureV1 } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Call, ExtrinsicSignatureV1 } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType } from '../../../create'; -import Struct from '../../../codec/Struct'; +import { createType } from '../../create'; +import Struct from '../../codec/Struct'; export interface ExtrinsicValueV1 { method?: Call; diff --git a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicPayload.ts b/packages/types/src/extrinsic/v1/ExtrinsicPayload.ts similarity index 89% rename from packages/types/src/primitive/Extrinsic/v1/ExtrinsicPayload.ts rename to packages/types/src/extrinsic/v1/ExtrinsicPayload.ts index 12736db268..0998c40691 100644 --- a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/v1/ExtrinsicPayload.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Hash, ExtrinsicEra, Index } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../../types'; +import { Hash, ExtrinsicEra, Index } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../types'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; -import Bytes from '../../../primitive/Bytes'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; +import Bytes from '../../primitive/Bytes'; import { sign } from '../util'; /** diff --git a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v1/ExtrinsicSignature.ts similarity index 95% rename from packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts rename to packages/types/src/extrinsic/v1/ExtrinsicSignature.ts index d3e6718dd2..b85bc222b5 100644 --- a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v1/ExtrinsicSignature.ts @@ -2,13 +2,13 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicSignatureOptions } from '../types'; -import { createType } from '../../../create'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; +import { createType } from '../../create'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; import ExtrinsicPayloadV1 from './ExtrinsicPayload'; diff --git a/packages/types/src/primitive/Extrinsic/v1/index.ts b/packages/types/src/extrinsic/v1/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/v1/index.ts rename to packages/types/src/extrinsic/v1/index.ts diff --git a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts b/packages/types/src/extrinsic/v2/Extrinsic.spec.ts similarity index 98% rename from packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts rename to packages/types/src/extrinsic/v2/Extrinsic.spec.ts index 21333787fa..4a9a3c7097 100644 --- a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts +++ b/packages/types/src/extrinsic/v2/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import testingPairs from '@polkadot/keyring/testingPairs'; -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts b/packages/types/src/extrinsic/v2/Extrinsic.ts similarity index 92% rename from packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts rename to packages/types/src/extrinsic/v2/Extrinsic.ts index b6d77917b0..5e742a50d4 100644 --- a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts +++ b/packages/types/src/extrinsic/v2/Extrinsic.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Call, ExtrinsicSignatureV2 } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Call, ExtrinsicSignatureV2 } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../create'; -import Struct from '../../../codec/Struct'; +import { createType, ClassOf } from '../../create'; +import Struct from '../../codec/Struct'; const TRANSACTION_VERSION = 2; diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicPayload.ts b/packages/types/src/extrinsic/v2/ExtrinsicPayload.ts similarity index 88% rename from packages/types/src/primitive/Extrinsic/v2/ExtrinsicPayload.ts rename to packages/types/src/extrinsic/v2/ExtrinsicPayload.ts index 488eaea6f9..14e9116296 100644 --- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/v2/ExtrinsicPayload.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Balance, ExtrinsicEra, Hash, Index } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../../types'; +import { Balance, ExtrinsicEra, Hash, Index } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../types'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; -import Bytes from '../../../primitive/Bytes'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; +import Bytes from '../../primitive/Bytes'; import { sign } from '../util'; /** diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts b/packages/types/src/extrinsic/v2/ExtrinsicSignature.spec.ts similarity index 95% rename from packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts rename to packages/types/src/extrinsic/v2/ExtrinsicSignature.spec.ts index 2535115dab..9cf9e8ec92 100644 --- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts +++ b/packages/types/src/extrinsic/v2/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV2', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts similarity index 95% rename from packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts rename to packages/types/src/extrinsic/v2/ExtrinsicSignature.ts index 1d868aa088..6bfcda6e20 100644 --- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts @@ -2,13 +2,13 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicSignatureOptions } from '../types'; -import { createType } from '../../../create'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; +import { createType } from '../../create'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; import ExtrinsicPayloadV2 from './ExtrinsicPayload'; diff --git a/packages/types/src/primitive/Extrinsic/v2/index.ts b/packages/types/src/extrinsic/v2/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/v2/index.ts rename to packages/types/src/extrinsic/v2/index.ts diff --git a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts b/packages/types/src/extrinsic/v3/Extrinsic.spec.ts similarity index 98% rename from packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts rename to packages/types/src/extrinsic/v3/Extrinsic.spec.ts index e38d2c80e0..5028bc736a 100644 --- a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts +++ b/packages/types/src/extrinsic/v3/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import testingPairs from '@polkadot/keyring/testingPairs'; -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts b/packages/types/src/extrinsic/v3/Extrinsic.ts similarity index 92% rename from packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts rename to packages/types/src/extrinsic/v3/Extrinsic.ts index 5494bc52f3..2e1f145cb6 100644 --- a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts +++ b/packages/types/src/extrinsic/v3/Extrinsic.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Call, ExtrinsicSignatureV3 } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Call, ExtrinsicSignatureV3 } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../create'; -import Struct from '../../../codec/Struct'; +import { createType, ClassOf } from '../../create'; +import Struct from '../../codec/Struct'; const TRANSACTION_VERSION = 3; diff --git a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicPayload.ts b/packages/types/src/extrinsic/v3/ExtrinsicPayload.ts similarity index 88% rename from packages/types/src/primitive/Extrinsic/v3/ExtrinsicPayload.ts rename to packages/types/src/extrinsic/v3/ExtrinsicPayload.ts index 4cd4dd2604..995f2e4bb6 100644 --- a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/v3/ExtrinsicPayload.ts @@ -2,13 +2,13 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Balance, ExtrinsicEra, Hash, Index } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../../types'; +import { Balance, ExtrinsicEra, Hash, Index } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../types'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; -import Bytes from '../../../primitive/Bytes'; -import u32 from '../../../primitive/U32'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; +import Bytes from '../../primitive/Bytes'; +import u32 from '../../primitive/U32'; import { sign } from '../util'; /** diff --git a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts b/packages/types/src/extrinsic/v3/ExtrinsicSignature.spec.ts similarity index 95% rename from packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts rename to packages/types/src/extrinsic/v3/ExtrinsicSignature.spec.ts index 9483ed903a..a7835fcd3d 100644 --- a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts +++ b/packages/types/src/extrinsic/v3/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV3', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts similarity index 94% rename from packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts rename to packages/types/src/extrinsic/v3/ExtrinsicSignature.ts index 98db320350..5e8706e63c 100644 --- a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts @@ -2,10 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Call } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, SignatureOptions } from '../../../types'; +import { Address, Call } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, SignatureOptions } from '../../types'; -import { createType } from '../../../create'; +import { createType } from '../../create'; import { IMMORTAL_ERA } from '../constants'; import ExtrinsicSignatureV2 from '../v2/ExtrinsicSignature'; import ExtrinsicPayloadV3 from './ExtrinsicPayload'; diff --git a/packages/types/src/primitive/Extrinsic/v3/index.ts b/packages/types/src/extrinsic/v3/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/v3/index.ts rename to packages/types/src/extrinsic/v3/index.ts diff --git a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts b/packages/types/src/extrinsic/v4/Extrinsic.spec.ts similarity index 98% rename from packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts rename to packages/types/src/extrinsic/v4/Extrinsic.spec.ts index 80278dc3af..082580e900 100644 --- a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts +++ b/packages/types/src/extrinsic/v4/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Decorated from '@polkadot/metadata/Decorated'; import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts b/packages/types/src/extrinsic/v4/Extrinsic.ts similarity index 92% rename from packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts rename to packages/types/src/extrinsic/v4/Extrinsic.ts index b50a95386d..79aad08f1a 100644 --- a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts +++ b/packages/types/src/extrinsic/v4/Extrinsic.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Call, ExtrinsicSignatureV4 } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Call, ExtrinsicSignatureV4 } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicImpl, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../create'; -import Struct from '../../../codec/Struct'; +import { createType, ClassOf } from '../../create'; +import Struct from '../../codec/Struct'; export const TRANSACTION_VERSION = 4; diff --git a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicPayload.ts b/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts similarity index 89% rename from packages/types/src/primitive/Extrinsic/v4/ExtrinsicPayload.ts rename to packages/types/src/extrinsic/v4/ExtrinsicPayload.ts index 3c95382a99..362e4ac377 100644 --- a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicPayload.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicPayload.ts @@ -2,13 +2,13 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Balance, ExtrinsicEra, Hash, Index } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../../types'; +import { Balance, ExtrinsicEra, Hash, Index } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IKeyringPair, Registry } from '../../types'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; -import Bytes from '../../../primitive/Bytes'; -import u32 from '../../../primitive/U32'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; +import Bytes from '../../primitive/Bytes'; +import u32 from '../../primitive/U32'; import { sign } from '../util'; /** diff --git a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts b/packages/types/src/extrinsic/v4/ExtrinsicSignature.spec.ts similarity index 96% rename from packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts rename to packages/types/src/extrinsic/v4/ExtrinsicSignature.spec.ts index abeb7284a8..11e104beb8 100644 --- a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../create'; +import { TypeRegistry } from '../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV4', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts similarity index 96% rename from packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts rename to packages/types/src/extrinsic/v4/ExtrinsicSignature.ts index 3180d0689b..a49960ef29 100644 --- a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Address, Balance, Call, EcdsaSignature, Ed25519Signature, ExtrinsicEra, Index, MultiSignature, Sr25519Signature } from '../../../interfaces/runtime'; -import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../../types'; +import { Address, Balance, Call, EcdsaSignature, Ed25519Signature, ExtrinsicEra, Index, MultiSignature, Sr25519Signature } from '../../interfaces/runtime'; +import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../types'; import { ExtrinsicSignatureOptions } from '../types'; import { u8aConcat } from '@polkadot/util'; -import { createType } from '../../../create'; -import Compact from '../../../codec/Compact'; -import Struct from '../../../codec/Struct'; +import { createType } from '../../create'; +import Compact from '../../codec/Compact'; +import Struct from '../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; import ExtrinsicPayloadV4 from './ExtrinsicPayload'; diff --git a/packages/types/src/primitive/Extrinsic/v4/index.ts b/packages/types/src/extrinsic/v4/index.ts similarity index 100% rename from packages/types/src/primitive/Extrinsic/v4/index.ts rename to packages/types/src/extrinsic/v4/index.ts diff --git a/packages/types/src/primitive/Generic/AccountId.spec.ts b/packages/types/src/generic/AccountId.spec.ts similarity index 96% rename from packages/types/src/primitive/Generic/AccountId.spec.ts rename to packages/types/src/generic/AccountId.spec.ts index 7b5f6f8d42..4851b8c5eb 100644 --- a/packages/types/src/primitive/Generic/AccountId.spec.ts +++ b/packages/types/src/generic/AccountId.spec.ts @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../create'; -import Raw from '../../codec/Raw'; -import jsonVec from '../../json/AccountIdVec.001.json'; +import { createType, TypeRegistry } from '../create'; +import Raw from '../codec/Raw'; +import jsonVec from '../json/AccountIdVec.001.json'; import AccountId from './AccountId'; describe('AccountId', (): void => { diff --git a/packages/types/src/primitive/Generic/AccountId.ts b/packages/types/src/generic/AccountId.ts similarity index 95% rename from packages/types/src/primitive/Generic/AccountId.ts rename to packages/types/src/generic/AccountId.ts index 980bf59972..309a094efc 100644 --- a/packages/types/src/primitive/Generic/AccountId.ts +++ b/packages/types/src/generic/AccountId.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AnyString, AnyU8a, Registry } from '../../types'; +import { AnyString, AnyU8a, Registry } from '../types'; import { hexToU8a, isHex, isString, isU8a, u8aToU8a } from '@polkadot/util'; import { decodeAddress, encodeAddress } from '@polkadot/util-crypto'; -import U8aFixed from '../../codec/U8aFixed'; +import U8aFixed from '../codec/U8aFixed'; /** @internal */ function decodeAccountId (value: AnyU8a | AnyString): Uint8Array { diff --git a/packages/types/src/primitive/Generic/AccountIndex.spec.ts b/packages/types/src/generic/AccountIndex.spec.ts similarity index 96% rename from packages/types/src/primitive/Generic/AccountIndex.spec.ts rename to packages/types/src/generic/AccountIndex.spec.ts index 25640d0824..4d0e123193 100644 --- a/packages/types/src/primitive/Generic/AccountIndex.spec.ts +++ b/packages/types/src/generic/AccountIndex.spec.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; -import { createType, TypeRegistry } from '../../create'; +import { createType, TypeRegistry } from '../create'; import AccountIndex from './AccountIndex'; describe('AccountIndex', (): void => { diff --git a/packages/types/src/primitive/Generic/AccountIndex.ts b/packages/types/src/generic/AccountIndex.ts similarity index 96% rename from packages/types/src/primitive/Generic/AccountIndex.ts rename to packages/types/src/generic/AccountIndex.ts index 0b04f572d3..2c559b4d3d 100644 --- a/packages/types/src/primitive/Generic/AccountIndex.ts +++ b/packages/types/src/generic/AccountIndex.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AnyNumber, Registry } from '../../types'; +import { AnyNumber, Registry } from '../types'; import BN from 'bn.js'; import { bnToBn, isBn, isNumber, isU8a, isHex } from '@polkadot/util'; import { decodeAddress, encodeAddress } from '@polkadot/util-crypto'; -import { createType } from '../../create'; -import U32 from '../U32'; +import { createType } from '../create'; +import U32 from '../primitive/U32'; export const ENUMSET_SIZE = new BN(64); diff --git a/packages/types/src/primitive/Generic/Address.spec.ts b/packages/types/src/generic/Address.spec.ts similarity index 98% rename from packages/types/src/primitive/Generic/Address.spec.ts rename to packages/types/src/generic/Address.spec.ts index 7c70314bf0..462b524b2f 100644 --- a/packages/types/src/primitive/Generic/Address.spec.ts +++ b/packages/types/src/generic/Address.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../create'; +import { createType, TypeRegistry } from '../create'; import AccountId from './AccountId'; import AccountIndex from './AccountIndex'; import Address from './Address'; diff --git a/packages/types/src/primitive/Generic/Address.ts b/packages/types/src/generic/Address.ts similarity index 97% rename from packages/types/src/primitive/Generic/Address.ts rename to packages/types/src/generic/Address.ts index 954d1c79fd..4c36eb6847 100644 --- a/packages/types/src/primitive/Generic/Address.ts +++ b/packages/types/src/generic/Address.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Registry } from '../../types'; +import { Registry } from '../types'; import BN from 'bn.js'; import { isBn, isHex, isNumber, isU8a, u8aConcat, u8aToHex, u8aToU8a, u8aToBn } from '@polkadot/util'; import { decodeAddress } from '@polkadot/util-crypto'; -import { createType } from '../../create'; -import Base from '../../codec/Base'; +import { createType } from '../create'; +import Base from '../codec/Base'; import AccountId from './AccountId'; import AccountIndex from './AccountIndex'; diff --git a/packages/types/src/primitive/Generic/Block.spec.ts b/packages/types/src/generic/Block.spec.ts similarity index 93% rename from packages/types/src/primitive/Generic/Block.spec.ts rename to packages/types/src/generic/Block.spec.ts index c9f9c5c178..fd5570cba0 100644 --- a/packages/types/src/primitive/Generic/Block.spec.ts +++ b/packages/types/src/generic/Block.spec.ts @@ -5,8 +5,8 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../create'; -import block00300 from '../../json/SignedBlock.003.00.json'; +import { TypeRegistry } from '../create'; +import block00300 from '../json/SignedBlock.003.00.json'; import Block from './Block'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Generic/Block.ts b/packages/types/src/generic/Block.ts similarity index 82% rename from packages/types/src/primitive/Generic/Block.ts rename to packages/types/src/generic/Block.ts index f93875469b..34e91c2074 100644 --- a/packages/types/src/primitive/Generic/Block.ts +++ b/packages/types/src/generic/Block.ts @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Digest, DigestItem, H256, Header } from '../../interfaces/runtime'; -import { AnyNumber, AnyU8a, Registry } from '../../types'; +import { Digest, DigestItem, H256, Header } from '../interfaces/runtime'; +import { AnyNumber, AnyU8a, Registry } from '../types'; import { blake2AsU8a } from '@polkadot/util-crypto'; -import { createType } from '../../create'; -import Extrinsic from '../Extrinsic/Extrinsic'; -import Struct from '../../codec/Struct'; -import Vec from '../../codec/Vec'; +import { createType } from '../create'; +import Extrinsic from '../extrinsic/Extrinsic'; +import Struct from '../codec/Struct'; +import Vec from '../codec/Vec'; export interface HeaderValue { digest?: Digest | { logs: DigestItem[] }; diff --git a/packages/types/src/primitive/Generic/Call.spec.ts b/packages/types/src/generic/Call.spec.ts similarity index 97% rename from packages/types/src/primitive/Generic/Call.spec.ts rename to packages/types/src/generic/Call.spec.ts index c0545ee415..fc9783352a 100644 --- a/packages/types/src/primitive/Generic/Call.spec.ts +++ b/packages/types/src/generic/Call.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import Call from './Call'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Generic/Call.ts b/packages/types/src/generic/Call.ts similarity index 96% rename from packages/types/src/primitive/Generic/Call.ts rename to packages/types/src/generic/Call.ts index f51b085d3a..3609bbf2e2 100644 --- a/packages/types/src/primitive/Generic/Call.ts +++ b/packages/types/src/generic/Call.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { FunctionArgumentMetadataLatest, FunctionMetadataLatest } from '../../interfaces/metadata'; -import { AnyJsonObject, AnyU8a, ArgsDef, CallFunction, Codec, IMethod, Registry } from '../../types'; +import { FunctionArgumentMetadataLatest, FunctionMetadataLatest } from '../interfaces/metadata'; +import { AnyJsonObject, AnyU8a, ArgsDef, CallFunction, Codec, IMethod, Registry } from '../types'; import { isHex, isObject, isU8a, u8aToHex, u8aToU8a } from '@polkadot/util'; -import { getTypeDef, getTypeClass } from '../../create'; -import Struct from '../../codec/Struct'; -import U8aFixed from '../../codec/U8aFixed'; +import { getTypeDef, getTypeClass } from '../create'; +import Struct from '../codec/Struct'; +import U8aFixed from '../codec/U8aFixed'; interface DecodeMethodInput { args: any; diff --git a/packages/types/src/primitive/Generic/ConsensusEngineId.spec.ts b/packages/types/src/generic/ConsensusEngineId.spec.ts similarity index 100% rename from packages/types/src/primitive/Generic/ConsensusEngineId.spec.ts rename to packages/types/src/generic/ConsensusEngineId.spec.ts diff --git a/packages/types/src/primitive/Generic/ConsensusEngineId.ts b/packages/types/src/generic/ConsensusEngineId.ts similarity index 93% rename from packages/types/src/primitive/Generic/ConsensusEngineId.ts rename to packages/types/src/generic/ConsensusEngineId.ts index 23002852cf..56cb8f4b3b 100644 --- a/packages/types/src/primitive/Generic/ConsensusEngineId.ts +++ b/packages/types/src/generic/ConsensusEngineId.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AccountId } from '../../interfaces/runtime'; +import { AccountId } from '../interfaces/runtime'; import BN from 'bn.js'; import { bnToBn } from '@polkadot/util'; -import { createType } from '../../create'; -import Bytes from '../Bytes'; -import U32 from '../U32'; +import { createType } from '../create'; +import Bytes from '../primitive/Bytes'; +import U32 from '../primitive/U32'; const CID_AURA = 0x61727561; // 'aura' const CID_BABE = 0x45424142; // 'BABE' diff --git a/packages/types/src/primitive/Generic/Digest.spec.ts b/packages/types/src/generic/Digest.spec.ts similarity index 90% rename from packages/types/src/primitive/Generic/Digest.spec.ts rename to packages/types/src/generic/Digest.spec.ts index ca423b95dc..53c156b775 100644 --- a/packages/types/src/primitive/Generic/Digest.spec.ts +++ b/packages/types/src/generic/Digest.spec.ts @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../create'; -import json3 from '../../json/Header.003.json'; -import block1 from '../../json/SignedBlock.003.00.json'; +import { TypeRegistry } from '../create'; +import json3 from '../json/Header.003.json'; +import block1 from '../json/SignedBlock.003.00.json'; import Digest from './Digest'; describe('Digest', (): void => { diff --git a/packages/types/src/primitive/Generic/Digest.ts b/packages/types/src/generic/Digest.ts similarity index 88% rename from packages/types/src/primitive/Generic/Digest.ts rename to packages/types/src/generic/Digest.ts index bd4dda1498..342e657669 100644 --- a/packages/types/src/primitive/Generic/Digest.ts +++ b/packages/types/src/generic/Digest.ts @@ -2,11 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { DigestItem } from '../../interfaces/runtime'; -import { Registry, AnyJsonObject } from '../../types'; +import { DigestItem } from '../interfaces/runtime'; +import { Registry, AnyJsonObject } from '../types'; -import Struct from '../../codec/Struct'; -import Vec from '../../codec/Vec'; +import Struct from '../codec/Struct'; +import Vec from '../codec/Vec'; /** * @name Digest diff --git a/packages/types/src/primitive/Generic/Event.ts b/packages/types/src/generic/Event.ts similarity index 92% rename from packages/types/src/primitive/Generic/Event.ts rename to packages/types/src/generic/Event.ts index 05a72579d5..f1fd3aa4f6 100644 --- a/packages/types/src/primitive/Generic/Event.ts +++ b/packages/types/src/generic/Event.ts @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef } from '../../create/types'; -import { EventMetadataLatest } from '../../interfaces/metadata'; -import { EventId } from '../../interfaces/system'; -import { AnyJsonObject, Constructor, Registry, RegistryMetadataEvent } from '../../types'; +import { TypeDef } from '../create/types'; +import { EventMetadataLatest } from '../interfaces/metadata'; +import { EventId } from '../interfaces/system'; +import { AnyJsonObject, Constructor, Registry, RegistryMetadataEvent } from '../types'; -import Struct from '../../codec/Struct'; -import Tuple from '../../codec/Tuple'; -import Null from '../Null'; +import Struct from '../codec/Struct'; +import Tuple from '../codec/Tuple'; +import Null from '../primitive/Null'; /** * @name EventData diff --git a/packages/types/src/primitive/Generic/Origin.spec.ts b/packages/types/src/generic/Origin.spec.ts similarity index 90% rename from packages/types/src/primitive/Generic/Origin.spec.ts rename to packages/types/src/generic/Origin.spec.ts index 9be2074f3b..ecfa11d65f 100644 --- a/packages/types/src/primitive/Generic/Origin.spec.ts +++ b/packages/types/src/generic/Origin.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import Origin from './Origin'; describe('Origin', (): void => { diff --git a/packages/types/src/primitive/Generic/Origin.ts b/packages/types/src/generic/Origin.ts similarity index 88% rename from packages/types/src/primitive/Generic/Origin.ts rename to packages/types/src/generic/Origin.ts index 8b796e20ff..0a734645a4 100644 --- a/packages/types/src/primitive/Generic/Origin.ts +++ b/packages/types/src/generic/Origin.ts @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Registry } from '../../types'; +import { Registry } from '../types'; -import Null from '../Null'; +import Null from '../primitive/Null'; /** * @name Origin diff --git a/packages/types/src/primitive/Generic/Vote.spec.ts b/packages/types/src/generic/Vote.spec.ts similarity index 98% rename from packages/types/src/primitive/Generic/Vote.spec.ts rename to packages/types/src/generic/Vote.spec.ts index 60691568c2..67db1ebbd6 100644 --- a/packages/types/src/primitive/Generic/Vote.spec.ts +++ b/packages/types/src/generic/Vote.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../create'; +import { TypeRegistry } from '../create'; import Vote from './Vote'; describe('Vote', (): void => { diff --git a/packages/types/src/primitive/Generic/Vote.ts b/packages/types/src/generic/Vote.ts similarity index 91% rename from packages/types/src/primitive/Generic/Vote.ts rename to packages/types/src/generic/Vote.ts index 333fa7b53a..e315e96ae1 100644 --- a/packages/types/src/primitive/Generic/Vote.ts +++ b/packages/types/src/generic/Vote.ts @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AnyJsonObject, ArrayElementType, Registry } from '../../types'; -import democracyDef from '../../interfaces/democracy/definitions'; -import { Conviction } from '../../interfaces/democracy'; +import { AnyJsonObject, ArrayElementType, Registry } from '../types'; +import democracyDef from '../interfaces/democracy/definitions'; +import { Conviction } from '../interfaces/democracy'; import { isBoolean, isNumber, isU8a, isUndefined } from '@polkadot/util'; -import { createType } from '../../create'; -import U8aFixed from '../../codec/U8aFixed'; -import Bool from '../Bool'; +import { createType } from '../create'; +import U8aFixed from '../codec/U8aFixed'; +import Bool from '../primitive/Bool'; export const convictionNames = democracyDef.types.Conviction._enum; diff --git a/packages/types/src/primitive/Generic/index.ts b/packages/types/src/generic/index.ts similarity index 100% rename from packages/types/src/primitive/Generic/index.ts rename to packages/types/src/generic/index.ts diff --git a/packages/types/src/index.types.ts b/packages/types/src/index.types.ts index b1a2aedd2a..0e2c6bac8e 100644 --- a/packages/types/src/index.types.ts +++ b/packages/types/src/index.types.ts @@ -3,4 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. export { default as Metadata } from '@polkadot/metadata/Metadata'; + +export * from './extrinsic'; +export * from './generic'; export * from './primitive'; diff --git a/packages/types/src/interfaceRegistry.ts b/packages/types/src/interfaceRegistry.ts index de7d633415..5f41d56037 100644 --- a/packages/types/src/interfaceRegistry.ts +++ b/packages/types/src/interfaceRegistry.ts @@ -37,12 +37,12 @@ import { CallMetadataV0, DoubleMapTypeLatest, DoubleMapTypeV10, DoubleMapTypeV11 import { ApiId, BlockHash, ChainProperties, ExtrinsicOrHash, ExtrinsicStatus, Health, KeyValueOption, NetworkState, PeerInfo, RpcMethods, RuntimeDispatchInfo, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/rpc'; export interface InterfaceRegistry { - bool: bool; - 'Option': Option; - 'Vec': Vec; BitVec: BitVec; 'Option': Option; 'Vec': Vec; + bool: bool; + 'Option': Option; + 'Vec': Vec; Bytes: Bytes; 'Option': Option; 'Vec': Vec; @@ -184,7 +184,6 @@ export interface InterfaceRegistry { 'Option': Option; 'Vec': Vec; AccountIndex: AccountIndex; - 'Compact': Compact; 'Option': Option; 'Vec': Vec; Address: Address; @@ -215,7 +214,6 @@ export interface InterfaceRegistry { 'Option': Option; 'Vec': Vec; ConsensusEngineId: ConsensusEngineId; - 'Compact': Compact; 'Option': Option; 'Vec': Vec; Digest: Digest; diff --git a/packages/types/src/interfaces/elections/types.ts b/packages/types/src/interfaces/elections/types.ts index b43c929adc..0484143cfb 100644 --- a/packages/types/src/interfaces/elections/types.ts +++ b/packages/types/src/interfaces/elections/types.ts @@ -2,7 +2,8 @@ /* eslint-disable @typescript-eslint/no-empty-interface */ import { Enum, Struct } from '@polkadot/types/codec'; -import { GenericVote, u32 } from '@polkadot/types/primitive'; +import { GenericVote } from '@polkadot/types/generic'; +import { u32 } from '@polkadot/types/primitive'; import { Balance } from '@polkadot/types/interfaces/runtime'; /** @name ApprovalFlag */ diff --git a/packages/types/src/interfaces/runtime/types.ts b/packages/types/src/interfaces/runtime/types.ts index 3a01018361..98cd0911f3 100644 --- a/packages/types/src/interfaces/runtime/types.ts +++ b/packages/types/src/interfaces/runtime/types.ts @@ -3,7 +3,9 @@ import { ITuple } from '@polkadot/types/types'; import { Compact, Enum, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; -import { Bytes, Fixed64, GenericAccountId, GenericAccountIndex, GenericAddress, GenericBlock, GenericCall, GenericConsensusEngineId, GenericDigest, GenericExtrinsic, GenericExtrinsicEra, GenericExtrinsicPayload, GenericExtrinsicPayloadUnknown, GenericExtrinsicPayloadV1, GenericExtrinsicPayloadV2, GenericExtrinsicPayloadV3, GenericExtrinsicPayloadV4, GenericExtrinsicSignatureV1, GenericExtrinsicSignatureV2, GenericExtrinsicSignatureV3, GenericExtrinsicSignatureV4, GenericExtrinsicUnknown, GenericExtrinsicV1, GenericExtrinsicV2, GenericExtrinsicV3, GenericExtrinsicV4, GenericImmortalEra, GenericMortalEra, GenericOrigin, GenericSignerPayload, Null, StorageData, StorageKey, bool, u128, u32, u64, u8 } from '@polkadot/types/primitive'; +import { GenericExtrinsic, GenericExtrinsicEra, GenericExtrinsicPayload, GenericExtrinsicPayloadUnknown, GenericExtrinsicPayloadV1, GenericExtrinsicPayloadV2, GenericExtrinsicPayloadV3, GenericExtrinsicPayloadV4, GenericExtrinsicSignatureV1, GenericExtrinsicSignatureV2, GenericExtrinsicSignatureV3, GenericExtrinsicSignatureV4, GenericExtrinsicUnknown, GenericExtrinsicV1, GenericExtrinsicV2, GenericExtrinsicV3, GenericExtrinsicV4, GenericImmortalEra, GenericMortalEra, GenericSignerPayload } from '@polkadot/types/extrinsic'; +import { GenericAccountId, GenericAccountIndex, GenericAddress, GenericBlock, GenericCall, GenericConsensusEngineId, GenericDigest, GenericOrigin } from '@polkadot/types/generic'; +import { Bytes, Fixed64, Null, StorageData, StorageKey, bool, u128, u32, u64, u8 } from '@polkadot/types/primitive'; import { AuthorityId } from '@polkadot/types/interfaces/consensus'; /** @name AccountId */ diff --git a/packages/types/src/interfaces/system/types.ts b/packages/types/src/interfaces/system/types.ts index e389dec31a..99ab4944a6 100644 --- a/packages/types/src/interfaces/system/types.ts +++ b/packages/types/src/interfaces/system/types.ts @@ -3,7 +3,8 @@ import { ITuple } from '@polkadot/types/types'; import { Enum, Option, Result, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; -import { Bytes, GenericEvent, Text, u32, u8 } from '@polkadot/types/primitive'; +import { GenericEvent } from '@polkadot/types/generic'; +import { Bytes, Text, u32, u8 } from '@polkadot/types/primitive'; import { Digest, Hash } from '@polkadot/types/interfaces/runtime'; /** @name DigestOf */ diff --git a/packages/types/src/primitive/index.ts b/packages/types/src/primitive/index.ts index d85c69c35a..254cc3260d 100644 --- a/packages/types/src/primitive/index.ts +++ b/packages/types/src/primitive/index.ts @@ -8,8 +8,8 @@ /** * @summary Type definitions that are used in the system */ -export { default as bool } from './Bool'; export { default as BitVec } from './BitVec'; +export { default as bool } from './Bool'; export { default as Bytes } from './Bytes'; export { default as Data } from './Data'; export { default as IdentityFields } from './IdentityFields'; @@ -33,6 +33,3 @@ export { default as u128 } from './U128'; export { default as u256, default as U256 } from './U256'; export { default as Unconstructable } from './Unconstructable'; export { default as usize } from './USize'; - -export * from './Generic'; -export * from './Extrinsic';