@typeberry/lib 0.5.10 → 0.5.11-10b197e

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

@@ -216,7 +216,7 @@ const createServices = (items) => {
 const createService = (serviceId, hash, blob, info) => {
     const preimages = HashDictionary.new();
     preimages.set(hash.asOpaque(), PreimageItem.create({ hash: hash.asOpaque(), blob }));
-    return new InMemoryService(serviceId, {
+    return InMemoryService.new(serviceId, {
         info: ServiceAccountInfo.create({
             accumulateMinGas: tryAsServiceGas(0n),
             codeHash: hash.asOpaque(),

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/block-verifier.d.ts

@@ -17,7 +17,8 @@ type BlockVerificationOptions = {
 export declare class BlockVerifier {
     readonly hasher: TransitionHasher;
     private readonly blocks;
-    constructor(hasher: TransitionHasher, blocks: BlocksDb);
+    static new(hasher: TransitionHasher, blocks: BlocksDb): BlockVerifier;
+    private constructor();
     verifyBlock(block: BlockView, options?: BlockVerificationOptions): Promise<Result<HeaderHash, BlockVerifierError>>;
 }
 export {};

package/packages/jam/transition/block-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-verifier.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/block-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,oBAAY,kBAAkB;IAC5B,cAAc,IAAI;IAClB,eAAe,IAAI;IACnB,gBAAgB,IAAI;IACpB,iBAAiB,IAAI;IACrB,gBAAgB,IAAI;IACpB,eAAe,IAAI;CACpB;AAID,KAAK,wBAAwB,GAAG;IAC9B,iEAAiE;IACjE,sBAAsB,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,qBAAa,aAAa;aAEN,MAAM,EAAE,gBAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADP,MAAM,EAAE,gBAAgB,EACvB,MAAM,EAAE,QAAQ;IAG7B,WAAW,CACf,KAAK,EAAE,SAAS,EAChB,OAAO,GAAE,wBAA4D,GACpE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;CAgEnD"}
+{"version":3,"file":"block-verifier.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/block-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,oBAAY,kBAAkB;IAC5B,cAAc,IAAI;IAClB,eAAe,IAAI;IACnB,gBAAgB,IAAI;IACpB,iBAAiB,IAAI;IACrB,gBAAgB,IAAI;IACpB,eAAe,IAAI;CACpB;AAID,KAAK,wBAAwB,GAAG;IAC9B,iEAAiE;IACjE,sBAAsB,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,qBAAa,aAAa;aAMN,MAAM,EAAE,gBAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ;IAIrD,OAAO;IAKD,WAAW,CACf,KAAK,EAAE,SAAS,EAChB,OAAO,GAAE,wBAA4D,GACpE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;CAgEnD"}

package/packages/jam/transition/block-verifier.js

@@ -14,6 +14,9 @@ const ZERO_HASH = Bytes.zero(HASH_SIZE).asOpaque();
 export class BlockVerifier {
     hasher;
     blocks;
+    static new(hasher, blocks) {
+        return new BlockVerifier(hasher, blocks);
+    }
     constructor(hasher, blocks) {
         this.hasher = hasher;
         this.blocks = blocks;

package/packages/jam/transition/block-verifier.test.js

@@ -15,7 +15,7 @@ const DEFAULT_STATE_ROOT = Bytes.fill(HASH_SIZE, 10).asOpaque();
 const DEFAULT_TIME_SLOT = tryAsTimeSlot(1);
 describe("Block Verifier", async () => {
     const spec = tinyChainSpec;
-    const hasher = new TransitionHasher(await keccak.KeccakHasher.create(), await Blake2b.createHasher());
+    const hasher = TransitionHasher.new(await keccak.KeccakHasher.create(), await Blake2b.createHasher());
     const toBlockView = (block) => {
         const encodedBlock = Encoder.encodeObject(Block.Codec, block, spec);
         const blockView = Decoder.decodeObject(Block.Codec.View, encodedBlock, spec);
@@ -29,7 +29,7 @@ describe("Block Verifier", async () => {
         const blockView = toBlockView(block);
         const headerHashOrDefault = headerHash ?? DEFAULT_HEADER_HASH;
         const stateRoot = stateRootHash ?? DEFAULT_STATE_ROOT;
-        db.insertBlock(new WithHash(headerHashOrDefault, blockView));
+        db.insertBlock(WithHash.new(headerHashOrDefault, blockView));
         if (prepareStateRoot) {
             db.setPostStateRoot(headerHashOrDefault, stateRoot);
         }
@@ -52,7 +52,7 @@ describe("Block Verifier", async () => {
     it("should return ParentNotFound error if parent block is not found", async () => {
         const blocksDb = InMemoryBlocks.new();
         prepareBlocksDb(blocksDb, { headerHash: Bytes.fill(HASH_SIZE, 7).asOpaque() });
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({ parentHash: Bytes.fill(HASH_SIZE, 8).asOpaque() });
         const result = await blockVerifier.verifyBlock(toBlockView(block));
         deepEqual(result, Result.error(BlockVerifierError.ParentNotFound, () => "Parent 0x0808080808080808080808080808080808080808080808080808080808080808 not found"));
@@ -61,7 +61,7 @@ describe("Block Verifier", async () => {
         const timeSlot = tryAsTimeSlot(42);
         const blocksDb = InMemoryBlocks.new();
         prepareBlocksDb(blocksDb, { timeSlot });
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({ timeSlot: tryAsTimeSlot(timeSlot - 2) });
         const result = await blockVerifier.verifyBlock(toBlockView(block));
         deepEqual(result, Result.error(BlockVerifierError.InvalidTimeSlot, () => "Invalid time slot index: 40, expected > 42"));
@@ -69,7 +69,7 @@ describe("Block Verifier", async () => {
     it("should return InvalidExtrinsic error if current block extrinsic hash is incorrect", async () => {
         const blocksDb = InMemoryBlocks.new();
         prepareBlocksDb(blocksDb);
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({ correctExtrinsic: false });
         const result = await blockVerifier.verifyBlock(toBlockView(block));
         deepEqual(result, Result.error(BlockVerifierError.InvalidExtrinsic, () => "Invalid extrinsic hash: 0x0202020202020202020202020202020202020202020202020202020202020202, expected 0x0377c11c61a370e532ce1b18a652aecdd060a3a3a257d53dac8f8e1cb32dea98"));
@@ -80,7 +80,7 @@ describe("Block Verifier", async () => {
             stateRootHash: Bytes.fill(HASH_SIZE, 6).asOpaque(),
             prepareStateRoot: false,
         });
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({
             priorStateRootHash: Bytes.fill(HASH_SIZE, 7).asOpaque(),
             correctExtrinsic: true,
@@ -94,7 +94,7 @@ describe("Block Verifier", async () => {
             stateRootHash: Bytes.fill(HASH_SIZE, 6).asOpaque(),
             prepareStateRoot: true,
         });
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({
             priorStateRootHash: Bytes.fill(HASH_SIZE, 7).asOpaque(),
             correctExtrinsic: true,
@@ -105,7 +105,7 @@ describe("Block Verifier", async () => {
     it("should return valid header hash if all checks pass", async () => {
         const blocksDb = InMemoryBlocks.new();
         prepareBlocksDb(blocksDb, { prepareStateRoot: true });
-        const blockVerifier = new BlockVerifier(hasher, blocksDb);
+        const blockVerifier = BlockVerifier.new(hasher, blocksDb);
         const block = prepareBlock({
             correctExtrinsic: true,
         });

package/packages/jam/transition/chain-stf.d.ts

@@ -44,9 +44,6 @@ export declare const stfError: <Kind extends StfErrorKind, Err extends StfError[
     toString(): string;
 }>;
 export declare class OnChain {
-    readonly chainSpec: ChainSpec;
-    readonly state: State & WithStateView;
-    readonly hasher: TransitionHasher;
     private readonly safrole;
     private readonly safroleSeal;
     private readonly disputes;
@@ -59,7 +56,18 @@ export declare class OnChain {
     private readonly authorization;
     private readonly statistics;
     private isReadyForNextEpoch;
-    constructor(chainSpec: ChainSpec, state: State & WithStateView, hasher: TransitionHasher, options: AccumulateOptions, headerChain: HeaderChain);
+    readonly chainSpec: ChainSpec;
+    readonly state: State & WithStateView;
+    readonly hasher: TransitionHasher;
+    /** Wire up a full on-chain STF from its dependencies. */
+    static assemble(args: {
+        chainSpec: ChainSpec;
+        state: State & WithStateView;
+        hasher: TransitionHasher;
+        options: AccumulateOptions;
+        headerChain: HeaderChain;
+    }): OnChain;
+    private constructor();
     /** Pre-populate things worth caching for the next epoch. */
     prepareForNextEpoch(): Promise<void>;
     private verifySeal;

package/packages/jam/transition/chain-stf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"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"}

package/packages/jam/transition/chain-stf.js

@@ -60,9 +60,6 @@ export const stfError = (kind, nested) => {
 };
 const logger = Logger.new(import.meta.filename, "stf");
 export class OnChain {
-    chainSpec;
-    state;
-    hasher;
     // chapter 6: https://graypaper.fluffylabs.dev/#/68eaa1f/0d13000d1300?v=0.6.4
     safrole;
     safroleSeal;
@@ -84,6 +81,13 @@ export class OnChain {
     // chapter 13: https://graypaper.fluffylabs.dev/#/68eaa1f/18b60118b601?v=0.6.4
     statistics;
     isReadyForNextEpoch = Promise.resolve(false);
+    chainSpec;
+    state;
+    hasher;
+    /** Wire up a full on-chain STF from its dependencies. */
+    static assemble(args) {
+        return new OnChain(args.chainSpec, args.state, args.hasher, args.options, args.headerChain);
+    }
     constructor(chainSpec, state, hasher, options, headerChain) {
         this.chainSpec = chainSpec;
         this.state = state;

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

@@ -2,26 +2,40 @@ 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";
 import { type U64 } from "#@typeberry/numbers";
 import { type AUTHORIZATION_QUEUE_SIZE, type PerCore, ServiceAccountInfo, type StorageKey, type ValidatorData } from "#@typeberry/state";
 import { OK, Result } from "#@typeberry/utils";
+/** Construction arguments for {@link AccumulateExternalities}. */
+export type AccumulateExternalitiesArgs = {
+    chainSpec: ChainSpec;
+    blake2b: Blake2b;
+    updatedState: PartiallyUpdatedState;
+    /** `x_s` */
+    currentServiceId: ServiceId;
+    nextNewServiceIdCandidate: ServiceId;
+    currentTimeslot: TimeSlot;
+};
 export declare class AccumulateExternalities implements PartialState, general.AccountsWrite, general.AccountsRead, general.AccountsInfo, general.AccountsLookup {
+    private checkpointedState;
+    /** `x_i`: next service id we are going to create. */
+    private nextNewServiceId;
+    /**
+     * Construct externalities for accumulating a specific service.
+     *
+     * Validates that the current service exists in `updatedState`.
+     */
+    static forService(args: AccumulateExternalitiesArgs): AccumulateExternalities;
+    private constructor();
     private readonly chainSpec;
     private readonly blake2b;
     private readonly updatedState;
     /** `x_s` */
     private readonly currentServiceId;
     private readonly currentTimeslot;
-    private checkpointedState;
-    /** `x_i`: next service id we are going to create. */
-    private nextNewServiceId;
-    constructor(chainSpec: ChainSpec, blake2b: Blake2b, updatedState: PartiallyUpdatedState, 
-    /** `x_s` */
-    currentServiceId: ServiceId, nextNewServiceIdCandidate: ServiceId, currentTimeslot: TimeSlot);
     /** Return the underlying state update and checkpointed state. */
     getStateUpdates(): [AccumulationStateUpdate, AccumulationStateUpdate];
     /** Return current `x_i` value of next new service id. */
@@ -64,7 +78,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":"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"}

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";
@@ -22,29 +23,36 @@ const LOOKUP_HISTORY_ENTRY_BYTES = tryAsU64(81);
 const BASE_STORAGE_BYTES = tryAsU64(34);
 const logger = Logger.new(import.meta.filename, "externalities");
 export class AccumulateExternalities {
-    chainSpec;
-    blake2b;
-    updatedState;
-    currentServiceId;
-    currentTimeslot;
     checkpointedState;
     /** `x_i`: next service id we are going to create. */
     nextNewServiceId;
-    constructor(chainSpec, blake2b, updatedState, 
-    /** `x_s` */
-    currentServiceId, nextNewServiceIdCandidate, currentTimeslot) {
-        this.chainSpec = chainSpec;
-        this.blake2b = blake2b;
-        this.updatedState = updatedState;
-        this.currentServiceId = currentServiceId;
-        this.currentTimeslot = currentTimeslot;
-        this.checkpointedState = AccumulationStateUpdate.copyFrom(updatedState.stateUpdate);
-        this.nextNewServiceId = this.getNextAvailableServiceId(nextNewServiceIdCandidate);
-        const service = this.updatedState.getServiceInfo(this.currentServiceId);
+    /**
+     * Construct externalities for accumulating a specific service.
+     *
+     * Validates that the current service exists in `updatedState`.
+     */
+    static forService(args) {
+        const service = args.updatedState.getServiceInfo(args.currentServiceId);
         if (service === null) {
-            throw new Error(`Invalid state initialization. Service info missing for ${this.currentServiceId}.`);
+            throw new Error(`Invalid state initialization. Service info missing for ${args.currentServiceId}.`);
         }
+        return new AccumulateExternalities(args);
+    }
+    constructor(args) {
+        this.chainSpec = args.chainSpec;
+        this.blake2b = args.blake2b;
+        this.updatedState = args.updatedState;
+        this.currentServiceId = args.currentServiceId;
+        this.currentTimeslot = args.currentTimeslot;
+        this.checkpointedState = AccumulationStateUpdate.copyFrom(args.updatedState.stateUpdate);
+        this.nextNewServiceId = this.getNextAvailableServiceId(args.nextNewServiceIdCandidate);
     }
+    chainSpec;
+    blake2b;
+    updatedState;
+    /** `x_s` */
+    currentServiceId;
+    currentTimeslot;
     /** Return the underlying state update and checkpointed state. */
     getStateUpdates() {
         return [this.updatedState.stateUpdate, this.checkpointedState];
@@ -156,13 +164,13 @@ export class AccumulateExternalities {
         if (existingPreimage === null) {
             // https://graypaper.fluffylabs.dev/#/9a08063/38a60038a600?v=0.6.6
             this.updatedState.updatePreimage(this.currentServiceId, UpdatePreimage.updateOrAdd({
-                lookupHistory: new LookupHistoryItem(hash, clampedLength, tryAsLookupHistorySlots([])),
+                lookupHistory: LookupHistoryItem.new(hash, clampedLength, tryAsLookupHistorySlots([])),
             }));
         }
         else {
             /** https://graypaper.fluffylabs.dev/#/9a08063/38ca0038ca00?v=0.6.6 */
             this.updatedState.updatePreimage(this.currentServiceId, UpdatePreimage.updateOrAdd({
-                lookupHistory: new LookupHistoryItem(hash, clampedLength, tryAsLookupHistorySlots([...existingPreimage.slots, this.currentTimeslot])),
+                lookupHistory: LookupHistoryItem.new(hash, clampedLength, tryAsLookupHistorySlots([...existingPreimage.slots, this.currentTimeslot])),
             }));
         }
         return Result.ok(OK);
@@ -212,7 +220,7 @@ export class AccumulateExternalities {
         // https://graypaper.fluffylabs.dev/#/ab2cdbd/382802383302?v=0.7.2
         if (s.status === PreimageStatusKind.Available) {
             this.updatedState.updatePreimage(serviceId, UpdatePreimage.updateOrAdd({
-                lookupHistory: new LookupHistoryItem(status.hash, status.length, tryAsLookupHistorySlots([s.data[0], t])),
+                lookupHistory: LookupHistoryItem.new(status.hash, status.length, tryAsLookupHistorySlots([s.data[0], t])),
             }));
             return Result.ok(OK);
         }
@@ -221,7 +229,7 @@ export class AccumulateExternalities {
             const y = s.data[1];
             if (y < t - this.chainSpec.preimageExpungePeriod) {
                 this.updatedState.updatePreimage(serviceId, UpdatePreimage.updateOrAdd({
-                    lookupHistory: new LookupHistoryItem(status.hash, status.length, tryAsLookupHistorySlots([s.data[2], t])),
+                    lookupHistory: LookupHistoryItem.new(status.hash, status.length, tryAsLookupHistorySlots([s.data[2], t])),
                 }));
                 return Result.ok(OK);
             }
@@ -295,7 +303,7 @@ export class AccumulateExternalities {
             lastAccumulation: tryAsTimeSlot(0),
             parentService: this.currentServiceId,
         });
-        const newLookupItem = new LookupHistoryItem(codeHash.asOpaque(), clampedLength, tryAsLookupHistorySlots([]));
+        const newLookupItem = LookupHistoryItem.new(codeHash.asOpaque(), clampedLength, tryAsLookupHistorySlots([]));
         // `s`: https://graypaper.fluffylabs.dev/#/ab2cdbd/361003361003?v=0.7.2
         const updatedCurrentAccount = ServiceAccountInfo.create({
             ...currentService,
@@ -354,19 +362,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) {