[WIP] Add support for Moonriver

configs/moonbase-alpha.yml

@@ -0,0 +1,26 @@
+endpoint: wss://wss.api.moonbase.moonbeam.network
+mock-signature-host: true
+db: ./db.sqlite
+
+import-storage:
+  System:
+    Account:
+      -
+        -
+          - "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"
+        - data:
+            free: "100000000000000000000000"
+  TechCommitteeCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  CouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  TreasuryCouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  Sudo:
+    Key: "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"
+  AuthorFilter:
+    EligibleRatio: 100
+    EligibleCount: 100
+
+
+

configs/moonbeam.yml

@@ -0,0 +1,24 @@
+endpoint: wss://wss.api.moonbeam.network
+mock-signature-host: true
+db: ./db.sqlite
+
+import-storage:
+  System:
+    Account:
+      -
+        -
+          - "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"
+        - data:
+            free: "100000000000000000000000"
+  TechCommitteeCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  CouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  TreasuryCouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  AuthorFilter:
+    EligibleRatio: 100
+    EligibleCount: 100
+
+
+

configs/moonriver.yml

@@ -0,0 +1,24 @@
+endpoint: wss://wss.moonriver.moonbeam.network
+mock-signature-host: true
+db: ./db.sqlite
+
+import-storage:
+  System:
+    Account:
+      -
+        -
+          - "0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"
+        - data:
+            free: "100000000000000000000000"
+  TechCommitteeCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  CouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  TreasuryCouncilCollective:
+    Members: ["0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"]
+  AuthorFilter:
+    EligibleRatio: 100
+    EligibleCount: 100
+
+
+

e2e/helper.ts

@@ -8,7 +8,14 @@ import { Api } from '../src/api'
 import { Blockchain } from '../src/blockchain'
 import { BuildBlockMode } from '../src/blockchain/txpool'
 import { GenesisProvider } from '../src/genesis-provider'
-import { InherentProviders, ParaInherentEnter, SetTimestamp, SetValidationData } from '../src/blockchain/inherent'
+import {
+  InherentProviders,
+  ParaInherentEnter,
+  SetBabeRandomness,
+  SetNimbusAuthorInherent,
+  SetTimestamp,
+  SetValidationData,
+} from '../src/blockchain/inherent'
 import { StorageValues } from '../src/utils/set-storage'
 import { createServer } from '../src/server'
 import { handler } from '../src/rpc'
@@ -52,7 +59,12 @@ export const setupAll = async ({
 
   return {
     async setup() {
-      const inherents = new InherentProviders(new SetTimestamp(), [new SetValidationData(), new ParaInherentEnter()])
+      const inherents = new InherentProviders(new SetTimestamp(), [
+        new SetValidationData(),
+        new ParaInherentEnter(),
+        new SetNimbusAuthorInherent(),
+        new SetBabeRandomness(),
+      ])
 
       const chain = new Blockchain({
         api,

package.json

@@ -24,7 +24,9 @@
 		"test:dev": "LOG_LEVEL=trace vitest --inspect",
 		"dev": "LOG_LEVEL=trace ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/dev.yml",
 		"dev:karura": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/karura.yml",
-		"dev:acala": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/acala.yml"
+		"dev:acala": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/acala.yml",
+		"dev:moonriver": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/moonriver.yml",
+		"dev:moonbeam": "ts-node-dev --transpile-only --inspect --notify=false src/index.ts -- dev --config=configs/moonbeam.yml"
 	},
 	"dependencies": {
 		"@acala-network/chopsticks-executor": "workspace:*",

src/blockchain/block-builder.ts

@@ -1,7 +1,9 @@
 import { Block, TaskCallResponse } from './block'
 import { Header, RawBabePreDigest } from '@polkadot/types/interfaces'
 import { HexString } from '@polkadot/util/types'
-import { compactAddLength } from '@polkadot/util'
+import { StorageValueKind } from './storage-layer'
+import { compactAddLength, stringToHex } from '@polkadot/util'
+import { compactHex } from '../utils'
 import { defaultLogger, truncate, truncateStorageDiff } from '../logger'
 import { getCurrentSlot } from '../utils/time-travel'
 
@@ -57,6 +59,21 @@ const newHeader = async (head: Block) => {
     const digest = meta.registry.createType<RawBabePreDigest>('RawBabePreDigest', consensus.slot)
     const newSlot = compactAddLength(meta.registry.createType('RawBabePreDigest', getNewSlot(digest, slot + 1)).toU8a())
     newLogs = [{ PreRuntime: [consensus.consensusEngine, newSlot] }, ...consensus.rest]
+  } else if (consensus?.consensusEngine?.toString() == 'nmbs') {
+    const nmbsKey = stringToHex('nmbs')
+    newLogs = [
+      {
+        // Using previous block author
+        PreRuntime: [
+          consensus.consensusEngine,
+          parentHeader.digest.logs
+            .find((log) => log.isPreRuntime && log.asPreRuntime[0].toHex() == nmbsKey)
+            ?.asPreRuntime[1].toHex(),
+        ],
+      },
+      ...consensus.rest,
+      head.pushStorageLayer().set(compactHex(meta.query.randomness.notFirstBlock()), StorageValueKind.Deleted),
+    ]
   }
 
   const header = meta.registry.createType<Header>('Header', {

src/blockchain/inherent/index.ts

@@ -6,6 +6,8 @@ import { getCurrentTimestamp, getSlotDuration } from '../../utils/time-travel'
 
 export { SetValidationData } from './parachain/validation-data'
 export { ParaInherentEnter } from './para-enter'
+export { SetBabeRandomness } from './parachain/babe-randomness'
+export { SetNimbusAuthorInherent } from './parachain/nimbus-author-inherent'
 
 export interface CreateInherents {
   createInherents(parent: Block, params?: BuildBlockParams['inherent']): Promise<HexString[]>

src/blockchain/inherent/parachain/babe-randomness.ts

@@ -0,0 +1,17 @@
+import { GenericExtrinsic } from '@polkadot/types'
+import { HexString } from '@polkadot/util/types'
+
+import { Block } from '../../../blockchain/block'
+import { BuildBlockParams } from '../../txpool'
+import { CreateInherents } from '..'
+
+// Support for Moonbeam pallet-randomness mandatory inherent
+export class SetBabeRandomness implements CreateInherents {
+  async createInherents(parent: Block, _params?: BuildBlockParams['inherent']): Promise<HexString[]> {
+    const meta = await parent.meta
+    if (!meta.tx.randomness?.setBabeRandomnessResults) {
+      return []
+    }
+    return [new GenericExtrinsic(meta.registry, meta.tx.randomness.setBabeRandomnessResults()).toHex()]
+  }
+}

src/blockchain/inherent/parachain/nimbus-author-inherent.ts

@@ -0,0 +1,17 @@
+import { GenericExtrinsic } from '@polkadot/types'
+import { HexString } from '@polkadot/util/types'
+
+import { Block } from '../../../blockchain/block'
+import { BuildBlockParams } from '../../txpool'
+import { CreateInherents } from '..'
+
+// Support for Nimbus Author Inherent
+export class SetNimbusAuthorInherent implements CreateInherents {
+  async createInherents(parent: Block, _params?: BuildBlockParams['inherent']): Promise<HexString[]> {
+    const meta = await parent.meta
+    if (!meta.tx.authorInherent?.kickOffAuthorshipValidation) {
+      return []
+    }
+    return [new GenericExtrinsic(meta.registry, meta.tx.authorInherent.kickOffAuthorshipValidation()).toHex()]
+  }
+}

src/setup.ts

@@ -8,7 +8,14 @@ import { Api } from './api'
 import { Blockchain } from './blockchain'
 import { Config } from './schema'
 import { GenesisProvider } from './genesis-provider'
-import { InherentProviders, ParaInherentEnter, SetTimestamp, SetValidationData } from './blockchain/inherent'
+import {
+  InherentProviders,
+  ParaInherentEnter,
+  SetBabeRandomness,
+  SetNimbusAuthorInherent,
+  SetTimestamp,
+  SetValidationData,
+} from './blockchain/inherent'
 import { defaultLogger } from './logger'
 import { importStorage, overrideWasm } from './utils/import-storage'
 import { openDb } from './db'
@@ -46,7 +53,12 @@ export const setup = async (argv: Config) => {
 
   const header = await api.getHeader(blockHash)
 
-  const inherents = new InherentProviders(new SetTimestamp(), [new SetValidationData(), new ParaInherentEnter()])
+  const inherents = new InherentProviders(new SetTimestamp(), [
+    new SetValidationData(),
+    new ParaInherentEnter(),
+    new SetNimbusAuthorInherent(),
+    new SetBabeRandomness(),
+  ])
 
   const chain = new Blockchain({
     api,