diff --git a/CHANGELOG.md b/CHANGELOG.md index ae5e6d4cd7..1891d660ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## master + +Changes: + +- Align `BeefyPayload` with Substrate master + + ## 8.9.1 Jun 19, 2022 Contributed: diff --git a/packages/types-augment/src/registry/interfaces.ts b/packages/types-augment/src/registry/interfaces.ts index e1592ae60e..674eac8e8e 100644 --- a/packages/types-augment/src/registry/interfaces.ts +++ b/packages/types-augment/src/registry/interfaces.ts @@ -10,7 +10,7 @@ import type { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interface import type { UncleEntryItem } from '@polkadot/types/interfaces/authorship'; import type { AllowedSlots, BabeAuthorityWeight, BabeBlockWeight, BabeEpochConfiguration, BabeEquivocationProof, BabeWeight, EpochAuthorship, MaybeRandomness, MaybeVrf, NextConfigDescriptor, NextConfigDescriptorV1, Randomness, RawBabePreDigest, RawBabePreDigestCompat, RawBabePreDigestPrimary, RawBabePreDigestPrimaryTo159, RawBabePreDigestSecondaryPlain, RawBabePreDigestSecondaryTo159, RawBabePreDigestSecondaryVRF, RawBabePreDigestTo159, SlotNumber, VrfData, VrfOutput, VrfProof } from '@polkadot/types/interfaces/babe'; import type { AccountData, BalanceLock, BalanceLockTo212, BalanceStatus, Reasons, ReserveData, ReserveIdentifier, VestingSchedule, WithdrawReasons } from '@polkadot/types/interfaces/balances'; -import type { BeefyCommitment, BeefyId, BeefyNextAuthoritySet, BeefyPayload, BeefySignedCommitment, MmrRootHash, ValidatorSetId } from '@polkadot/types/interfaces/beefy'; +import type { BeefyCommitment, BeefyId, BeefyNextAuthoritySet, BeefyPayload, BeefyPayloadId, BeefySignedCommitment, MmrRootHash, ValidatorSetId } from '@polkadot/types/interfaces/beefy'; import type { BridgeMessageId, BridgedBlockHash, BridgedBlockNumber, BridgedHeader, CallOrigin, ChainId, DeliveredMessages, DispatchFeePayment, InboundLaneData, InboundRelayer, InitializationData, LaneId, MessageData, MessageKey, MessageNonce, MessagesDeliveryProofOf, MessagesProofOf, OperatingMode, OutboundLaneData, OutboundMessageFee, OutboundPayload, Parameter, RelayerId, UnrewardedRelayer, UnrewardedRelayersState } from '@polkadot/types/interfaces/bridges'; import type { BlockHash } from '@polkadot/types/interfaces/chain'; import type { PrefixedStorageKey } from '@polkadot/types/interfaces/childstate'; @@ -141,6 +141,7 @@ declare module '@polkadot/types/types/registry' { BeefyKey: BeefyKey; BeefyNextAuthoritySet: BeefyNextAuthoritySet; BeefyPayload: BeefyPayload; + BeefyPayloadId: BeefyPayloadId; BeefySignedCommitment: BeefySignedCommitment; Bid: Bid; Bidder: Bidder; diff --git a/packages/types/src/interfaces/beefy/definitions.ts b/packages/types/src/interfaces/beefy/definitions.ts index 646f34cd42..173f6a0512 100644 --- a/packages/types/src/interfaces/beefy/definitions.ts +++ b/packages/types/src/interfaces/beefy/definitions.ts @@ -40,7 +40,8 @@ export default { len: 'u32', root: 'H256' }, - BeefyPayload: 'MmrRootHash', + BeefyPayload: 'Vec<(BeefyPayloadId, Bytes)>', + BeefyPayloadId: '[u8;2]', MmrRootHash: 'H256', ValidatorSetId: 'u64' } diff --git a/packages/types/src/interfaces/beefy/types.ts b/packages/types/src/interfaces/beefy/types.ts index 9e1ec6d7c4..a32af6ee9d 100644 --- a/packages/types/src/interfaces/beefy/types.ts +++ b/packages/types/src/interfaces/beefy/types.ts @@ -1,7 +1,8 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -import type { Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types-codec'; +import type { Bytes, Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types-codec'; +import type { ITuple } from '@polkadot/types-codec/types'; import type { EcdsaSignature } from '@polkadot/types/interfaces/extrinsics'; import type { BlockNumber, H256 } from '@polkadot/types/interfaces/runtime'; @@ -23,7 +24,10 @@ export interface BeefyNextAuthoritySet extends Struct { } /** @name BeefyPayload */ -export interface BeefyPayload extends MmrRootHash {} +export interface BeefyPayload extends Vec> {} + +/** @name BeefyPayloadId */ +export interface BeefyPayloadId extends U8aFixed {} /** @name BeefySignedCommitment */ export interface BeefySignedCommitment extends Struct {