From 27cd9b1ca49e99a993a7b453bae55a7740b25e26 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 25 Mar 2020 09:23:03 +0100 Subject: [PATCH] Cleanup interfaces/rpc, types to correct locations (#2084) * Cleanup interfaces/rcp, types to correct locations * Update import locations --- packages/api/src/augment/rpc.ts | 8 +- packages/types/src/augment/registry.ts | 104 ++++++------ .../{rpc => author}/ExtrinsicStatus.spec.ts | 0 .../src/interfaces/author/definitions.ts | 23 ++- packages/types/src/interfaces/author/types.ts | 32 ++++ .../types/src/interfaces/chain/definitions.ts | 4 +- packages/types/src/interfaces/chain/types.ts | 5 + packages/types/src/interfaces/engine/types.ts | 2 +- .../src/interfaces/payment/definitions.ts | 8 +- .../types/src/interfaces/payment/types.ts | 10 ++ .../types/src/interfaces/rpc/definitions.ts | 104 ------------ packages/types/src/interfaces/rpc/types.ts | 150 +----------------- .../{rpc => state}/KeyValueOption.spec.ts | 0 .../{rpc => state}/RuntimeVersion.spec.ts | 0 .../{rpc => state}/StorageChangeSet.spec.ts | 0 .../types/src/interfaces/state/definitions.ts | 18 ++- packages/types/src/interfaces/state/types.ts | 30 ++++ .../{rpc => system}/ChainProperties.spec.ts | 0 .../src/interfaces/system/definitions.ts | 63 ++++++++ packages/types/src/interfaces/system/types.ts | 87 +++++++++- packages/types/src/types/extrinsic.ts | 2 +- packages/types/src/types/registry.ts | 2 +- 22 files changed, 338 insertions(+), 314 deletions(-) rename packages/types/src/interfaces/{rpc => author}/ExtrinsicStatus.spec.ts (100%) rename packages/types/src/interfaces/{rpc => state}/KeyValueOption.spec.ts (100%) rename packages/types/src/interfaces/{rpc => state}/RuntimeVersion.spec.ts (100%) rename packages/types/src/interfaces/{rpc => state}/StorageChangeSet.spec.ts (100%) rename packages/types/src/interfaces/{rpc => system}/ChainProperties.spec.ts (100%) diff --git a/packages/api/src/augment/rpc.ts b/packages/api/src/augment/rpc.ts index ae564a35f9..64d7114101 100644 --- a/packages/api/src/augment/rpc.ts +++ b/packages/api/src/augment/rpc.ts @@ -5,15 +5,19 @@ import { AnyNumber, Codec, IExtrinsic } from '@polkadot/types/types'; import { HashMap, Option, Vec } from '@polkadot/types/codec'; import { Bytes, Null, StorageKey, Text, bool, u32, u64 } from '@polkadot/types/primitive'; import { Metadata } from '@polkadot/types'; +import { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author'; import { EpochAuthorship } from '@polkadot/types/interfaces/babe'; +import { BlockHash } from '@polkadot/types/interfaces/chain'; import { AuthorityId } from '@polkadot/types/interfaces/consensus'; import { ContractCallRequest, ContractExecResult } from '@polkadot/types/interfaces/contracts'; import { CreatedBlock } from '@polkadot/types/interfaces/engine'; import { Extrinsic } from '@polkadot/types/interfaces/extrinsics'; import { StorageKind } from '@polkadot/types/interfaces/offchain'; -import { BlockHash, ChainProperties, ExtrinsicOrHash, ExtrinsicStatus, Health, NetworkState, PeerInfo, RpcMethods, RuntimeDispatchInfo, RuntimeVersion } from '@polkadot/types/interfaces/rpc'; +import { RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment'; +import { RpcMethods } from '@polkadot/types/interfaces/rpc'; import { AccountId, BlockNumber, H256, Hash, Header, Index, Justification, KeyValue, SignedBlock, StorageData } from '@polkadot/types/interfaces/runtime'; -import { NodeRole } from '@polkadot/types/interfaces/system'; +import { RuntimeVersion } from '@polkadot/types/interfaces/state'; +import { ChainProperties, Health, NetworkState, NodeRole, PeerInfo } from '@polkadot/types/interfaces/system'; import { Observable } from 'rxjs'; declare module '@polkadot/rpc-core/types.jsonrpc' { diff --git a/packages/types/src/augment/registry.ts b/packages/types/src/augment/registry.ts index c412ebcb7f..12b0d4c952 100644 --- a/packages/types/src/augment/registry.ts +++ b/packages/types/src/augment/registry.ts @@ -5,9 +5,11 @@ import { Compact, Option, Raw, Vec } from '@polkadot/types/codec'; import { BitVec, Bytes, Data, Null, StorageKey, Text, Type, U256, Unconstructable, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types/primitive'; import { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations'; import { RawAuraPreDigest } from '@polkadot/types/interfaces/aura'; +import { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author'; import { UncleEntryItem } from '@polkadot/types/interfaces/authorship'; import { BabeAuthorityWeight, BabeBlockWeight, BabeWeight, EpochAuthorship, MaybeVrf, RawBabePreDigest, RawBabePreDigestCompat, RawBabePreDigestPrimary, RawBabePreDigestPrimaryTo159, RawBabePreDigestSecondary, RawBabePreDigestSecondaryTo159, RawBabePreDigestTo159, SlotNumber, VrfData, VrfProof } from '@polkadot/types/interfaces/babe'; import { AccountData, BalanceLock, BalanceLockTo212, Reasons, ReleasesBalances, VestingSchedule, WithdrawReasons } from '@polkadot/types/interfaces/balances'; +import { BlockHash } from '@polkadot/types/interfaces/chain'; import { EthereumAddress } from '@polkadot/types/interfaces/claims'; import { MemberCount, ProposalIndex, Votes, VotesTo230 } from '@polkadot/types/interfaces/collective'; import { AuthorityId } from '@polkadot/types/interfaces/consensus'; @@ -25,13 +27,15 @@ import { CallMetadataV0, DoubleMapTypeLatest, DoubleMapTypeV10, DoubleMapTypeV11 import { StorageKind } from '@polkadot/types/interfaces/offchain'; import { Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences'; import { AttestedCandidate, AuctionIndex, Bidder, CandidateReceipt, CollatorId, CollatorSignature, EgressQueueRoot, HeadData, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, LeasePeriod, LeasePeriodOf, NewBidder, ParaId, ParaIdOf, ParaInfo, ParaScheduling, ParachainDispatchOrigin, Retriable, SlotRange, SubId, UpwardMessage, ValidityAttestation, WinningData, WinningDataEntry } from '@polkadot/types/interfaces/parachains'; +import { RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment'; import { ActiveRecovery, RecoveryConfig } from '@polkadot/types/interfaces/recovery'; -import { ApiId, BlockHash, ChainProperties, ExtrinsicOrHash, ExtrinsicStatus, Health, KeyValueOption, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, RpcMethods, RuntimeDispatchInfo, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/rpc'; +import { RpcMethods } from '@polkadot/types/interfaces/rpc'; import { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, ChangesTrieConfiguration, Consensus, ConsensusEngineId, Digest, DigestItem, DispatchClass, DispatchInfo, DispatchInfoTo190, Fixed64, H160, H256, H512, Hash, Header, Index, Justification, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, Moment, Origin, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Seal, SealV0, SignedBlock, StorageData, ValidatorId, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime'; import { FullIdentification, IdentificationTuple, Keys, SessionIndex, SessionKeys1, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6 } from '@polkadot/types/interfaces/session'; import { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society'; import { ActiveEraInfo, CompactAssignments, CompactScore, ElectionCompute, ElectionResult, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, PhragmenScore, Points, ReleasesStaking, RewardDestination, RewardPoint, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196 } from '@polkadot/types/interfaces/staking'; -import { AccountInfo, DigestOf, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, EventRecordTo76, Key, LastRuntimeUpgradeInfo, NodeRole, Phase, RefCount } from '@polkadot/types/interfaces/system'; +import { ApiId, KeyValueOption, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/state'; +import { AccountInfo, ChainProperties, DigestOf, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, EventRecordTo76, Health, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, Phase, RefCount } from '@polkadot/types/interfaces/system'; import { OpenTip, OpenTipFinder, OpenTipTip, TreasuryProposal } from '@polkadot/types/interfaces/treasury'; import { Multiplier } from '@polkadot/types/interfaces/txpayment'; import { Multisig, Timepoint } from '@polkadot/types/interfaces/utility'; @@ -853,6 +857,9 @@ declare module '@polkadot/types/types/registry' { AccountInfo: AccountInfo; 'Option': Option; 'Vec': Vec; + ChainProperties: ChainProperties; + 'Option': Option; + 'Vec': Vec; DigestOf: DigestOf; 'Option': Option; 'Vec': Vec; @@ -890,15 +897,45 @@ declare module '@polkadot/types/types/registry' { EventRecordTo76: EventRecordTo76; 'Option': Option; 'Vec': Vec; + Health: Health; + 'Option': Option; + 'Vec': Vec; Key: Key; 'Option': Option; 'Vec': Vec; LastRuntimeUpgradeInfo: LastRuntimeUpgradeInfo; 'Option': Option; 'Vec': Vec; + NetworkState: NetworkState; + 'Option': Option; + 'Vec': Vec; + NetworkStatePeerset: NetworkStatePeerset; + 'Option': Option; + 'Vec': Vec; + NetworkStatePeersetInfo: NetworkStatePeersetInfo; + 'Option': Option; + 'Vec': Vec; NodeRole: NodeRole; 'Option': Option; 'Vec': Vec; + NotConnectedPeer: NotConnectedPeer; + 'Option': Option; + 'Vec': Vec; + Peer: Peer; + 'Option': Option; + 'Vec': Vec; + PeerEndpoint: PeerEndpoint; + 'Option': Option; + 'Vec': Vec; + PeerEndpointAddr: PeerEndpointAddr; + 'Option': Option; + 'Vec': Vec; + PeerPing: PeerPing; + 'Option': Option; + 'Vec': Vec; + PeerInfo: PeerInfo; + 'Option': Option; + 'Vec': Vec; Phase: Phase; 'Option': Option; 'Vec': Vec; @@ -1548,60 +1585,30 @@ declare module '@polkadot/types/types/registry' { MetadataAll: MetadataAll; 'Option': Option; 'Vec': Vec; - ApiId: ApiId; - 'Option': Option; - 'Vec': Vec; - BlockHash: BlockHash; - 'Option': Option; - 'Vec': Vec; - ChainProperties: ChainProperties; - 'Option': Option; - 'Vec': Vec; + RpcMethods: RpcMethods; + 'Option': Option; + 'Vec': Vec; ExtrinsicOrHash: ExtrinsicOrHash; 'Option': Option; 'Vec': Vec; ExtrinsicStatus: ExtrinsicStatus; 'Option': Option; 'Vec': Vec; - Health: Health; - 'Option': Option; - 'Vec': Vec; - KeyValueOption: KeyValueOption; - 'Option': Option; - 'Vec': Vec; - NetworkState: NetworkState; - 'Option': Option; - 'Vec': Vec; - Peer: Peer; - 'Option': Option; - 'Vec': Vec; - NotConnectedPeer: NotConnectedPeer; - 'Option': Option; - 'Vec': Vec; - PeerEndpoint: PeerEndpoint; - 'Option': Option; - 'Vec': Vec; - PeerEndpointAddr: PeerEndpointAddr; - 'Option': Option; - 'Vec': Vec; - PeerPing: PeerPing; - 'Option': Option; - 'Vec': Vec; - NetworkStatePeerset: NetworkStatePeerset; - 'Option': Option; - 'Vec': Vec; - NetworkStatePeersetInfo: NetworkStatePeersetInfo; - 'Option': Option; - 'Vec': Vec; - PeerInfo: PeerInfo; - 'Option': Option; - 'Vec': Vec; - RpcMethods: RpcMethods; - 'Option': Option; - 'Vec': Vec; + BlockHash: BlockHash; + 'Option': Option; + 'Vec': Vec; + StorageKind: StorageKind; + 'Option': Option; + 'Vec': Vec; RuntimeDispatchInfo: RuntimeDispatchInfo; 'Option': Option; 'Vec': Vec; + ApiId: ApiId; + 'Option': Option; + 'Vec': Vec; + KeyValueOption: KeyValueOption; + 'Option': Option; + 'Vec': Vec; RuntimeVersionApi: RuntimeVersionApi; 'Option': Option; 'Vec': Vec; @@ -1611,8 +1618,5 @@ declare module '@polkadot/types/types/registry' { StorageChangeSet: StorageChangeSet; 'Option': Option; 'Vec': Vec; - StorageKind: StorageKind; - 'Option': Option; - 'Vec': Vec; } } diff --git a/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts b/packages/types/src/interfaces/author/ExtrinsicStatus.spec.ts similarity index 100% rename from packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts rename to packages/types/src/interfaces/author/ExtrinsicStatus.spec.ts diff --git a/packages/types/src/interfaces/author/definitions.ts b/packages/types/src/interfaces/author/definitions.ts index f20efefd0f..31ce9b8128 100644 --- a/packages/types/src/interfaces/author/definitions.ts +++ b/packages/types/src/interfaces/author/definitions.ts @@ -96,5 +96,26 @@ export default { type: 'ExtrinsicStatus' } }, - types: {} + types: { + ExtrinsicOrHash: { + _enum: { + Hash: 'Hash', + Extrinsic: 'Bytes' + } + }, + ExtrinsicStatus: { + _enum: { + Future: 'Null', + Ready: 'Null', + Broadcast: 'Vec', + InBlock: 'Hash', + Retracted: 'Hash', + FinalityTimeout: 'Hash', + Finalized: 'Hash', + Usurped: 'Hash', + Dropped: 'Null', + Invalid: 'Null' + } + } + } } as Definitions; diff --git a/packages/types/src/interfaces/author/types.ts b/packages/types/src/interfaces/author/types.ts index 9d65972ca2..cd20a6d7a0 100644 --- a/packages/types/src/interfaces/author/types.ts +++ b/packages/types/src/interfaces/author/types.ts @@ -1,4 +1,36 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ +import { Enum, Vec } from '@polkadot/types/codec'; +import { Bytes, Text } from '@polkadot/types/primitive'; +import { Hash } from '@polkadot/types/interfaces/runtime'; + +/** @name ExtrinsicOrHash */ +export interface ExtrinsicOrHash extends Enum { + readonly isHash: boolean; + readonly asHash: Hash; + readonly isExtrinsic: boolean; + readonly asExtrinsic: Bytes; +} + +/** @name ExtrinsicStatus */ +export interface ExtrinsicStatus extends Enum { + readonly isFuture: boolean; + readonly isReady: boolean; + readonly isBroadcast: boolean; + readonly asBroadcast: Vec; + readonly isInBlock: boolean; + readonly asInBlock: Hash; + readonly isRetracted: boolean; + readonly asRetracted: Hash; + readonly isFinalityTimeout: boolean; + readonly asFinalityTimeout: Hash; + readonly isFinalized: boolean; + readonly asFinalized: Hash; + readonly isUsurped: boolean; + readonly asUsurped: Hash; + readonly isDropped: boolean; + readonly isInvalid: boolean; +} + export type PHANTOM_AUTHOR = 'author'; diff --git a/packages/types/src/interfaces/chain/definitions.ts b/packages/types/src/interfaces/chain/definitions.ts index 082f07075d..613d7a7db1 100644 --- a/packages/types/src/interfaces/chain/definitions.ts +++ b/packages/types/src/interfaces/chain/definitions.ts @@ -80,5 +80,7 @@ export default { type: 'Header' } }, - types: {} + types: { + BlockHash: 'Hash' + } } as Definitions; diff --git a/packages/types/src/interfaces/chain/types.ts b/packages/types/src/interfaces/chain/types.ts index b18a95c418..ffe9a8f159 100644 --- a/packages/types/src/interfaces/chain/types.ts +++ b/packages/types/src/interfaces/chain/types.ts @@ -1,4 +1,9 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ +import { Hash } from '@polkadot/types/interfaces/runtime'; + +/** @name BlockHash */ +export interface BlockHash extends Hash {} + export type PHANTOM_CHAIN = 'chain'; diff --git a/packages/types/src/interfaces/engine/types.ts b/packages/types/src/interfaces/engine/types.ts index 1ffd3f180f..0e36568491 100644 --- a/packages/types/src/interfaces/engine/types.ts +++ b/packages/types/src/interfaces/engine/types.ts @@ -3,7 +3,7 @@ import { Struct } from '@polkadot/types/codec'; import { bool } from '@polkadot/types/primitive'; -import { BlockHash } from '@polkadot/types/interfaces/rpc'; +import { BlockHash } from '@polkadot/types/interfaces/chain'; /** @name CreatedBlock */ export interface CreatedBlock extends Struct { diff --git a/packages/types/src/interfaces/payment/definitions.ts b/packages/types/src/interfaces/payment/definitions.ts index c5a617bd61..ccafce1c78 100644 --- a/packages/types/src/interfaces/payment/definitions.ts +++ b/packages/types/src/interfaces/payment/definitions.ts @@ -22,5 +22,11 @@ export default { type: 'RuntimeDispatchInfo' } }, - types: {} + types: { + RuntimeDispatchInfo: { + weight: 'Weight', + class: 'DispatchClass', + partialFee: 'Balance' + } + } } as Definitions; diff --git a/packages/types/src/interfaces/payment/types.ts b/packages/types/src/interfaces/payment/types.ts index 373aa1958f..e6aefe4af3 100644 --- a/packages/types/src/interfaces/payment/types.ts +++ b/packages/types/src/interfaces/payment/types.ts @@ -1,4 +1,14 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ +import { Struct } from '@polkadot/types/codec'; +import { Balance, DispatchClass, Weight } from '@polkadot/types/interfaces/runtime'; + +/** @name RuntimeDispatchInfo */ +export interface RuntimeDispatchInfo extends Struct { + readonly weight: Weight; + readonly class: DispatchClass; + readonly partialFee: Balance; +} + export type PHANTOM_PAYMENT = 'payment'; diff --git a/packages/types/src/interfaces/rpc/definitions.ts b/packages/types/src/interfaces/rpc/definitions.ts index 00ab3f309a..283d71fc7f 100644 --- a/packages/types/src/interfaces/rpc/definitions.ts +++ b/packages/types/src/interfaces/rpc/definitions.ts @@ -13,113 +13,9 @@ export default { } }, types: { - ApiId: '[u8; 8]', - BlockHash: 'Hash', - ChainProperties: { - ss58Format: 'Option', - tokenDecimals: 'Option', - tokenSymbol: 'Option' - }, - ExtrinsicOrHash: { - _enum: { - Hash: 'Hash', - Extrinsic: 'Bytes' - } - }, - ExtrinsicStatus: { - _enum: { - Future: 'Null', - Ready: 'Null', - Broadcast: 'Vec', - InBlock: 'Hash', - Retracted: 'Hash', - FinalityTimeout: 'Hash', - Finalized: 'Hash', - Usurped: 'Hash', - Dropped: 'Null', - Invalid: 'Null' - } - }, - Health: { - peers: 'u64', - isSyncing: 'bool', - shouldHavePeers: 'bool' - }, - KeyValueOption: '(StorageKey, Option)', - NetworkState: { - peerId: 'Text', - listenedAddresses: 'Vec', - externalAddresses: 'Vec', - connectedPeers: 'HashMap', - notConnectedPeers: 'HashMap', - averageDownloadPerSec: 'u64', - averageUploadPerSec: 'u64', - peerset: 'NetworkStatePeerset' - }, - Peer: { - enabled: 'bool', - endpoint: 'PeerEndpoint', - knownAddresses: 'Vec', - latestPingTime: 'PeerPing', - open: 'bool', - versionString: 'Text' - }, - NotConnectedPeer: { - knownAddresses: 'Vec', - latestPingTime: 'Option', - versionString: 'Option' - }, - PeerEndpoint: { - listening: 'PeerEndpointAddr' - }, - PeerEndpointAddr: { - _alias: { - localAddr: 'local_addr', - sendBackAddr: 'send_back_addr' - }, - localAddr: 'Text', - sendBackAddr: 'Text' - }, - PeerPing: { - nanos: 'u64', - secs: 'u64' - }, - NetworkStatePeerset: { - messageQueue: 'u64', - nodes: 'HashMap' - }, - NetworkStatePeersetInfo: { - connected: 'bool', - reputation: 'u64' - }, - PeerInfo: { - peerId: 'Text', - roles: 'Text', - protocolVersion: 'u32', - bestHash: 'Hash', - bestNumber: 'BlockNumber' - }, RpcMethods: { version: 'u32', methods: 'Vec' - }, - RuntimeDispatchInfo: { - weight: 'Weight', - class: 'DispatchClass', - partialFee: 'Balance' - }, - RuntimeVersionApi: '(ApiId, u32)', - RuntimeVersion: { - specName: 'Text', - implName: 'Text', - authoringVersion: 'u32', - specVersion: 'u32', - implVersion: 'u32', - apis: 'Vec' - }, - StorageChangeSet: { - block: 'Hash', - changes: 'Vec' } } } as Definitions; diff --git a/packages/types/src/interfaces/rpc/types.ts b/packages/types/src/interfaces/rpc/types.ts index 91be8114dd..63ead2b8fb 100644 --- a/packages/types/src/interfaces/rpc/types.ts +++ b/packages/types/src/interfaces/rpc/types.ts @@ -1,128 +1,8 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -import { ITuple } from '@polkadot/types/types'; -import { Enum, HashMap, Option, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; -import { Bytes, StorageKey, Text, bool, u32, u64, u8 } from '@polkadot/types/primitive'; -import { Balance, BlockNumber, DispatchClass, Hash, StorageData, Weight } from '@polkadot/types/interfaces/runtime'; - -/** @name ApiId */ -export interface ApiId extends U8aFixed {} - -/** @name BlockHash */ -export interface BlockHash extends Hash {} - -/** @name ChainProperties */ -export interface ChainProperties extends Struct { - readonly ss58Format: Option; - readonly tokenDecimals: Option; - readonly tokenSymbol: Option; -} - -/** @name ExtrinsicOrHash */ -export interface ExtrinsicOrHash extends Enum { - readonly isHash: boolean; - readonly asHash: Hash; - readonly isExtrinsic: boolean; - readonly asExtrinsic: Bytes; -} - -/** @name ExtrinsicStatus */ -export interface ExtrinsicStatus extends Enum { - readonly isFuture: boolean; - readonly isReady: boolean; - readonly isBroadcast: boolean; - readonly asBroadcast: Vec; - readonly isInBlock: boolean; - readonly asInBlock: Hash; - readonly isRetracted: boolean; - readonly asRetracted: Hash; - readonly isFinalityTimeout: boolean; - readonly asFinalityTimeout: Hash; - readonly isFinalized: boolean; - readonly asFinalized: Hash; - readonly isUsurped: boolean; - readonly asUsurped: Hash; - readonly isDropped: boolean; - readonly isInvalid: boolean; -} - -/** @name Health */ -export interface Health extends Struct { - readonly peers: u64; - readonly isSyncing: bool; - readonly shouldHavePeers: bool; -} - -/** @name KeyValueOption */ -export interface KeyValueOption extends ITuple<[StorageKey, Option]> {} - -/** @name NetworkState */ -export interface NetworkState extends Struct { - readonly peerId: Text; - readonly listenedAddresses: Vec; - readonly externalAddresses: Vec; - readonly connectedPeers: HashMap; - readonly notConnectedPeers: HashMap; - readonly averageDownloadPerSec: u64; - readonly averageUploadPerSec: u64; - readonly peerset: NetworkStatePeerset; -} - -/** @name NetworkStatePeerset */ -export interface NetworkStatePeerset extends Struct { - readonly messageQueue: u64; - readonly nodes: HashMap; -} - -/** @name NetworkStatePeersetInfo */ -export interface NetworkStatePeersetInfo extends Struct { - readonly connected: bool; - readonly reputation: u64; -} - -/** @name NotConnectedPeer */ -export interface NotConnectedPeer extends Struct { - readonly knownAddresses: Vec; - readonly latestPingTime: Option; - readonly versionString: Option; -} - -/** @name Peer */ -export interface Peer extends Struct { - readonly enabled: bool; - readonly endpoint: PeerEndpoint; - readonly knownAddresses: Vec; - readonly latestPingTime: PeerPing; - readonly open: bool; - readonly versionString: Text; -} - -/** @name PeerEndpoint */ -export interface PeerEndpoint extends Struct { - readonly listening: PeerEndpointAddr; -} - -/** @name PeerEndpointAddr */ -export interface PeerEndpointAddr extends Struct { - readonly localAddr: Text; - readonly sendBackAddr: Text; -} - -/** @name PeerInfo */ -export interface PeerInfo extends Struct { - readonly peerId: Text; - readonly roles: Text; - readonly protocolVersion: u32; - readonly bestHash: Hash; - readonly bestNumber: BlockNumber; -} - -/** @name PeerPing */ -export interface PeerPing extends Struct { - readonly nanos: u64; - readonly secs: u64; -} +import { Struct, Vec } from '@polkadot/types/codec'; +import { Text, u32 } from '@polkadot/types/primitive'; /** @name RpcMethods */ export interface RpcMethods extends Struct { @@ -130,30 +10,4 @@ export interface RpcMethods extends Struct { readonly methods: Vec; } -/** @name RuntimeDispatchInfo */ -export interface RuntimeDispatchInfo extends Struct { - readonly weight: Weight; - readonly class: DispatchClass; - readonly partialFee: Balance; -} - -/** @name RuntimeVersion */ -export interface RuntimeVersion extends Struct { - readonly specName: Text; - readonly implName: Text; - readonly authoringVersion: u32; - readonly specVersion: u32; - readonly implVersion: u32; - readonly apis: Vec; -} - -/** @name RuntimeVersionApi */ -export interface RuntimeVersionApi extends ITuple<[ApiId, u32]> {} - -/** @name StorageChangeSet */ -export interface StorageChangeSet extends Struct { - readonly block: Hash; - readonly changes: Vec; -} - export type PHANTOM_RPC = 'rpc'; diff --git a/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts b/packages/types/src/interfaces/state/KeyValueOption.spec.ts similarity index 100% rename from packages/types/src/interfaces/rpc/KeyValueOption.spec.ts rename to packages/types/src/interfaces/state/KeyValueOption.spec.ts diff --git a/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts b/packages/types/src/interfaces/state/RuntimeVersion.spec.ts similarity index 100% rename from packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts rename to packages/types/src/interfaces/state/RuntimeVersion.spec.ts diff --git a/packages/types/src/interfaces/rpc/StorageChangeSet.spec.ts b/packages/types/src/interfaces/state/StorageChangeSet.spec.ts similarity index 100% rename from packages/types/src/interfaces/rpc/StorageChangeSet.spec.ts rename to packages/types/src/interfaces/state/StorageChangeSet.spec.ts diff --git a/packages/types/src/interfaces/state/definitions.ts b/packages/types/src/interfaces/state/definitions.ts index ffdaa8ce80..bb737ec10a 100644 --- a/packages/types/src/interfaces/state/definitions.ts +++ b/packages/types/src/interfaces/state/definitions.ts @@ -306,5 +306,21 @@ export default { type: 'StorageChangeSet' } }, - types: {} + types: { + ApiId: '[u8; 8]', + KeyValueOption: '(StorageKey, Option)', + RuntimeVersionApi: '(ApiId, u32)', + RuntimeVersion: { + specName: 'Text', + implName: 'Text', + authoringVersion: 'u32', + specVersion: 'u32', + implVersion: 'u32', + apis: 'Vec' + }, + StorageChangeSet: { + block: 'Hash', + changes: 'Vec' + } + } } as Definitions; diff --git a/packages/types/src/interfaces/state/types.ts b/packages/types/src/interfaces/state/types.ts index cf2749b362..a799c7efe6 100644 --- a/packages/types/src/interfaces/state/types.ts +++ b/packages/types/src/interfaces/state/types.ts @@ -1,4 +1,34 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ +import { ITuple } from '@polkadot/types/types'; +import { Option, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; +import { StorageKey, Text, u32 } from '@polkadot/types/primitive'; +import { Hash, StorageData } from '@polkadot/types/interfaces/runtime'; + +/** @name ApiId */ +export interface ApiId extends U8aFixed {} + +/** @name KeyValueOption */ +export interface KeyValueOption extends ITuple<[StorageKey, Option]> {} + +/** @name RuntimeVersion */ +export interface RuntimeVersion extends Struct { + readonly specName: Text; + readonly implName: Text; + readonly authoringVersion: u32; + readonly specVersion: u32; + readonly implVersion: u32; + readonly apis: Vec; +} + +/** @name RuntimeVersionApi */ +export interface RuntimeVersionApi extends ITuple<[ApiId, u32]> {} + +/** @name StorageChangeSet */ +export interface StorageChangeSet extends Struct { + readonly block: Hash; + readonly changes: Vec; +} + export type PHANTOM_STATE = 'state'; diff --git a/packages/types/src/interfaces/rpc/ChainProperties.spec.ts b/packages/types/src/interfaces/system/ChainProperties.spec.ts similarity index 100% rename from packages/types/src/interfaces/rpc/ChainProperties.spec.ts rename to packages/types/src/interfaces/system/ChainProperties.spec.ts diff --git a/packages/types/src/interfaces/system/definitions.ts b/packages/types/src/interfaces/system/definitions.ts index 889570c5e7..559d2f2d29 100644 --- a/packages/types/src/interfaces/system/definitions.ts +++ b/packages/types/src/interfaces/system/definitions.ts @@ -73,6 +73,11 @@ export default { refcount: 'RefCount', data: 'AccountData' }, + ChainProperties: { + ss58Format: 'Option', + tokenDecimals: 'Option', + tokenSymbol: 'Option' + }, DigestOf: 'Digest', DispatchError: { _enum: { @@ -105,11 +110,34 @@ export default { phase: 'Phase', event: 'Event' }, + Health: { + peers: 'u64', + isSyncing: 'bool', + shouldHavePeers: 'bool' + }, Key: 'Bytes', LastRuntimeUpgradeInfo: { specVersion: 'Compact', specName: 'Text' }, + NetworkState: { + peerId: 'Text', + listenedAddresses: 'Vec', + externalAddresses: 'Vec', + connectedPeers: 'HashMap', + notConnectedPeers: 'HashMap', + averageDownloadPerSec: 'u64', + averageUploadPerSec: 'u64', + peerset: 'NetworkStatePeerset' + }, + NetworkStatePeerset: { + messageQueue: 'u64', + nodes: 'HashMap' + }, + NetworkStatePeersetInfo: { + connected: 'bool', + reputation: 'u64' + }, NodeRole: { _enum: { Full: 'Null', @@ -118,6 +146,41 @@ export default { UnknownRole: 'u8' } }, + NotConnectedPeer: { + knownAddresses: 'Vec', + latestPingTime: 'Option', + versionString: 'Option' + }, + Peer: { + enabled: 'bool', + endpoint: 'PeerEndpoint', + knownAddresses: 'Vec', + latestPingTime: 'PeerPing', + open: 'bool', + versionString: 'Text' + }, + PeerEndpoint: { + listening: 'PeerEndpointAddr' + }, + PeerEndpointAddr: { + _alias: { + localAddr: 'local_addr', + sendBackAddr: 'send_back_addr' + }, + localAddr: 'Text', + sendBackAddr: 'Text' + }, + PeerPing: { + nanos: 'u64', + secs: 'u64' + }, + PeerInfo: { + peerId: 'Text', + roles: 'Text', + protocolVersion: 'u32', + bestHash: 'Hash', + bestNumber: 'BlockNumber' + }, Phase: { _enum: { ApplyExtrinsic: 'u32', diff --git a/packages/types/src/interfaces/system/types.ts b/packages/types/src/interfaces/system/types.ts index c1639d288e..7b9285572b 100644 --- a/packages/types/src/interfaces/system/types.ts +++ b/packages/types/src/interfaces/system/types.ts @@ -2,11 +2,11 @@ /* eslint-disable */ import { ITuple } from '@polkadot/types/types'; -import { Compact, Enum, Option, Result, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; +import { Compact, Enum, HashMap, Option, Result, Struct, U8aFixed, Vec } from '@polkadot/types/codec'; import { GenericEvent } from '@polkadot/types/generic'; -import { Bytes, Text, u32, u8 } from '@polkadot/types/primitive'; +import { Bytes, Text, bool, u32, u64, u8 } from '@polkadot/types/primitive'; import { AccountData } from '@polkadot/types/interfaces/balances'; -import { Digest, Hash, Index } from '@polkadot/types/interfaces/runtime'; +import { BlockNumber, Digest, Hash, Index } from '@polkadot/types/interfaces/runtime'; /** @name AccountInfo */ export interface AccountInfo extends Struct { @@ -15,6 +15,13 @@ export interface AccountInfo extends Struct { readonly data: AccountData; } +/** @name ChainProperties */ +export interface ChainProperties extends Struct { + readonly ss58Format: Option; + readonly tokenDecimals: Option; + readonly tokenSymbol: Option; +} + /** @name DigestOf */ export interface DigestOf extends Digest {} @@ -80,6 +87,13 @@ export interface EventRecordTo76 extends Struct { readonly event: Event; } +/** @name Health */ +export interface Health extends Struct { + readonly peers: u64; + readonly isSyncing: bool; + readonly shouldHavePeers: bool; +} + /** @name Key */ export interface Key extends Bytes {} @@ -89,6 +103,30 @@ export interface LastRuntimeUpgradeInfo extends Struct { readonly specName: Text; } +/** @name NetworkState */ +export interface NetworkState extends Struct { + readonly peerId: Text; + readonly listenedAddresses: Vec; + readonly externalAddresses: Vec; + readonly connectedPeers: HashMap; + readonly notConnectedPeers: HashMap; + readonly averageDownloadPerSec: u64; + readonly averageUploadPerSec: u64; + readonly peerset: NetworkStatePeerset; +} + +/** @name NetworkStatePeerset */ +export interface NetworkStatePeerset extends Struct { + readonly messageQueue: u64; + readonly nodes: HashMap; +} + +/** @name NetworkStatePeersetInfo */ +export interface NetworkStatePeersetInfo extends Struct { + readonly connected: bool; + readonly reputation: u64; +} + /** @name NodeRole */ export interface NodeRole extends Enum { readonly isFull: boolean; @@ -98,6 +136,49 @@ export interface NodeRole extends Enum { readonly asUnknownRole: u8; } +/** @name NotConnectedPeer */ +export interface NotConnectedPeer extends Struct { + readonly knownAddresses: Vec; + readonly latestPingTime: Option; + readonly versionString: Option; +} + +/** @name Peer */ +export interface Peer extends Struct { + readonly enabled: bool; + readonly endpoint: PeerEndpoint; + readonly knownAddresses: Vec; + readonly latestPingTime: PeerPing; + readonly open: bool; + readonly versionString: Text; +} + +/** @name PeerEndpoint */ +export interface PeerEndpoint extends Struct { + readonly listening: PeerEndpointAddr; +} + +/** @name PeerEndpointAddr */ +export interface PeerEndpointAddr extends Struct { + readonly localAddr: Text; + readonly sendBackAddr: Text; +} + +/** @name PeerInfo */ +export interface PeerInfo extends Struct { + readonly peerId: Text; + readonly roles: Text; + readonly protocolVersion: u32; + readonly bestHash: Hash; + readonly bestNumber: BlockNumber; +} + +/** @name PeerPing */ +export interface PeerPing extends Struct { + readonly nanos: u64; + readonly secs: u64; +} + /** @name Phase */ export interface Phase extends Enum { readonly isApplyExtrinsic: boolean; diff --git a/packages/types/src/types/extrinsic.ts b/packages/types/src/types/extrinsic.ts index 1b28aad215..3139fc0553 100644 --- a/packages/types/src/types/extrinsic.ts +++ b/packages/types/src/types/extrinsic.ts @@ -2,8 +2,8 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { ExtrinsicStatus } from '../interfaces/author'; import { EcdsaSignature, Ed25519Signature, Sr25519Signature } from '../interfaces/extrinsics'; -import { ExtrinsicStatus } from '../interfaces/rpc'; import { Address, Balance, Call, H256, Index } from '../interfaces/runtime'; import { EventRecord } from '../interfaces/system'; import { Codec } from './codec'; diff --git a/packages/types/src/types/registry.ts b/packages/types/src/types/registry.ts index 7b26c5ddb9..3f96b408c8 100644 --- a/packages/types/src/types/registry.ts +++ b/packages/types/src/types/registry.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 { ChainProperties } from '../interfaces/rpc'; +import { ChainProperties } from '../interfaces/system'; import { OverrideModuleType } from '../known/types'; import { CallFunction } from './calls'; import { Codec, Constructor } from './codec';