@typeberry/lib 0.5.3 → 0.5.4

package/packages/jam/in-core/in-core.js

@@ -0,0 +1,294 @@
+import { tryAsCoreIndex, tryAsServiceGas, } from "#@typeberry/block";
+import { W_C } from "#@typeberry/block/gp-constants.js";
+import { WorkPackageInfo, } from "#@typeberry/block/refine-context.js";
+import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
+import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { codec, Encoder } from "#@typeberry/codec";
+import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
+import { PvmExecutor, ReturnStatus } from "#@typeberry/executor";
+import { HASH_SIZE } from "#@typeberry/hash";
+import { Logger } from "#@typeberry/logger";
+import { tryAsU8, tryAsU16, tryAsU32 } from "#@typeberry/numbers";
+import { FetchExternalities } from "#@typeberry/transition/externalities/fetch-externalities.js";
+import { assertEmpty, assertNever, Result } from "#@typeberry/utils";
+import { RefineExternalitiesImpl } from "./externalities/refine.js";
+export var RefineError;
+(function (RefineError) {
+    /** State for context anchor block or lookup anchor is not found in the DB. */
+    RefineError[RefineError["StateMissing"] = 0] = "StateMissing";
+    /** Posterior state root of context anchor block does not match the one in the DB. */
+    RefineError[RefineError["StateRootMismatch"] = 1] = "StateRootMismatch";
+    /** Lookup anchor state-slot does not match the one given in context. */
+    RefineError[RefineError["InvalidLookupAnchorSlot"] = 2] = "InvalidLookupAnchorSlot";
+    /** Authorization error. */
+    RefineError[RefineError["AuthorizationError"] = 3] = "AuthorizationError";
+})(RefineError || (RefineError = {}));
+var ServiceCodeError;
+(function (ServiceCodeError) {
+    /** Service id is not found in the state. */
+    ServiceCodeError[ServiceCodeError["ServiceNotFound"] = 0] = "ServiceNotFound";
+    /** Expected service code does not match the state one. */
+    ServiceCodeError[ServiceCodeError["ServiceCodeMismatch"] = 1] = "ServiceCodeMismatch";
+    /** Code preimage missing. */
+    ServiceCodeError[ServiceCodeError["ServiceCodeMissing"] = 2] = "ServiceCodeMissing";
+    /** Code blob is too big. */
+    ServiceCodeError[ServiceCodeError["ServiceCodeTooBig"] = 3] = "ServiceCodeTooBig";
+})(ServiceCodeError || (ServiceCodeError = {}));
+var AuthorizationError;
+(function (AuthorizationError) {
+})(AuthorizationError || (AuthorizationError = {}));
+const logger = Logger.new(import.meta.filename, "refine");
+/** https://graypaper.fluffylabs.dev/#/ab2cdbd/2ffe002ffe00?v=0.7.2 */
+const ARGS_CODEC = codec.object({
+    core: codec.varU32.convert((x) => tryAsU32(x), (x) => tryAsCoreIndex(x)),
+    workItemIndex: codec.varU32,
+    serviceId: codec.varU32.asOpaque(),
+    payloadLength: codec.varU32,
+    packageHash: codec.bytes(HASH_SIZE).asOpaque(),
+});
+export class InCore {
+    chainSpec;
+    states;
+    pvmBackend;
+    blake2b;
+    constructor(chainSpec, states, pvmBackend, blake2b) {
+        this.chainSpec = chainSpec;
+        this.states = states;
+        this.pvmBackend = pvmBackend;
+        this.blake2b = blake2b;
+    }
+    /**
+     * Work-report computation function.
+     *
+     * Note this requires all of the imports and extrinsics to be already fetched
+     * and only performs the refinement.
+     *
+     * Any validation must be done externally!
+     *
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/1b7f021b7f02?v=0.7.2
+     */
+    async refine(workPackageAndHash, core, imports, extrinsics) {
+        const workPackageHash = workPackageAndHash.hash;
+        const { context, authorization, authCodeHash, authCodeHost, parametrization, items, ...rest } = workPackageAndHash.data;
+        assertEmpty(rest);
+        // TODO [ToDr] Verify BEEFY root
+        // TODO [ToDr] Verify prerequisites
+        logger.log `[core:${core}] Attempting to refine work package with ${items.length} items.`;
+        // TODO [ToDr] GP link
+        // Verify anchor block
+        const state = this.states.getState(context.anchor);
+        if (state === null) {
+            return Result.error(RefineError.StateMissing, () => `State at anchor block ${context.anchor} is missing.`);
+        }
+        const stateRoot = await this.states.getStateRoot(state);
+        if (!stateRoot.isEqualTo(context.stateRoot)) {
+            return Result.error(RefineError.StateRootMismatch, () => `State at ${context.anchor} does not match expected root hash. Ours: ${stateRoot}, expected: ${context.stateRoot}`);
+        }
+        // TODO [ToDr] GP link
+        // Verify lookup anchor state
+        const lookupState = this.states.getState(context.lookupAnchor);
+        if (lookupState === null) {
+            return Result.error(RefineError.StateMissing, () => `Lookup state at block ${context.lookupAnchor} is missing.`);
+        }
+        // TODO [ToDr] GP link
+        if (lookupState.timeslot !== context.lookupAnchorSlot) {
+            return Result.error(RefineError.InvalidLookupAnchorSlot, () => `Lookup anchor slot does not match the one is state. Ours: ${lookupState.timeslot}, expected: ${context.lookupAnchorSlot}`);
+        }
+        // Check authorization
+        const authResult = await this.authorizePackage(authorization, authCodeHost, authCodeHash, parametrization);
+        if (authResult.isError) {
+            return Result.error(RefineError.AuthorizationError, () => `Authorization error: ${AuthorizationError[authResult.error]}: ${authResult.details()}.`);
+        }
+        logger.log `[core:${core}] Authorized. Proceeding with work items verification. Anchor=${context.anchor}`;
+        // Verify the work items
+        const refineResults = [];
+        for (const [idx, item] of items.entries()) {
+            logger.info `[core:${core}][i:${idx}] Refining item for service ${item.service}.`;
+            refineResults.push(await this.refineItem(state, idx, item, imports, extrinsics, core, workPackageHash));
+        }
+        // amalgamate the work report now
+        return Result.ok(this.amalgamateWorkReport(asKnownSize(refineResults), authResult.ok, workPackageHash, context, core));
+    }
+    amalgamateWorkReport(refineResults, authResult, workPackageHash, context, coreIndex) {
+        // unzip exports and work results for each work item
+        const exports = refineResults.map((x) => x.exports);
+        const results = refineResults.map((x) => x.result);
+        const { authorizerHash, authorizationGasUsed, authorizationOutput, ...authRest } = authResult;
+        assertEmpty(authRest);
+        // TODO [ToDr] Compute erasure root
+        const erasureRoot = Bytes.zero(HASH_SIZE);
+        // TODO [ToDr] Compute exports root
+        const exportsRoot = Bytes.zero(HASH_SIZE).asOpaque();
+        const exportsCount = exports.reduce((acc, x) => acc + x.length, 0);
+        // TODO [ToDr] Segment root lookup computation?
+        const segmentRootLookup = [
+            WorkPackageInfo.create({
+                workPackageHash,
+                segmentTreeRoot: exportsRoot,
+            }),
+        ];
+        // TODO [ToDr] Auditable work bundle length?
+        const workBundleLength = tryAsU32(0);
+        return {
+            report: WorkReport.create({
+                workPackageSpec: WorkPackageSpec.create({
+                    length: workBundleLength,
+                    hash: workPackageHash,
+                    erasureRoot,
+                    exportsRoot,
+                    // safe to convert, since we have limit on number of
+                    // exports per item and a limit for number of items
+                    exportsCount: tryAsU16(exportsCount),
+                }),
+                context,
+                coreIndex,
+                authorizerHash,
+                authorizationGasUsed,
+                authorizationOutput,
+                segmentRootLookup,
+                // safe to convert, since we know that number of work items is limited
+                results: FixedSizeArray.new(results, tryAsU8(refineResults.length)),
+            }),
+            exports: asKnownSize(exports),
+        };
+    }
+    async authorizePackage(_authorization, _authCodeHost, _authCodeHash, _parametrization) {
+        // TODO [ToDr] Check authorization?
+        const authorizerHash = Bytes.zero(HASH_SIZE).asOpaque();
+        const authorizationGasUsed = tryAsServiceGas(0);
+        const authorizationOutput = BytesBlob.empty();
+        return Result.ok({
+            authorizerHash,
+            authorizationGasUsed,
+            authorizationOutput,
+        });
+    }
+    async refineItem(state, idx, item, allImports, allExtrinsics, coreIndex, workPackageHash) {
+        const payloadHash = this.blake2b.hashBytes(item.payload);
+        const baseResult = {
+            serviceId: item.service,
+            codeHash: item.codeHash,
+            payloadHash,
+            gas: item.refineGasLimit,
+        };
+        const imports = allImports[idx];
+        const extrinsics = allExtrinsics[idx];
+        const baseLoad = {
+            importedSegments: tryAsU32(imports.length),
+            extrinsicCount: tryAsU32(extrinsics.length),
+            extrinsicSize: tryAsU32(extrinsics.reduce((acc, x) => acc + x.length, 0)),
+        };
+        const maybeCode = this.getServiceCode(state, idx, item);
+        if (maybeCode.isError) {
+            const error = maybeCode.error === ServiceCodeError.ServiceCodeTooBig
+                ? WorkExecResultKind.codeOversize
+                : WorkExecResultKind.badCode;
+            return {
+                exports: [],
+                result: WorkResult.create({
+                    ...baseResult,
+                    result: WorkExecResult.error(error),
+                    load: WorkRefineLoad.create({
+                        ...baseLoad,
+                        gasUsed: tryAsServiceGas(item.refineGasLimit),
+                        exportedSegments: tryAsU32(0),
+                    }),
+                }),
+            };
+        }
+        const code = maybeCode.ok;
+        const externalities = this.createRefineExternalities({
+            payload: item.payload,
+            imports: allImports,
+            extrinsics: allExtrinsics,
+        });
+        const executor = await PvmExecutor.createRefineExecutor(item.service, code, externalities, this.pvmBackend);
+        const args = Encoder.encodeObject(ARGS_CODEC, {
+            serviceId: item.service,
+            core: coreIndex,
+            workItemIndex: tryAsU32(idx),
+            payloadLength: tryAsU32(item.payload.length),
+            packageHash: workPackageHash,
+        });
+        const execResult = await executor.run(args, item.refineGasLimit);
+        // TODO [ToDr] get exports from externalities
+        const exports = [];
+        if (exports.length !== item.exportCount) {
+            return {
+                exports,
+                result: WorkResult.create({
+                    ...baseResult,
+                    result: WorkExecResult.error(WorkExecResultKind.incorrectNumberOfExports),
+                    load: WorkRefineLoad.create({
+                        ...baseLoad,
+                        gasUsed: tryAsServiceGas(item.refineGasLimit),
+                        exportedSegments: tryAsU32(0),
+                    }),
+                }),
+            };
+        }
+        const result = this.extractWorkResult(execResult);
+        return {
+            exports,
+            result: WorkResult.create({
+                ...baseResult,
+                result,
+                load: WorkRefineLoad.create({
+                    ...baseLoad,
+                    gasUsed: tryAsServiceGas(execResult.consumedGas),
+                    exportedSegments: tryAsU32(exports.length),
+                }),
+            }),
+        };
+    }
+    extractWorkResult(execResult) {
+        if (execResult.status === ReturnStatus.OK) {
+            const slice = execResult.memorySlice;
+            // TODO [ToDr] Verify the output size and change digestTooBig?
+            return WorkExecResult.ok(BytesBlob.blobFrom(slice));
+        }
+        switch (execResult.status) {
+            case ReturnStatus.OOG:
+                return WorkExecResult.error(WorkExecResultKind.outOfGas);
+            case ReturnStatus.PANIC:
+                return WorkExecResult.error(WorkExecResultKind.panic);
+            default:
+                assertNever(execResult);
+        }
+    }
+    getServiceCode(state, idx, item) {
+        const serviceId = item.service;
+        const service = state.getService(serviceId);
+        // TODO [ToDr] GP link
+        // missing service
+        if (service === null) {
+            return Result.error(ServiceCodeError.ServiceNotFound, () => `[i:${idx}] Service ${serviceId} is missing in state.`);
+        }
+        // TODO [ToDr] GP link
+        // TODO [ToDr] shall we rather use the old codehash instead
+        if (!service.getInfo().codeHash.isEqualTo(item.codeHash)) {
+            return Result.error(ServiceCodeError.ServiceCodeMismatch, () => `[i:${idx}] Service ${serviceId} has invalid code hash. Ours: ${service.getInfo().codeHash}, expected: ${item.codeHash}`);
+        }
+        const code = service.getPreimage(item.codeHash.asOpaque());
+        if (code === null) {
+            return Result.error(ServiceCodeError.ServiceCodeMissing, () => `[i:${idx}] Code ${item.codeHash} for service ${serviceId} was not found.`);
+        }
+        if (code.length > W_C) {
+            return Result.error(ServiceCodeError.ServiceCodeTooBig, () => `[i:${idx}] Code ${item.codeHash} for service ${serviceId} is too big! ${code.length} bytes vs ${W_C} bytes max.`);
+        }
+        return Result.ok(code);
+    }
+    createRefineExternalities(args) {
+        // TODO [ToDr] Pass all required fetch data
+        const fetchExternalities = FetchExternalities.createForRefine({
+            entropy: undefined,
+            ...args,
+        }, this.chainSpec);
+        const refine = RefineExternalitiesImpl.create();
+        return {
+            fetchExternalities,
+            refine,
+        };
+    }
+}

package/packages/jam/in-core/in-core.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=in-core.test.d.ts.map

package/packages/jam/in-core/in-core.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in-core.test.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/in-core.test.ts"],"names":[],"mappings":""}

package/packages/jam/in-core/in-core.test.js

@@ -0,0 +1,81 @@
+import assert from "node:assert";
+import { before, describe, it } from "node:test";
+import { tryAsCoreIndex, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "#@typeberry/block";
+import { RefineContext } from "#@typeberry/block/refine-context.js";
+import { WorkItem } from "#@typeberry/block/work-item.js";
+import { tryAsWorkItemsCount, WorkPackage } from "#@typeberry/block/work-package.js";
+import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { Encoder } from "#@typeberry/codec";
+import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
+import { PvmBackend, tinyChainSpec } from "#@typeberry/config";
+import { InMemoryStates } from "#@typeberry/database";
+import { Blake2b, HASH_SIZE, WithHash } from "#@typeberry/hash";
+import { tryAsU16 } from "#@typeberry/numbers";
+import { testState } from "#@typeberry/state/test.utils.js";
+import { InCore, RefineError } from "./in-core.js";
+let blake2b;
+before(async () => {
+    blake2b = await Blake2b.createHasher();
+});
+function createWorkItem(serviceId = 1) {
+    return WorkItem.create({
+        service: tryAsServiceId(serviceId),
+        codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
+        payload: BytesBlob.empty(),
+        refineGasLimit: tryAsServiceGas(1_000_000),
+        accumulateGasLimit: tryAsServiceGas(1_000_000),
+        importSegments: asKnownSize([]),
+        extrinsic: [],
+        exportCount: tryAsU16(0),
+    });
+}
+function createWorkPackage(anchorHash, stateRoot, lookupAnchorSlot = 0) {
+    return WorkPackage.create({
+        authorization: BytesBlob.empty(),
+        authCodeHost: tryAsServiceId(1),
+        authCodeHash: Bytes.zero(HASH_SIZE).asOpaque(),
+        parametrization: BytesBlob.empty(),
+        context: RefineContext.create({
+            anchor: anchorHash,
+            stateRoot,
+            beefyRoot: Bytes.zero(HASH_SIZE).asOpaque(),
+            lookupAnchor: anchorHash,
+            lookupAnchorSlot: tryAsTimeSlot(lookupAnchorSlot),
+            prerequisites: [],
+        }),
+        items: FixedSizeArray.new([createWorkItem()], tryAsWorkItemsCount(1)),
+    });
+}
+function hashWorkPackage(spec, workPackage) {
+    const workPackageHash = blake2b
+        .hashBytes(Encoder.encodeObject(WorkPackage.Codec, workPackage, spec))
+        .asOpaque();
+    return new WithHash(workPackageHash, workPackage);
+}
+describe("InCore", () => {
+    it("should return StateMissing error when anchor block state is not in DB", async () => {
+        const spec = tinyChainSpec;
+        const states = new InMemoryStates(spec);
+        const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
+        const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
+        const stateRoot = Bytes.zero(HASH_SIZE).asOpaque();
+        const workPackage = createWorkPackage(anchorHash, stateRoot);
+        const result = await inCore.refine(hashWorkPackage(spec, workPackage), tryAsCoreIndex(0), asKnownSize([[]]), asKnownSize([[]]));
+        assert.strictEqual(result.isError, true);
+        assert.strictEqual(result.error, RefineError.StateMissing);
+    });
+    it("should refine work package and produce a report when state is set up", async () => {
+        const spec = tinyChainSpec;
+        const states = new InMemoryStates(spec);
+        const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
+        const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
+        const state = testState();
+        await states.insertInitialState(anchorHash, state);
+        const correctStateRoot = await states.getStateRoot(state);
+        const workPackage = createWorkPackage(anchorHash, correctStateRoot, state.timeslot);
+        const result = await inCore.refine(hashWorkPackage(spec, workPackage), tryAsCoreIndex(0), asKnownSize([[]]), asKnownSize([[]]));
+        assert.strictEqual(result.isOk, true);
+        assert.strictEqual(result.ok.report.coreIndex, 0);
+        assert.strictEqual(result.ok.report.results.length, 1);
+    });
+});

package/packages/jam/in-core/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./in-core.js";
+//# sourceMappingURL=index.d.ts.map

package/packages/jam/in-core/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}

package/packages/jam/in-core/index.js

@@ -0,0 +1 @@
+export * from "./in-core.js";

package/packages/jam/jam-host-calls/accumulate/bless.test.js

@@ -3,14 +3,13 @@ import { describe, it } from "node:test";
 import { tryAsServiceGas, tryAsServiceId } from "#@typeberry/block";
 import { codec, Encoder } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
-import { tryAsU64 } from "#@typeberry/numbers";
+import { MAX_VALUE_U32, MAX_VALUE_U64, tryAsU64 } from "#@typeberry/numbers";
 import { HostCallMemory, HostCallRegisters, PvmExecution } from "#@typeberry/pvm-host-calls";
 import { tryAsGas } from "#@typeberry/pvm-interface";
 import { gasCounter } from "#@typeberry/pvm-interpreter/gas.js";
 import { MemoryBuilder, tryAsMemoryIndex } from "#@typeberry/pvm-interpreter/memory/index.js";
 import { PAGE_SIZE } from "#@typeberry/pvm-interpreter/memory/memory-consts.js";
 import { tryAsSbrkIndex } from "#@typeberry/pvm-interpreter/memory/memory-index.js";
-import { MAX_VALUE, MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
 import { codecPerCore, tryAsPerCore } from "#@typeberry/state";
 import { Compatibility, deepEqual, GpVersion, Result } from "#@typeberry/utils";
 import { UpdatePrivilegesError } from "../externalities/partial-state.js";
@@ -99,7 +98,7 @@ describe("HostCalls: Bless", () => {
                     tryAsServiceId(5),
                     tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
                     tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
+                    tryAsServiceId(MAX_VALUE_U32),
                     new Map(entries),
                 ],
             ]);
@@ -161,7 +160,7 @@ describe("HostCalls: Bless", () => {
                     tryAsServiceId(5),
                     tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
                     tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
+                    tryAsServiceId(MAX_VALUE_U32),
                     new Map(entries),
                 ],
             ]);
@@ -197,7 +196,7 @@ describe("HostCalls: Bless", () => {
                     tryAsServiceId(5),
                     tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
                     tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
+                    tryAsServiceId(MAX_VALUE_U32),
                     new Map(entries),
                 ],
             ]);

package/packages/jam/jamnp-s/peers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peers.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/jamnp-s/peers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGhF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;IAErB,iDAAiD;IACjD,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB,cAAc,EAAE,eAAe,CAAC;IAEhC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAWF;;;;;;;GAOG;AACH,qBAAa,WAAW;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,oFAAoF;IACpF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;gBAEhC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;IAWnD,qDAAqD;IACrD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAInD,yDAAyD;IACzD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS;IAI1D,sDAAsD;IACtD,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC;IAM7E,sDAAsD;IACtD,YAAY;IAIZ,iDAAiD;IAChD,iBAAiB;IAQlB,oDAAoD;IACpD,OAAO,CAAC,UAAU;IAyBlB,8EAA8E;YAChE,iBAAiB;IA0D/B;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE;CAezC"}
+{"version":3,"file":"peers.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/jamnp-s/peers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGhF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;IAErB,iDAAiD;IACjD,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IAErB,cAAc,EAAE,eAAe,CAAC;IAEhC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAWF;;;;;;;GAOG;AACH,qBAAa,WAAW;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,oFAAoF;IACpF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;gBAEhC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;IAWnD,qDAAqD;IACrD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAInD,yDAAyD;IACzD,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS;IAI1D,sDAAsD;IACtD,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC;IAM7E,sDAAsD;IACtD,YAAY;IAIZ,iDAAiD;IAChD,iBAAiB;IAQlB,oDAAoD;IACpD,OAAO,CAAC,UAAU;IAyBlB,8EAA8E;YAChE,iBAAiB;IAqE/B;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE;CAezC"}

package/packages/jam/jamnp-s/peers.js

@@ -90,6 +90,8 @@ export class Connections {
             return;
         }
         if (markAsDisconnected) {
+            // abort any existing reconnect task
+            meta.backgroundTask.abort();
             // mark the peer as disconnected
             meta.peerRef = null;
             meta.backgroundTask = new AbortController();
@@ -120,6 +122,10 @@ export class Connections {
             if (meta.peerRef !== null) {
                 return;
             }
+            // also check via network.peers to handle race with incoming connections
+            if (this.network.peers.isConnected(id)) {
+                return;
+            }
             // attempt to connect to the peer
             try {
                 logger.trace `[${id}] Attempting to connect to peer at ${meta.address.host}:${meta.address.port}.`;
@@ -130,6 +136,10 @@ export class Connections {
                 if (signal.aborted) {
                     return;
                 }
+                // check if we got connected via incoming connection while dialing
+                if (this.network.peers.isConnected(id)) {
+                    return;
+                }
                 // failing to connect, will retry.
                 logger.trace `[${id}] Failure reason: ${e}`;
                 logger.trace `[${id}] attempt failed. Will retry (${meta.currentRetry}/${meta.maxRetries})`;

package/packages/jam/jamnp-s/protocol/ce-128-block-request.d.ts

@@ -44,7 +44,7 @@ export declare class ServerHandler implements StreamHandler<typeof STREAM_KIND>
     kind: 128 & import("@typeberry/numbers").WithBytesRepresentation<1>;
     constructor(chainSpec: ChainSpec, getBlockSequence: (streamId: StreamId, hash: HeaderHash, direction: Direction, maxBlocks: U32) => BlockView[]);
     onStreamMessage(sender: StreamMessageSender, message: BytesBlob): void;
-    onClose(): void;
+    onClose(_streamId: StreamId): void;
 }
 export declare class ClientHandler implements StreamHandler<typeof STREAM_KIND> {
     private readonly chainSpec;

package/packages/jam/jamnp-s/protocol/ce-128-block-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ce-128-block-request.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-128-block-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAW,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;GAIG;AAEH,eAAO,MAAM,WAAW,+DAAuB,CAAC;AAEhD,oBAAY,SAAS;IACnB;;;;OAIG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,QAAQ,IAAI;CACb;AAED,qBAAa,YAAa,SAAQ,SAAS;aAwBvB,UAAU,EAAE,UAAU;aACtB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,GAAG;IAzBhC,MAAM,CAAC,KAAK;;;;QAgBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;IAI7E,OAAO;CAOR;AAID,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAInE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAJnC,IAAI,gEAAe;gBAGA,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,GAAG,KACX,SAAS,EAAE;IAGlB,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAYtE,OAAO;CACR;AAED,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAMzD,OAAO,CAAC,QAAQ,CAAC,SAAS;IALtC,IAAI,gEAAe;IAEnB,OAAO,CAAC,gBAAgB,CAA0D;IAClF,OAAO,CAAC,gBAAgB,CAAwD;gBAEnD,SAAS,EAAE,SAAS;IAEjD,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAUtE,OAAO,CAAC,QAAQ,EAAE,QAAQ;IAOpB,oBAAoB,CACxB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,SAAS,EAAE,CAAC;CAexB;AAED,0CAA0C;AAC1C,oBAAY,kBAAkB;IAC5B,+CAA+C;IAC/C,YAAY,IAAI;IAChB,iFAAiF;IACjF,WAAW,IAAI;CAChB;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,QAAQ,EAChB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,GAAG,GACT,MAAM,CAAC,SAAS,EAAE,EAAE,kBAAkB,CAAC,CAmEzC"}
+{"version":3,"file":"ce-128-block-request.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-128-block-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAW,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;GAIG;AAEH,eAAO,MAAM,WAAW,+DAAuB,CAAC;AAEhD,oBAAY,SAAS;IACnB;;;;OAIG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,QAAQ,IAAI;CACb;AAED,qBAAa,YAAa,SAAQ,SAAS;aAwBvB,UAAU,EAAE,UAAU;aACtB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,GAAG;IAzBhC,MAAM,CAAC,KAAK;;;;QAgBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;IAI7E,OAAO;CAOR;AAID,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAInE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAJnC,IAAI,gEAAe;gBAGA,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,GAAG,KACX,SAAS,EAAE;IAGlB,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAYtE,OAAO,CAAC,SAAS,EAAE,QAAQ;CAC5B;AAED,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAMzD,OAAO,CAAC,QAAQ,CAAC,SAAS;IALtC,IAAI,gEAAe;IAEnB,OAAO,CAAC,gBAAgB,CAA0D;IAClF,OAAO,CAAC,gBAAgB,CAAwD;gBAEnD,SAAS,EAAE,SAAS;IAEjD,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAWtE,OAAO,CAAC,QAAQ,EAAE,QAAQ;IAOpB,oBAAoB,CACxB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,SAAS,EAAE,CAAC;CAgBxB;AAED,0CAA0C;AAC1C,oBAAY,kBAAkB;IAC5B,+CAA+C;IAC/C,YAAY,IAAI;IAChB,iFAAiF;IACjF,WAAW,IAAI;CAChB;AAED,sEAAsE;AACtE,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,QAAQ,EAChB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,GAAG,GACT,MAAM,CAAC,SAAS,EAAE,EAAE,kBAAkB,CAAC,CAmEzC"}

package/packages/jam/jamnp-s/protocol/ce-128-block-request.js

@@ -71,7 +71,7 @@ export class ServerHandler {
         sender.bufferAndSend(Encoder.encodeObject(codec.sequenceFixLen(Block.Codec.View, blocks.length), blocks, this.chainSpec));
         sender.close();
     }
-    onClose() { }
+    onClose(_streamId) { }
 }
 export class ClientHandler {
     chainSpec;
@@ -82,13 +82,14 @@ export class ClientHandler {
         this.chainSpec = chainSpec;
     }
     onStreamMessage(sender, message) {
-        if (!this.promiseResolvers.has(sender.streamId)) {
+        const { streamId } = sender;
+        if (!this.promiseResolvers.has(streamId)) {
             throw new Error("Received an unexpected message from the server.");
         }
         const blocks = Decoder.decodeSequence(Block.Codec.View, message, this.chainSpec);
-        logger.log `[${sender.streamId}] Server returned ${blocks.length} blocks in ${message.length} bytes of data.`;
-        this.promiseResolvers.get(sender.streamId)?.(blocks);
-        this.promiseResolvers.delete(sender.streamId);
+        logger.log `[${streamId}] Server returned ${blocks.length} blocks in ${message.length} bytes of data.`;
+        this.promiseResolvers.get(streamId)?.(blocks);
+        this.promiseResolvers.delete(streamId);
     }
     onClose(streamId) {
         this.promiseRejectors.get(streamId)?.("Stream closed.");
@@ -96,12 +97,13 @@ export class ClientHandler {
         this.promiseRejectors.delete(streamId);
     }
     async requestBlockSequence(sender, headerHash, direction, maxBlocks) {
-        if (this.promiseResolvers.has(sender.streamId)) {
+        const { streamId } = sender;
+        if (this.promiseResolvers.has(streamId)) {
             throw new Error("It is disallowed to use the same stream for multiple requests.");
         }
         return new Promise((resolve, reject) => {
-            this.promiseResolvers.set(sender.streamId, resolve);
-            this.promiseRejectors.set(sender.streamId, reject);
+            this.promiseResolvers.set(streamId, resolve);
+            this.promiseRejectors.set(streamId, reject);
             sender.bufferAndSend(Encoder.encodeObject(BlockRequest.Codec, BlockRequest.create({ headerHash, direction, maxBlocks })));
             sender.close();
         });

package/packages/jam/jamnp-s/protocol/ce-129-state-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ce-129-state-request.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-129-state-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;GAIG;AAEH,eAAO,MAAM,WAAW,+DAAuB,CAAC;AAGhD,MAAM,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAO7C,qBAAa,YAAa,SAAQ,SAAS;aAWvB,GAAG,EAAE,GAAG;aACR,KAAK,EAAE,SAAS;IAXlC,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;gBAKrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,SAAS;CAInC;AAED,qBAAa,aAAc,SAAQ,SAAS;aASN,aAAa,EAAE,YAAY,EAAE;IARjE,MAAM,CAAC,KAAK;;;;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,aAAa,CAAC;IAI3D,OAAO;CAGR;AAED,qBAAa,YAAa,SAAQ,SAAS;aAavB,UAAU,EAAE,UAAU;aACtB,QAAQ,EAAE,GAAG;aACb,MAAM,EAAE,GAAG;aACX,WAAW,EAAE,GAAG;IAflC,MAAM,CAAC,KAAK;;;;;QAKT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;IAItF,OAAO;CAQR;AAID,qBAAa,OAAQ,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAO7D,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IARpC,IAAI,gEAAe;IAEnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA4D;gBAGpE,QAAQ,GAAE,OAAe,EACzB,gBAAgB,CAAC,GAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,QAAQ,EAAE,aAAA,EAC/E,gBAAgB,CAAC,GAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,YAAY,EAAE,aAAA;IAOtG,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IA+BtE,OAAO,CAAC,QAAQ,EAAE,QAAQ;IAK1B,aAAa,CACX,MAAM,EAAE,mBAAmB,EAC3B,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,EAClC,UAAU,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;CAc7C"}
+{"version":3,"file":"ce-129-state-request.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-129-state-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;GAIG;AAEH,eAAO,MAAM,WAAW,+DAAuB,CAAC;AAGhD,MAAM,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAO7C,qBAAa,YAAa,SAAQ,SAAS;aAWvB,GAAG,EAAE,GAAG;aACR,KAAK,EAAE,SAAS;IAXlC,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;gBAKrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,SAAS;CAInC;AAED,qBAAa,aAAc,SAAQ,SAAS;aASN,aAAa,EAAE,YAAY,EAAE;IARjE,MAAM,CAAC,KAAK;;;;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,aAAa,CAAC;IAI3D,OAAO;CAGR;AAED,qBAAa,YAAa,SAAQ,SAAS;aAavB,UAAU,EAAE,UAAU;aACtB,QAAQ,EAAE,GAAG;aACb,MAAM,EAAE,GAAG;aACX,WAAW,EAAE,GAAG;IAflC,MAAM,CAAC,KAAK;;;;;QAKT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,YAAY,CAAC;IAItF,OAAO;CAQR;AAID,qBAAa,OAAQ,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAO7D,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IARpC,IAAI,gEAAe;IAEnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA4D;gBAGpE,QAAQ,GAAE,OAAe,EACzB,gBAAgB,CAAC,GAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,QAAQ,EAAE,aAAA,EAC/E,gBAAgB,CAAC,GAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,YAAY,EAAE,aAAA;IAOtG,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAgCtE,OAAO,CAAC,QAAQ,EAAE,QAAQ;IAK1B,aAAa,CACX,MAAM,EAAE,mBAAmB,EAC3B,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,EAClC,UAAU,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;CAe7C"}

package/packages/jam/jamnp-s/protocol/ce-129-state-request.js

@@ -82,37 +82,39 @@ export class Handler {
         }
     }
     onStreamMessage(sender, message) {
+        const { streamId } = sender;
         if (this.isServer) {
-            logger.info `[${sender.streamId}][server]: Received request.`;
+            logger.info `[${streamId}][server]: Received request.`;
             if (this.getBoundaryNodes === undefined || this.getKeyValuePairs === undefined) {
                 return;
             }
             const request = Decoder.decodeObject(StateRequest.Codec, message);
             const boundaryNodes = this.getBoundaryNodes(request.headerHash, request.startKey, request.endKey);
             const keyValuePairs = this.getKeyValuePairs(request.headerHash, request.startKey, request.endKey);
-            logger.info `[${sender.streamId}][server]: <-- responding with boundary nodes and key value pairs.`;
+            logger.info `[${streamId}][server]: <-- responding with boundary nodes and key value pairs.`;
             sender.bufferAndSend(Encoder.encodeObject(codec.sequenceVarLen(trieNodeCodec), boundaryNodes));
             sender.bufferAndSend(Encoder.encodeObject(StateResponse.Codec, StateResponse.create({ keyValuePairs })));
             sender.close();
             return;
         }
-        if (!this.boundaryNodes.has(sender.streamId)) {
-            this.boundaryNodes.set(sender.streamId, Decoder.decodeObject(codec.sequenceVarLen(trieNodeCodec), message));
-            logger.info `[${sender.streamId}][client]: Received boundary nodes.`;
+        if (!this.boundaryNodes.has(streamId)) {
+            this.boundaryNodes.set(streamId, Decoder.decodeObject(codec.sequenceVarLen(trieNodeCodec), message));
+            logger.info `[${streamId}][client]: Received boundary nodes.`;
             return;
         }
-        this.onResponse.get(sender.streamId)?.(Decoder.decodeObject(StateResponse.Codec, message));
-        logger.info `[${sender.streamId}][client]: Received state values.`;
+        this.onResponse.get(streamId)?.(Decoder.decodeObject(StateResponse.Codec, message));
+        logger.info `[${streamId}][client]: Received state values.`;
     }
     onClose(streamId) {
         this.boundaryNodes.delete(streamId);
         this.onResponse.delete(streamId);
     }
     getStateByKey(sender, headerHash, startKey, onResponse) {
-        if (this.onResponse.has(sender.streamId)) {
+        const { streamId } = sender;
+        if (this.onResponse.has(streamId)) {
             throw new Error("It is disallowed to use the same stream for multiple requests.");
         }
-        this.onResponse.set(sender.streamId, onResponse);
+        this.onResponse.set(streamId, onResponse);
         sender.bufferAndSend(Encoder.encodeObject(StateRequest.Codec, StateRequest.create({ headerHash, startKey, endKey: startKey, maximumSize: tryAsU32(4096) })));
         sender.close();
     }

package/packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.d.ts

@@ -3,7 +3,7 @@ import { SignedTicket } from "#@typeberry/block/tickets.js";
 import type { BytesBlob } from "#@typeberry/bytes";
 import { type CodecRecord } from "#@typeberry/codec";
 import { WithDebug } from "#@typeberry/utils";
-import { type StreamHandler, type StreamMessageSender } from "./stream.js";
+import { type StreamHandler, type StreamId, type StreamMessageSender } from "./stream.js";
 /**
  * JAM-SNP CE-131 and CE-132 streams.
  *
@@ -32,13 +32,13 @@ export declare class ServerHandler<T extends STREAM_KIND> implements StreamHandl
     private readonly onTicketReceived;
     constructor(kind: T, onTicketReceived: (epochIndex: Epoch, ticket: SignedTicket) => void);
     onStreamMessage(sender: StreamMessageSender, message: BytesBlob): void;
-    onClose(): void;
+    onClose(_streamId: StreamId): void;
 }
 export declare class ClientHandler<T extends STREAM_KIND> implements StreamHandler<T> {
     readonly kind: T;
     constructor(kind: T);
     onStreamMessage(sender: StreamMessageSender): void;
-    onClose(): void;
+    onClose(_streamId: StreamId): void;
     sendTicket(sender: StreamMessageSender, epochIndex: Epoch, ticket: SignedTicket): void;
 }
 export {};

package/packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ce-131-ce-132-safrole-ticket-distribution.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE5F;;;;;;GAMG;AAEH,eAAO,MAAM,8BAA8B,+DAAuB,CAAC;AACnE,eAAO,MAAM,wBAAwB,+DAAuB,CAAC;AAE7D,KAAK,WAAW,GAAG,OAAO,8BAA8B,GAAG,OAAO,wBAAwB,CAAC;AAE3F,qBAAa,yBAA0B,SAAQ,SAAS;aAWpC,UAAU,EAAE,KAAK;aACjB,MAAM,EAAE,YAAY;IAXtC,MAAM,CAAC,KAAK;;;;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,yBAAyB,CAAC;IAI5E,OAAO;CAMR;AAID,qBAAa,aAAa,CAAC,CAAC,SAAS,WAAW,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAEzD,IAAI,EAAE,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADjB,IAAI,EAAE,CAAC,EACN,gBAAgB,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI;IAGtF,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAOtE,OAAO;CACR;AAED,qBAAa,aAAa,CAAC,CAAC,SAAS,WAAW,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAC/C,IAAI,EAAE,CAAC;gBAAP,IAAI,EAAE,CAAC;IAEnC,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAKlD,OAAO;IAEP,UAAU,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY;CAKhF"}
+{"version":3,"file":"ce-131-ce-132-safrole-ticket-distribution.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;;;GAMG;AAEH,eAAO,MAAM,8BAA8B,+DAAuB,CAAC;AACnE,eAAO,MAAM,wBAAwB,+DAAuB,CAAC;AAE7D,KAAK,WAAW,GAAG,OAAO,8BAA8B,GAAG,OAAO,wBAAwB,CAAC;AAE3F,qBAAa,yBAA0B,SAAQ,SAAS;aAWpC,UAAU,EAAE,KAAK;aACjB,MAAM,EAAE,YAAY;IAXtC,MAAM,CAAC,KAAK;;;;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,yBAAyB,CAAC;IAI5E,OAAO;CAMR;AAID,qBAAa,aAAa,CAAC,CAAC,SAAS,WAAW,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAEzD,IAAI,EAAE,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADjB,IAAI,EAAE,CAAC,EACN,gBAAgB,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI;IAGtF,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAOtE,OAAO,CAAC,SAAS,EAAE,QAAQ;CAC5B;AAED,qBAAa,aAAa,CAAC,CAAC,SAAS,WAAW,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAC/C,IAAI,EAAE,CAAC;gBAAP,IAAI,EAAE,CAAC;IAEnC,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAKlD,OAAO,CAAC,SAAS,EAAE,QAAQ;IAE3B,UAAU,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY;CAKhF"}