Added Anan-AS PVM Interpreter

bin/jam/args.test.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-
+import { PvmBackend, PvmBackendNames } from "@typeberry/config";
 import { NODE_DEFAULTS } from "@typeberry/config-node";
 import { tryAsU16 } from "@typeberry/numbers";
 import { deepEqual } from "@typeberry/utils";
@@ -11,6 +11,7 @@ describe("CLI", () => {
   const defaultOptions: SharedOptions = {
     nodeName: NODE_DEFAULTS.name,
     configPath: NODE_DEFAULTS.config,
+    pvm: NODE_DEFAULTS.pvm,
   };
 
   it("should start with default arguments", () => {
@@ -82,6 +83,30 @@ describe("CLI", () => {
     });
   });
 
+  it("should parse pvm option", () => {
+    const args = parse(["--pvm=ananas"]);
+
+    deepEqual(args, {
+      command: Command.Run,
+      args: {
+        ...defaultOptions,
+        pvm: PvmBackend.Ananas,
+      },
+    });
+  });
+
+  it("should throw on invalid pvm option", () => {
+    const pvms = PvmBackendNames.join(", ");
+    assert.throws(
+      () => {
+        const _args = parse(["--pvm=unimplemented"]);
+      },
+      {
+        message: `Invalid value 'unimplemented' for option 'pvm': Error: Use one of ${pvms}`,
+      },
+    );
+  });
+
   it("should throw on missing output path", () => {
     assert.throws(
       () => {

bin/jam/args.ts

@@ -1,3 +1,4 @@
+import { type PvmBackend, PvmBackendNames } from "@typeberry/config";
 import { DEFAULT_CONFIG, DEV_CONFIG, NODE_DEFAULTS } from "@typeberry/config-node";
 import { isU16, type U16 } from "@typeberry/numbers";
 import minimist from "minimist";
@@ -18,6 +19,8 @@ Options:
                         [default: ${NODE_DEFAULTS.name}]
   --config              Path to a config file or one of: ['${DEV_CONFIG}', '${DEFAULT_CONFIG}'].
                         [default: ${NODE_DEFAULTS.config}]
+  --pvm                 PVM Backend, one of: [${PvmBackendNames.join(", ")}].
+                        [default: ${PvmBackendNames[NODE_DEFAULTS.pvm]}]
 `;
 
 /** Command to execute. */
@@ -37,6 +40,7 @@ export enum Command {
 export type SharedOptions = {
   nodeName: string;
   configPath: string;
+  pvm: PvmBackend;
 };
 
 export type Arguments =
@@ -79,10 +83,23 @@ function parseSharedOptions(
     (v) => (v === DEV_CONFIG || v === DEFAULT_CONFIG ? v : withRelPath(v)),
     defaultConfig,
   );
+  const { pvm } = parseStringOption(
+    args,
+    "pvm",
+    (v) => {
+      const pvm = PvmBackendNames.indexOf(v);
+      if (pvm >= 0) {
+        return pvm as PvmBackend;
+      }
+      throw Error(`Use one of ${PvmBackendNames.join(", ")}`);
+    },
+    NODE_DEFAULTS.pvm,
+  );
 
   return {
     nodeName: name,
     configPath: config,
+    pvm,
   };
 }
 

bin/jam/build-for-npm.sh

@@ -16,9 +16,10 @@ DIST_FOLDER=./dist/jam
 mkdir $DIST_FOLDER || true
 rm -rf $DIST_FOLDER/*
 
-
+# TODO [ToDr] Temporary require anan-as before https://github.com/tomusdrw/anan-as/issues/99
+# is resolved.
 # Build the main binary
-BUILD="npx @vercel/ncc build -a -s -e lmdb -e @matrixai/quic -e tsx/esm/api"
+BUILD="npx @vercel/ncc build -a -s -e lmdb -e @matrixai/quic -e @fluffylabs/anan-as -e tsx/esm/api"
 $BUILD ./bin/jam/index.ts -o $DIST_FOLDER
 
 # Fix un-compiled worker files to point to the ones we will compile manually.
@@ -80,7 +81,8 @@ cat > ./package.json << EOF
   },
   "dependencies": {
     "lmdb": "3.1.3",
-    "@matrixai/quic": "2.0.9"
+    "@matrixai/quic": "2.0.9",
+    "@fluffylabs/anan-as": "1.0.0-a9b8141"
   },
   "homepage": "https://typeberry.dev",
   "author": "Fluffy Labs <hello@fluffylabs.dev>",

bin/jam/index.ts

@@ -63,6 +63,7 @@ async function prepareConfigFile(args: Arguments, blake2b: Blake2b): Promise<Jam
     isAuthoring: args.command === Command.Dev,
     nodeName,
     nodeConfig,
+    pvmBackend: args.args.pvm,
     networkConfig: {
       key: devNetworkingSeed(blake2b, nodeName),
       host: "127.0.0.1",

bin/pvm/index.ts

@@ -1,29 +1,48 @@
 // biome-ignore-all lint/suspicious/noConsole: bin file
 
-import { Interpreter, tryAsGas } from "@typeberry/pvm-interpreter";
-import { Status } from "@typeberry/pvm-interpreter/status.js";
-
-const pvm = new Interpreter();
+import { Status, tryAsGas } from "@typeberry/pvm-interface";
+import { Interpreter } from "@typeberry/pvm-interpreter";
+import { AnanasInterpreter } from "@typeberry/pvm-interpreter-ananas";
 
 const program = new Uint8Array([
   0, 0, 35, 173, 101, 126, 173, 255, 239, 101, 101, 101, 101, 101, 194, 101, 101, 101, 174, 120, 44, 0, 0, 0, 0, 178,
   230, 174, 73, 44, 0, 0, 0, 0, 178, 230, 174, 120, 73, 85, 65, 2, 4,
 ]);
-pvm.reset(program, 0, tryAsGas(200n));
-const instructions = pvm.printProgram();
+
+const pvmTb = new Interpreter({ useSbrkGas: true });
+const pvmAnanas = await AnanasInterpreter.new();
+
+pvmTb.resetGeneric(program, 0, tryAsGas(200n));
+pvmAnanas.resetGeneric(program, 0, tryAsGas(200n));
+
+const instructions = pvmTb.printProgram();
 
 let i = 0;
-while (pvm.nextStep() === Status.OK) {
+let ananas = pvmAnanas.nextStep();
+let tb = Status.OK;
+
+while (ananas || tb === Status.OK) {
   console.info(`Instruction ${i}: ${instructions[i]}`);
-  console.info(`Registers: ${pvm.getRegisters().getAllU64()}`);
-  console.info(`Status: ${pvm.getStatus()}`);
-  console.info(`Gas: ${pvm.getGas()}`);
-  console.info(`Gas: ${pvm.getPC()}`);
+  console.info(`🫐 Registers: ${pvmTb.registers.getAllU64()}`);
+  console.info(`🍍 Registers: ${pvmAnanas.registers.getAllU64()}`);
+  console.info(`Status: 🫐 ${pvmTb.getStatus()} | 🍍 ${pvmAnanas.getStatus()}`);
+  console.info(`Gas: 🫐 ${pvmTb.gas.get()}| 🍍 ${pvmAnanas.gas.get()}`);
+  console.info(`PC: 🫐 ${pvmTb.getPC()} | 🍍 ${pvmAnanas.getPC()}`);
   console.info();
   i++;
+  if (tb === Status.OK) {
+    tb = pvmTb.nextStep();
+  }
+  if (ananas) {
+    ananas = pvmAnanas.nextStep();
+  }
 }
+
 console.info(`Instruction ${i}: ${instructions[i]}`);
-console.info(`Registers: ${pvm.getRegisters().getAllU64()}`);
-console.info(`Status: ${pvm.getStatus()}`);
-console.info(`Gas: ${pvm.getGas()}`);
-console.info(`Gas: ${pvm.getPC()}`);
+console.info(`🫐 Registers: ${pvmTb.registers.getAllU64()}`);
+console.info(`🍍 Registers: ${pvmAnanas.registers.getAllU64()}`);
+console.info(`Status: 🫐 ${pvmTb.getStatus()} | 🍍 ${pvmAnanas.getStatus()}`);
+// TODO [MaSo] Check why they not finished with same gas.
+console.info(`Gas: 🫐 ${pvmTb.gas.get()}| 🍍 ${pvmAnanas.gas.get()}`);
+console.info(`PC: 🫐 ${pvmTb.getPC()} | 🍍 ${pvmAnanas.getPC()}`);
+console.info();

bin/pvm/package.json

@@ -4,7 +4,9 @@
   "description": "PVM program runner.",
   "main": "index.ts",
   "dependencies": {
-    "@typeberry/pvm-interpreter": "*"
+    "@typeberry/pvm-interface": "*",
+    "@typeberry/pvm-interpreter": "*",
+    "@typeberry/pvm-interpreter-ananas": "*"
   },
   "scripts": {
     "start": "tsx ./index.ts",

bin/rpc/test/e2e-setup.ts

@@ -11,7 +11,7 @@ const withRelPath = workspacePathFix(`${import.meta.dirname}/../../..`);
 
 async function main() {
   const nodeConfig = loadConfig(`${import.meta.dirname}/e2e.config.json`);
-  const jamConfig = JamConfig.new({ nodeName: NODE_DEFAULTS.name, nodeConfig });
+  const jamConfig = JamConfig.new({ nodeName: NODE_DEFAULTS.name, nodeConfig, pvmBackend: NODE_DEFAULTS.pvm });
   try {
     const api = await node(jamConfig, withRelPath);
     await importBlocks(api, blocksToImport);

bin/tci/index.test.ts

@@ -13,6 +13,7 @@ describe("Typeberry Common Interface: Config", () => {
     nodeName: NODE_DEFAULTS.name,
     nodeConfig: loadConfig(NODE_DEFAULTS.config),
     devConfig: DEFAULT_DEV_CONFIG,
+    pvmBackend: NODE_DEFAULTS.pvm,
   });
   const key = Bytes.fill(SEED_SIZE, 1).asOpaque<PublicKeySeed>();
 

bin/tci/index.ts

@@ -80,7 +80,12 @@ export function createJamConfig(argv: CommonArguments): node.JamConfig {
     };
   }
 
-  return node.JamConfig.new({ nodeName: NODE_DEFAULTS.name, nodeConfig, devConfig });
+  return node.JamConfig.new({
+    nodeName: NODE_DEFAULTS.name,
+    nodeConfig,
+    devConfig,
+    pvmBackend: NODE_DEFAULTS.pvm,
+  });
 }
 
 if (import.meta.url === pathToFileURL(process.argv[1]).href) {

bin/test-runner/package.json

@@ -10,6 +10,7 @@
     "@typeberry/codec": "*",
     "@typeberry/collections": "*",
     "@typeberry/config": "*",
+    "@typeberry/config-node": "*",
     "@typeberry/crypto": "*",
     "@typeberry/database": "*",
     "@typeberry/disputes": "*",
@@ -18,6 +19,7 @@
     "@typeberry/json-parser": "*",
     "@typeberry/logger": "*",
     "@typeberry/numbers": "*",
+    "@typeberry/pvm-interface": "*",
     "@typeberry/pvm-interpreter": "*",
     "@typeberry/safrole": "*",
     "@typeberry/shuffling": "*",

bin/test-runner/w3f/accumulate.ts

@@ -12,7 +12,7 @@ import type { WorkPackageHash } from "@typeberry/block/refine-context.js";
 import type { WorkReport } from "@typeberry/block/work-report.js";
 import { fromJson, workReportFromJson } from "@typeberry/block-json";
 import { asKnownSize, HashSet } from "@typeberry/collections";
-import type { ChainSpec } from "@typeberry/config";
+import { type ChainSpec, PvmBackend, PvmBackendNames } from "@typeberry/config";
 import { Blake2b } from "@typeberry/hash";
 import { type FromJson, json } from "@typeberry/json-parser";
 import type { InMemoryService } from "@typeberry/state";
@@ -142,8 +142,15 @@ export class AccumulateTest {
 }
 
 export async function runAccumulateTest(test: AccumulateTest, path: string) {
-  const chainSpec = getChainSpec(path);
+  await runAccumulateInternal(test, path, PvmBackend.BuiltIn);
+}
 
+export async function runAccumulateTestAnanas(test: AccumulateTest, path: string) {
+  await runAccumulateInternal(test, path, PvmBackend.Ananas);
+}
+
+async function runAccumulateInternal(test: AccumulateTest, path: string, pvm: PvmBackend) {
+  const chainSpec = getChainSpec(path);
   /**
    * entropy has to be moved to input because state is incompatibile -
    * in test state we have: `entropy: EntropyHash;`
@@ -152,19 +159,19 @@ export async function runAccumulateTest(test: AccumulateTest, path: string) {
    */
   const entropy = test.pre_state.entropy;
 
-  const state = TestState.toAccumulateState(test.pre_state as TestState, chainSpec);
-  const accumulate = new Accumulate(chainSpec, await Blake2b.createHasher(), state);
+  const post_state = TestState.toAccumulateState(test.post_state, chainSpec);
+
+  const state = TestState.toAccumulateState(test.pre_state, chainSpec);
+  const accumulate = new Accumulate(chainSpec, await Blake2b.createHasher(), state, pvm);
   const accumulateOutput = new AccumulateOutput();
   const result = await accumulate.transition({ ...test.input, entropy });
-
   if (result.isError) {
-    assert.fail(`Expected successfull accumulation, got: ${result}`);
+    assert.fail(`Expected successfull accumulation for ${PvmBackendNames[pvm]}, got: ${result}`);
   }
-  const accumulateRoot = await accumulateOutput.transition({ accumulationOutputLog: result.ok.accumulationOutputLog });
+  const accumulateRoot = await accumulateOutput.transition({
+    accumulationOutputLog: result.ok.accumulationOutputLog,
+  });
   state.applyUpdate(result.ok.stateUpdate);
-
-  const post_state = TestState.toAccumulateState(test.post_state as TestState, chainSpec);
-
   deepEqual(state, post_state);
   deepEqual(accumulateRoot, test.output.ok);
 }

bin/test-runner/w3f/pvm-gas-cost.ts

@@ -1,7 +1,8 @@
 import assert from "node:assert";
 import { fromJson } from "@typeberry/block-json";
 import { type FromJson, json } from "@typeberry/json-parser";
-import { Interpreter, tryAsGas } from "@typeberry/pvm-interpreter";
+import { tryAsGas } from "@typeberry/pvm-interface";
+import { Interpreter } from "@typeberry/pvm-interpreter";
 
 export class PvmGasCostTest {
   static fromJson: FromJson<PvmGasCostTest> = {
@@ -15,7 +16,7 @@ export class PvmGasCostTest {
 
 export async function runPvmGasCostTest(testContent: PvmGasCostTest) {
   const pvm = new Interpreter();
-  pvm.reset(testContent.program, 0, tryAsGas(1000));
+  pvm.resetGeneric(testContent.program, 0, tryAsGas(1000));
 
   const blockGasCosts = pvm.calculateBlockGasCost();
 

bin/test-runner/w3f/pvm.ts

@@ -1,14 +1,14 @@
 import assert from "node:assert";
 import { fromJson } from "@typeberry/block-json";
 import { type FromJson, json } from "@typeberry/json-parser";
-import { Interpreter, tryAsGas } from "@typeberry/pvm-interpreter";
+import { MAX_MEMORY_INDEX, Status, tryAsGas } from "@typeberry/pvm-interface";
+import { Interpreter } from "@typeberry/pvm-interpreter";
 import { MemoryBuilder } from "@typeberry/pvm-interpreter/memory/index.js";
-import { MAX_MEMORY_INDEX, PAGE_SIZE } from "@typeberry/pvm-interpreter/memory/memory-consts.js";
+import { PAGE_SIZE } from "@typeberry/pvm-interpreter/memory/memory-consts.js";
 import { tryAsMemoryIndex, tryAsSbrkIndex } from "@typeberry/pvm-interpreter/memory/memory-index.js";
 import { getPageNumber } from "@typeberry/pvm-interpreter/memory/memory-utils.js";
 import { type PageNumber, tryAsPageNumber } from "@typeberry/pvm-interpreter/memory/pages/page-utils.js";
 import { Registers } from "@typeberry/pvm-interpreter/registers.js";
-import { Status } from "@typeberry/pvm-interpreter/status.js";
 import { safeAllocUint8Array } from "@typeberry/utils";
 
 class MemoryChunkItem {
@@ -113,12 +113,12 @@ export async function runPvmTest(testContent: PvmTest) {
     return "halt";
   };
 
-  pvm.reset(testContent.program, testContent["initial-pc"], tryAsGas(testContent["initial-gas"]), regs, memory);
+  pvm.resetGeneric(testContent.program, testContent["initial-pc"], tryAsGas(testContent["initial-gas"]), regs, memory);
   pvm.runProgram();
 
-  assert.strictEqual(pvm.getGas(), BigInt(testContent["expected-gas"]));
+  assert.strictEqual(pvm.gas.get(), BigInt(testContent["expected-gas"]));
   assert.strictEqual(pvm.getPC(), testContent["expected-pc"]);
-  assert.deepStrictEqual(pvm.getRegisters().getAllU64(), testContent["expected-regs"]);
+  assert.deepStrictEqual(pvm.registers.getAllU64(), testContent["expected-regs"]);
 
   const testStatus = mapPvmStatus(pvm.getStatus());
   const exitParam = pvm.getExitParam();

bin/test-runner/w3f/runners.ts

@@ -14,7 +14,7 @@ import {
 import { fullChainSpec, tinyChainSpec } from "@typeberry/config";
 import { runner } from "../common.js";
 import { runStateTransition, StateTransition } from "../state-transition/state-transition.js";
-import { AccumulateTest, runAccumulateTest } from "./accumulate.js";
+import { AccumulateTest, runAccumulateTest, runAccumulateTestAnanas } from "./accumulate.js";
 import { AssurancesTestFull, AssurancesTestTiny, runAssurancesTestFull, runAssurancesTestTiny } from "./assurances.js";
 import { AuthorizationsTest, runAuthorizationsTest } from "./authorizations.js";
 import {
@@ -50,6 +50,7 @@ import { runTrieTest, trieTestSuiteFromJson } from "./trie.js";
 
 export const runners = [
   runner("accumulate", AccumulateTest.fromJson, runAccumulateTest),
+  runner("accumulate_ananas", AccumulateTest.fromJson, runAccumulateTestAnanas),
   runner("assurances/tiny", AssurancesTestTiny.fromJson, runAssurancesTestTiny),
   runner("assurances/full", AssurancesTestFull.fromJson, runAssurancesTestFull),
   runner("authorizations", AuthorizationsTest.fromJson, runAuthorizationsTest),