fix genesis dmp (#633)

* fix genesis dmp * increase timeout * lint * disable collectives test * disable collectives test
AcalaNetwork · Jan 16, 2024 · 7e3d283 · 7e3d283
1 parent 478d4e0
commit 7e3d283
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/packages/core/src/blockchain/inherent/parachain/validation-data.ts b/packages/core/src/blockchain/inherent/parachain/validation-data.ts
@@ -131,26 +131,24 @@ export class SetValidationData implements CreateInherents {
     newEntries.push([paraHead(paraId), u8aToHex(headData.toU8a())])
 
     // inject downward messages
-    let dmqMqcHeadHash = decoded[dmqMqcHeadKey]
-    if (dmqMqcHeadHash) {
-      for (const { msg, sentAt } of params.downwardMessages) {
-        // calculate new hash
-        dmqMqcHeadHash = blake2AsHex(
-          u8aConcat(
-            meta.registry.createType('Hash', dmqMqcHeadHash).toU8a(),
-            meta.registry.createType('BlockNumber', sentAt).toU8a(),
-            blake2AsU8a(meta.registry.createType('Bytes', msg).toU8a(), 256),
-          ),
-          256,
-        )
-
-        downwardMessages.push({
-          msg,
-          sentAt,
-        })
-      }
-      newEntries.push([dmqMqcHeadKey, dmqMqcHeadHash])
+    let dmqMqcHeadHash = decoded[dmqMqcHeadKey] || '0x0000000000000000000000000000000000000000000000000000000000000000'
+    for (const { msg, sentAt } of params.downwardMessages) {
+      // calculate new hash
+      dmqMqcHeadHash = blake2AsHex(
+        u8aConcat(
+          meta.registry.createType('Hash', dmqMqcHeadHash).toU8a(),
+          meta.registry.createType('BlockNumber', sentAt).toU8a(),
+          blake2AsU8a(meta.registry.createType('Bytes', msg).toU8a(), 256),
+        ),
+        256,
+      )
+
+      downwardMessages.push({
+        msg,
+        sentAt,
+      })
     }
+    newEntries.push([dmqMqcHeadKey, dmqMqcHeadHash])
 
     const hrmpIngressChannels = meta.registry
       .createType('Vec<ParaId>', decoded[hrmpIngressChannelIndexKey])

diff --git a/packages/e2e/src/build-block.test.ts b/packages/e2e/src/build-block.test.ts
@@ -15,7 +15,7 @@ const KUSAMA_STORAGE = {
 describe.runIf(process.env.CI).each([
   { chain: 'Polkadot', endpoint: 'https://rpc.polkadot.io' },
   { chain: 'Statemint', endpoint: 'wss://statemint-rpc.dwellir.com' },
-  { chain: 'Polkadot Collectives', endpoint: 'wss://sys.ibp.network/collectives-polkadot' },
+  // { chain: 'Polkadot Collectives', endpoint: 'wss://sys.ibp.network/collectives-polkadot' },
   { chain: 'Acala', endpoint: 'wss://acala-rpc-1.aca-api.network' },
 
   { chain: 'Kusama', endpoint: 'wss://kusama-rpc.polkadot.io', storage: KUSAMA_STORAGE },
@@ -24,22 +24,26 @@ describe.runIf(process.env.CI).each([
 
   { chain: 'Westend', endpoint: 'wss://westend-rpc.polkadot.io' },
   { chain: 'Westmint', endpoint: 'wss://westmint-rpc.polkadot.io' },
-  { chain: 'Westend Collectives', endpoint: 'wss://sys.ibp.network/collectives-westend' },
+  // { chain: 'Westend Collectives', endpoint: 'wss://sys.ibp.network/collectives-westend' },
 ])('Latest $chain can build blocks', async ({ endpoint, storage }) => {
   const { setup, teardownAll } = await setupAll({ endpoint })
 
   afterAll(async () => {
     await teardownAll()
   })
 
-  it('build blocks', async () => {
-    const { chain, ws, teardown } = await setup()
-    storage && (await ws.send('dev_setStorage', [storage]))
-    const blockNumber = chain.head.number
-    await ws.send('dev_newBlock', [{ count: 2 }])
-    expect(chain.head.number).eq(blockNumber + 2)
-    await teardown()
-  })
+  it(
+    'build blocks',
+    async () => {
+      const { chain, ws, teardown } = await setup()
+      storage && (await ws.send('dev_setStorage', [storage]))
+      const blockNumber = chain.head.number
+      await ws.send('dev_newBlock', [{ count: 2 }])
+      expect(chain.head.number).eq(blockNumber + 2)
+      await teardown()
+    },
+    { timeout: 300_000, retry: 1 },
+  )
 
   it('build block using unsafeBlockHeight', async () => {
     const { chain, ws, teardown } = await setup()