fix genesis

AcalaNetwork · Jan 8, 2024 · 95aff9b · 95aff9b
1 parent ed77173
commit 95aff9b
Show file tree

Hide file tree

Showing 12 changed files with 647 additions and 208 deletions.
diff --git a/packages/chopsticks/src/schema/index.ts b/packages/chopsticks/src/schema/index.ts
@@ -29,7 +29,11 @@ export const configSchema = z.object({
   'max-memory-block-count': z.number().optional(),
   db: z.string({ description: 'Path to database' }).optional(),
   'wasm-override': z.string({ description: 'Path to wasm override' }).optional(),
-  genesis: z.union([z.string(), genesisSchema]).optional(),
+  genesis: z
+    .union([z.string(), genesisSchema], {
+      description: 'URL to genesis config file. NOTE: Only parachains with AURA consensus are supported!',
+    })
+    .optional(),
   timestamp: z.number().optional(),
   'registered-types': z.any().optional(),
   'runtime-log-level': z

diff --git a/packages/chopsticks/src/setup-with-server.ts b/packages/chopsticks/src/setup-with-server.ts
@@ -7,11 +7,6 @@ import { setupContext } from './context.js'
 export const setupWithServer = async (argv: Config) => {
   const context = await setupContext(argv)
 
-  if (argv.genesis) {
-    // mine 1st block when starting from genesis to set some mock validation data
-    await context.chain.newBlock()
-  }
-
   const { close, port: listenPort } = await createServer(handler(context), argv.port)
 
   defaultLogger.info(`${await context.chain.api.getSystemChain()} RPC listening on port ${listenPort}`)

diff --git a/packages/core/src/blockchain/block-builder.ts b/packages/core/src/blockchain/block-builder.ts
@@ -125,6 +125,14 @@ const initNewBlock = async (
     const resp = await newBlock.call('Core_initialize_block', [header.toHex()])
     newBlock.pushStorageLayer().setAll(resp.storageDiff)
 
+    if (head.number === 0) {
+      // set parent hash for genesis block
+      // this makes sure to override the default parent hash
+      const meta = await head.meta
+      const header = await head.header
+      newBlock.pushStorageLayer().setAll([[compactHex(meta.query.system.parentHash()), header.hash.toHex()]])
+    }
+
     callback?.onPhaseApplied?.('initialize', resp)
   }
 

diff --git a/packages/core/src/blockchain/inherent/para-enter.ts b/packages/core/src/blockchain/inherent/para-enter.ts
@@ -12,6 +12,17 @@ export class ParaInherentEnter implements CreateInherents {
       return []
     }
 
+    if (parent.number === 0) {
+      return [
+        new GenericExtrinsic(
+          meta.registry,
+          meta.tx.paraInherent.enter({
+            parentHeader: (await parent.header).toJSON(),
+          }),
+        ).toHex(),
+      ]
+    }
+
     const extrinsics = await parent.extrinsics
 
     const paraEnterExtrinsic = extrinsics.find((extrinsic) => {