@typeberry/lib 0.5.3 → 0.5.4-472e282

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

@@ -3,16 +3,15 @@ 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_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 { deepEqual, Result } from "#@typeberry/utils";
 import { UpdatePrivilegesError } from "../externalities/partial-state.js";
 import { PartialStateMock } from "../externalities/partial-state-mock.js";
 import { HostCallResult } from "../general/results.js";
@@ -24,8 +23,8 @@ const MANAGER_REG = 7;
 const AUTHORIZATION_REG = 8;
 const VALIDATOR_REG = 9;
 const REGISTRAR_REG = 10;
-const DICTIONARY_START = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? 11 : 10;
-const DICTIONARY_COUNT = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? 12 : 11;
+const DICTIONARY_START = 11;
+const DICTIONARY_COUNT = 12;
 function prepareServiceGasMap() {
     const entries = [];
     entries.push([tryAsServiceId(10_000), tryAsServiceGas(15_000)]);
@@ -69,7 +68,6 @@ function prepareRegsAndMemory(entries, authorizerData, { skipDictionary = false,
     };
 }
 describe("HostCalls: Bless", () => {
-    const itPost071 = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? it : it.skip;
     it("should set new privileged services and auto-accumulate services", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
@@ -82,28 +80,15 @@ describe("HostCalls: Bless", () => {
         // then
         assert.deepStrictEqual(result, undefined);
         assert.deepStrictEqual(registers.get(RESULT_REG), HostCallResult.OK);
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(42),
-                    new Map(entries),
-                ],
-            ]);
-        }
-        else {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
-                    new Map(entries),
-                ],
-            ]);
-        }
+        deepEqual(accumulate.privilegedServices, [
+            [
+                tryAsServiceId(5),
+                tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
+                tryAsServiceId(20),
+                tryAsServiceId(42),
+                new Map(entries),
+            ],
+        ]);
     });
     it("should return panic when dictionary is not readable", async () => {
         const accumulate = new PartialStateMock();
@@ -144,28 +129,15 @@ describe("HostCalls: Bless", () => {
         // then
         assert.deepStrictEqual(result, undefined);
         assert.deepStrictEqual(registers.get(RESULT_REG), HostCallResult.OK);
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(42),
-                    new Map(entries),
-                ],
-            ]);
-        }
-        else {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
-                    new Map(entries),
-                ],
-            ]);
-        }
+        deepEqual(accumulate.privilegedServices, [
+            [
+                tryAsServiceId(5),
+                tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
+                tryAsServiceId(20),
+                tryAsServiceId(42),
+                new Map(entries),
+            ],
+        ]);
     });
     it("should auto-accumulate services when dictionary contains duplicates", async () => {
         const accumulate = new PartialStateMock();
@@ -180,28 +152,15 @@ describe("HostCalls: Bless", () => {
         // then
         assert.deepStrictEqual(result, undefined);
         assert.deepStrictEqual(registers.get(RESULT_REG), HostCallResult.OK);
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(42),
-                    new Map(entries),
-                ],
-            ]);
-        }
-        else {
-            deepEqual(accumulate.privilegedServices, [
-                [
-                    tryAsServiceId(5),
-                    tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
-                    tryAsServiceId(20),
-                    tryAsServiceId(MAX_VALUE),
-                    new Map(entries),
-                ],
-            ]);
-        }
+        deepEqual(accumulate.privilegedServices, [
+            [
+                tryAsServiceId(5),
+                tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
+                tryAsServiceId(20),
+                tryAsServiceId(42),
+                new Map(entries),
+            ],
+        ]);
     });
     it("should return HUH when service is unprivileged", async () => {
         const accumulate = new PartialStateMock();
@@ -248,7 +207,7 @@ describe("HostCalls: Bless", () => {
         assert.deepStrictEqual(registers.get(RESULT_REG), HostCallResult.WHO);
         assert.deepStrictEqual(accumulate.privilegedServices, []);
     });
-    itPost071("should return WHO if given registrar is invalid", async () => {
+    it("should return WHO if given registrar is invalid", async () => {
         const accumulate = new PartialStateMock();
         accumulate.privilegedServicesResponse = Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Test: invalid registrar service ID for bless");
         const serviceId = tryAsServiceId(11_000);

package/packages/jam/jam-host-calls/accumulate/new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAInE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAMvF;;;;GAIG;AACH,qBAAa,GAAI,YAAW,eAAe;aAQvB,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAE8B;gBAG3B,gBAAgB,EAAE,SAAS,EAC1B,YAAY,EAAE,YAAY;IAGvC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CA0DrH"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/accumulate/new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AAInE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAMvF;;;;GAIG;AACH,qBAAa,GAAI,YAAW,eAAe;aAMvB,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,KAAK,iIAA0B;IAC/B,YAAY,4HAAqB;IACjC,eAAe,uEAAgD;gBAG7C,gBAAgB,EAAE,SAAS,EAC1B,YAAY,EAAE,YAAY;IAGvC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CA0DrH"}

package/packages/jam/jam-host-calls/accumulate/new.js

@@ -4,7 +4,7 @@ import { HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU64 } from "#@typeberry/numbers";
 import { PvmExecution, traceRegisters, tryAsHostCallIndex } from "#@typeberry/pvm-host-calls";
 import { tryAsSmallGas } from "#@typeberry/pvm-interface";
-import { assertNever, Compatibility, GpVersion, resultToString } from "#@typeberry/utils";
+import { assertNever, resultToString } from "#@typeberry/utils";
 import { NewServiceError } from "../externalities/partial-state.js";
 import { HostCallResult } from "../general/results.js";
 import { logger } from "../logger.js";
@@ -19,9 +19,7 @@ export class New {
     partialState;
     index = tryAsHostCallIndex(18);
     basicGasCost = tryAsSmallGas(10);
-    tracedRegisters = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-        ? traceRegisters(IN_OUT_REG, 8, 9, 10, 11, 12)
-        : traceRegisters(IN_OUT_REG, 8, 9, 10, 11);
+    tracedRegisters = traceRegisters(IN_OUT_REG, 8, 9, 10, 11, 12);
     constructor(currentServiceId, partialState) {
         this.currentServiceId = currentServiceId;
         this.partialState = partialState;

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

@@ -10,7 +10,7 @@ import { gasCounter } from "#@typeberry/pvm-interpreter/gas.js";
 import { MemoryBuilder, tryAsMemoryIndex } from "#@typeberry/pvm-interpreter/memory/index.js";
 import { tryAsSbrkIndex } from "#@typeberry/pvm-interpreter/memory/memory-index.js";
 import { PAGE_SIZE } from "#@typeberry/pvm-interpreter/spi-decoder/memory-conts.js";
-import { Compatibility, GpVersion, Result } from "#@typeberry/utils";
+import { Result } from "#@typeberry/utils";
 import { NewServiceError } from "../externalities/partial-state.js";
 import { PartialStateMock } from "../externalities/partial-state-mock.js";
 import { HostCallResult } from "../general/results.js";
@@ -46,7 +46,6 @@ wantedServiceId = tryAsU64(2 ** 32 - 1), { skipCodeHash = false } = {}) {
     };
 }
 describe("HostCalls: New", () => {
-    const itPost071 = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? it : it.skip;
     it("should create a new service", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000);
@@ -98,7 +97,7 @@ describe("HostCalls: New", () => {
         assert.deepStrictEqual(registers.get(RESULT_REG), HostCallResult.HUH);
         assert.deepStrictEqual(accumulate.newServiceCalled.length, 1);
     });
-    itPost071("should create a new service with selected id", async () => {
+    it("should create a new service with selected id", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10); // service has registrar privilege
         const n = new New(serviceId, accumulate);
@@ -113,7 +112,7 @@ describe("HostCalls: New", () => {
             [Bytes.fill(HASH_SIZE, 0x69), 4096n, 2n ** 40n, 2n ** 50n, gratisStorage, 42n],
         ]);
     });
-    itPost071("should create a new service with random id", async () => {
+    it("should create a new service with random id", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10_000); // service does not have registrar privilege
         const n = new New(serviceId, accumulate);
@@ -128,7 +127,7 @@ describe("HostCalls: New", () => {
             [Bytes.fill(HASH_SIZE, 0x69), 4096n, 2n ** 40n, 2n ** 50n, gratisStorage, 42n],
         ]);
     });
-    itPost071("should fail when trying to set selected id, but service already exists", async () => {
+    it("should fail when trying to set selected id, but service already exists", async () => {
         const accumulate = new PartialStateMock();
         const serviceId = tryAsServiceId(10);
         const n = new New(serviceId, accumulate);

package/packages/jam/jam-host-calls/general/fetch.d.ts

@@ -142,19 +142,6 @@ export interface IFetchExternalities {
      * https://graypaper.fluffylabs.dev/#/9a08063/32f00132f001?v=0.6.6
      */
     workItemPayload(workItem: U64): BytesBlob | null;
-    /**
-     * Get all accumulation operands (work results?).
-     *
-     * Is Authorized: <empty>
-     * Refine: <empty>
-     * Accumulate: `E(↕o)`
-     * On Transfer: <empty>
-     *
-     * @deprecated since 0.7.1
-     *
-     * https://graypaper.fluffylabs.dev/#/9a08063/32fb0132fb01?v=0.6.6
-     */
-    allOperands(): BytesBlob | null;
     /**
      * Get all accumulation operands (work results?) and transfers.
      *
@@ -165,19 +152,6 @@ export interface IFetchExternalities {
      * https://graypaper.fluffylabs.dev/#/ab2cdbd/314c03314c03?v=0.7.2
      */
     allTransfersAndOperands(): BytesBlob | null;
-    /**
-     * Get one selected accumulation operand.
-     *
-     * Is Authorized: <empty>
-     * Refine: <empty>
-     * Accumulate: `E(o[omega_11])`
-     * On Transfer: <empty>
-     *
-     * @deprecated 0.7.1
-     *
-     * https://graypaper.fluffylabs.dev/#/9a08063/320202320202?v=0.6.6
-     */
-    oneOperand(operandIndex: U64): BytesBlob | null;
     /**
      * Get one selected accumulation operand or transfer.
      *
@@ -188,32 +162,6 @@ export interface IFetchExternalities {
      * https://graypaper.fluffylabs.dev/#/ab2cdbd/315503315503?v=0.7.2
      */
     oneTransferOrOperand(index: U64): BytesBlob | null;
-    /**
-     * Inspect all incoming transfers.
-     *
-     * Is Authorized: <empty>
-     * Refine: <empty>
-     * Accumulate: <empty>
-     * On Transfer: `E(↕t)`
-     *
-     * @deprecated 0.7.1
-     *
-     * https://graypaper.fluffylabs.dev/#/9a08063/320c02320c02?v=0.6.6
-     */
-    allTransfers(): BytesBlob | null;
-    /**
-     * Inspect one particular incoming transfers.
-     *
-     * Is Authorized: <empty>
-     * Refine: <empty>
-     * Accumulate: <empty>
-     * On Transfer: `E(t[omega_11])`
-     *
-     * @deprecated 0.7.1
-     *
-     * https://graypaper.fluffylabs.dev/#/9a08063/321302321302?v=0.6.6
-     */
-    oneTransfer(transferIndex: U64): BytesBlob | null;
 }
 /**
  * https://graypaper.fluffylabs.dev/#/7e6ff6a/324000324000?v=0.6.7
@@ -243,11 +191,7 @@ export declare enum FetchKind {
     AllWorkItems = 11,
     OneWorkItem = 12,
     WorkItemPayload = 13,
-    LegacyAllOperands = 14,
     AllTransfersAndOperands = 14,
-    LegacyOneOperand = 15,
-    OneTransferOrOperand = 15,
-    LegacyAllTransfers = 16,
-    LegacyOneTransfer = 17
+    OneTransferOrOperand = 15
 }
 //# sourceMappingURL=fetch.d.ts.map

package/packages/jam/jam-host-calls/general/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/general/fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jam-host-calls/general/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAA8B,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAK3E,sBAAsB;AACtB,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,SAAS,IAAI,SAAS,CAAC;IAEvB;;;;;;;;;OASG;IACH,OAAO,IAAI,SAAS,GAAG,IAAI,CAAC;IAE5B;;;;;;;;;;OAUG;IACH,eAAe,IAAI,SAAS,GAAG,IAAI,CAAC;IAEpC;;;;;;;;;;;OAWG;IACH,iBAAiB,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;IAEtE;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;IAEnE;;;;;;;;;OASG;IACH,WAAW,IAAI,SAAS,GAAG,IAAI,CAAC;IAEhC;;;;;;;;;;OAUG;IACH,UAAU,IAAI,SAAS,GAAG,IAAI,CAAC;IAE/B;;;;;;;;;OASG;IACH,kBAAkB,IAAI,SAAS,GAAG,IAAI,CAAC;IAEvC;;;;;;;;;OASG;IACH,aAAa,IAAI,SAAS,GAAG,IAAI,CAAC;IAElC;;;;;;;;;;OAUG;IACH,YAAY,IAAI,SAAS,GAAG,IAAI,CAAC;IAEjC;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;IAE7C;;;;;;;;;OASG;IACH,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;IAEjD;;;;;;;;OAQG;IACH,uBAAuB,IAAI,SAAS,GAAG,IAAI,CAAC;IAE5C;;;;;;;;OAQG;IACH,oBAAoB,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;CACpD;AAID;;GAEG;AACH,qBAAa,KAAM,YAAW,eAAe;aAMzB,gBAAgB,EAAE,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK;IANxB,KAAK,iIAAyB;IAC9B,YAAY,4HAAqB;IACjC,eAAe,uEAAgD;gBAG7C,gBAAgB,EAAE,SAAS,EAC1B,KAAK,EAAE,mBAAmB;IAGvC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;IA6BpH,OAAO,CAAC,QAAQ;CA4EjB;AAED,oBAAY,SAAS;IACnB,SAAS,IAAI;IACb,OAAO,IAAI;IACX,eAAe,IAAI;IACnB,uBAAuB,IAAI;IAC3B,YAAY,IAAI;IAChB,oBAAoB,IAAI;IACxB,SAAS,IAAI;IACb,WAAW,IAAI;IACf,UAAU,IAAI;IACd,kBAAkB,IAAI;IACtB,aAAa,KAAK;IAClB,YAAY,KAAK;IACjB,WAAW,KAAK;IAChB,eAAe,KAAK;IACpB,uBAAuB,KAAK;IAC5B,oBAAoB,KAAK;CAC1B"}

package/packages/jam/jam-host-calls/general/fetch.js

@@ -1,7 +1,6 @@
 import { minU64, tryAsU64 } from "#@typeberry/numbers";
 import { PvmExecution, traceRegisters, tryAsHostCallIndex } from "#@typeberry/pvm-host-calls";
 import { tryAsSmallGas } from "#@typeberry/pvm-interface";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { logger } from "../logger.js";
 import { clampU64ToU32 } from "../utils.js";
 import { HostCallResult } from "./results.js";
@@ -94,30 +93,12 @@ export class Fetch {
             const workItem = regs.get(11);
             return this.fetch.workItemPayload(workItem);
         }
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            if (kind === FetchKind.AllTransfersAndOperands) {
-                return this.fetch.allTransfersAndOperands();
-            }
-            if (kind === FetchKind.OneTransferOrOperand) {
-                const index = regs.get(11);
-                return this.fetch.oneTransferOrOperand(index);
-            }
-        }
-        else {
-            if (kind === FetchKind.LegacyAllOperands) {
-                return this.fetch.allOperands();
-            }
-            if (kind === FetchKind.LegacyOneOperand) {
-                const index = regs.get(11);
-                return this.fetch.oneOperand(index);
-            }
-            if (kind === FetchKind.LegacyAllTransfers) {
-                return this.fetch.allTransfers();
-            }
-            if (kind === FetchKind.LegacyOneTransfer) {
-                const index = regs.get(11);
-                return this.fetch.oneTransfer(index);
-            }
+        if (kind === FetchKind.AllTransfersAndOperands) {
+            return this.fetch.allTransfersAndOperands();
+        }
+        if (kind === FetchKind.OneTransferOrOperand) {
+            const index = regs.get(11);
+            return this.fetch.oneTransferOrOperand(index);
         }
         return null;
     }
@@ -138,10 +119,6 @@ export var FetchKind;
     FetchKind[FetchKind["AllWorkItems"] = 11] = "AllWorkItems";
     FetchKind[FetchKind["OneWorkItem"] = 12] = "OneWorkItem";
     FetchKind[FetchKind["WorkItemPayload"] = 13] = "WorkItemPayload";
-    FetchKind[FetchKind["LegacyAllOperands"] = 14] = "LegacyAllOperands";
     FetchKind[FetchKind["AllTransfersAndOperands"] = 14] = "AllTransfersAndOperands";
-    FetchKind[FetchKind["LegacyOneOperand"] = 15] = "LegacyOneOperand";
     FetchKind[FetchKind["OneTransferOrOperand"] = 15] = "OneTransferOrOperand";
-    FetchKind[FetchKind["LegacyAllTransfers"] = 16] = "LegacyAllTransfers";
-    FetchKind[FetchKind["LegacyOneTransfer"] = 17] = "LegacyOneTransfer";
 })(FetchKind || (FetchKind = {}));

package/packages/jam/jam-host-calls/general/fetch.test.js

@@ -7,14 +7,12 @@ import { HostCallMemory, HostCallRegisters, PvmExecution } from "#@typeberry/pvm
 import { tryAsGas } from "#@typeberry/pvm-interface";
 import { gasCounter, MemoryBuilder, tryAsMemoryIndex, tryAsSbrkIndex } from "#@typeberry/pvm-interpreter";
 import { PAGE_SIZE } from "#@typeberry/pvm-interpreter/memory/memory-consts.js";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { emptyRegistersBuffer } from "../utils.js";
 import { Fetch, FetchKind } from "./fetch.js";
 import { HostCallResult } from "./results.js";
 describe("Fetch", () => {
     const IN_OUT_REG = 7;
     const gas = gasCounter(tryAsGas(0));
-    const [itPre071, itPost071] = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? [it.skip, it] : [it, it.skip];
     it("should return PvmExecution.Panic if memory write fails", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([1, 2, 3]);
@@ -277,61 +275,7 @@ describe("Fetch", () => {
         assert.deepStrictEqual(readBack(), blob.raw);
         assert.deepStrictEqual(fetchMock.workItemPayloadData, [[workItem]]);
     });
-    itPre071("should fetch all operands and write result to memory", async () => {
-        const currentServiceId = tryAsServiceId(10_000);
-        const blob = BytesBlob.blobFromNumbers([101, 102, 103]);
-        const fetchMock = new FetchMock();
-        fetchMock.allOperandsResponse = blob;
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.LegacyAllOperands);
-        const fetch = new Fetch(currentServiceId, fetchMock);
-        const result = await fetch.execute(gas, registers, memory);
-        assert.strictEqual(result, undefined);
-        assert.deepStrictEqual(registers.get(IN_OUT_REG), expectedLength);
-        assert.deepStrictEqual(readBack(), blob.raw);
-    });
-    itPre071("should fetch one operand and write result to memory", async () => {
-        const currentServiceId = tryAsServiceId(10_000);
-        const blob = BytesBlob.blobFromNumbers([115, 116, 117]);
-        const fetchMock = new FetchMock();
-        const index = tryAsU64(9);
-        fetchMock.oneOperandResponses.set(index.toString(), blob);
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.LegacyOneOperand);
-        registers.set(11, index);
-        const fetch = new Fetch(currentServiceId, fetchMock);
-        const result = await fetch.execute(gas, registers, memory);
-        assert.strictEqual(result, undefined);
-        assert.deepStrictEqual(registers.get(IN_OUT_REG), expectedLength);
-        assert.deepStrictEqual(readBack(), blob.raw);
-        assert.deepStrictEqual(fetchMock.oneOperandData, [[index]]);
-    });
-    itPre071("should fetch all transfers and write result to memory", async () => {
-        const currentServiceId = tryAsServiceId(10_000);
-        const blob = BytesBlob.blobFromNumbers([130, 131, 132]);
-        const fetchMock = new FetchMock();
-        fetchMock.allTransfersResponse = blob;
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.LegacyAllTransfers);
-        const fetch = new Fetch(currentServiceId, fetchMock);
-        const result = await fetch.execute(gas, registers, memory);
-        assert.strictEqual(result, undefined);
-        assert.deepStrictEqual(registers.get(IN_OUT_REG), expectedLength);
-        assert.deepStrictEqual(readBack(), blob.raw);
-    });
-    itPre071("should fetch one transfer and write result to memory", async () => {
-        const currentServiceId = tryAsServiceId(10_000);
-        const blob = BytesBlob.blobFromNumbers([140, 141, 142]);
-        const fetchMock = new FetchMock();
-        const index = tryAsU64(2);
-        fetchMock.oneTransferResponses.set(index.toString(), blob);
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.LegacyOneTransfer);
-        registers.set(11, index);
-        const fetch = new Fetch(currentServiceId, fetchMock);
-        const result = await fetch.execute(gas, registers, memory);
-        assert.strictEqual(result, undefined);
-        assert.deepStrictEqual(registers.get(IN_OUT_REG), expectedLength);
-        assert.deepStrictEqual(readBack(), blob.raw);
-        assert.deepStrictEqual(fetchMock.oneTransferData, [[index]]);
-    });
-    itPost071("should fetch all transfers and operands and write result to memory", async () => {
+    it("should fetch all transfers and operands and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([101, 102, 103]);
         const fetchMock = new FetchMock();
@@ -343,7 +287,7 @@ describe("Fetch", () => {
         assert.deepStrictEqual(registers.get(IN_OUT_REG), expectedLength);
         assert.deepStrictEqual(readBack(), blob.raw);
     });
-    itPost071("should fetch one operand or transfer and write result to memory", async () => {
+    it("should fetch one operand or transfer and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([115, 116, 117]);
         const fetchMock = new FetchMock();

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();
     }