@typeberry/lib 0.5.3 → 0.5.4-b101fe6

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

@@ -2,7 +2,7 @@ import type { EntropyHash, ServiceId, TimeSlot } from "#@typeberry/block";
 import type { WorkReport } from "#@typeberry/block/work-report.js";
 import type { SortedArray } from "#@typeberry/collections";
 import type { OpaqueHash } from "#@typeberry/hash";
-import type { PendingTransfer, ServiceStateUpdate } from "#@typeberry/jam-host-calls";
+import type { ServiceStateUpdate } from "#@typeberry/jam-host-calls";
 import type { AccumulationOutput, State } from "#@typeberry/state";
 import type { CountAndGasUsed } from "../statistics.js";
 /** `G_A`: The gas allocated to invoke a work-report’s Accumulation logic. */
@@ -22,7 +22,6 @@ export type AccumulateStateUpdate = Pick<State, "timeslot"> & Partial<Pick<State
 export type AccumulateResult = {
     stateUpdate: AccumulateStateUpdate;
     accumulationStatistics: Map<ServiceId, CountAndGasUsed>;
-    pendingTransfers: PendingTransfer[];
     accumulationOutputLog: SortedArray<AccumulationOutput>;
 };
 //# sourceMappingURL=accumulate-state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"accumulate-state.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,KAAK,EACH,UAAU,GACV,yBAAyB,GACzB,YAAY,GACZ,YAAY,GACZ,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,CACvB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,qBAAqB,GAAG,mBAAmB,CAAC,CAAC,GACjE,kBAAkB,CAAC;AAErB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,qBAAqB,CAAC;IACnC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,qBAAqB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;CACxD,CAAC"}
+{"version":3,"file":"accumulate-state.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,KAAK,EACH,UAAU,GACV,yBAAyB,GACzB,YAAY,GACZ,YAAY,GACZ,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,CACvB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,qBAAqB,GAAG,mBAAmB,CAAC,CAAC,GACjE,kBAAkB,CAAC;AAErB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,qBAAqB,CAAC;IACnC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD,qBAAqB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;CACxD,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"accumulate-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;AAI1D;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGpF;AAED,KAAK,kBAAkB,GAAG;IACxB,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,sCAAsC;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAQF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EACpD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,SAAS,CAkBX"}
+{"version":3,"file":"accumulate-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;AAG1D;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGpF;AAED,KAAK,kBAAkB,GAAG;IACxB,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,sCAAsC;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAQF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EACpD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,SAAS,CAeX"}

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

@@ -4,7 +4,6 @@ import { codec, Encoder } from "#@typeberry/codec";
 import { HashSet } from "#@typeberry/collections";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { leBytesAsU32 } from "#@typeberry/numbers";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 /**
  * A function that removes duplicates but does not change order - it keeps the first occurence.
  */
@@ -44,9 +43,6 @@ export function generateNextServiceId({ serviceId, entropy, timeslot }, chainSpe
     }, chainSpec);
     const result = blake2b.hashBytes(encoded).raw.subarray(0, 4);
     const number = leBytesAsU32(result) >>> 0;
-    const mod = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-        ? 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8
-        : 2 ** 32 - 2 ** 9;
-    const offset = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? MIN_PUBLIC_SERVICE_INDEX : 2 ** 8;
-    return tryAsServiceId((number % mod) + offset);
+    const mod = 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8;
+    return tryAsServiceId((number % mod) + MIN_PUBLIC_SERVICE_INDEX);
 }

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

@@ -4,13 +4,13 @@ import { tryAsCoreIndex, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { FixedSizeArray, HashSet } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU16, tryAsU32 } from "#@typeberry/numbers";
-import { Compatibility, deepEqual, GpVersion } from "#@typeberry/utils";
+import { deepEqual } from "#@typeberry/utils";
 import { generateNextServiceId, getWorkPackageHashes, uniquePreserveOrder } from "./accumulate-utils.js";
 let blake2b;
 before(async () => {
@@ -52,7 +52,7 @@ describe("accumulate-utils", () => {
                         importedSegments: tryAsU32(0),
                     }),
                     payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
-                    result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+                    result: WorkExecResult.ok(BytesBlob.empty()),
                     serviceId: tryAsServiceId(0),
                 }),
             ], tryAsWorkItemsCount(1)),
@@ -78,9 +78,7 @@ describe("accumulate-utils", () => {
             const serviceId = tryAsServiceId(5);
             const entropy = Bytes.fill(HASH_SIZE, 4).asOpaque();
             const timeslot = tryAsTimeSlot(6);
-            const expectedServiceId = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-                ? tryAsServiceId(2596254713)
-                : tryAsServiceId(2596189433);
+            const expectedServiceId = tryAsServiceId(2596254713);
             const result = generateNextServiceId({ serviceId, entropy, timeslot }, tinyChainSpec, blake2b);
             assert.strictEqual(result, expectedServiceId);
         });

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

@@ -1 +1 @@
-{"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAmB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;IAyGrC;;;;OAIG;YACW,uBAAuB;IAoDrC;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;CAwGrH"}
+{"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAiB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;IAmGrC;;;;OAIG;YACW,uBAAuB;IAiDrC;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;CA0FrH"}

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

@@ -3,12 +3,11 @@ import { W_C } from "#@typeberry/block/gp-constants.js";
 import { Bytes } from "#@typeberry/bytes";
 import { codec, Encoder } from "#@typeberry/codec";
 import { ArrayView, HashSet, SortedArray } from "#@typeberry/collections";
+import { PvmExecutor, ReturnStatus } from "#@typeberry/executor";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { AccumulationStateUpdate, PartiallyUpdatedState, } from "#@typeberry/jam-host-calls/externalities/state-update.js";
 import { Logger } from "#@typeberry/logger";
-import { sumU64, tryAsU32 } from "#@typeberry/numbers";
-import { Status, tryAsGas } from "#@typeberry/pvm-interface";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+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";
@@ -18,7 +17,6 @@ import { AccumulateQueue, pruneQueue } from "./accumulate-queue.js";
 import { GAS_TO_INVOKE_WORK_REPORT, } from "./accumulate-state.js";
 import { generateNextServiceId, getWorkPackageHashes } from "./accumulate-utils.js";
 import { mergePerallelAccumulationResults, } from "./accumulation-result-merge-utils.js";
-import { PvmExecutor } from "./pvm-executor.js";
 export const ACCUMULATION_ERROR = "duplicate service created";
 var PvmInvocationError;
 (function (PvmInvocationError) {
@@ -88,9 +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 = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec)
-            : FetchExternalities.createForPre071Accumulate({ entropy, operands }, this.chainSpec);
+        const fetchExternalities = FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec);
         const externalities = {
             partialState,
             serviceExternalities: partialState,
@@ -102,28 +98,25 @@ export class Accumulate {
             serviceId,
             argsLength: tryAsU32(transfers.length + operands.length),
         });
-        const result = await executor.run(invocationArgs, tryAsGas(gas));
+        const result = await executor.run(invocationArgs, gas);
         const [newState, checkpoint] = partialState.getStateUpdates();
         /**
          * PVM invocation returned and error so we return the checkpoint
          *
          * https://graypaper.fluffylabs.dev/#/7e6ff6a/300002300002?v=0.6.7
          */
-        if (result.hasStatus()) {
-            const status = result.status;
-            if (status === Status.OOG || status === Status.PANIC) {
-                logger.trace `[${serviceId}] accumulate finished with ${Status[status]} reverting to checkpoint.`;
-                return Result.ok({ stateUpdate: checkpoint, consumedGas: tryAsServiceGas(result.consumedGas) });
-            }
-            logger.trace `[${serviceId}] accumulate finished with ${Status[status]}`;
+        if (result.status !== ReturnStatus.OK) {
+            logger.trace `[${serviceId}] accumulate finished with ${ReturnStatus[result.status]} reverting to checkpoint.`;
+            return Result.ok({ stateUpdate: checkpoint, consumedGas: tryAsServiceGas(result.consumedGas) });
         }
+        logger.trace `[${serviceId}] accumulate finished with ${ReturnStatus[result.status]}`;
         /**
          * PVM invocation returned a hash so we override whatever `yield` host call
          * provided.
          *
          * https://graypaper.fluffylabs.dev/#/7e6ff6a/301202301202?v=0.6.7
          */
-        if (result.hasMemorySlice() && result.memorySlice.length === HASH_SIZE) {
+        if (result.memorySlice.length === HASH_SIZE) {
             const memorySlice = Bytes.fromBlob(result.memorySlice, HASH_SIZE);
             newState.yieldedRoot = memorySlice.asOpaque();
         }
@@ -142,19 +135,16 @@ export class Accumulate {
     async accumulateSingleService(serviceId, transfers, operands, gasCost, slot, entropy, inputStateUpdate) {
         logger.log `Accumulating service ${serviceId}, transfers: ${transfers.length} operands: ${operands.length} at slot: ${slot}`;
         const updatedState = new PartiallyUpdatedState(this.state, inputStateUpdate);
-        // update service balance from incoming transfers
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            const serviceInfo = updatedState.getServiceInfo(serviceId);
-            if (serviceInfo !== null) {
-                // update the balance from incoming tranfsers
-                const newBalance = sumU64(serviceInfo.balance, ...transfers.map((item) => item.amount));
-                if (newBalance.overflow) {
-                    logger.log `Accumulation failed because of overflowing balance ${serviceId}.`;
-                    return { stateUpdate: null, consumedGas: tryAsServiceGas(0n) };
-                }
-                const newInfo = ServiceAccountInfo.create({ ...serviceInfo, balance: newBalance.value });
-                updatedState.updateServiceInfo(serviceId, newInfo);
+        const serviceInfo = updatedState.getServiceInfo(serviceId);
+        if (serviceInfo !== null) {
+            // update the balance from incoming transfers
+            const newBalance = sumU64(serviceInfo.balance, ...transfers.map((item) => item.amount));
+            if (newBalance.overflow) {
+                logger.log `Accumulation failed because of overflowing balance ${serviceId}.`;
+                return { stateUpdate: null, consumedGas: tryAsServiceGas(0n) };
             }
+            const newInfo = ServiceAccountInfo.create({ ...serviceInfo, balance: newBalance.value });
+            updatedState.updateServiceInfo(serviceId, newInfo);
         }
         const result = await this.pvmAccumulateInvocation(slot, serviceId, transfers, operands, gasCost, entropy, updatedState);
         if (result.isError) {
@@ -389,7 +379,6 @@ export class Accumulate {
     }
     async transition({ reports, slot, entropy }) {
         const statistics = new Map();
-        const legacyTransfers = [];
         const yieldedRoots = new Map();
         const accumulateQueue = new AccumulateQueue(this.chainSpec, this.state);
         const toAccumulateImmediately = accumulateQueue.getWorkReportsToAccumulateImmediately(reports);
@@ -400,9 +389,7 @@ export class Accumulate {
         const accumulatableReports = ArrayView.from(toAccumulateImmediately.concat(queue));
         const gasLimit = this.getGasLimit();
         const autoAccumulateServices = this.state.privilegedServices.autoAccumulateServices;
-        const { accumulatedReports, gasCost, state, ...rest } = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? await this.accumulateSequentially(gasLimit, accumulatableReports, [], slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots)
-            : await this.accumulateSequentiallyLegacy(gasLimit, accumulatableReports, slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots, legacyTransfers);
+        const { accumulatedReports, gasCost, state, ...rest } = await this.accumulateSequentially(gasLimit, accumulatableReports, [], slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots);
         // we can safely ignore top-level gas cost from accSequentially.
         const _gasCost = gasCost;
         assertEmpty(rest);
@@ -439,7 +426,6 @@ export class Accumulate {
                 ...authQueues,
             },
             accumulationStatistics: statistics,
-            pendingTransfers: legacyTransfers,
             accumulationOutputLog: accumulationOutput,
         });
     }

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

@@ -5,7 +5,7 @@ import { MIN_PUBLIC_SERVICE_INDEX } from "#@typeberry/block/gp-constants.js";
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { asKnownSize, FixedSizeArray, HashDictionary, HashSet } from "#@typeberry/collections";
 import { PvmBackend, PvmBackendNames, tinyChainSpec } from "#@typeberry/config";
@@ -266,7 +266,7 @@ const createWorkReport = (workPackageHash, prerequisites = [], serviceId = tryAs
                 importedSegments: tryAsU32(0),
             }),
             payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
-            result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.empty()),
+            result: WorkExecResult.ok(BytesBlob.empty()),
             serviceId,
         }),
     ], tryAsWorkItemsCount(1)),

package/packages/jam/transition/accumulate/accumulation-result-merge-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accumulation-result-merge-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulation-result-merge-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAI1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,0BAA0B,GAClC,WAAW,CAab;AAED,KAAK,SAAS,GAAG,SAAS,CAAC;AAC3B,KAAK,WAAW,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAGrF,MAAM,MAAM,0BAA0B,GAAG,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC"}
+{"version":3,"file":"accumulation-result-merge-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulation-result-merge-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,0BAA0B,GAClC,WAAW,CAab;AAED,KAAK,SAAS,GAAG,SAAS,CAAC;AAC3B,KAAK,WAAW,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAGrF,MAAM,MAAM,0BAA0B,GAAG,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC"}

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

@@ -1,7 +1,6 @@
 import { tryAsServiceGas } from "#@typeberry/block";
 import { AccumulationStateUpdate } from "#@typeberry/jam-host-calls";
-import { sumU64 } from "#@typeberry/numbers";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, sumU64 } from "#@typeberry/numbers";
 import { PrivilegedServices, tryAsPerCore, UpdatePreimageKind } from "#@typeberry/state";
 export function mergePerallelAccumulationResults(chainSpec, state, inputState, results) {
     const mergeContext = createMergeContext(chainSpec, state, inputState, results);

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

@@ -7,8 +7,7 @@ import { BANDERSNATCH_KEY_BYTES, BLS_KEY_BYTES, ED25519_KEY_BYTES } from "#@type
 import { HASH_SIZE } from "#@typeberry/hash";
 import { AccumulationStateUpdate, PendingTransfer } from "#@typeberry/jam-host-calls";
 import { TRANSFER_MEMO_BYTES } from "#@typeberry/jam-host-calls/externalities/partial-state.js";
-import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U64, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { AUTHORIZATION_QUEUE_SIZE, InMemoryState, PreimageItem, PrivilegedServices, ServiceAccountInfo, StorageItem, tryAsPerCore, UpdatePreimage, UpdateService, UpdateStorage, VALIDATOR_META_BYTES, ValidatorData, } from "#@typeberry/state";
 import { deepEqual } from "#@typeberry/utils";
 import { mergePerallelAccumulationResults } from "./accumulation-result-merge-utils.js";

package/packages/jam/transition/accumulate/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./accumulate.js";
 export * from "./accumulate-state.js";
-export * from "./deferred-transfers.js";
 export * from "./options.js";
 //# sourceMappingURL=index.d.ts.map

package/packages/jam/transition/accumulate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC"}

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

@@ -1,4 +1,3 @@
 export * from "./accumulate.js";
 export * from "./accumulate-state.js";
-export * from "./deferred-transfers.js";
 export * from "./options.js";

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

@@ -7,7 +7,7 @@ import type { SafroleErrorCode, SafroleStateUpdate } from "#@typeberry/safrole/s
 import { type SafroleSealError } from "#@typeberry/safrole/safrole-seal.js";
 import type { State, WithStateView } from "#@typeberry/state";
 import { type ErrorResult, Result, type TaggedError } from "#@typeberry/utils";
-import { type ACCUMULATION_ERROR, type AccumulateOptions, type AccumulateStateUpdate, type DeferredTransfersErrorCode } from "./accumulate/index.js";
+import { type ACCUMULATION_ERROR, type AccumulateOptions, type AccumulateStateUpdate } from "./accumulate/index.js";
 import { type AssurancesError, type AssurancesStateUpdate } from "./assurances.js";
 import { type AuthorizationStateUpdate } from "./authorization.js";
 import type { TransitionHasher } from "./hasher.js";
@@ -32,10 +32,9 @@ export declare enum StfErrorKind {
     Preimages = 4,
     SafroleSeal = 5,
     Accumulate = 6,
-    DeferredTransfers = 7,
-    Offenders = 8
+    Offenders = 7
 }
-export type StfError = TaggedError<StfErrorKind.Assurances, AssurancesError> | TaggedError<StfErrorKind.Reports, ReportsError> | TaggedError<StfErrorKind.Disputes, DisputesErrorCode> | TaggedError<StfErrorKind.Safrole, SafroleErrorCode> | TaggedError<StfErrorKind.Preimages, PreimagesErrorCode> | TaggedError<StfErrorKind.SafroleSeal, SafroleSealError> | TaggedError<StfErrorKind.Accumulate, ACCUMULATION_ERROR> | TaggedError<StfErrorKind.DeferredTransfers, DeferredTransfersErrorCode> | TaggedError<StfErrorKind.Offenders, OFFENDERS_ERROR>;
+export type StfError = TaggedError<StfErrorKind.Assurances, AssurancesError> | TaggedError<StfErrorKind.Reports, ReportsError> | TaggedError<StfErrorKind.Disputes, DisputesErrorCode> | TaggedError<StfErrorKind.Safrole, SafroleErrorCode> | TaggedError<StfErrorKind.Preimages, PreimagesErrorCode> | TaggedError<StfErrorKind.SafroleSeal, SafroleSealError> | TaggedError<StfErrorKind.Accumulate, ACCUMULATION_ERROR> | TaggedError<StfErrorKind.Offenders, OFFENDERS_ERROR>;
 export declare const stfError: <Kind extends StfErrorKind, Err extends StfError["error"]>(kind: Kind, nested: ErrorResult<Err>) => Result<Ok, {
     readonly kind: Kind;
     readonly error: Err;
@@ -55,7 +54,6 @@ export declare class OnChain {
     private readonly assurances;
     private readonly accumulate;
     private readonly accumulateOutput;
-    private readonly deferredTransfers;
     private readonly preimages;
     private readonly recentHistory;
     private readonly authorization;

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

@@ -5,9 +5,9 @@ import { Logger } from "#@typeberry/logger";
 import { Safrole } from "#@typeberry/safrole";
 import { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
 import { SafroleSeal } from "#@typeberry/safrole/safrole-seal.js";
-import { assertEmpty, Compatibility, check, GpVersion, measure, OK, Result, } from "#@typeberry/utils";
+import { assertEmpty, measure, OK, Result } from "#@typeberry/utils";
 import { AccumulateOutput } from "./accumulate/accumulate-output.js";
-import { Accumulate, DeferredTransfers, } from "./accumulate/index.js";
+import { Accumulate, } from "./accumulate/index.js";
 import { Assurances } from "./assurances.js";
 import { Authorization } from "./authorization.js";
 import { Preimages } from "./preimages.js";
@@ -53,8 +53,7 @@ export var StfErrorKind;
     StfErrorKind[StfErrorKind["Preimages"] = 4] = "Preimages";
     StfErrorKind[StfErrorKind["SafroleSeal"] = 5] = "SafroleSeal";
     StfErrorKind[StfErrorKind["Accumulate"] = 6] = "Accumulate";
-    StfErrorKind[StfErrorKind["DeferredTransfers"] = 7] = "DeferredTransfers";
-    StfErrorKind[StfErrorKind["Offenders"] = 8] = "Offenders";
+    StfErrorKind[StfErrorKind["Offenders"] = 7] = "Offenders";
 })(StfErrorKind || (StfErrorKind = {}));
 export const stfError = (kind, nested) => {
     return Result.taggedError(StfErrorKind, kind, nested);
@@ -75,8 +74,6 @@ export class OnChain {
     // chapter 12: https://graypaper.fluffylabs.dev/#/68eaa1f/159f02159f02?v=0.6.4
     accumulate;
     accumulateOutput;
-    // chapter 12.3: https://graypaper.fluffylabs.dev/#/68eaa1f/178203178203?v=0.6.4
-    deferredTransfers;
     // chapter 12.4: https://graypaper.fluffylabs.dev/#/68eaa1f/18cc0018cc00?v=0.6.4
     preimages;
     // after accumulation
@@ -101,7 +98,6 @@ export class OnChain {
         this.assurances = new Assurances(chainSpec, state, hasher.blake2b);
         this.accumulate = new Accumulate(chainSpec, hasher.blake2b, state, options);
         this.accumulateOutput = new AccumulateOutput();
-        this.deferredTransfers = new DeferredTransfers(chainSpec, hasher.blake2b, state, options.pvm);
         this.preimages = new Preimages(state, hasher.blake2b);
         this.authorization = new Authorization(chainSpec, state);
     }
@@ -216,29 +212,10 @@ export class OnChain {
         if (accumulateResult.isError) {
             return stfError(StfErrorKind.Accumulate, accumulateResult);
         }
-        const { stateUpdate: accumulateUpdate, accumulationStatistics, pendingTransfers, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
+        const { stateUpdate: accumulateUpdate, accumulationStatistics, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
         assertEmpty(accumulateRest);
         const { privilegedServices: maybePrivilegedServices, authQueues: maybeAuthorizationQueues, designatedValidatorData: maybeDesignatedValidatorData, preimages: accumulatePreimages, accumulationQueue, recentlyAccumulated, ...servicesUpdateFromAccumulate } = accumulateUpdate;
-        let transferStatistics = new Map();
-        let servicesUpdate = { ...servicesUpdateFromAccumulate, preimages: accumulatePreimages };
-        if (!Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            const deferredTransfersResult = await this.deferredTransfers.transition({
-                entropy: entropy[0],
-                pendingTransfers,
-                servicesUpdate,
-                timeslot: timeSlot,
-            });
-            if (deferredTransfersResult.isError) {
-                return stfError(StfErrorKind.DeferredTransfers, deferredTransfersResult);
-            }
-            const { servicesUpdate: servicesUpdateFromDeferredTransfers, transferStatistics: transferStatisticsFromDeferredTransfers, ...deferredTransfersRest } = deferredTransfersResult.ok;
-            transferStatistics = transferStatisticsFromDeferredTransfers;
-            servicesUpdate = servicesUpdateFromDeferredTransfers;
-            assertEmpty(deferredTransfersRest);
-        }
-        else {
-            check `${pendingTransfers.length === 0} All transfers should be already accumulated.`;
-        }
+        const servicesUpdate = { ...servicesUpdateFromAccumulate, preimages: accumulatePreimages };
         const accumulateRoot = await this.accumulateOutput.transition({ accumulationOutputLog });
         // recent history
         const recentHistoryUpdate = this.recentHistory.transition({
@@ -264,7 +241,6 @@ export class OnChain {
             incomingReports: extrinsic.guarantees.map((g) => g.report),
             availableReports,
             accumulationStatistics,
-            transferStatistics,
             reporters: reporters,
             currentValidatorData,
         });

package/packages/jam/transition/disputes/disputes.test.data2.js

@@ -2,7 +2,7 @@
 import { tryAsCoreIndex, tryAsPerValidator, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "#@typeberry/block";
 import { RefineContext } from "#@typeberry/block/refine-context.js";
 import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
-import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
+import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
 import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { FixedSizeArray } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
@@ -174,7 +174,7 @@ export function workReport(packageHash, coreIndex) {
                 codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 payloadHash: Bytes.zero(HASH_SIZE).asOpaque(),
                 gas: tryAsServiceGas(42),
-                result: new WorkExecResult(WorkExecResultKind.ok, BytesBlob.parseBlob("0x010203")),
+                result: WorkExecResult.ok(BytesBlob.parseBlob("0x010203")),
                 load: WorkRefineLoad.create({
                     gasUsed: tryAsServiceGas(0),
                     importedSegments: tryAsU32(0),

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

@@ -6,7 +6,7 @@ import { AccumulationStateUpdate, clampU64ToU32, EjectError, ForgetPreimageError
 import { Logger } from "#@typeberry/logger";
 import { maxU64, sumU64, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { LookupHistoryItem, PreimageItem, PrivilegedServices, ServiceAccountInfo, tryAsLookupHistorySlots, UpdatePreimage, } from "#@typeberry/state";
-import { assertNever, Compatibility, check, GpVersion, OK, Result } from "#@typeberry/utils";
+import { assertNever, check, OK, Result } from "#@typeberry/utils";
 /**
  * Number of storage items required for ejection of the service.
  *
@@ -102,10 +102,7 @@ export class AccumulateExternalities {
     /** `check`: https://graypaper.fluffylabs.dev/#/ab2cdbd/30c60330c603?v=0.7.2 */
     getNextAvailableServiceId(serviceId) {
         let currentServiceId = serviceId;
-        const mod = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8
-            : 2 ** 32 - 2 ** 9;
-        const offset = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? MIN_PUBLIC_SERVICE_INDEX : 2 ** 8;
+        const mod = 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8;
         for (;;) {
             const service = this.getServiceInfo(currentServiceId);
             // we found an empty id
@@ -113,7 +110,7 @@ export class AccumulateExternalities {
                 return currentServiceId;
             }
             // keep trying
-            currentServiceId = tryAsServiceId(((currentServiceId - offset + 1 + mod) % mod) + offset);
+            currentServiceId = tryAsServiceId(((currentServiceId - MIN_PUBLIC_SERVICE_INDEX + 1 + mod) % mod) + MIN_PUBLIC_SERVICE_INDEX);
         }
     }
     checkPreimageStatus(hash, length) {
@@ -304,25 +301,23 @@ export class AccumulateExternalities {
             ...currentService,
             balance: tryAsU64(balanceLeftForCurrent),
         });
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            if (wantedServiceId < MIN_PUBLIC_SERVICE_INDEX &&
-                this.currentServiceId === this.updatedState.getPrivilegedServices().registrar) {
-                // NOTE: It's safe to cast to `Number` here, bcs here service ID cannot be bigger than 2**16
-                const newServiceId = tryAsServiceId(Number(wantedServiceId));
-                if (this.getServiceInfo(newServiceId) !== null) {
-                    return Result.error(NewServiceError.RegistrarServiceIdAlreadyTaken, () => `Service ID ${newServiceId} already taken`);
-                }
-                // add the new service with selected ID
-                // https://graypaper.fluffylabs.dev/#/ab2cdbd/36be0336c003?v=0.7.2
-                this.updatedState.createService(newServiceId, newAccount, newLookupItem);
-                // update the balance of current service
-                // https://graypaper.fluffylabs.dev/#/ab2cdbd/36c20336c403?v=0.7.2
-                this.updatedState.updateServiceInfo(this.currentServiceId, updatedCurrentAccount);
-                return Result.ok(newServiceId);
+        if (wantedServiceId < MIN_PUBLIC_SERVICE_INDEX &&
+            this.currentServiceId === this.updatedState.getPrivilegedServices().registrar) {
+            // NOTE: It's safe to cast to `Number` here, bcs here service ID cannot be bigger than 2**16
+            const newServiceId = tryAsServiceId(Number(wantedServiceId));
+            if (this.getServiceInfo(newServiceId) !== null) {
+                return Result.error(NewServiceError.RegistrarServiceIdAlreadyTaken, () => `Service ID ${newServiceId} already taken`);
             }
-            // NOTE: in case the service is not a registrar or the requested serviceId is out of range,
-            // we completely ignore the `wantedServiceId` and assign a random one
-        }
+            // add the new service with selected ID
+            // https://graypaper.fluffylabs.dev/#/ab2cdbd/36be0336c003?v=0.7.2
+            this.updatedState.createService(newServiceId, newAccount, newLookupItem);
+            // update the balance of current service
+            // https://graypaper.fluffylabs.dev/#/ab2cdbd/36c20336c403?v=0.7.2
+            this.updatedState.updateServiceInfo(this.currentServiceId, updatedCurrentAccount);
+            return Result.ok(newServiceId);
+        }
+        // NOTE: in case the service is not a registrar or the requested serviceId is out of range,
+        // we completely ignore the `wantedServiceId` and assign a random one
         const newServiceId = this.nextNewServiceId;
         // add the new service
         // https://graypaper.fluffylabs.dev/#/7e6ff6a/36cb0236cb02?v=0.6.7
@@ -367,7 +362,7 @@ export class AccumulateExternalities {
             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 && Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
+        if (assigners === 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}`);
         }
@@ -375,25 +370,6 @@ export class AccumulateExternalities {
         return Result.ok(OK);
     }
     updatePrivilegedServices(manager, assigners, delegator, registrar, autoAccumulateServices) {
-        if (!Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            /** https://graypaper.fluffylabs.dev/#/7e6ff6a/36d90036de00?v=0.6.7 */
-            const current = this.updatedState.getPrivilegedServices();
-            const isManager = current.manager === this.currentServiceId;
-            if (!isManager) {
-                return Result.error(UpdatePrivilegesError.UnprivilegedService, () => `Service ${this.currentServiceId} is not manager`);
-            }
-            if (manager === null || delegator === null) {
-                return Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Either manager or delegator is not a valid service id.");
-            }
-            this.updatedState.stateUpdate.privilegedServices = PrivilegedServices.create({
-                manager,
-                assigners,
-                delegator,
-                registrar: registrar ?? tryAsServiceId(0),
-                autoAccumulateServices,
-            });
-            return Result.ok(OK);
-        }
         if (manager === null || delegator === null || registrar === null) {
             return Result.error(UpdatePrivilegesError.InvalidServiceId, () => "Either manager or delegator or registrar is not a valid service id.");
         }
@@ -527,9 +503,6 @@ export class AccumulateExternalities {
     }
 }
 function bumpServiceId(serviceId) {
-    const mod = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-        ? 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8
-        : 2 ** 32 - 2 ** 9;
-    const offset = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? MIN_PUBLIC_SERVICE_INDEX : 2 ** 8;
-    return tryAsServiceId(offset + ((serviceId - offset + 42 + mod) % mod));
+    const mod = 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8;
+    return tryAsServiceId(MIN_PUBLIC_SERVICE_INDEX + ((serviceId - MIN_PUBLIC_SERVICE_INDEX + 42 + mod) % mod));
 }