@typeberry/lib 0.5.2 → 0.5.3-5a6cfcc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.5.2",
+  "version": "0.5.3-5a6cfcc",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",
@@ -218,8 +218,12 @@
     "#@typeberry/database/*": "./packages/jam/database/*",
     "#@typeberry/database-lmdb": "./packages/jam/database-lmdb/index.js",
     "#@typeberry/database-lmdb/*": "./packages/jam/database-lmdb/*",
+    "#@typeberry/executor": "./packages/jam/executor/index.js",
+    "#@typeberry/executor/*": "./packages/jam/executor/*",
     "#@typeberry/fuzz-proto": "./packages/jam/fuzz-proto/index.js",
     "#@typeberry/fuzz-proto/*": "./packages/jam/fuzz-proto/*",
+    "#@typeberry/in-core": "./packages/jam/in-core/index.js",
+    "#@typeberry/in-core/*": "./packages/jam/in-core/*",
     "#@typeberry/jam-host-calls": "./packages/jam/jam-host-calls/index.js",
     "#@typeberry/jam-host-calls/*": "./packages/jam/jam-host-calls/*",
     "#@typeberry/jamnp-s": "./packages/jam/jamnp-s/index.js",
@@ -238,6 +242,8 @@
     "#@typeberry/state-json/*": "./packages/jam/state-json/*",
     "#@typeberry/state-merkleization": "./packages/jam/state-merkleization/index.js",
     "#@typeberry/state-merkleization/*": "./packages/jam/state-merkleization/*",
+    "#@typeberry/state-vectors": "./packages/jam/state-vectors/index.js",
+    "#@typeberry/state-vectors/*": "./packages/jam/state-vectors/*",
     "#@typeberry/transition": "./packages/jam/transition/index.js",
     "#@typeberry/transition/*": "./packages/jam/transition/*",
     "#@typeberry/disputes": "./packages/jam/transition/disputes/index.js",
@@ -253,12 +259,10 @@
     "#@typeberry/importer": "./packages/workers/importer/index.js",
     "#@typeberry/importer/*": "./packages/workers/importer/*",
     "#@typeberry/jam-network": "./packages/workers/jam-network/index.js",
-    "#@typeberry/jam-network/*": "./packages/workers/jam-network/*",
-    "#@typeberry/state-vectors": "./packages/jam/state-vectors/index.js",
-    "#@typeberry/state-vectors/*": "./packages/jam/state-vectors/*"
+    "#@typeberry/jam-network/*": "./packages/workers/jam-network/*"
   },
   "dependencies": {
-    "@fluffylabs/anan-as": "^1.1.3",
+    "@fluffylabs/anan-as": "^1.1.5",
     "@noble/ed25519": "2.2.3",
     "@typeberry/native": "0.0.4-4c0cd28",
     "hash-wasm": "4.12.0"

package/packages/core/collections/blob-dictionary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blob-dictionary.d.ts","sourceRoot":"","sources":["../../../../../packages/core/collections/blob-dictionary.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blob-dictionary.d.ts","sourceRoot":"","sources":["../../../../../packages/core/collections/blob-dictionary.ts"],"names":[],"mappings":"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"}

package/packages/core/collections/blob-dictionary.js

@@ -172,14 +172,14 @@ export class BlobDictionary extends WithDebug {
         const pathChunksGenerator = key.chunks(CHUNK_SIZE);
         let depth = 0;
         while (node !== undefined) {
-            const maybePathChunk = pathChunksGenerator.next().value;
             if (node.children instanceof ListChildren) {
-                const subkey = BytesBlob.blobFrom(key.raw.subarray(depth * CHUNK_SIZE));
+                const subkey = depth === 0 ? key : BytesBlob.blobFrom(key.raw.subarray(depth * CHUNK_SIZE));
                 const child = node.children.find(subkey);
                 if (child !== null) {
                     return child.value;
                 }
             }
+            const maybePathChunk = pathChunksGenerator.next().value;
             if (maybePathChunk === undefined) {
                 return node.getLeaf()?.value;
             }
@@ -363,7 +363,7 @@ export class ListChildren {
     children = [];
     constructor() { }
     find(key) {
-        const result = this.children.find((item) => item[0].isEqualTo(key));
+        const result = this.children.find((item) => item[0] === key || item[0].isEqualTo(key));
         if (result !== undefined) {
             return result[1];
         }

package/packages/core/crypto/bandersnatch.d.ts

@@ -1,5 +1,5 @@
 import { Bytes } from "#@typeberry/bytes";
-import { type Opaque } from "#@typeberry/utils";
+import { OK, type Opaque, Result } from "#@typeberry/utils";
 /** Bandersnatch public key size. */
 export declare const BANDERSNATCH_KEY_BYTES = 32;
 export type BANDERSNATCH_KEY_BYTES = typeof BANDERSNATCH_KEY_BYTES;
@@ -47,4 +47,5 @@ export type BandersnatchProof = Opaque<Bytes<BANDERSNATCH_PROOF_BYTES>, "Banders
 export type BlsKey = Opaque<Bytes<BLS_KEY_BYTES>, "BlsKey">;
 /** Derive a Bandersnatch public key from a seed. */
 export declare function publicKey(seed: Uint8Array): BandersnatchKey;
+export declare function checkNativeBindings(): Result<OK, string>;
 //# sourceMappingURL=bandersnatch.d.ts.map

package/packages/core/crypto/bandersnatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bandersnatch.d.ts","sourceRoot":"","sources":["../../../../../packages/core/crypto/bandersnatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAS,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEtD,oCAAoC;AACpC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC;AAEnE,sCAAsC;AACtC,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,MAAM,MAAM,gCAAgC,GAAG,OAAO,gCAAgC,CAAC;AAEvF,wCAAwC;AACxC,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAChD,MAAM,MAAM,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAE/E,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,MAAM,MAAM,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAEvE,2BAA2B;AAC3B,eAAO,MAAM,aAAa,MAAM,CAAC;AACjC,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAEvF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAEvG;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,0BAA0B,CAAC,CAAC;AAEnH;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,2BAA2B,CAAC,CAAC;AAErG;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;AAE5D,oDAAoD;AACpD,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,CAM3D"}
+{"version":3,"file":"bandersnatch.d.ts","sourceRoot":"","sources":["../../../../../packages/core/crypto/bandersnatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAS,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAElE,oCAAoC;AACpC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC;AAEnE,sCAAsC;AACtC,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,MAAM,MAAM,gCAAgC,GAAG,OAAO,gCAAgC,CAAC;AAEvF,wCAAwC;AACxC,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAChD,MAAM,MAAM,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAE/E,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,MAAM,MAAM,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAEvE,2BAA2B;AAC3B,eAAO,MAAM,aAAa,MAAM,CAAC;AACjC,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAEvF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAEvG;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,0BAA0B,CAAC,CAAC;AAEnH;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,2BAA2B,CAAC,CAAC;AAErG;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;AAE5D,oDAAoD;AACpD,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,CAM3D;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAMxD"}

package/packages/core/crypto/bandersnatch.js

@@ -1,6 +1,6 @@
 import { Bytes } from "#@typeberry/bytes";
 import { bandersnatch } from "@typeberry/native";
-import { check } from "#@typeberry/utils";
+import { check, OK, Result } from "#@typeberry/utils";
 /** Bandersnatch public key size. */
 export const BANDERSNATCH_KEY_BYTES = 32;
 /** Bandersnatch VRF signature size */
@@ -13,7 +13,14 @@ export const BANDERSNATCH_PROOF_BYTES = 784;
 export const BLS_KEY_BYTES = 144;
 /** Derive a Bandersnatch public key from a seed. */
 export function publicKey(seed) {
-    const key = bandersnatch.derive_public_key(seed);
+    const key = bandersnatch.derivePublicKey(seed);
     check `${key[0] === 0} Invalid Bandersnatch public key derived from seed`;
     return Bytes.fromBlob(key.subarray(1), BANDERSNATCH_KEY_BYTES).asOpaque();
 }
+export function checkNativeBindings() {
+    if (bandersnatch.isNativeBinding()) {
+        return Result.ok(OK);
+    }
+    const error = "native binding error";
+    return Result.error(bandersnatch.getNativeBindingError() ?? error, () => error);
+}

package/packages/core/crypto/key-derivation.test.js

@@ -3,6 +3,7 @@ import { before, describe, it } from "node:test";
 import { Bytes } from "#@typeberry/bytes";
 import { Blake2b } from "#@typeberry/hash";
 import { tryAsU32 } from "#@typeberry/numbers";
+import { deepEqual } from "#@typeberry/utils";
 import { initWasm } from "./index.js";
 import { deriveBandersnatchPublicKey, deriveBandersnatchSecretKey, deriveEd25519PublicKey, deriveEd25519SecretKey, SEED_SIZE, trivialSeed, } from "./key-derivation.js";
 before(initWasm);
@@ -183,42 +184,42 @@ describe("Key Derivation: Bandersnatch public key", () => {
         const seed = trivialSeed(tryAsU32(0));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("ff71c6c03ff88adb5ed52c9681de1629a54e702fc14729f6b50d2f0a76f185b3").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("ff71c6c03ff88adb5ed52c9681de1629a54e702fc14729f6b50d2f0a76f185b3").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: 1", () => {
         const seed = trivialSeed(tryAsU32(1));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("dee6d555b82024f1ccf8a1e37e60fa60fd40b1958c4bb3006af78647950e1b91").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("dee6d555b82024f1ccf8a1e37e60fa60fd40b1958c4bb3006af78647950e1b91").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: 2", () => {
         const seed = trivialSeed(tryAsU32(2));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("9326edb21e5541717fde24ec085000b28709847b8aab1ac51f84e94b37ca1b66").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("9326edb21e5541717fde24ec085000b28709847b8aab1ac51f84e94b37ca1b66").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: 3", () => {
         const seed = trivialSeed(tryAsU32(3));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("0746846d17469fb2f95ef365efcab9f4e22fa1feb53111c995376be8019981cc").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("0746846d17469fb2f95ef365efcab9f4e22fa1feb53111c995376be8019981cc").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: 4", () => {
         const seed = trivialSeed(tryAsU32(4));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("151e5c8fe2b9d8a606966a79edd2f9e5db47e83947ce368ccba53bf6ba20a40b").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("151e5c8fe2b9d8a606966a79edd2f9e5db47e83947ce368ccba53bf6ba20a40b").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: 5", () => {
         const seed = trivialSeed(tryAsU32(5));
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("2105650944fcd101621fd5bb3124c9fd191d114b7ad936c1d79d734f9f21392e").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("2105650944fcd101621fd5bb3124c9fd191d114b7ad936c1d79d734f9f21392e").raw, SEED_SIZE).asOpaque());
     });
     it("should derive from seed: f92d...d9d1", () => {
         const seed = Bytes.fromBlob(Bytes.parseBlobNoPrefix("f92d680ea3f0ac06307795490d8a03c5c0d4572b5e0a8cffec87e1294855d9d1").raw, SEED_SIZE).asOpaque();
         const bandersnatch_seed = deriveBandersnatchSecretKey(seed, blake2b);
         const bandersnatch_public_key = deriveBandersnatchPublicKey(bandersnatch_seed);
-        assert.deepStrictEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("299bdfd8d615aadd9e6c58718f9893a5144d60e897bc9da1f3d73c935715c650").raw, SEED_SIZE).asOpaque());
+        deepEqual(bandersnatch_public_key, Bytes.fromBlob(Bytes.parseBlobNoPrefix("299bdfd8d615aadd9e6c58718f9893a5144d60e897bc9da1f3d73c935715c650").raw, SEED_SIZE).asOpaque());
     });
 });

package/packages/core/hash/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../../../../packages/core/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,KAAK,CAAC;AAC5B,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC;AAEzC,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC;AAE7D,4BAA4B;AAC5B,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE3C,yBAAyB;AACzB,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAEvD,eAAO,MAAM,SAAS,WAAwB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,SAAS;aAEpD,IAAI,EAAE,KAAK;aACX,IAAI,EAAE,KAAK;gBADX,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK;CAI9B;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;aAIzE,OAAO,EAAE,SAAS;gBAFlC,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACK,OAAO,EAAE,SAAS;CAIrC"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../../../../packages/core/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,KAAK,CAAC;AAC5B,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC;AAEzC,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC;AAE7D,4BAA4B;AAC5B,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE3C,yBAAyB;AACzB,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAEvD,eAAO,MAAM,SAAS,WAAwB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,SAAS;aAGpD,IAAI,EAAE,KAAK;aACX,IAAI,EAAE,KAAK;gBADX,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK;CAI9B;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;aAIzE,OAAO,EAAE,SAAS;gBAFlC,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACK,OAAO,EAAE,SAAS;CAIrC"}

package/packages/core/hash/hash.js

@@ -19,6 +19,7 @@ export const ZERO_HASH = Bytes.zero(HASH_SIZE);
 export class WithHash extends WithDebug {
     hash;
     data;
+    // TODO [ToDr] use static method and make constructor private
     constructor(hash, data) {
         super();
         this.hash = hash;

package/packages/core/networking/certificate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"certificate.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/certificate.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAErF,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAezC,oBAAY,eAAe;IACzB,aAAa,IAAI;IACjB,UAAU,IAAI;IACd,qBAAqB,IAAI;IACzB,eAAe,IAAI;IACnB,kBAAkB,IAAI;CACvB;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAwDvG;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IACtD,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,CAcD;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,mBAQ5D;AAED,wFAAwF;AACxF,wBAAsB,mBAAmB,CAAC,EACxC,MAAM,EACN,cAAc,EACd,aAAa,EACb,iBAAsB,EACtB,gBAAqB,EACrB,GAAgB,GACjB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACvD,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CA6EhC;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,SAAS,UAElD;AACD,wBAAgB,UAAU,CAAC,aAAa,EAAE,UAAU,UAGnD;AA4BD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,UAEnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,cAAc,CAkBpF"}
+{"version":3,"file":"certificate.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/certificate.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAErF,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAezC,oBAAY,eAAe;IACzB,aAAa,IAAI;IACjB,UAAU,IAAI;IACd,qBAAqB,IAAI;IACzB,eAAe,IAAI;IACnB,kBAAkB,IAAI;CACvB;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAyDvG;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IACtD,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,CAcD;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,mBAQ5D;AAED,wFAAwF;AACxF,wBAAsB,mBAAmB,CAAC,EACxC,MAAM,EACN,cAAc,EACd,aAAa,EACb,iBAAsB,EACtB,gBAAqB,EACrB,GAAgB,GACjB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACvD,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CA6EhC;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,SAAS,UAElD;AACD,wBAAgB,UAAU,CAAC,aAAa,EAAE,UAAU,UAGnD;AA4BD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,UAEnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,cAAc,CAkBpF"}

package/packages/core/networking/certificate.js

@@ -54,6 +54,7 @@ export async function verifyCertificate(certs) {
     }
     const key = Buffer.from(jwk.x ?? "", "base64url");
     if (!xc.verify(xc.publicKey)) {
+        logger.log `Certificate validation failed: incorrect signature`;
         return Result.error(VerifyCertError.IncorrectSignature, () => "Certificate validation failed: incorrect signature");
     }
     const publicKey = Bytes.fromBlob(new Uint8Array(key), ED25519_KEY_BYTES);

package/packages/core/networking/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/networking",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "QUIC-based p2p networking.",
     "license": "MPL-2.0",
     "author": "Fluffy Labs",

package/packages/core/networking/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAgBhE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,sCAAsC;AACtC,MAAM,MAAM,OAAO,GAAG;IACpB,yBAAyB;IACzB,GAAG,EAAE,WAAW,CAAC;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAQF,qBAAa,IAAI;IACf,6DAA6D;WAChD,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;CAkKlF"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAiBhE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,sCAAsC;AACtC,MAAM,MAAM,OAAO,GAAG;IACpB,yBAAyB;IACzB,GAAG,EAAE,WAAW,CAAC;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAQF,qBAAa,IAAI;IACf,6DAA6D;WAChD,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;CAsKlF"}

package/packages/core/networking/setup.js

@@ -3,7 +3,7 @@ import { events, QUICClient, QUICServer, QUICSocket } from "@matrixai/quic";
 import { BytesBlob } from "#@typeberry/bytes";
 import { Level, Logger } from "#@typeberry/logger";
 import { now } from "#@typeberry/utils";
-import { altNameRaw, certToPEM, ed25519AsJsonWebKeyPair, generateCertificate, privateKeyToPEM, } from "./certificate.js";
+import { altNameRaw, certToPEM, ed25519AsJsonWebKeyPair, generateCertificate, privateKeyToPEM, verifyCertificate, } from "./certificate.js";
 import { getQuicClientCrypto, getQuicServerCrypto } from "./crypto.js";
 import * as metrics from "./metrics.js";
 import { peerVerification } from "./peer-verification.js";
@@ -34,7 +34,6 @@ export class Quic {
             subjectKeyPair: keyPair,
             issuerKeyPair: keyPair,
         });
-        const lastConnectedPeer = peerVerification();
         // QUICConfig
         const config = {
             keepAliveIntervalTime: 3000,
@@ -43,7 +42,9 @@ export class Quic {
             cert: certToPEM(cert),
             key: privKeyPEM,
             verifyPeer: true,
-            verifyCallback: lastConnectedPeer.verifyCallback,
+            // Server accepts TLS and verifies the certificate in the connection handler
+            // (EventQUICServerConnection). Client overrides this with peerVerification() per dial.
+            verifyCallback: async () => undefined,
         };
         logger.info `🆔 Peer id: ** ${altNameRaw(key.pubKey)}@${host}:${port} ** (pubkey: ${key.pubKey})`;
         // Shared injected UDP socket
@@ -67,27 +68,30 @@ export class Quic {
             const conn = ev.detail;
             const peerAddress = `${conn.remoteHost}:${conn.remotePort}`;
             networkMetrics.recordConnectingIn(peerAddress);
-            if (lastConnectedPeer.info === null) {
-                networkMetrics.recordConnectInFailed("no_peer_info");
+            // Verify the peer's certificate and extract peer info.
+            const remoteCerts = conn.getRemoteCertsChain();
+            const verification = await verifyCertificate(remoteCerts);
+            if (verification.isError) {
+                networkMetrics.recordConnectInFailed("cert_verification_failed");
                 await conn.stop();
                 return;
             }
-            if (lastConnectedPeer.info.key.isEqualTo(key.pubKey)) {
+            const peerInfo = verification.ok;
+            if (peerInfo.key.isEqualTo(key.pubKey)) {
                 logger.log `🛜 Rejecting connection from ourself from ${conn.remoteHost}:${conn.remotePort}`;
                 networkMetrics.recordConnectionRefused(peerAddress);
                 await conn.stop({ isApp: true, errorCode: CloseReason.ConnectionFromOurself });
                 return;
             }
-            if (peers.isConnected(lastConnectedPeer.info.id)) {
-                logger.log `🛜 Rejecting duplicate connection with peer ${lastConnectedPeer.info.id} from ${conn.remoteHost}:${conn.remotePort}`;
+            if (peers.isConnected(peerInfo.id)) {
+                logger.log `🛜 Rejecting duplicate connection with peer ${peerInfo.id} from ${conn.remoteHost}:${conn.remotePort}`;
                 networkMetrics.recordConnectionRefused(peerAddress);
-                await conn.stop({ isApp: true, errorCode: CloseReason.DuplicateConnection });
+                await conn.stop({ isApp: true, errorCode: CloseReason.DuplicateConnection, force: false });
                 return;
             }
             logger.log `🛜 Server handshake with ${conn.remoteHost}:${conn.remotePort}`;
-            newPeer(conn, lastConnectedPeer.info, "in");
-            networkMetrics.recordConnectedIn(lastConnectedPeer.info.id);
-            lastConnectedPeer.info = null;
+            newPeer(conn, peerInfo, "in");
+            networkMetrics.recordConnectedIn(peerInfo.id);
             await conn.start();
         });
         // connecting to a peer

package/packages/core/numbers/index.d.ts

@@ -5,12 +5,16 @@ export type WithBytesRepresentation<Bytes extends number> = {
 export type FixedSizeNumber<Bytes extends number> = number & WithBytesRepresentation<Bytes>;
 /** Unsigned integer that can be represented as one byte. */
 export type U8 = FixedSizeNumber<1>;
+export declare const MAX_VALUE_U8 = 255;
 /** Unsigned integer that can be represented as two bytes. */
 export type U16 = FixedSizeNumber<2>;
+export declare const MAX_VALUE_U16 = 65535;
 /** Unsigned integer that can be represented as 4 bytes. */
 export type U32 = FixedSizeNumber<4>;
+export declare const MAX_VALUE_U32 = 4294967295;
 /** Unsigned integer that can be represented as 8 bytes. */
 export type U64 = bigint & WithBytesRepresentation<8>;
+export declare const MAX_VALUE_U64 = 18446744073709551615n;
 /** Attempt to cast an input number into U8. */
 export declare const tryAsU8: (v: number) => U8;
 /** Check if given number is a valid U8 number. */

package/packages/core/numbers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/numbers/index.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,CAAC,MAAM,wBAAwB,EAAE,OAAO,MAAM,CAAC;AAE7D,MAAM,MAAM,uBAAuB,CAAC,KAAK,SAAS,MAAM,IAAI;IAC1D,QAAQ,CAAC,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC;CAC5C,CAAC;AAKF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,IAAI,MAAM,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;AAE5F,4DAA4D;AAC5D,MAAM,MAAM,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAEpC,6DAA6D;AAC7D,MAAM,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAErC,2DAA2D;AAC3D,MAAM,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAErC,2DAA2D;AAC3D,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAGtD,+CAA+C;AAC/C,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,KAAG,EAGnC,CAAC;AACF,kDAAkD;AAClD,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,EAA8B,CAAC;AAErE,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,KAAG,GAGpC,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAgC,CAAC;AAExE,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,KAAG,GAGpC,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAsC,CAAC;AAE9E,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,GAAG,MAAM,KAAG,GAI7C,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAgC,CAAC;AAExE,0CAA0C;AAC1C,eAAO,MAAM,YAAY,GAAI,kBAAkB;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE,KAAG,GAG3E,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,YAAY,GAAI,GAAG,GAAG,KAAG;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAS7D,CAAC;AAEF,qCAAqC;AACrC,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI;IACtB,uCAAuC;IACvC,QAAQ,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAEF;;;GAGG;AACH,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE;;;EAWtC;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE;;;EAWtC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,UAAU,CAEnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,GAAG,CAGxD;AAED,iFAAiF;AACjF,eAAO,MAAM,MAAM,GAAI,GAAG,GAAG,EAAE,GAAG,QAAQ,GAAG,EAAE,KAAG,GAAoE,CAAC;AAEvH,gFAAgF;AAChF,eAAO,MAAM,MAAM,GAAI,GAAG,GAAG,EAAE,GAAG,QAAQ,GAAG,EAAE,KAAG,GAAoE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/numbers/index.ts"],"names":[],"mappings":"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"}

package/packages/core/numbers/index.js

@@ -1,9 +1,9 @@
 import { check } from "#@typeberry/utils";
 const asTypedNumber = (v) => v;
-const MAX_VALUE_U8 = 0xff;
-const MAX_VALUE_U16 = 0xffff;
-const MAX_VALUE_U32 = 0xffff_ffff;
-const MAX_VALUE_U64 = 0xffffffffffffffffn;
+export const MAX_VALUE_U8 = 0xff;
+export const MAX_VALUE_U16 = 0xffff;
+export const MAX_VALUE_U32 = 0xffff_ffff;
+export const MAX_VALUE_U64 = 0xffffffffffffffffn;
 /** Attempt to cast an input number into U8. */
 export const tryAsU8 = (v) => {
     check `${isU8(v)} input must have one-byte representation, got ${v}`;

package/packages/core/pvm-host-calls/bin.js

@@ -1,11 +1,11 @@
 import { PvmBackend } from "#@typeberry/config";
 import { tryAsGas } from "#@typeberry/pvm-interface";
-import { HostCalls } from "./host-calls.js";
-import { HostCallsManager, NoopMissing } from "./host-calls-manager.js";
-import { InterpreterInstanceManager } from "./interpreter-instance-manager.js";
-const hostCalls = new HostCallsManager({ missing: new NoopMissing(), handlers: [] });
-const pvmInstanceManager = await InterpreterInstanceManager.new(PvmBackend.BuiltIn);
-const pvmHostCallExtension = new HostCalls(pvmInstanceManager, hostCalls);
+import { HostCalls, NoopMissing } from "./host-calls.js";
+import { HostCallsExecutor } from "./host-calls-executor.js";
+import { PvmInstanceManager } from "./pvm-instance-manager.js";
+const hostCalls = new HostCalls({ missing: new NoopMissing(), handlers: [] });
+const pvmInstanceManager = await PvmInstanceManager.new(PvmBackend.BuiltIn);
+const pvmHostCallExtension = new HostCallsExecutor(pvmInstanceManager, hostCalls);
 const program = new Uint8Array([
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x1, 0x0, 0x0, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0xd9, 0x5, 0x12,
     0x0, 0x0, 0x0, 0x5, 0x11, 0x0, 0x0, 0x0, 0x5, 0xa3, 0x0, 0x0, 0x0, 0x5, 0xc6, 0x0, 0x4, 0x7, 0x13, 0x0, 0x2, 0x11,

package/packages/core/pvm-host-calls/ecalli-io-tracker.d.ts

@@ -0,0 +1,32 @@
+import type { U32, U64 } from "#@typeberry/numbers";
+import type { RegisterIndex } from "#@typeberry/pvm-interpreter";
+/**
+ * Interface for tracking PVM I/O operations during host call execution.
+ *
+ * Implementations record memory reads/writes and register modifications
+ * for debugging, tracing, or replay purposes.
+ */
+export interface IoTracker {
+    /** Record a register write operation. */
+    setReg(idx: number, val: U64): void;
+    /** Record a memory read operation. */
+    memRead(address: U32, data: Uint8Array): void;
+    /** Record a memory write operation. */
+    memWrite(address: U32, data: Uint8Array): void;
+    /** Clear all recorded operations. */
+    clear(): void;
+}
+/** Create a no-op tracker that discards all operations. */
+export declare function noopTracker(): NoopIoTracker;
+/**
+ * No-op implementation that discards all tracked operations.
+ * Used when I/O tracing is disabled.
+ */
+declare class NoopIoTracker implements IoTracker {
+    clear(): void;
+    setReg(_idx: RegisterIndex, _val: U64): void;
+    memRead(_address: U32, _data: Uint8Array): void;
+    memWrite(_address: U32, _data: Uint8Array): void;
+}
+export {};
+//# sourceMappingURL=ecalli-io-tracker.d.ts.map

package/packages/core/pvm-host-calls/ecalli-io-tracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ecalli-io-tracker.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/ecalli-io-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,yCAAyC;IACzC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IACpC,sCAAsC;IACtC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9C,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/C,qCAAqC;IACrC,KAAK,IAAI,IAAI,CAAC;CACf;AAED,2DAA2D;AAC3D,wBAAgB,WAAW,kBAE1B;AAED;;;GAGG;AACH,cAAM,aAAc,YAAW,SAAS;IACtC,KAAK,IAAI,IAAI;IACb,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAC5C,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAC/C,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;CACjD"}

package/packages/core/pvm-host-calls/ecalli-io-tracker.js

@@ -0,0 +1,14 @@
+/** Create a no-op tracker that discards all operations. */
+export function noopTracker() {
+    return new NoopIoTracker();
+}
+/**
+ * No-op implementation that discards all tracked operations.
+ * Used when I/O tracing is disabled.
+ */
+class NoopIoTracker {
+    clear() { }
+    setReg(_idx, _val) { }
+    memRead(_address, _data) { }
+    memWrite(_address, _data) { }
+}

package/packages/core/pvm-host-calls/ecalli-trace-logger.d.ts

@@ -0,0 +1,139 @@
+import type { U32, U64 } from "#@typeberry/numbers";
+import type { Gas } from "#@typeberry/pvm-interface";
+import type { IoTracker } from "./ecalli-io-tracker.js";
+import type { HostCallIndex } from "./host-call-handler.js";
+import type { HostCallRegisters } from "./host-call-registers.js";
+/**
+ * Output function type for IO trace logging.
+ * Each call should output a single line.
+ */
+export type IoTraceOutput = (line: string) => void;
+/**
+ * Ecalli PVM IO Trace Logger.
+ *
+ * Implements the logging format specified for PVM execution tracing.
+ * This format is designed to be:
+ * - Human-readable, newline-delimited text
+ * - Self-contained for stateless re-execution
+ * - Comparable using simple textual diff tools
+ *
+ * @see https://github.com/tomusdrw/JIPs/pull/2
+ */
+export declare class EcalliTraceLogger {
+    private readonly output;
+    /** Returns a tracker for IO operations. */
+    tracker(): IoTraceTracker | null;
+    /**
+     * Create an IoTraceLogger that outputs to the `ecalli` module logger.
+     *
+     * Returns `null` if the `ecalli` logger is not configured for at least TRACE level.
+     * Enable with: `JAM_LOG=ecalli=trace` or `JAM_LOG=trace`
+     */
+    static create(): EcalliTraceLogger | null;
+    /**
+     * Create a no-op IoTraceLogger that discards all output.
+     * Used when tracing is disabled.
+     */
+    static noop(): EcalliTraceLogger;
+    static new(output: IoTraceOutput): EcalliTraceLogger;
+    private constructor();
+    /**
+     * Log optional context lines (implementation metadata, execution environment).
+     */
+    logContext(context: string): void;
+    /**
+     * Log the program blob being executed and the write data (if any)
+     *
+     * Format: `program {hex-encoded-program-with-metadata}`
+     * Format: `memwrite {hex-encoded-address} len={blob-byte-length} <- {hex-encoded-bytes}`
+     */
+    logProgram(program: Uint8Array, args: Uint8Array): void;
+    /**
+     * Log initial execution state (prelude).
+     *
+     * Format: `start pc={pc} gas={gas} {register-dump}`
+     */
+    logStart(pc: number, gas: Gas, registers: HostCallRegisters): void;
+    /**
+     * Log ecalli invocation with register dump.
+     *
+     * Format: `ecalli={index} pc={pc} gas={gas} {register-dump}`
+     */
+    logEcalli(index: HostCallIndex, pc: number, gas: Gas, registers: HostCallRegisters): void;
+    /**
+     * Log memory read operation.
+     *
+     * Format: `memread {hex-encoded-address} len={blob-byte-length} -> {hex-encoded-data-read}`
+     */
+    logMemRead(address: number, len: number, data: string): void;
+    /**
+     * Log memory write operation.
+     *
+     * Format: `memwrite {hex-encoded-address} len={blob-byte-length} <- {hex-encoded-bytes}`
+     */
+    logMemWrite(address: number, len: number, data: string): void;
+    /**
+     * Log register write operation.
+     *
+     * Format: `setreg r{idx} <- {hex-encoded-value}`
+     */
+    logSetReg(index: number, value: bigint): void;
+    /**
+     * Log gas overwrite operation.
+     *
+     * Format: `setgas <- {gas}`
+     */
+    logSetGas(gas: Gas): void;
+    /**
+     * Log all host actions from a single ecalli invocation.
+     * Actions are logged in the order specified by JIP-6:
+     * 1. Memory reads (sorted by address)
+     * 2. Memory writes (sorted by address)
+     * 3. Register writes (sorted by index)
+     * 4. Gas overwrite
+     */
+    logHostActions(ioTracker: IoTraceTracker | null, gasBefore: Gas, gasAfter: Gas): void;
+    /**
+     * Log PANIC termination.
+     *
+     * Format: `PANIC={argument} pc={pc} gas={gas} {register-dump}`
+     */
+    logPanic(argument: number, pc: number, gas: Gas, registers: HostCallRegisters): void;
+    /**
+     * Log OOG (out of gas) termination.
+     *
+     * Format: `OOG pc={pc} gas={gas} {register-dump}`
+     */
+    logOog(pc: number, gas: Gas, registers: HostCallRegisters): void;
+    /**
+     * Log HALT termination.
+     *
+     * Format: `HALT pc={pc} gas={gas} {register-dump}`
+     */
+    logHalt(pc: number, gas: Gas, registers: HostCallRegisters): void;
+}
+type MemoryOperation = {
+    address: number;
+    hex: string;
+    len: number;
+};
+/**
+ * IoTracker implementation that records all I/O operations for trace logging.
+ *
+ * Stores memory reads, writes, and register modifications as hex-encoded strings
+ * for output via IoTraceLogger.
+ */
+export declare class IoTraceTracker implements IoTracker {
+    /** Recorded memory read operations (address + hex data + len). */
+    reads: MemoryOperation[];
+    /** Recorded memory write operations (address + hex data + len). */
+    writes: MemoryOperation[];
+    /** Recorded register write operations (index -> value). */
+    registers: Map<number, U64>;
+    setReg(idx: number, val: U64): void;
+    memRead(address: U32, data: Uint8Array): void;
+    memWrite(address: U32, data: Uint8Array): void;
+    clear(): void;
+}
+export {};
+//# sourceMappingURL=ecalli-trace-logger.d.ts.map

package/packages/core/pvm-host-calls/ecalli-trace-logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ecalli-trace-logger.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/ecalli-trace-logger.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAOnD;;;;;;;;;;GAUG;AACH,qBAAa,iBAAiB;IAgCR,OAAO,CAAC,QAAQ,CAAC,MAAM;IA/B3C,2CAA2C;IAC3C,OAAO,IAAI,cAAc,GAAG,IAAI;IAIhC;;;;;OAKG;IACH,MAAM,CAAC,MAAM,IAAI,iBAAiB,GAAG,IAAI;IAQzC;;;OAGG;IACH,MAAM,CAAC,IAAI,IAAI,iBAAiB;IAIhC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB;IAIpD,OAAO;IAEP;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIjC;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI;IASvD;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKlE;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKzF;;;;OAIG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI5D;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI7D;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAK7C;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAIzB;;;;;;;OAOG;IACH,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAyBrF;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKpF;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKhE;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;CAIlE;AASD,KAAK,eAAe,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,kEAAkE;IAClE,KAAK,EAAE,eAAe,EAAE,CAAM;IAC9B,mEAAmE;IACnE,MAAM,EAAE,eAAe,EAAE,CAAM;IAC/B,2DAA2D;IAC3D,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAa;IAExC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAInC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI;IAI7C,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI;IAI9C,KAAK,IAAI,IAAI;CAKd"}