@typeberry/lib 0.5.3-fb6e98a → 0.5.4-472e282

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.5.3-fb6e98a",
+  "version": "0.5.4-472e282",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",

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.3",
+    "version": "0.5.4",
     "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/telemetry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/telemetry",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "OpenTelemetry initialization utilities for Typeberry",
     "license": "MPL-2.0",
     "author": "Fluffy Labs",

package/packages/core/utils/compatibility.d.ts

@@ -1,5 +1,4 @@
 export declare enum GpVersion {
-    V0_7_0 = "0.7.0",
     V0_7_1 = "0.7.1",
     V0_7_2 = "0.7.2"
 }

package/packages/core/utils/compatibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../../../../../packages/core/utils/compatibility.ts"],"names":[],"mappings":"AAEA,oBAAY,SAAS;IACnB,MAAM,UAAU;IAChB,MAAM,UAAU;IAChB,MAAM,UAAU;CACjB;AAED,oBAAY,SAAS;IACnB,SAAS,cAAc;CACxB;AAKD,eAAO,MAAM,aAAa,sBAAsB,CAAC;AACjD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAEhD,eAAO,IAAI,eAAe,WAAyD,CAAC;AACpF,eAAO,IAAI,aAAa,WAAqD,CAAC;AA8B9E,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAInC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS;IAIrC,MAAM,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE;IAOjC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,SAAS;IASpD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS;IAQ1C;;;;;;OAMG;IACH,MAAM,CAAC,sBAAsB,CAAC,CAAC,EAAE,EAC/B,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,CAAC,CAAC;QACZ,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;KACzC,GAAG,CAAC;CASN"}
+{"version":3,"file":"compatibility.d.ts","sourceRoot":"","sources":["../../../../../packages/core/utils/compatibility.ts"],"names":[],"mappings":"AAEA,oBAAY,SAAS;IACnB,MAAM,UAAU;IAChB,MAAM,UAAU;CACjB;AAED,oBAAY,SAAS;IACnB,SAAS,cAAc;CACxB;AAKD,eAAO,MAAM,aAAa,sBAAsB,CAAC;AACjD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAEhD,eAAO,IAAI,eAAe,WAAyD,CAAC;AACpF,eAAO,IAAI,aAAa,WAAqD,CAAC;AA8B9E,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAInC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS;IAIrC,MAAM,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE;IAOjC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,SAAS;IASpD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS;IAQ1C;;;;;;OAMG;IACH,MAAM,CAAC,sBAAsB,CAAC,CAAC,EAAE,EAC/B,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,CAAC,CAAC;QACZ,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;KACzC,GAAG,CAAC;CASN"}

package/packages/core/utils/compatibility.js

@@ -1,7 +1,6 @@
 import { env } from "./env.js";
 export var GpVersion;
 (function (GpVersion) {
-    GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1";
     GpVersion["V0_7_2"] = "0.7.2";
 })(GpVersion || (GpVersion = {}));
@@ -10,7 +9,7 @@ export var TestSuite;
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
 })(TestSuite || (TestSuite = {}));
 // NOTE: Also acts as a supported versions
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_7_1, GpVersion.V0_7_2];
 export const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
 export const DEFAULT_VERSION = GpVersion.V0_7_2;
 export let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;

package/packages/core/utils/compatibility.test.js

@@ -15,22 +15,21 @@ describe("GrayPaper compatibility", { concurrency: false }, () => {
         assert.equal(Compatibility.is(defaultVersion), true);
     });
     it("Should check with env variable if env variable was set", () => {
-        const gpVersion = GpVersion.V0_7_0;
+        const gpVersion = GpVersion.V0_7_2;
         Compatibility.override(gpVersion);
         assert.equal(Compatibility.is(gpVersion), true);
     });
     it("Should check an order of versions (isGreaterOrEqual)", () => {
-        const gpVersion = GpVersion.V0_7_0;
+        const gpVersion = GpVersion.V0_7_1;
         Compatibility.override(gpVersion);
-        assert.equal(Compatibility.isGreaterOrEqual(GpVersion.V0_7_0), true);
-        assert.equal(Compatibility.isGreaterOrEqual(GpVersion.V0_7_1), false);
+        assert.equal(Compatibility.isGreaterOrEqual(GpVersion.V0_7_1), true);
         assert.equal(Compatibility.isGreaterOrEqual(GpVersion.V0_7_2), false);
     });
     it("Should order values by versions and get the one for highest version matching", () => {
         const gpVersion = GpVersion.V0_7_1;
         Compatibility.override(gpVersion);
         const record = {
-            [GpVersion.V0_7_0]: "low",
+            [GpVersion.V0_7_1]: "low",
             [GpVersion.V0_7_2]: "high",
         };
         const result = Compatibility.selectIfGreaterOrEqual({ fallback: "default", versions: record });
@@ -40,7 +39,6 @@ describe("GrayPaper compatibility", { concurrency: false }, () => {
         const gpVersion = GpVersion.V0_7_1;
         Compatibility.override(gpVersion);
         const record = {
-            [GpVersion.V0_7_0]: "low",
             [GpVersion.V0_7_1]: "mid",
             [GpVersion.V0_7_2]: "high",
         };
@@ -51,7 +49,6 @@ describe("GrayPaper compatibility", { concurrency: false }, () => {
         const gpVersion = GpVersion.V0_7_2;
         Compatibility.override(gpVersion);
         const record = {
-            [GpVersion.V0_7_0]: "low",
             [GpVersion.V0_7_1]: "mid",
             [GpVersion.V0_7_2]: "high",
         };
@@ -59,17 +56,16 @@ describe("GrayPaper compatibility", { concurrency: false }, () => {
         assert.equal(result, "high");
     });
     it("Should return default if no version is greater or equal", () => {
-        const gpVersion = GpVersion.V0_7_0;
+        const gpVersion = GpVersion.V0_7_1;
         Compatibility.override(gpVersion);
         const record = {
-            [GpVersion.V0_7_1]: "mid",
             [GpVersion.V0_7_2]: "high",
         };
         const result = Compatibility.selectIfGreaterOrEqual({ fallback: "default", versions: record });
         assert.equal(result, "default");
     });
     it("Should return default if record is empty", () => {
-        const gpVersion = GpVersion.V0_7_0;
+        const gpVersion = GpVersion.V0_7_1;
         Compatibility.override(gpVersion);
         const result = Compatibility.selectIfGreaterOrEqual({ fallback: "default", versions: {} });
         assert.equal(result, "default");

package/packages/extensions/ipc/jamnp/handler.d.ts

@@ -1,8 +1,8 @@
 import { BytesBlob } from "#@typeberry/bytes";
 import type { IpcHandler } from "#@typeberry/fuzz-proto";
-import type { StreamHandler, StreamId, StreamKindOf, StreamMessageSender } from "#@typeberry/jamnp-s";
+import { type StreamHandler, type StreamId, type StreamKindOf, type StreamMessageSender } from "#@typeberry/jamnp-s";
 import type { IpcSender } from "../server.js";
-import { NewStream } from "./stream.js";
+import { type IpcStreamId, NewStream } from "./stream.js";
 export type ResponseHandler = (err: Error | null, response?: BytesBlob) => void;
 export declare class JamnpIpcHandler implements IpcHandler {
     private readonly sender;
@@ -31,9 +31,10 @@ export declare class JamnpIpcHandler implements IpcHandler {
     waitForEnd(): Promise<void>;
 }
 declare class EnvelopeSender implements StreamMessageSender {
-    readonly streamId: StreamId;
+    private readonly ipcStreamId;
     private readonly sender;
-    constructor(streamId: StreamId, sender: IpcSender);
+    readonly streamId: StreamId;
+    constructor(ipcStreamId: IpcStreamId, sender: IpcSender);
     open(newStream: NewStream): void;
     bufferAndSend(msg: BytesBlob): boolean;
     close(): void;

package/packages/extensions/ipc/jamnp/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAc,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEjH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAsC,MAAM,aAAa,CAAC;AAE5E,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;AAWhF,qBAAa,eAAgB,YAAW,UAAU;IAUpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IATnC,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;IACnE,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqC;IACpE,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,sCAAsC;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;gBAED,MAAM,EAAE,SAAS;IAe9C,gCAAgC;IAChC,sBAAsB,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE;IAMnD,0DAA0D;IAC1D,gBAAgB,CAAC,QAAQ,SAAS,aAAa,EAC7C,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAClC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IAWP,uCAAuC;IACvC,aAAa,CAAC,QAAQ,SAAS,aAAa,EAC1C,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IA2BP,8CAA8C;IACxC,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDrD,yDAAyD;IACzD,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAiBpC,qEAAqE;IACrE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B;AAED,cAAM,cAAe,YAAW,mBAAmB;aAE/B,QAAQ,EAAE,QAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADP,QAAQ,EAAE,QAAQ,EACjB,MAAM,EAAE,SAAS;IAGpC,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,aAAa,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAWtC,KAAK,IAAI,IAAI;CAYd"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,YAAY,EACjB,KAAK,mBAAmB,EAEzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAsC,MAAM,aAAa,CAAC;AAS9F,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;AAWhF,qBAAa,eAAgB,YAAW,UAAU;IAUpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IATnC,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IACtE,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwC;IACvE,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,sCAAsC;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;gBAED,MAAM,EAAE,SAAS;IAe9C,gCAAgC;IAChC,sBAAsB,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE;IAMnD,0DAA0D;IAC1D,gBAAgB,CAAC,QAAQ,SAAS,aAAa,EAC7C,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAClC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IAWP,uCAAuC;IACvC,aAAa,CAAC,QAAQ,SAAS,aAAa,EAC1C,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IA2BP,8CAA8C;IACxC,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmErD,yDAAyD;IACzD,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAkBpC,qEAAqE;IACrE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B;AAED,cAAM,cAAe,YAAW,mBAAmB;IAI/C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,SAAgB,QAAQ,EAAE,QAAQ,CAAC;gBAGhB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,SAAS;IAKpC,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,aAAa,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAWtC,KAAK,IAAI,IAAI;CAYd"}

package/packages/extensions/ipc/jamnp/handler.js

@@ -1,7 +1,14 @@
 import { BytesBlob } from "#@typeberry/bytes";
 import { Decoder, Encoder } from "#@typeberry/codec";
+import { tryAsStreamId, } from "#@typeberry/jamnp-s";
 import { Logger } from "#@typeberry/logger";
+import { assertNever } from "#@typeberry/utils";
 import { NewStream, StreamEnvelope, StreamEnvelopeType } from "./stream.js";
+const IPC_PEER_ID = "ipc-peer";
+/** Construct a protocol-level StreamId from an IPC-level numeric stream ID. */
+function toStreamId(ipcStreamId) {
+    return tryAsStreamId(`${IPC_PEER_ID}:${ipcStreamId}`);
+}
 const logger = Logger.new(import.meta.filename, "ext-ipc-jamnp");
 export class JamnpIpcHandler {
     sender;
@@ -37,9 +44,9 @@ export class JamnpIpcHandler {
     /** Re-use an existing stream of given kind if present. */
     withStreamOfKind(streamKind, work) {
         // find first stream id with given kind
-        for (const [streamId, handler] of this.streams.entries()) {
+        for (const [ipcStreamId, handler] of this.streams.entries()) {
             if (handler.kind === streamKind) {
-                work(handler, new EnvelopeSender(streamId, this.sender));
+                work(handler, new EnvelopeSender(ipcStreamId, this.sender));
                 return;
             }
         }
@@ -52,19 +59,19 @@ export class JamnpIpcHandler {
             throw new Error(`Stream with unregistered handler of kind: ${kind} was requested to be opened.`);
         }
         // pick a stream id
-        const getRandomStreamId = () => Math.floor(Math.random() * 2 ** 16);
+        const getRandomIpcStreamId = () => Math.floor(Math.random() * 2 ** 32);
         const streams = this.streams;
-        const streamId = (function findStreamId() {
-            const s = getRandomStreamId();
+        const ipcStreamId = (function findStreamId() {
+            const s = getRandomIpcStreamId();
             if (!streams.has(s)) {
                 return s;
             }
             return findStreamId();
         })();
         // register the stream
-        this.streams.set(streamId, handler);
-        this.pendingStreams.set(streamId, true);
-        const sender = new EnvelopeSender(streamId, this.sender);
+        this.streams.set(ipcStreamId, handler);
+        this.pendingStreams.set(ipcStreamId, true);
+        const sender = new EnvelopeSender(ipcStreamId, this.sender);
         sender.open(NewStream.create({ streamByte: kind }));
         work(handler, sender);
     }
@@ -72,24 +79,24 @@ export class JamnpIpcHandler {
     async onSocketMessage(msg) {
         // decode the message as `StreamEnvelope`
         const envelope = Decoder.decodeObject(StreamEnvelope.Codec, msg);
-        const streamId = envelope.streamId;
-        logger.log `[${streamId}] incoming message: ${envelope.type} ${envelope.data}`;
+        const ipcStreamId = envelope.streamId;
+        logger.log `[${ipcStreamId}] incoming message: ${envelope.type} ${envelope.data}`;
         // check if this is a already known stream id
-        const streamHandler = this.streams.get(streamId);
-        const streamSender = new EnvelopeSender(streamId, this.sender);
+        const streamHandler = this.streams.get(ipcStreamId);
+        const streamSender = new EnvelopeSender(ipcStreamId, this.sender);
         // we don't know that stream yet, so it has to be a new one
         if (streamHandler === undefined) {
             // closing or message of unknown stream - ignore.
             if (envelope.type !== StreamEnvelopeType.Open) {
-                logger.warn `[${streamId}] (unknown) got invalid type ${envelope.type}.`;
+                logger.warn `[${ipcStreamId}] (unknown) got invalid type ${envelope.type}.`;
                 return;
             }
             const newStream = Decoder.decodeObject(NewStream.Codec, envelope.data);
             const handler = this.streamHandlers.get(newStream.streamByte);
             if (handler !== undefined) {
-                logger.log `[${streamId}] new stream for ${handler.kind}`;
+                logger.log `[${ipcStreamId}] new stream for ${handler.kind}`;
                 // insert the stream
-                this.streams.set(streamId, handler);
+                this.streams.set(ipcStreamId, handler);
                 // Just send back the same stream byte.
                 streamSender.open(newStream);
                 return;
@@ -98,31 +105,47 @@ export class JamnpIpcHandler {
             streamSender.close();
             return;
         }
-        // close the stream
-        if (envelope.type === StreamEnvelopeType.Close) {
-            const handler = this.streams.get(streamId);
-            handler?.onClose(streamId, false);
-            this.streams.delete(streamId);
-            return;
-        }
-        if (envelope.type !== StreamEnvelopeType.Msg) {
+        if (envelope.type === StreamEnvelopeType.Open) {
             // display a warning but only if the stream was not pending for confirmation.
-            if (!this.pendingStreams.delete(streamId)) {
-                logger.warn `[${streamId}] got invalid type ${envelope.type}.`;
+            if (!this.pendingStreams.delete(ipcStreamId)) {
+                logger.warn `[${ipcStreamId}] got invalid type ${envelope.type}.`;
             }
             return;
         }
+        // reject stream messages without open ack first.
+        if (this.pendingStreams.has(ipcStreamId)) {
+            logger.warn `[${ipcStreamId}] got invalid type ${envelope.type}. Expected Open.`;
+            // closing the connection and removing the stream from pending.
+            this.pendingStreams.delete(ipcStreamId);
+            // the stream should not be in the collection yet, but we remove it just for safety.
+            this.streams.delete(ipcStreamId);
+            streamSender.close();
+            return;
+        }
         // this is a known stream, so just dispatch the message.
-        streamHandler.onStreamMessage(streamSender, envelope.data);
+        if (envelope.type === StreamEnvelopeType.Msg) {
+            streamHandler.onStreamMessage(streamSender, envelope.data);
+            return;
+        }
+        // close the stream
+        if (envelope.type === StreamEnvelopeType.Close) {
+            streamHandler.onClose(toStreamId(ipcStreamId), false);
+            this.streams.delete(ipcStreamId);
+            // not really needed, but just for sure.
+            this.pendingStreams.delete(ipcStreamId);
+            return;
+        }
+        assertNever(envelope.type);
     }
     /** Notify about termination of the underlying socket. */
     onClose({ error }) {
         logger.log `Closing the handler. Reason: ${error !== undefined ? error.message : "close"}.`;
         // Socket closed - we should probably clear everything.
-        for (const [streamId, handler] of this.streams.entries()) {
-            handler.onClose(streamId, error === undefined);
+        for (const [ipcStreamId, handler] of this.streams.entries()) {
+            handler.onClose(toStreamId(ipcStreamId), error !== undefined);
         }
         this.streams.clear();
+        this.pendingStreams.clear();
         // finish the handler.
         this.onEnd.finished = true;
         if (error !== undefined) {
@@ -139,24 +162,26 @@ export class JamnpIpcHandler {
     }
 }
 class EnvelopeSender {
-    streamId;
+    ipcStreamId;
     sender;
-    constructor(streamId, sender) {
-        this.streamId = streamId;
+    streamId;
+    constructor(ipcStreamId, sender) {
+        this.ipcStreamId = ipcStreamId;
         this.sender = sender;
+        this.streamId = toStreamId(ipcStreamId);
     }
     open(newStream) {
         const msg = Encoder.encodeObject(NewStream.Codec, newStream);
-        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.streamId, type: StreamEnvelopeType.Open, data: msg })));
+        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.ipcStreamId, type: StreamEnvelopeType.Open, data: msg })));
     }
     bufferAndSend(msg) {
-        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.streamId, type: StreamEnvelopeType.Msg, data: msg })));
+        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.ipcStreamId, type: StreamEnvelopeType.Msg, data: msg })));
         // we are buffering until we run OOM
         return true;
     }
     close() {
         this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({
-            streamId: this.streamId,
+            streamId: this.ipcStreamId,
             type: StreamEnvelopeType.Close,
             data: BytesBlob.blobFromNumbers([]),
         })));

package/packages/extensions/ipc/jamnp/stream.d.ts

@@ -1,18 +1,20 @@
 import type { BytesBlob } from "#@typeberry/bytes";
 import { type CodecRecord } from "#@typeberry/codec";
-import type { StreamId, StreamKind } from "#@typeberry/jamnp-s";
-import { type U8 } from "#@typeberry/numbers";
+import type { StreamKind } from "#@typeberry/jamnp-s";
+import { type U8, type U32 } from "#@typeberry/numbers";
+/** IPC-level stream identifier (u32), used for multiplexing streams over a single socket. */
+export type IpcStreamId = U32;
 export declare enum StreamEnvelopeType {
     Msg = 0,
     Open = 1,
     Close = 2
 }
 export declare class StreamEnvelope {
-    readonly streamId: StreamId;
+    readonly streamId: IpcStreamId;
     readonly type: StreamEnvelopeType;
     readonly data: BytesBlob;
     static Codec: import("@typeberry/codec").Descriptor<StreamEnvelope, import("@typeberry/codec").ViewOf<StreamEnvelope, {
-        streamId: import("@typeberry/codec").Descriptor<import("@typeberry/numbers").U32, import("@typeberry/bytes").Bytes<4>>;
+        streamId: import("@typeberry/codec").Descriptor<U32, import("@typeberry/bytes").Bytes<4>>;
         type: import("@typeberry/codec").Descriptor<StreamEnvelopeType, U8>;
         data: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
     }>>;

package/packages/extensions/ipc/jamnp/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAW,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,kBAAkB;IAC5B,GAAG,IAAI;IACP,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAED,qBAAa,cAAc;aA0BP,QAAQ,EAAE,QAAQ;aAClB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,SAAS;IA3BjC,MAAM,CAAC,KAAK;;;;QAkBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC;IAInE,OAAO;CAKR;AAED,qBAAa,SAAS;aASgB,UAAU,EAAE,UAAU;IAR1D,MAAM,CAAC,KAAK;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC;IAIpD,OAAO;CACR"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAW,KAAK,EAAE,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEhE,6FAA6F;AAC7F,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC;AAE9B,oBAAY,kBAAkB;IAC5B,GAAG,IAAI;IACP,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAED,qBAAa,cAAc;aA0BP,QAAQ,EAAE,WAAW;aACrB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,SAAS;IA3BjC,MAAM,CAAC,KAAK;;;;QAkBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC;IAInE,OAAO;CAKR;AAED,qBAAa,SAAS;aASgB,UAAU,EAAE,UAAU;IAR1D,MAAM,CAAC,KAAK;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC;IAIpD,OAAO;CACR"}

package/packages/jam/block/index.d.ts

@@ -1,18 +1,18 @@
-export * as assurances from "./assurances.js";
+export * from "./assurances.js";
 export * from "./block.js";
-export * as codecUtils from "./codec-utils.js";
+export * from "./codec-utils.js";
 export * from "./common.js";
-export * as disputes from "./disputes.js";
-export * as guarantees from "./guarantees.js";
+export * from "./disputes.js";
+export * from "./guarantees.js";
 export * from "./hash.js";
 export * from "./header.js";
-export * as preimage from "./preimage.js";
-export * as refineContext from "./refine-context.js";
-export * as tickets from "./tickets.js";
+export * from "./preimage.js";
+export * from "./refine-context.js";
+export * from "./tickets.js";
 export * from "./utils.js";
-export * as workItem from "./work-item.js";
+export * from "./work-item.js";
 export * from "./work-item-segment.js";
-export * as workPackage from "./work-package.js";
-export * as workReport from "./work-report.js";
-export * as workResult from "./work-result.js";
+export * from "./work-package.js";
+export * from "./work-report.js";
+export * from "./work-result.js";
 //# sourceMappingURL=index.d.ts.map

package/packages/jam/block/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,cAAc,aAAa,CAAC;AAC5B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}

package/packages/jam/block/index.js

@@ -1,17 +1,17 @@
-export * as assurances from "./assurances.js";
+export * from "./assurances.js";
 export * from "./block.js";
-export * as codecUtils from "./codec-utils.js";
+export * from "./codec-utils.js";
 export * from "./common.js";
-export * as disputes from "./disputes.js";
-export * as guarantees from "./guarantees.js";
+export * from "./disputes.js";
+export * from "./guarantees.js";
 export * from "./hash.js";
 export * from "./header.js";
-export * as preimage from "./preimage.js";
-export * as refineContext from "./refine-context.js";
-export * as tickets from "./tickets.js";
+export * from "./preimage.js";
+export * from "./refine-context.js";
+export * from "./tickets.js";
 export * from "./utils.js";
-export * as workItem from "./work-item.js";
+export * from "./work-item.js";
 export * from "./work-item-segment.js";
-export * as workPackage from "./work-package.js";
-export * as workReport from "./work-report.js";
-export * as workResult from "./work-result.js";
+export * from "./work-package.js";
+export * from "./work-report.js";
+export * from "./work-result.js";

package/packages/jam/block/work-package.d.ts

@@ -10,8 +10,10 @@ import { WorkItem } from "./work-item.js";
 /** Possible number of work items in the package or results in the report. */
 /** Constrained by I=16 https://graypaper.fluffylabs.dev/#/68eaa1f/417a00417a00?v=0.6.4 */
 export type WorkItemsCount = U8;
-/** Verify the value is within the `WorkItemsCount` bounds. */
+/** Convert the value to `WorkItemsCount` bounds. */
 export declare function tryAsWorkItemsCount(len: number): WorkItemsCount;
+/** Verify the value is within the `WorkItemsCount` bounds. */
+export declare function isWorkItemsCount(len: number): len is WorkItemsCount;
 /** Minimal number of work items in the work package or results in work report. */
 export declare const MIN_NUMBER_OF_WORK_ITEMS = 1;
 /** `I`: Maximal number of work items in the work package or results in work report. */

package/packages/jam/block/work-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-package.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-package.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAW,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,6EAA6E;AAC7E,0FAA0F;AAC1F,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC;AAEhC,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAM/D;AAED,kFAAkF;AAClF,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,uFAAuF;AACvF,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C;;;;;;GAMG;AACH,qBAAa,WAAY,SAAQ,SAAS;IAyBtC,wDAAwD;aACxC,aAAa,EAAE,SAAS;IACxC,kEAAkE;aAClD,YAAY,EAAE,SAAS;IACvC,mCAAmC;aACnB,YAAY,EAAE,QAAQ;IACtC,8CAA8C;aAC9B,eAAe,EAAE,SAAS;IAC1C,2DAA2D;aAC3C,OAAO,EAAE,aAAa;IACtC;;;;;OAKG;aACa,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC;IAxCjE,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUT;IAEH,MAAM,CAAC,MAAM,CAAC,EACZ,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,OAAO,EACP,KAAK,GACN,EAAE,WAAW,CAAC,WAAW,CAAC;IAI3B,OAAO;CAqBR;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"work-package.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-package.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAW,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,6EAA6E;AAC7E,0FAA0F;AAC1F,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC;AAEhC,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAM/D;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,cAAc,CAEnE;AAED,kFAAkF;AAClF,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,uFAAuF;AACvF,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C;;;;;;GAMG;AACH,qBAAa,WAAY,SAAQ,SAAS;IAyBtC,wDAAwD;aACxC,aAAa,EAAE,SAAS;IACxC,kEAAkE;aAClD,YAAY,EAAE,SAAS;IACvC,mCAAmC;aACnB,YAAY,EAAE,QAAQ;IACtC,8CAA8C;aAC9B,eAAe,EAAE,SAAS;IAC1C,2DAA2D;aAC3C,OAAO,EAAE,aAAa;IACtC;;;;;OAKG;aACa,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC;IAxCjE,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUT;IAEH,MAAM,CAAC,MAAM,CAAC,EACZ,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,OAAO,EACP,KAAK,GACN,EAAE,WAAW,CAAC,WAAW,CAAC;IAI3B,OAAO;CAqBR;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC"}

package/packages/jam/block/work-package.js

@@ -5,14 +5,18 @@ import { tryAsU8 } from "#@typeberry/numbers";
 import { check, WithDebug } from "#@typeberry/utils";
 import { RefineContext } from "./refine-context.js";
 import { WorkItem } from "./work-item.js";
-/** Verify the value is within the `WorkItemsCount` bounds. */
+/** Convert the value to `WorkItemsCount` bounds. */
 export function tryAsWorkItemsCount(len) {
     check `
-    ${len >= MIN_NUMBER_OF_WORK_ITEMS && len <= MAX_NUMBER_OF_WORK_ITEMS}
+    ${isWorkItemsCount(len)}
     WorkItemsCount: Expected '${MIN_NUMBER_OF_WORK_ITEMS} <= count <= ${MAX_NUMBER_OF_WORK_ITEMS}' got ${len}
   `;
     return tryAsU8(len);
 }
+/** Verify the value is within the `WorkItemsCount` bounds. */
+export function isWorkItemsCount(len) {
+    return len >= MIN_NUMBER_OF_WORK_ITEMS && len <= MAX_NUMBER_OF_WORK_ITEMS;
+}
 /** Minimal number of work items in the work package or results in work report. */
 export const MIN_NUMBER_OF_WORK_ITEMS = 1;
 /** `I`: Maximal number of work items in the work package or results in work report. */