fix genesis (#624)

* fix genesis * udpate snapshot
AcalaNetwork · Jan 9, 2024 · d7b476e · d7b476e
1 parent 64b64a9
commit d7b476e
Show file tree

Hide file tree

Showing 13 changed files with 750 additions and 311 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/schema/options.test.ts b/packages/chopsticks/src/schema/options.test.ts
@@ -3,107 +3,107 @@ import { expect, it } from 'vitest'
 
 it('get yargs options from zod schema', () => {
   expect(getYargsOptions(configSchema.shape)).toMatchInlineSnapshot(`
-      {
-        "allow-unresolved-imports": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": undefined,
-          "type": "boolean",
-        },
-        "block": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Block hash or block number. Default to latest block",
-          "type": "string",
-        },
-        "build-block-mode": {
-          "choices": [
-            "Batch",
-            "Instant",
-            "Manual",
-          ],
-          "demandOption": false,
-          "description": undefined,
-          "type": undefined,
-        },
-        "db": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Path to database",
-          "type": "string",
-        },
-        "endpoint": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Endpoint to connect to",
-          "type": "string",
-        },
-        "genesis": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": undefined,
-          "type": "string",
-        },
-        "import-storage": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Pre-defined JSON/YAML storage file path",
-          "type": undefined,
-        },
-        "max-memory-block-count": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": undefined,
-          "type": "number",
-        },
-        "mock-signature-host": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid",
-          "type": "boolean",
-        },
-        "offchain-worker": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Enable offchain worker",
-          "type": "boolean",
-        },
-        "port": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Port to listen on",
-          "type": "number",
-        },
-        "registered-types": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": undefined,
-          "type": undefined,
-        },
-        "resume": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Resume from the specified block hash or block number in db. If true, it will resume from the latest block in db. Note this will override the block option",
-          "type": "string",
-        },
-        "runtime-log-level": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Runtime maximum log level [off = 0; error = 1; warn = 2; info = 3; debug = 4; trace = 5]",
-          "type": "number",
-        },
-        "timestamp": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": undefined,
-          "type": "number",
-        },
-        "wasm-override": {
-          "choices": undefined,
-          "demandOption": false,
-          "description": "Path to wasm override",
-          "type": "string",
-        },
-      }
-    `)
+    {
+      "allow-unresolved-imports": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": undefined,
+        "type": "boolean",
+      },
+      "block": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Block hash or block number. Default to latest block",
+        "type": "string",
+      },
+      "build-block-mode": {
+        "choices": [
+          "Batch",
+          "Instant",
+          "Manual",
+        ],
+        "demandOption": false,
+        "description": undefined,
+        "type": undefined,
+      },
+      "db": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Path to database",
+        "type": "string",
+      },
+      "endpoint": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Endpoint to connect to",
+        "type": "string",
+      },
+      "genesis": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "URL to genesis config file. NOTE: Only parachains with AURA consensus are supported!",
+        "type": "string",
+      },
+      "import-storage": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Pre-defined JSON/YAML storage file path",
+        "type": undefined,
+      },
+      "max-memory-block-count": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": undefined,
+        "type": "number",
+      },
+      "mock-signature-host": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Mock signature host so any signature starts with 0xdeadbeef and filled by 0xcd is considered valid",
+        "type": "boolean",
+      },
+      "offchain-worker": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Enable offchain worker",
+        "type": "boolean",
+      },
+      "port": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Port to listen on",
+        "type": "number",
+      },
+      "registered-types": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": undefined,
+        "type": undefined,
+      },
+      "resume": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Resume from the specified block hash or block number in db. If true, it will resume from the latest block in db. Note this will override the block option",
+        "type": "string",
+      },
+      "runtime-log-level": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Runtime maximum log level [off = 0; error = 1; warn = 2; info = 3; debug = 4; trace = 5]",
+        "type": "number",
+      },
+      "timestamp": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": undefined,
+        "type": "number",
+      },
+      "wasm-override": {
+        "choices": undefined,
+        "demandOption": false,
+        "description": "Path to wasm override",
+        "type": "string",
+      },
+    }
+  `)
 })
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) => {