@typeberry/lib 0.5.10-6cb1bd5 → 0.5.10-7338c21

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

@@ -1,14 +1,15 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
 import { tryAsServiceId } from "#@typeberry/block";
-import { BytesBlob } from "#@typeberry/bytes";
+import { Bytes, BytesBlob } from "#@typeberry/bytes";
+import { HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU64 } from "#@typeberry/numbers";
 import { HostCallMemory, HostCallRegisters, PvmExecution } from "#@typeberry/pvm-host-calls";
 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 { emptyRegistersBuffer } from "../utils.js";
-import { Fetch, FetchKind } from "./fetch.js";
+import { Fetch, FetchContext, FetchKind } from "./fetch.js";
 import { HostCallResult } from "./results.js";
 describe("Fetch", () => {
     const IN_OUT_REG = 7;
@@ -16,7 +17,7 @@ describe("Fetch", () => {
     it("should return PvmExecution.Panic if memory write fails", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([1, 2, 3]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.constantsResponse = blob;
         const badOffset = tryAsU64(0xfffff);
         const registers = new HostCallRegisters(emptyRegistersBuffer());
@@ -33,10 +34,13 @@ describe("Fetch", () => {
     });
     it("should write empty result and set IN_OUT_REG to NONE if fetch returns null", async () => {
         const currentServiceId = tryAsServiceId(10_000);
-        const fetchMock = new FetchMock();
-        fetchMock.entropyResponse = null;
+        const fetchMock = new RefineFetchMock();
+        // oneWorkItem returns null when the work item index has no mock response registered
         const blob = BytesBlob.blobFromNumbers([]);
-        const { registers, memory, readBack } = prepareRegsAndMemory(blob, FetchKind.Entropy);
+        const { registers, memory, readBack } = prepareRegsAndMemory(blob, FetchKind.OneWorkItem);
+        // set work item index to one that has no response → oneWorkItem returns null
+        registers.set(11, tryAsU64(999));
+        fetchMock.oneWorkItemResponses.set("999", null);
         const fetch = new Fetch(currentServiceId, fetchMock);
         const result = await fetch.execute(gas, registers, memory);
         assert.strictEqual(result, undefined);
@@ -47,7 +51,7 @@ describe("Fetch", () => {
     it("should write nothing if offset >= blob length", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([1, 2, 3]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.constantsResponse = blob;
         const { registers, memory, readBack } = prepareRegsAndMemory(blob, FetchKind.Constants, 5, 2);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -59,7 +63,7 @@ describe("Fetch", () => {
     it("should clamp offset + length to blob end", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([9, 8, 7, 6, 5]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.constantsResponse = blob;
         const { registers, memory, readBack } = prepareRegsAndMemory(blob, FetchKind.Constants, 3, 10);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -71,7 +75,7 @@ describe("Fetch", () => {
     it("should return NONE and write nothing if fetch kind is unknown", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.empty();
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.constantsResponse = blob;
         const { registers, memory, readBack } = prepareRegsAndMemory(blob, FetchKind.Constants);
         registers.set(10, tryAsU64(999));
@@ -84,7 +88,7 @@ describe("Fetch", () => {
     it("should fetch constants and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([1, 2, 3, 4, 5]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.constantsResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.Constants);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -95,8 +99,8 @@ describe("Fetch", () => {
     });
     it("should fetch entropy and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
-        const blob = BytesBlob.blobFromNumbers([10, 20, 30, 40]);
-        const fetchMock = new FetchMock();
+        const blob = Bytes.fill(HASH_SIZE, 10).asOpaque();
+        const fetchMock = new RefineFetchMock();
         fetchMock.entropyResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.Entropy);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -108,7 +112,7 @@ describe("Fetch", () => {
     it("should fetch authorizer trace and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([9, 9, 9]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.authorizerTraceResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AuthorizerTrace);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -120,7 +124,7 @@ describe("Fetch", () => {
     it("should fetch other work item extrinsics and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([42, 43, 44]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const workItem = tryAsU64(123);
         const index = tryAsU64(7);
         const key = `${workItem}:${index}`;
@@ -138,7 +142,7 @@ describe("Fetch", () => {
     it("should fetch my extrinsics and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([11, 12, 13]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const index = tryAsU64(5);
         const key = `null:${index}`;
         fetchMock.workItemExtrinsicResponses.set(key, blob);
@@ -154,7 +158,7 @@ describe("Fetch", () => {
     it("should fetch other work item imports and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([21, 22, 23]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const workItem = tryAsU64(42);
         const index = tryAsU64(3);
         const key = `${workItem}:${index}`;
@@ -172,7 +176,7 @@ describe("Fetch", () => {
     it("should fetch my imports and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([31, 32, 33]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const index = tryAsU64(8);
         const key = `null:${index}`;
         fetchMock.workItemImportResponses.set(key, blob);
@@ -188,7 +192,7 @@ describe("Fetch", () => {
     it("should fetch work package and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([100, 101, 102]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.workPackageResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.WorkPackage);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -200,9 +204,9 @@ describe("Fetch", () => {
     it("should fetch authorizer and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([201, 202, 203]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.authorizerResponse = blob;
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.Authorizer);
+        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AuthConfiguration);
         const fetch = new Fetch(currentServiceId, fetchMock);
         const result = await fetch.execute(gas, registers, memory);
         assert.strictEqual(result, undefined);
@@ -212,9 +216,9 @@ describe("Fetch", () => {
     it("should fetch authorization token and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([210, 211, 212]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.authorizationTokenResponse = blob;
-        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AuthorizationToken);
+        const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AuthToken);
         const fetch = new Fetch(currentServiceId, fetchMock);
         const result = await fetch.execute(gas, registers, memory);
         assert.strictEqual(result, undefined);
@@ -224,7 +228,7 @@ describe("Fetch", () => {
     it("should fetch refine context and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([88, 89, 90]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.refineContextResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.RefineContext);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -236,7 +240,7 @@ describe("Fetch", () => {
     it("should fetch all work items and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([70, 71, 72]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         fetchMock.allWorkItemsResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AllWorkItems);
         const fetch = new Fetch(currentServiceId, fetchMock);
@@ -248,7 +252,7 @@ describe("Fetch", () => {
     it("should fetch one work item and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([33, 34, 35]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const workItem = tryAsU64(55);
         fetchMock.oneWorkItemResponses.set(workItem.toString(), blob);
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.OneWorkItem);
@@ -263,7 +267,7 @@ describe("Fetch", () => {
     it("should fetch work item payload and write result to memory", async () => {
         const currentServiceId = tryAsServiceId(10_000);
         const blob = BytesBlob.blobFromNumbers([60, 61, 62]);
-        const fetchMock = new FetchMock();
+        const fetchMock = new RefineFetchMock();
         const workItem = tryAsU64(77);
         fetchMock.workItemPayloadResponses.set(workItem.toString(), blob);
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.WorkItemPayload);
@@ -278,8 +282,8 @@ describe("Fetch", () => {
     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();
-        fetchMock.allTransfersAndOperandsResponses = blob;
+        const fetchMock = new AccumulateFetchMock();
+        fetchMock.allTransfersAndOperandsResponse = blob;
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.AllTransfersAndOperands);
         const fetch = new Fetch(currentServiceId, fetchMock);
         const result = await fetch.execute(gas, registers, memory);
@@ -290,7 +294,7 @@ describe("Fetch", () => {
     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();
+        const fetchMock = new AccumulateFetchMock();
         const index = tryAsU64(9);
         fetchMock.oneTransferOrOperandResponses.set(index.toString(), blob);
         const { registers, memory, readBack, expectedLength } = prepareRegsAndMemory(blob, FetchKind.OneTransferOrOperand);
@@ -302,6 +306,43 @@ describe("Fetch", () => {
         assert.deepStrictEqual(readBack(), blob.raw);
         assert.deepStrictEqual(fetchMock.oneTransferOrOperandData, [[index]]);
     });
+    it("should return NONE for refine-only kinds in accumulate context", async () => {
+        const currentServiceId = tryAsServiceId(10_000);
+        const fetchMock = new AccumulateFetchMock();
+        const blob = BytesBlob.empty();
+        for (const kind of [
+            FetchKind.AuthorizerTrace,
+            FetchKind.OtherWorkItemExtrinsics,
+            FetchKind.MyExtrinsics,
+            FetchKind.OtherWorkItemImports,
+            FetchKind.MyImports,
+            FetchKind.WorkPackage,
+            FetchKind.AuthConfiguration,
+            FetchKind.AuthToken,
+            FetchKind.RefineContext,
+            FetchKind.AllWorkItems,
+            FetchKind.OneWorkItem,
+            FetchKind.WorkItemPayload,
+        ]) {
+            const { registers, memory } = prepareRegsAndMemory(blob, kind);
+            const fetch = new Fetch(currentServiceId, fetchMock);
+            const result = await fetch.execute(gas, registers, memory);
+            assert.strictEqual(result, undefined, `Expected undefined for kind ${kind}`);
+            assert.strictEqual(registers.get(IN_OUT_REG), HostCallResult.NONE, `Expected NONE for kind ${kind}`);
+        }
+    });
+    it("should return NONE for accumulate-only kinds in refine context", async () => {
+        const currentServiceId = tryAsServiceId(10_000);
+        const fetchMock = new RefineFetchMock();
+        const blob = BytesBlob.empty();
+        for (const kind of [FetchKind.AllTransfersAndOperands, FetchKind.OneTransferOrOperand]) {
+            const { registers, memory } = prepareRegsAndMemory(blob, kind);
+            const fetch = new Fetch(currentServiceId, fetchMock);
+            const result = await fetch.execute(gas, registers, memory);
+            assert.strictEqual(result, undefined, `Expected undefined for kind ${kind}`);
+            assert.strictEqual(registers.get(IN_OUT_REG), HostCallResult.NONE, `Expected NONE for kind ${kind}`);
+        }
+    });
     function prepareRegsAndMemory(blob, fetchKind, offset = 0, length = blob.length) {
         const pageStart = 2 ** 16;
         const memOffset = tryAsU64(pageStart + 1234);
@@ -327,32 +368,24 @@ describe("Fetch", () => {
         };
     }
 });
-class FetchMock {
+class RefineFetchMock {
+    context = FetchContext.Refine;
     workItemExtrinsicData = [];
     workItemImportData = [];
     oneWorkItemData = [];
     workItemPayloadData = [];
-    oneOperandData = [];
-    oneTransferData = [];
-    oneTransferOrOperandData = [];
     constantsResponse = null;
     entropyResponse = null;
-    authorizerTraceResponse = null;
+    authorizerTraceResponse = BytesBlob.empty();
     workItemExtrinsicResponses = new Map();
     workItemImportResponses = new Map();
-    workPackageResponse = null;
-    authorizerResponse = null;
-    authorizationTokenResponse = null;
-    refineContextResponse = null;
-    allWorkItemsResponse = null;
+    workPackageResponse = BytesBlob.empty();
+    authorizerResponse = BytesBlob.empty();
+    authorizationTokenResponse = BytesBlob.empty();
+    refineContextResponse = BytesBlob.empty();
+    allWorkItemsResponse = BytesBlob.empty();
     oneWorkItemResponses = new Map();
     workItemPayloadResponses = new Map();
-    allOperandsResponse = null;
-    oneOperandResponses = new Map();
-    allTransfersResponse = null;
-    oneTransferResponses = new Map();
-    allTransfersAndOperandsResponses = null;
-    oneTransferOrOperandResponses = new Map();
     constants() {
         if (this.constantsResponse === null) {
             throw new Error("Unexpected call to constants.");
@@ -360,6 +393,9 @@ class FetchMock {
         return this.constantsResponse;
     }
     entropy() {
+        if (this.entropyResponse === null) {
+            throw new Error("Unexpected call to entropy.");
+        }
         return this.entropyResponse;
     }
     authorizerTrace() {
@@ -384,10 +420,10 @@ class FetchMock {
     workPackage() {
         return this.workPackageResponse;
     }
-    authorizer() {
+    authConfiguration() {
         return this.authorizerResponse;
     }
-    authorizationToken() {
+    authToken() {
         return this.authorizationTokenResponse;
     }
     refineContext() {
@@ -412,30 +448,28 @@ class FetchMock {
         }
         return this.workItemPayloadResponses.get(key) ?? null;
     }
-    allOperands() {
-        return this.allOperandsResponse;
-    }
-    oneOperand(operandIndex) {
-        this.oneOperandData.push([operandIndex]);
-        const key = operandIndex.toString();
-        if (!this.oneOperandResponses.has(key)) {
-            throw new Error(`Missing mock response for oneOperand(${key})`);
+}
+class AccumulateFetchMock {
+    context = FetchContext.Accumulate;
+    oneTransferOrOperandData = [];
+    constantsResponse = null;
+    entropyResponse = null;
+    allTransfersAndOperandsResponse = null;
+    oneTransferOrOperandResponses = new Map();
+    constants() {
+        if (this.constantsResponse === null) {
+            throw new Error("Unexpected call to constants.");
         }
-        return this.oneOperandResponses.get(key) ?? null;
-    }
-    allTransfers() {
-        return this.allTransfersResponse;
+        return this.constantsResponse;
     }
-    oneTransfer(transferIndex) {
-        this.oneTransferData.push([transferIndex]);
-        const key = transferIndex.toString();
-        if (!this.oneTransferResponses.has(key)) {
-            throw new Error(`Missing mock response for oneTransfer(${key})`);
+    entropy() {
+        if (this.entropyResponse === null) {
+            throw new Error("Unexpected call to entropy.");
         }
-        return this.oneTransferResponses.get(key) ?? null;
+        return this.entropyResponse;
     }
     allTransfersAndOperands() {
-        return this.allTransfersAndOperandsResponses;
+        return this.allTransfersAndOperandsResponse;
     }
     oneTransferOrOperand(index) {
         this.oneTransferOrOperandData.push([index]);

package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.d.ts

@@ -29,8 +29,8 @@ export declare class CoreWorkPackage extends WithDebug {
                 lookupAnchorSlot: import("@typeberry/codec").Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"TimeSlot[u32]">, import("@typeberry/bytes").Bytes<4>>;
                 prerequisites: import("@typeberry/codec").Descriptor<(import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"WorkPackageHash">)[], import("@typeberry/codec").SequenceView<import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"WorkPackageHash">, import("@typeberry/bytes").Bytes<32>>>;
             }>>;
-            authorization: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
-            parametrization: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
+            authToken: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
+            authConfiguration: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
             items: import("@typeberry/codec").Descriptor<import("@typeberry/collections").FixedSizeArray<import("@typeberry/block").WorkItem, import("@typeberry/numbers").U8>, import("@typeberry/codec").SequenceView<import("@typeberry/block").WorkItem, import("@typeberry/codec").ViewOf<import("@typeberry/block").WorkItem, {
                 service: import("@typeberry/codec").Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"ServiceId[u32]">, import("@typeberry/bytes").Bytes<4>>;
                 codeHash: import("@typeberry/codec").Descriptor<import("@typeberry/bytes").Bytes<32> & import("@typeberry/utils").WithOpaque<"CodeHash">, import("@typeberry/bytes").Bytes<32>>;

package/packages/jam/transition/accumulate/accumulate.js

@@ -11,7 +11,7 @@ import { MAX_VALUE_U64, sumU64, tryAsU32 } from "#@typeberry/numbers";
 import { accumulationOutputComparator, hashComparator, ServiceAccountInfo, tryAsPerCore, } from "#@typeberry/state";
 import { assertEmpty, Compatibility, GpVersion, Result, TestSuite } from "#@typeberry/utils";
 import { AccumulateExternalities } from "../externalities/accumulate-externalities.js";
-import { FetchExternalities } from "../externalities/index.js";
+import { AccumulateFetchExternalities } from "../externalities/accumulate-fetch-externalities.js";
 import { AccumulateData } from "./accumulate-data.js";
 import { AccumulateQueue, pruneQueue } from "./accumulate-queue.js";
 import { GAS_TO_INVOKE_WORK_REPORT, } from "./accumulate-state.js";
@@ -86,7 +86,7 @@ export class Accumulate {
         }
         const nextServiceId = generateNextServiceId({ serviceId, entropy, timeslot: slot }, this.chainSpec, this.blake2b);
         const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, updatedState, serviceId, nextServiceId, slot);
-        const fetchExternalities = FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec);
+        const fetchExternalities = new AccumulateFetchExternalities(entropy, transfers, operands, this.chainSpec);
         const externalities = {
             partialState,
             serviceExternalities: partialState,

package/packages/jam/transition/accumulate/accumulation-result-merge-utils.js

@@ -44,47 +44,56 @@ function mergePrivilegedServices(mergeContext, [serviceId, { stateUpdate }]) {
     const currentDelegator = currentPrivilegedServices.delegator;
     const currentAssigners = currentPrivilegedServices.assigners;
     const { privilegedServices } = stateUpdate;
-    if (privilegedServices !== null) {
-        if (outputState.privilegedServices === null) {
-            outputState.privilegedServices = PrivilegedServices.create({
-                ...currentPrivilegedServices,
-            });
-        }
-        if (serviceId === currentManager) {
-            outputState.privilegedServices = PrivilegedServices.create({
-                ...privilegedServices,
-            });
-        }
-        if (serviceId === currentRegistrar) {
-            const newRegistrar = updatePrivilegedService(currentPrivilegedServices.registrar, privilegedServicesUpdatedByManager.registrar, privilegedServices.registrar);
-            outputState.privilegedServices = PrivilegedServices.create({
-                ...outputState.privilegedServices,
-                registrar: newRegistrar,
-            });
-        }
-        if (serviceId === currentDelegator) {
-            const newDelegator = updatePrivilegedService(currentPrivilegedServices.delegator, privilegedServicesUpdatedByManager.delegator, privilegedServices.delegator);
-            outputState.privilegedServices = PrivilegedServices.create({
-                ...outputState.privilegedServices,
-                delegator: newDelegator,
-            });
-        }
-        let shouldUpdateAssigners = false;
-        const newAssigners = currentAssigners.map((currentAssigner, coreIndex) => {
-            if (serviceId === currentAssigner) {
-                const newAssigner = updatePrivilegedService(currentPrivilegedServices.assigners[coreIndex], privilegedServicesUpdatedByManager.assigners[coreIndex], privilegedServices.assigners[coreIndex]);
-                shouldUpdateAssigners = shouldUpdateAssigners || newAssigner !== currentAssigner;
-                return newAssigner;
-            }
-            return currentAssigner;
+    if (privilegedServices === null) {
+        return;
+    }
+    // initial value (ignore the update, because it might not be authorized)
+    if (outputState.privilegedServices === null) {
+        outputState.privilegedServices = PrivilegedServices.create({
+            ...currentPrivilegedServices,
+        });
+    }
+    // manager can override everything and it always takes precedence over
+    // everything else
+    if (serviceId === currentManager) {
+        outputState.privilegedServices = PrivilegedServices.create({
+            ...privilegedServices,
+        });
+    }
+    // current registrar can transfer out it's permissions, but only if
+    // it wasn't overwritten by manager in current run
+    if (serviceId === currentRegistrar) {
+        const newRegistrar = updatePrivilegedService(currentPrivilegedServices.registrar, privilegedServicesUpdatedByManager.registrar, privilegedServices.registrar);
+        outputState.privilegedServices = PrivilegedServices.create({
+            ...outputState.privilegedServices,
+            registrar: newRegistrar,
         });
-        if (shouldUpdateAssigners) {
-            const newAssignersPerCore = tryAsPerCore(newAssigners, chainSpec);
-            outputState.privilegedServices = PrivilegedServices.create({
-                ...outputState.privilegedServices,
-                assigners: newAssignersPerCore,
-            });
+    }
+    // current delegator can transfer out it's permissions, but only if
+    // it wasn't overwritten by manager in current run
+    if (serviceId === currentDelegator) {
+        const newDelegator = updatePrivilegedService(currentPrivilegedServices.delegator, privilegedServicesUpdatedByManager.delegator, privilegedServices.delegator);
+        outputState.privilegedServices = PrivilegedServices.create({
+            ...outputState.privilegedServices,
+            delegator: newDelegator,
+        });
+    }
+    let shouldUpdateAssigners = false;
+    // same with assigners - they are free to transfer out their core
+    const newAssigners = currentAssigners.map((currentAssigner, coreIndex) => {
+        if (serviceId === currentAssigner) {
+            const newAssigner = updatePrivilegedService(currentPrivilegedServices.assigners[coreIndex], privilegedServicesUpdatedByManager.assigners[coreIndex], privilegedServices.assigners[coreIndex]);
+            shouldUpdateAssigners = shouldUpdateAssigners || newAssigner !== currentAssigner;
+            return newAssigner;
         }
+        return currentAssigner;
+    });
+    if (shouldUpdateAssigners) {
+        const newAssignersPerCore = tryAsPerCore(newAssigners, chainSpec);
+        outputState.privilegedServices = PrivilegedServices.create({
+            ...outputState.privilegedServices,
+            assigners: newAssignersPerCore,
+        });
     }
 }
 function mergeValidatorsData(mergeContext, [serviceId, { stateUpdate }]) {

package/packages/jam/transition/externalities/accumulate-externalities.d.ts

@@ -2,7 +2,7 @@ import { type CodeHash, type CoreIndex, type PerValidator, type ServiceGas, type
 import type { PreimageHash } from "#@typeberry/block/preimage.js";
 import type { AuthorizerHash } from "#@typeberry/block/refine-context.js";
 import { Bytes, type BytesBlob } from "#@typeberry/bytes";
-import type { FixedSizeArray } from "#@typeberry/collections";
+import { type FixedSizeArray } from "#@typeberry/collections";
 import type { ChainSpec } from "#@typeberry/config";
 import { type Blake2b, type OpaqueHash } from "#@typeberry/hash";
 import { AccumulationStateUpdate, EjectError, ForgetPreimageError, type general, NewServiceError, type PartiallyUpdatedState, type PartialState, type PreimageStatus, ProvidePreimageError, RequestPreimageError, type TRANSFER_MEMO_BYTES, TransferError, UnprivilegedError, UpdatePrivilegesError } from "#@typeberry/jam-host-calls";
@@ -64,7 +64,7 @@ export declare class AccumulateExternalities implements PartialState, general.Ac
     upgradeService(codeHash: CodeHash, gas: U64, allowance: U64): void;
     updateValidatorsData(validatorsData: PerValidator<ValidatorData>): Result<OK, UnprivilegedError>;
     checkpoint(): void;
-    updateAuthorizationQueue(coreIndex: CoreIndex, authQueue: FixedSizeArray<AuthorizerHash, AUTHORIZATION_QUEUE_SIZE>, assigners: ServiceId | null): Result<OK, UpdatePrivilegesError>;
+    updateAuthorizationQueue(coreIndex: CoreIndex, authQueue: FixedSizeArray<AuthorizerHash, AUTHORIZATION_QUEUE_SIZE>, newAssigner: ServiceId | null): Result<OK, UpdatePrivilegesError>;
     updatePrivilegedServices(manager: ServiceId | null, assigners: PerCore<ServiceId>, delegator: ServiceId | null, registrar: ServiceId | null, autoAccumulateServices: Map<ServiceId, ServiceGas>): Result<OK, UpdatePrivilegesError>;
     yield(hash: OpaqueHash): void;
     providePreimage(serviceId: ServiceId | null, preimage: BytesBlob): Result<OK, ProvidePreimageError>;

package/packages/jam/transition/externalities/accumulate-externalities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accumulate-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/accumulate-externalities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accumulate-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/accumulate-externalities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,QAAQ,EAId,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EACL,uBAAuB,EAEvB,UAAU,EACV,mBAAmB,EACnB,KAAK,OAAO,EACZ,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,cAAc,EAEnB,oBAAoB,EACpB,oBAAoB,EAEpB,KAAK,mBAAmB,EACxB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAsC,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EACL,KAAK,wBAAwB,EAE7B,KAAK,OAAO,EAGZ,kBAAkB,EAClB,KAAK,UAAU,EAGf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAsB,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAmBlE,qBAAa,uBACX,YAAW,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,cAAc;IAOhH,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAXlC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,qDAAqD;IACrD,OAAO,CAAC,gBAAgB,CAAY;gBAGjB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,qBAAqB;IACpD,YAAY;IACK,gBAAgB,EAAE,SAAS,EAC5C,yBAAyB,EAAE,SAAS,EACnB,eAAe,EAAE,QAAQ;IAW5C,iEAAiE;IACjE,eAAe,IAAI,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAIrE,yDAAyD;IACzD,mBAAmB;IAInB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;;OAMG;IACH,cAAc,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,GAAG,kBAAkB,GAAG,IAAI;IAIxE;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,qBAAqB;IAY7B,+EAA+E;IAC/E,OAAO,CAAC,yBAAyB;IAiBjC,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,cAAc,GAAG,IAAI;IAU3E,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC;IAsElF,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,mBAAmB,CAAC;IA2FhF,QAAQ,CACN,aAAa,EAAE,SAAS,GAAG,IAAI,EAC/B,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,KAAK,CAAC,mBAAmB,CAAC,GAC/B,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC;IAiD5B,UAAU,CACR,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,GAAG,EACf,gBAAgB,EAAE,UAAU,EAC5B,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,GAAG,EAClB,eAAe,EAAE,GAAG,GACnB,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC;IAiGrC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI;IAclE,oBAAoB,CAAC,cAAc,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,iBAAiB,CAAC;IAgBhG,UAAU,IAAI,IAAI;IAKlB,wBAAwB,CACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,cAAc,CAAC,cAAc,EAAE,wBAAwB,CAAC,EACnE,WAAW,EAAE,SAAS,GAAG,IAAI,GAC5B,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC;IAsCpC,wBAAwB,CACtB,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,GACjD,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC;IAoBpC,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAK7B,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC;IAuDnG,KAAK,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,EAAE,gBAAgB,EAAE,YAAY,GAAG,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC;IA8D5F,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAOvE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC;IAyBhF,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI;CAO1E"}

package/packages/jam/transition/externalities/accumulate-externalities.js

@@ -1,6 +1,7 @@
 import { tryAsServiceGas, tryAsServiceId, tryAsTimeSlot, } from "#@typeberry/block";
 import { MIN_PUBLIC_SERVICE_INDEX } from "#@typeberry/block/gp-constants.js";
 import { Bytes } from "#@typeberry/bytes";
+import { asKnownSize } from "#@typeberry/collections";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { AccumulationStateUpdate, clampU64ToU32, EjectError, ForgetPreimageError, NewServiceError, PendingTransfer, PreimageStatusKind, ProvidePreimageError, RequestPreimageError, slotsToPreimageStatus, TransferError, UnprivilegedError, UpdatePrivilegesError, writeServiceIdAsLeBytes, } from "#@typeberry/jam-host-calls";
 import { Logger } from "#@typeberry/logger";
@@ -354,19 +355,31 @@ export class AccumulateExternalities {
         /** https://graypaper.fluffylabs.dev/#/9a08063/362202362202?v=0.6.6 */
         this.checkpointedState = AccumulationStateUpdate.copyFrom(this.updatedState.stateUpdate);
     }
-    updateAuthorizationQueue(coreIndex, authQueue, assigners) {
+    updateAuthorizationQueue(coreIndex, authQueue, newAssigner) {
         /** https://graypaper.fluffylabs.dev/#/7e6ff6a/36a40136a401?v=0.6.7 */
         // NOTE `coreIndex` is already verified in the HC, so this is infallible.
-        const currentAssigners = this.updatedState.getPrivilegedServices().assigners[coreIndex];
-        if (currentAssigners !== this.currentServiceId) {
-            logger.trace `Current service id (${this.currentServiceId}) is not an auth manager of core ${coreIndex} (expected: ${currentAssigners}) and cannot update authorization queue.`;
-            return Result.error(UpdatePrivilegesError.UnprivilegedService, () => `Service ${this.currentServiceId} not assigner for core ${coreIndex} (expected: ${currentAssigners})`);
-        }
-        if (assigners === null) {
+        const privilegedServices = this.updatedState.getPrivilegedServices();
+        const currentAssigners = privilegedServices.assigners;
+        const assigner = currentAssigners[coreIndex];
+        if (assigner !== this.currentServiceId) {
+            logger.trace `Current service id (${this.currentServiceId}) is not an auth manager of core ${coreIndex} (expected: ${assigner}) and cannot update authorization queue.`;
+            return Result.error(UpdatePrivilegesError.UnprivilegedService, () => `Service ${this.currentServiceId} not assigner for core ${coreIndex} (expected: ${assigner})`);
+        }
+        if (newAssigner === null) {
             logger.trace `The new auth manager is not a valid service id.`;
             return Result.error(UpdatePrivilegesError.InvalidServiceId, () => `New auth manager is null for core ${coreIndex}`);
         }
+        // update the authorization queue
         this.updatedState.stateUpdate.authorizationQueues.set(coreIndex, authQueue);
+        // move permissions to the new assigner
+        const assigners = currentAssigners.slice();
+        assigners[coreIndex] = newAssigner;
+        this.updatedState.stateUpdate.privilegedServices = PrivilegedServices.create({
+            ...privilegedServices,
+            // since coreindex is validated, we do not alter the size,
+            // hence it's safe to convert back
+            assigners: asKnownSize(assigners),
+        });
         return Result.ok(OK);
     }
     updatePrivilegedServices(manager, assigners, delegator, registrar, autoAccumulateServices) {