Fix validation data mock (#531)

* fix mock validation data for new upgrade * bump
AcalaNetwork · Nov 9, 2023 · f115c3b · f115c3b
1 parent 9e45639
commit f115c3b
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 17 deletions.
diff --git a/executor/Cargo.lock b/executor/Cargo.lock
diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chopsticks-executor"
-version = "0.9.1"
+version = "0.9.2-1"
 description = "Chopsticks executor"
 repository = "https://github.com/AcalaNetwork/chopsticks"
 license = "Apache-2.0"

diff --git a/packages/chopsticks/package.json b/packages/chopsticks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.9.1",
+	"version": "0.9.2-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"bin": "./chopsticks.cjs",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.9.1",
+	"version": "0.9.2-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/core/src/blockchain/inherent/parachain/validation-data.ts b/packages/core/src/blockchain/inherent/parachain/validation-data.ts
@@ -1,7 +1,7 @@
-import { AbridgedHrmpChannel, HrmpChannelId } from '@polkadot/types/interfaces'
+import { AbridgedHrmpChannel, HrmpChannelId, Slot } from '@polkadot/types/interfaces'
 import { GenericExtrinsic } from '@polkadot/types'
 import { HexString } from '@polkadot/util/types'
-import { hexToU8a, u8aConcat } from '@polkadot/util'
+import { hexToU8a, u8aConcat, u8aToHex } from '@polkadot/util'
 import _ from 'lodash'
 
 import { Block } from '../../block.js'
@@ -13,6 +13,7 @@ import {
   hrmpChannels,
   hrmpEgressChannelIndex,
   hrmpIngressChannelIndex,
+  paraHead,
   upgradeGoAheadSignal,
 } from '../../../utils/proof.js'
 import { blake2AsHex, blake2AsU8a } from '@polkadot/util-crypto'
@@ -101,11 +102,22 @@ export class SetValidationData implements CreateInherents {
       )
 
       for (const key of Object.values(WELL_KNOWN_KEYS)) {
-        newEntries.push([key, decoded[key]])
+        if (key === WELL_KNOWN_KEYS.CURRENT_SLOT) {
+          // increment current slot
+          const currentSlot = meta.registry.createType<Slot>('Slot', hexToU8a(decoded[key])).toNumber()
+          const newSlot = meta.registry.createType<Slot>('Slot', currentSlot + 2)
+          newEntries.push([key, u8aToHex(newSlot.toU8a())])
+        } else {
+          newEntries.push([key, decoded[key]])
+        }
       }
       newEntries.push([hrmpIngressChannelIndexKey, decoded[hrmpIngressChannelIndexKey]])
       newEntries.push([hrmpEgressChannelIndexKey, decoded[hrmpEgressChannelIndexKey]])
 
+      // inject paraHead
+      const headData = meta.registry.createType('HeadData', (await parent.header).toHex())
+      newEntries.push([paraHead(paraId), u8aToHex(headData.toU8a())])
+
       // inject downward messages
       let dmqMqcHeadHash = decoded[dmqMqcHeadKey]
       if (dmqMqcHeadHash) {

diff --git a/packages/core/src/utils/proof.ts b/packages/core/src/utils/proof.ts
@@ -41,3 +41,8 @@ export const hrmpChannels = (channelId: HrmpChannelId) => {
   const prefix = '0x6a0da05ca59913bc38a8630590f2627cb6604cff828a6e3f579ca6c59ace013d'
   return hash(prefix, channelId.toU8a())
 }
+
+export const paraHead = (paraId: u32) => {
+  const prefix = '0xcd710b30bd2eab0352ddcc26417aa1941b3c252fcb29d88eff4f3de5de4476c3'
+  return hash(prefix, paraId.toU8a())
+}
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-db",
-	"version": "0.9.1",
+	"version": "0.9.2-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/e2e/src/__snapshots__/author.test.ts.snap b/packages/e2e/src/__snapshots__/author.test.ts.snap
diff --git a/packages/e2e/src/__snapshots__/chain.test.ts.snap b/packages/e2e/src/__snapshots__/chain.test.ts.snap
diff --git a/packages/e2e/src/__snapshots__/chopsticks-provider.test.ts.snap b/packages/e2e/src/__snapshots__/chopsticks-provider.test.ts.snap
diff --git a/packages/e2e/src/__snapshots__/dry-run-extrinsic.test.ts.snap b/packages/e2e/src/__snapshots__/dry-run-extrinsic.test.ts.snap
@@ -28,7 +28,7 @@ exports[`dry-run-extrinsic > dry run extrinsic 2`] = `
   ],
   [
     "0x26aa394eea5630e07c48ae0c9558cef7a86da5a932684f199539836fcb8c886f",
-    "0x6a140000",
+    "0x68150000",
   ],
   [
     "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9280b197190fc1a763257f65171ea366e88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee",
@@ -89,7 +89,7 @@ exports[`dry-run-extrinsic > dry run extrinsic with fake signature 2`] = `
   ],
   [
     "0x26aa394eea5630e07c48ae0c9558cef7a86da5a932684f199539836fcb8c886f",
-    "0x48140000",
+    "0x46150000",
   ],
   [
     "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9280b197190fc1a763257f65171ea366e88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee",

diff --git a/packages/e2e/src/build-block.test.ts b/packages/e2e/src/build-block.test.ts
@@ -20,7 +20,7 @@ describe.runIf(process.env.CI).each([
 
   { chain: 'Kusama', endpoint: 'wss://kusama-rpc.polkadot.io', storage: KUSAMA_STORAGE },
   { chain: 'Statemine', endpoint: 'wss://statemine-rpc.polkadot.io' },
-  { chain: 'Karura', endpoint: 'wss://karura-rpc-1.aca-api.network' },
+  { chain: 'Karura', endpoint: 'wss://karura-rpc-3.aca-api.network' },
 
   { chain: 'Westend', endpoint: 'wss://westend-rpc.polkadot.io' },
   { chain: 'Westmint', endpoint: 'wss://westmint-rpc.polkadot.io' },

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-testing",
-	"version": "0.9.1",
+	"version": "0.9.2-1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",