Correctly use RelayChainBlockNumber in PersistedValidationData (#3126)

packages/types/src/interfaces/parachains/SystemInherentData.spec.ts

@@ -0,0 +1,20 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { TypeRegistry } from '../../create';
+
+const KILT = '0x8d01d51627af4cb8414b6ad454e7204424e7e8489738c5fabe20cee3256bd69b7534d12b2798b04e574d05fb8a4b163745b1e610fb75de59399271bd57e49738506a7a93ee0038dd6a1b3bfbb58f747a7b2052058620839a8e2d03f5a43b48ca6000c66a00299600004412f5d19eed1a0cbafadd3b050b6e87fbcdff0a4b2ab0dce498d2180f7d7fe40000000000000000000000000000000000000000000000000000000000000000000000200318f49e207f03cfdce586301014700e2c25930041585f078d434d6125b40443fe11fd292d13a410000008004c5f0ec2d17a76153ff51817f12d9cfc3c7f0400c106807ff6802ca40549562ffe6b52b99b82732a11693a9f94e719eb6091a28361553b7e1d6f8071c05107fa3ba69c860039b5eaf97de7405f1b96f158678ce0581618e4cb00ed8020617372d0786928a794bc2168d93a97c9934583395972b4d4ab49c99242035380947dbbbf1d13550ebd1c60bdad2e6e4905e72acf2135a3ecf9539b14ac336a1e8048b33fdf9c46b272d66e2467dba4fa4709dd3e560183d5ef462c8bdf09aa14e58083a5a2c804e9dbc8839a7d520a726c0518a82ff872d1ec2932c1142866c945648090bbb5b7644e54d533f3630580cb8074409ddcc510eab64ecc32216c912ac87a8071959a3ccb6903f9fb571c5eb87649e1a4d7fc095b7a9d88fd6941dadf0d251280ba7052563c97b91cccc3a3762e0a8d73a0fd2018bd63932fdf6e6dfb8e998705807970bd80ad702930fe83ab570956c242563c1ea2560e5bed94456168ded1ec2e801c3452fb59635b2a0def7e3a91cd071d57beb4d92294484ee948728d72a8a2ed80974da04ec2f2a432413995b1c30d9903e6c69b63d25ea3564c3fd604513c045480365249e4644cac1c396b92b70c2d8daa355a87236ca6ff3fdcf0e0039351fa911501802100803d7774397092a7bd12ebb498311ea37c46eeeec8460cbf88e03f55bfa109817f80f2ce141c02c934f343545350b70e54c8c2a0bb12f886462797399672b145ff0cad019e0da05ca59913bc38a8630590f2627c014180412934e1ef5da416397acfe5b81b2c604c81fd696fabcb082451b88dd46feafc585f078d434d6125b40443fe11fd292d13a410000008008077b468c9a59a67ed7ae15442240aba9ae23e7b632fe6e5bdb97b2b40b4aa10a135037f0006de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385a50200005000008000000800000000200000000400000500000005000000580200002c010000000020030004000000286bee0000000004000000040000000500000000000000000000000000000000000000000000000000000000000000000000000800000000200000040000000400000000040000b004000000000000000000001400000004000000040000000000000000000000000a000000000000000000000000000000000000009901801804800fcf38b60d2719964e4c4cc392848e51c8ce99e85efc57368586ed54938b6bf180aebb1dfa081e0f528a33c48cc0d64717ff2e6de6f73e001bc0c608d24f5b79b7809ee0a05d790e73768b384a037678e8cdc4fcfcb90ca782824c5119294de00fdb0000';
+
+describe('SystemInherentData', (): void => {
+  const registry = new TypeRegistry();
+
+  registry.register({ BlockNumber: 'u64' });
+
+  it('can decode Kilt', (): void => {
+    const value = registry.createType('SystemInherentData', KILT);
+
+    console.log(JSON.stringify(value.toHuman(), null, 2));
+
+    expect(value).toBeTruthy();
+  });
+});

packages/types/src/interfaces/parachains/definitions.ts

@@ -244,13 +244,13 @@ export default {
     ParaValidatorIndex: 'u32',
     PersistedValidationData: {
       parentHead: 'HeadData',
-      blockNumber: 'BlockNumber',
+      blockNumber: 'RelayChainBlockNumber',
       relayStorageRoot: 'Hash',
       hrmpMqcHeads: 'Vec<(u32, Hash)>',
       dmqMqcHead: 'Hash',
       maxPovSize: 'u32'
     },
-    RelayChainBlockNumber: 'BlockNumber',
+    RelayChainBlockNumber: 'u32',
     QueuedParathread: {
       claim: 'ParathreadEntry',
       coreOffset: 'u32'
@@ -526,7 +526,7 @@ export default {
     },
     MessagingStateSnapshotEgressEntry: '(ParaId, AbridgedHrmpChannel)',
     SystemInherentData: {
-      pvalidationData: 'PersistedValidationData',
+      validationData: 'PersistedValidationData',
       relayChainState: 'StorageProof',
       downwardMessages: 'Vec<InboundDownwardMessage>',
       horizontalMessages: 'BTreeMap<ParaId, VecInboundHrmpMessage>'

packages/types/src/interfaces/parachains/types.ts

@@ -602,7 +602,7 @@ export interface ParaValidatorIndex extends u32 {}
 /** @name PersistedValidationData */
 export interface PersistedValidationData extends Struct {
   readonly parentHead: HeadData;
-  readonly blockNumber: BlockNumber;
+  readonly blockNumber: RelayChainBlockNumber;
   readonly relayStorageRoot: Hash;
   readonly hrmpMqcHeads: Vec<ITuple<[u32, Hash]>>;
   readonly dmqMqcHead: Hash;
@@ -629,7 +629,7 @@ export interface RegisteredParachainInfo extends Struct {
 }
 
 /** @name RelayChainBlockNumber */
-export interface RelayChainBlockNumber extends BlockNumber {}
+export interface RelayChainBlockNumber extends u32 {}
 
 /** @name RelayedFrom */
 export interface RelayedFrom extends Struct {
@@ -728,7 +728,7 @@ export interface SubId extends u32 {}
 
 /** @name SystemInherentData */
 export interface SystemInherentData extends Struct {
-  readonly pvalidationData: PersistedValidationData;
+  readonly validationData: PersistedValidationData;
   readonly relayChainState: StorageProof;
   readonly downwardMessages: Vec<InboundDownwardMessage>;
   readonly horizontalMessages: BTreeMap<ParaId, VecInboundHrmpMessage>;