From fefcc2e0dca2a2f093a64eabd289a47dffd1ed87 Mon Sep 17 00:00:00 2001 From: Keith Ingram Date: Mon, 10 Feb 2020 15:25:14 -0500 Subject: [PATCH] update parachains types (#1830) --- packages/types/src/interfaceRegistry.ts | 15 +--------- .../src/interfaces/parachains/definitions.ts | 17 ++++++----- .../types/src/interfaces/parachains/types.ts | 28 ++++++------------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/packages/types/src/interfaceRegistry.ts b/packages/types/src/interfaceRegistry.ts index f34525f7a5..2dd34da7c2 100644 --- a/packages/types/src/interfaceRegistry.ts +++ b/packages/types/src/interfaceRegistry.ts @@ -31,7 +31,7 @@ import { Multisig, Timepoint } from '@polkadot/types/interfaces/utility'; import { VestingInfo } from '@polkadot/types/interfaces/vesting'; import { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations'; import { EthereumAddress } from '@polkadot/types/interfaces/claims'; -import { AttestedCandidate, AuctionIndex, BalanceUpload, Bidder, CandidateReceipt, CollatorId, CollatorSignature, EgressQueueRoot, HeadData, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, LeasePeriod, LeasePeriodOf, NewBidder, ParaId, ParaIdOf, ParaInfo, ParaScheduling, ParachainDispatchOrigin, Retriable, SlotRange, SubId, UpwardMessage, ValidatorIndex, ValidityAttestation, ValidityVote, WinningData, WinningDataEntry } from '@polkadot/types/interfaces/parachains'; +import { AttestedCandidate, AuctionIndex, Bidder, CandidateReceipt, CollatorId, CollatorSignature, 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 { CallMetadataV0, DoubleMapTypeLatest, DoubleMapTypeV10, DoubleMapTypeV11, DoubleMapTypeV3, DoubleMapTypeV4, DoubleMapTypeV5, DoubleMapTypeV6, DoubleMapTypeV7, DoubleMapTypeV8, DoubleMapTypeV9, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV8, ErrorMetadataV9, EventMetadataLatest, EventMetadataV0, EventMetadataV1, EventMetadataV10, EventMetadataV11, EventMetadataV2, EventMetadataV3, EventMetadataV4, EventMetadataV5, EventMetadataV6, EventMetadataV7, EventMetadataV8, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV0, FunctionArgumentMetadataV1, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV2, FunctionArgumentMetadataV3, FunctionArgumentMetadataV4, FunctionArgumentMetadataV5, FunctionArgumentMetadataV6, FunctionArgumentMetadataV7, FunctionArgumentMetadataV8, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV0, FunctionMetadataV1, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV2, FunctionMetadataV3, FunctionMetadataV4, FunctionMetadataV5, FunctionMetadataV6, FunctionMetadataV7, FunctionMetadataV8, FunctionMetadataV9, MapTypeLatest, MapTypeV0, MapTypeV10, MapTypeV11, MapTypeV2, MapTypeV3, MapTypeV4, MapTypeV5, MapTypeV6, MapTypeV7, MapTypeV8, MapTypeV9, MetadataAll, MetadataLatest, MetadataV0, MetadataV1, MetadataV10, MetadataV11, MetadataV2, MetadataV3, MetadataV4, MetadataV5, MetadataV6, MetadataV7, MetadataV8, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV6, ModuleConstantMetadataV7, ModuleConstantMetadataV8, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV0, ModuleMetadataV1, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV2, ModuleMetadataV3, ModuleMetadataV4, ModuleMetadataV5, ModuleMetadataV6, ModuleMetadataV7, ModuleMetadataV8, ModuleMetadataV9, OuterDispatchCallV0, OuterDispatchMetadataV0, OuterEventEventMetadataEventsV0, OuterEventEventMetadataV0, OuterEventMetadataV0, PlainTypeLatest, PlainTypeV0, PlainTypeV10, PlainTypeV11, PlainTypeV2, PlainTypeV3, PlainTypeV4, PlainTypeV5, PlainTypeV6, PlainTypeV7, PlainTypeV8, PlainTypeV9, RuntimeModuleMetadataV0, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV6, StorageEntryMetadataV7, StorageEntryMetadataV8, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV6, StorageEntryModifierV7, StorageEntryModifierV8, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV6, StorageEntryTypeV7, StorageEntryTypeV8, StorageEntryTypeV9, StorageFunctionMetadataV0, StorageFunctionMetadataV1, StorageFunctionMetadataV2, StorageFunctionMetadataV3, StorageFunctionMetadataV4, StorageFunctionMetadataV5, StorageFunctionModifierV0, StorageFunctionModifierV1, StorageFunctionModifierV2, StorageFunctionModifierV3, StorageFunctionModifierV4, StorageFunctionModifierV5, StorageFunctionTypeV0, StorageFunctionTypeV1, StorageFunctionTypeV2, StorageFunctionTypeV3, StorageFunctionTypeV4, StorageFunctionTypeV5, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV4, StorageHasherV5, StorageHasherV6, StorageHasherV7, StorageHasherV8, StorageHasherV9, StorageMetadataLatest, StorageMetadataV0, StorageMetadataV10, StorageMetadataV11, StorageMetadataV7, StorageMetadataV8, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata'; import { ApiId, BlockHash, ChainProperties, ExtrinsicOrHash, ExtrinsicStatus, Health, KeyValueOption, NetworkState, PeerInfo, RpcMethods, RuntimeDispatchInfo, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/rpc'; @@ -868,9 +868,6 @@ export interface InterfaceRegistry { 'Compact': Compact; 'Option': Option; 'Vec': Vec; - BalanceUpload: BalanceUpload; - 'Option': Option; - 'Vec': Vec; Bidder: Bidder; 'Option': Option; 'Vec': Vec; @@ -883,9 +880,6 @@ export interface InterfaceRegistry { CollatorSignature: CollatorSignature; 'Option': Option; 'Vec': Vec; - EgressQueueRoot: EgressQueueRoot; - 'Option': Option; - 'Vec': Vec; HeadData: HeadData; 'Option': Option; 'Vec': Vec; @@ -939,13 +933,6 @@ export interface InterfaceRegistry { ValidityAttestation: ValidityAttestation; 'Option': Option; 'Vec': Vec; - ValidatorIndex: ValidatorIndex; - 'Compact': Compact; - 'Option': Option; - 'Vec': Vec; - ValidityVote: ValidityVote; - 'Option': Option; - 'Vec': Vec; WinningDataEntry: WinningDataEntry; 'Option': Option; 'Vec': Vec; diff --git a/packages/types/src/interfaces/parachains/definitions.ts b/packages/types/src/interfaces/parachains/definitions.ts index 28082c9321..e817f8fa35 100644 --- a/packages/types/src/interfaces/parachains/definitions.ts +++ b/packages/types/src/interfaces/parachains/definitions.ts @@ -6,10 +6,10 @@ export default { types: { AttestedCandidate: { candidate: 'CandidateReceipt', - validityVotes: 'Vec' + validityVotes: 'Vec', + validatorIndices: 'BitVec' }, AuctionIndex: 'u32', - BalanceUpload: '(AccountId, u64)', Bidder: { _enum: { New: 'NewBidder', @@ -18,13 +18,14 @@ export default { }, CandidateReceipt: { parachainIndex: 'ParaId', - collator: 'AccountId', + collator: 'CollatorId', signature: 'CollatorSignature', headData: 'HeadData', - balanceUploads: 'Vec', - egressQueueRoots: 'Vec', - fees: 'u64', - blockDataHash: 'Hash' + egressQueueRoots: 'Vec<(ParaId, Hash)>', + fees: 'Balance', + blockDataHash: 'Hash', + upwardMessages: 'Vec', + erasureRoot: 'Hash' }, CollatorId: 'H256', CollatorSignature: 'Signature', @@ -96,8 +97,6 @@ export default { Explicit: 'CollatorSignature' // 2 } }, - ValidatorIndex: 'u32', - ValidityVote: '(ValidatorIndex, ValidityAttestation)', WinningDataEntry: '(AccountId, ParaIdOf, BalanceOf)', WinningData: '[WinningDataEntry; 10]' } diff --git a/packages/types/src/interfaces/parachains/types.ts b/packages/types/src/interfaces/parachains/types.ts index 5bad9431b9..f6d811a4c8 100644 --- a/packages/types/src/interfaces/parachains/types.ts +++ b/packages/types/src/interfaces/parachains/types.ts @@ -3,21 +3,19 @@ import { ITuple } from '@polkadot/types/types'; import { Enum, Struct, Vec } from '@polkadot/types/codec'; -import { Bytes, H256, u32, u64 } from '@polkadot/types/primitive'; -import { AccountId, BalanceOf, BlockNumber, Hash, Signature } from '@polkadot/types/interfaces/runtime'; +import { BitVec, Bytes, H256, u32 } from '@polkadot/types/primitive'; +import { AccountId, Balance, BalanceOf, BlockNumber, Hash, Signature } from '@polkadot/types/interfaces/runtime'; /** @name AttestedCandidate */ export interface AttestedCandidate extends Struct { readonly candidate: CandidateReceipt; - readonly validityVotes: Vec; + readonly validityVotes: Vec; + readonly validatorIndices: BitVec; } /** @name AuctionIndex */ export interface AuctionIndex extends u32 {} -/** @name BalanceUpload */ -export interface BalanceUpload extends ITuple<[AccountId, u64]> {} - /** @name Bidder */ export interface Bidder extends Enum { readonly isNew: boolean; @@ -29,13 +27,14 @@ export interface Bidder extends Enum { /** @name CandidateReceipt */ export interface CandidateReceipt extends Struct { readonly parachainIndex: ParaId; - readonly collator: AccountId; + readonly collator: CollatorId; readonly signature: CollatorSignature; readonly headData: HeadData; - readonly balanceUploads: Vec; - readonly egressQueueRoots: Vec; - readonly fees: u64; + readonly egressQueueRoots: Vec>; + readonly fees: Balance; readonly blockDataHash: Hash; + readonly upwardMessages: Vec; + readonly erasureRoot: Hash; } /** @name CollatorId */ @@ -44,9 +43,6 @@ export interface CollatorId extends H256 {} /** @name CollatorSignature */ export interface CollatorSignature extends Signature {} -/** @name EgressQueueRoot */ -export interface EgressQueueRoot extends ITuple<[ParaId, Hash]> {} - /** @name HeadData */ export interface HeadData extends Bytes {} @@ -137,9 +133,6 @@ export interface UpwardMessage extends Struct { readonly data: Bytes; } -/** @name ValidatorIndex */ -export interface ValidatorIndex extends u32 {} - /** @name ValidityAttestation */ export interface ValidityAttestation extends Enum { readonly isNone: boolean; @@ -149,9 +142,6 @@ export interface ValidityAttestation extends Enum { readonly asExplicit: CollatorSignature; } -/** @name ValidityVote */ -export interface ValidityVote extends ITuple<[ValidatorIndex, ValidityAttestation]> {} - /** @name WinningData */ export interface WinningData extends Vec {}