@fluffylabs/anan-as 1.2.0-69743c7 → 1.2.0-c2b7f5a

package/dist/test/test-gas-cost.js

@@ -2,7 +2,7 @@
 import "json-bigint-patch";
 import * as assert from "node:assert";
 import { ERR, OK, read, run } from "../bin/src/test-json.js";
-import { disassemble, getGasCosts, HasMetadata, InputKind } from "../build/release.js";
+import { disassemble, getBlockGasCosts, HasMetadata, InputKind } from "../build/release.js";
 // Run the CLI application
 main();
 // Main function
@@ -10,7 +10,6 @@ function main() {
     const options = {
         isDebug: false,
         isSilent: false,
-        useSbrkGas: false,
     };
     run(processGasCost, options);
 }
@@ -29,7 +28,7 @@ function processGasCost(data, options, filePath) {
         console.info(assembly);
         console.info("\n^^^^^^^^^^^\n");
     }
-    const result = asMap(getGasCosts(input.program, InputKind.Generic, HasMetadata.No));
+    const result = asMap(getBlockGasCosts(input.program, InputKind.Generic, HasMetadata.No));
     // silent mode - just put our vals into expected (comparison done externally)
     if (options.isSilent) {
         data.block_gas_costs = result;

package/dist/test/test-w3f-common.js

@@ -0,0 +1,125 @@
+import "json-bigint-patch";
+import * as assert from "node:assert";
+import { ERR, OK, read, run } from "../bin/src/test-json.js";
+const ignored = [
+    "inst_load_u8_nok",
+    "inst_store_imm_indirect_u16_with_offset_nok",
+    "inst_store_imm_indirect_u32_with_offset_nok",
+    "inst_store_imm_indirect_u64_with_offset_nok",
+    "inst_store_imm_indirect_u8_with_offset_nok",
+    "inst_store_imm_u8_trap_inaccessible",
+    "inst_store_imm_u8_trap_read_only",
+    "inst_store_indirect_u16_with_offset_nok",
+    "inst_store_indirect_u32_with_offset_nok",
+    "inst_store_indirect_u64_with_offset_nok",
+    "inst_store_indirect_u8_with_offset_nok",
+    "inst_store_u8_trap_inaccessible",
+    "inst_store_u8_trap_read_only",
+];
+export function runW3fTests(pvm) {
+    const options = {
+        isDebug: false,
+        isSilent: false,
+    };
+    run((data, opts, filePath) => processW3f(pvm, data, opts, filePath), options);
+}
+function processW3f(pvm, data, options, _filePath) {
+    if (options.isDebug) {
+        console.debug(`🤖 Running ${data.name}`);
+    }
+    if (ignored.includes(data.name)) {
+        if (options.isDebug) {
+            console.info(`⏭️ Skipping ${data.name}`);
+        }
+        return data;
+    }
+    // input
+    const input = {
+        registers: read(data, "initial-regs").map((x) => BigInt(x)),
+        pc: read(data, "initial-pc"),
+        pageMap: asPageMap(read(data, "initial-page-map")),
+        memory: asChunks(read(data, "initial-memory")),
+        gas: BigInt(read(data, "initial-gas")),
+        program: read(data, "program"),
+    };
+    if (options.isDebug) {
+        const assembly = pvm.disassemble(input.program, pvm.InputKind.Generic, pvm.HasMetadata.No);
+        console.info("===========");
+        console.info(assembly);
+        console.info("\n^^^^^^^^^^^\n");
+    }
+    const exe = pvm.prepareProgram(pvm.InputKind.Generic, pvm.HasMetadata.No, input.program, input.registers, input.pageMap, input.memory, [], 16);
+    const result = pvm.runProgram(exe, input.gas, input.pc, options.isDebug, true);
+    const status = statusAsString(result.status);
+    // Normalize registers to plain unsigned BigInt array for comparison.
+    // The portable build may store signed BigInts or plain numbers in registers.
+    result.registers = Array.from(result.registers).map((v) => typeof v === "bigint" ? BigInt.asUintN(64, v) : BigInt(v));
+    result.gas = typeof result.gas === "bigint" ? result.gas : BigInt(result.gas);
+    // Normalize memory chunks to plain objects for comparison.
+    // The portable build returns class instances; WASM returns plain objects.
+    result.memory = result.memory.map((chunk) => ({
+        address: chunk.address,
+        data: Array.from(chunk.data),
+    }));
+    // silent mode - just put our vals into expected (comparison done externally)
+    if (options.isSilent) {
+        data["expected-pc"] = result.pc;
+        data["expected-gas"] = result.gas;
+        data["expected-status"] = status;
+        data["expected-regs"] = result.registers;
+        data["expected-page-fault-address"] = result.exitCode;
+        return data;
+    }
+    // compare with expected values
+    const expected = {
+        // just copy JAM-output result field
+        result: result.result,
+        status: read(data, "expected-status"),
+        registers: read(data, "expected-regs").map((x) => BigInt(x)),
+        pc: read(data, "expected-pc"),
+        memory: asChunks(read(data, "expected-memory")),
+        gas: BigInt(read(data, "expected-gas")),
+        exitCode: read(data, "expected-page-fault-address", 0),
+    };
+    try {
+        assert.deepStrictEqual({
+            ...result,
+            status,
+        }, expected);
+        console.log(`${OK} ${data.name}`);
+    }
+    catch (e) {
+        console.log(`${ERR} ${data.name}`);
+        throw e;
+    }
+    return data;
+}
+function asChunks(chunks) {
+    return chunks.map((chunk) => {
+        chunk.data = read(chunk, "contents");
+        delete chunk.contents;
+        return chunk;
+    });
+}
+var Access;
+(function (Access) {
+    Access[Access["Read"] = 1] = "Read";
+    Access[Access["Write"] = 2] = "Write";
+})(Access || (Access = {}));
+function asPageMap(pages) {
+    return pages.map((page) => {
+        page.access = read(page, "is-writable") ? Access.Write : Access.Read;
+        return page;
+    });
+}
+function statusAsString(status) {
+    const map = {
+        255: "ok",
+        0: "halt",
+        1: "panic",
+        2: "page-fault",
+        3: "host",
+        4: "oog",
+    };
+    return map[status] || `unknown(${status})`;
+}

package/dist/test/test-w3f-portable.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+// @ts-expect-error: portable bundle has no TS declarations for direct import
+import * as pvm from "../dist/build/js/portable-bundle.js";
+import { runW3fTests } from "./test-w3f-common.js";
+runW3fTests(pvm);

package/dist/test/test-w3f.js

@@ -1,121 +1,4 @@
 #!/usr/bin/env node
-import "json-bigint-patch";
-import * as assert from "node:assert";
-import { ERR, OK, read, run } from "../bin/src/test-json.js";
-import { disassemble, HasMetadata, InputKind, prepareProgram, runProgram } from "../build/release.js";
-const ignored = [
-    "inst_load_u8_nok",
-    "inst_store_imm_indirect_u16_with_offset_nok",
-    "inst_store_imm_indirect_u32_with_offset_nok",
-    "inst_store_imm_indirect_u64_with_offset_nok",
-    "inst_store_imm_indirect_u8_with_offset_nok",
-    "inst_store_imm_u8_trap_inaccessible",
-    "inst_store_imm_u8_trap_read_only",
-    "inst_store_indirect_u16_with_offset_nok",
-    "inst_store_indirect_u32_with_offset_nok",
-    "inst_store_indirect_u64_with_offset_nok",
-    "inst_store_indirect_u8_with_offset_nok",
-    "inst_store_u8_trap_inaccessible",
-    "inst_store_u8_trap_read_only",
-];
-// Run the CLI application
-main();
-// Main function
-function main() {
-    const options = {
-        isDebug: false,
-        isSilent: false,
-        useSbrkGas: false,
-    };
-    run(processW3f, options);
-}
-function processW3f(data, options) {
-    if (options.isDebug) {
-        console.debug(`🤖 Running ${data.name}`);
-    }
-    if (ignored.includes(data.name)) {
-        if (options.isDebug) {
-            console.info(`⏭️ Skipping ${data.name}`);
-        }
-        return data;
-    }
-    // input
-    const input = {
-        registers: read(data, "initial-regs").map((x) => BigInt(x)),
-        pc: read(data, "initial-pc"),
-        pageMap: asPageMap(read(data, "initial-page-map")),
-        memory: asChunks(read(data, "initial-memory")),
-        gas: BigInt(read(data, "initial-gas")),
-        program: read(data, "program"),
-    };
-    if (options.isDebug) {
-        const assembly = disassemble(input.program, InputKind.Generic, HasMetadata.No);
-        console.info("===========");
-        console.info(assembly);
-        console.info("\n^^^^^^^^^^^\n");
-    }
-    const exe = prepareProgram(InputKind.Generic, HasMetadata.No, input.program, input.registers, input.pageMap, input.memory, [], 16);
-    const result = runProgram(exe, input.gas, input.pc, options.isDebug, options.useSbrkGas, true);
-    const status = statusAsString(result.status);
-    // silent mode - just put our vals into expected (comparison done externally)
-    if (options.isSilent) {
-        data["expected-pc"] = result.pc;
-        data["expected-gas"] = result.gas;
-        data["expected-status"] = status;
-        data["expected-regs"] = result.registers;
-        data["expected-page-fault-address"] = result.exitCode;
-        return data;
-    }
-    // compare with expected values
-    const expected = {
-        // just copy JAM-output result field
-        result: result.result,
-        status: read(data, "expected-status"),
-        registers: read(data, "expected-regs").map((x) => BigInt(x)),
-        pc: read(data, "expected-pc"),
-        memory: asChunks(read(data, "expected-memory")),
-        gas: BigInt(read(data, "expected-gas")),
-        exitCode: read(data, "expected-page-fault-address", 0),
-    };
-    try {
-        assert.deepStrictEqual({
-            ...result,
-            status,
-        }, expected);
-        console.log(`${OK} ${data.name}`);
-    }
-    catch (e) {
-        console.log(`${ERR} ${data.name}`);
-        throw e;
-    }
-    return data;
-}
-function asChunks(chunks) {
-    return chunks.map((chunk) => {
-        chunk.data = read(chunk, "contents");
-        delete chunk.contents;
-        return chunk;
-    });
-}
-var Access;
-(function (Access) {
-    Access[Access["Read"] = 1] = "Read";
-    Access[Access["Write"] = 2] = "Write";
-})(Access || (Access = {}));
-function asPageMap(pages) {
-    return pages.map((page) => {
-        page.access = read(page, "is-writable") ? Access.Write : Access.Read;
-        return page;
-    });
-}
-function statusAsString(status) {
-    const map = {
-        255: "ok",
-        0: "halt",
-        1: "panic",
-        2: "page-fault",
-        3: "host",
-        4: "oog",
-    };
-    return map[status] || `unknown(${status})`;
-}
+import * as pvm from "../build/release.js";
+import { runW3fTests } from "./test-w3f-common.js";
+runW3fTests(pvm);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@fluffylabs/anan-as",
 	"description": "AssemblyScript PVM interpreter.",
-	"version": "1.2.0-69743c7",
+	"version": "1.2.0-c2b7f5a",
 	"main": "./dist/bin/index.js",
 	"bin": {
 		"anan-as": "./dist/bin/index.js"
@@ -33,11 +33,17 @@
 		"qa-fix": "npm run format; npm run lint",
 		"start": "tsx ./bin/index.ts",
 		"test": "npm run asbuild:test && tsx ./test/test-as.ts && tsx ./test/test-trace-replay.ts",
-		"tsbuild": "tsc",
+		"tsbuild": "tsc && npm run tsbuild:portable",
+		"tsbuild:portable": "tsc --project portable/tsconfig.json && esbuild dist/build/js/portable/index.js --bundle --format=esm --platform=node --outfile=dist/build/js/portable-bundle.js",
 		"test:w3f": "tsx ./test/test-w3f.ts",
+		"test:w3f-portable": "tsx ./test/test-w3f-portable.ts",
 		"test:gas-cost": "tsx ./test/test-gas-cost.ts",
 		"update-version": "tsx ./web/bump-version.ts $GITHUB_SHA",
-		"web": "npx live-server ./web"
+		"web": "npx live-server ./web",
+		"bench": "tsx bench/run.ts --traces ./bench/traces --iterations 5 --warmup 1",
+		"bench:ci": "tsx bench/run.ts --traces ./bench/traces --iterations 5 --warmup 1 --output ./bench/results.json",
+		"bench:baseline": "tsx bench/run.ts --traces ./bench/traces --iterations 5 --warmup 1 --output ./bench/baseline.json",
+		"bench:compare": "tsx bench/compare.ts"
 	},
 	"type": "module",
 	"keywords": [],
@@ -47,10 +53,11 @@
 		"node": ">=18.3.0"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.11",
+		"@biomejs/biome": "^2.4.3",
 		"@typeberry/lib": "^0.5.1",
 		"@types/node": "^25.0.0",
 		"assemblyscript": "^0.28.8",
+		"esbuild": "^0.27.0",
 		"json-bigint-patch": "^0.0.8",
 		"tsx": "^4.20.6",
 		"typescript": "^5.9.3"
@@ -111,6 +118,10 @@
 		"./release.wasm": "./dist/build/release.wasm",
 		"./release-mini.wasm": "./dist/build/release-mini.wasm",
 		"./release-stub.wasm": "./dist/build/release-stub.wasm",
-		"./compiler.wasm": "./dist/build/compiler.wasm"
+		"./compiler.wasm": "./dist/build/compiler.wasm",
+		"./js": {
+			"import": "./dist/build/js/portable-bundle.js",
+			"types": "./dist/build/js/portable/index.d.ts"
+		}
 	}
 }