@typeberry/lib 0.5.4 → 0.5.5

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

@@ -4,7 +4,7 @@ import type { ChainSpec } from "#@typeberry/config";
 import { type general, PendingTransfer } from "#@typeberry/jam-host-calls";
 import { type U64 } from "#@typeberry/numbers";
 import { Operand } from "../accumulate/operand.js";
-declare enum TransferOperandKind {
+export declare enum TransferOperandKind {
     OPERAND = 0,
     TRANSFER = 1
 }
@@ -15,24 +15,11 @@ export type TransferOrOperand = {
     kind: TransferOperandKind.TRANSFER;
     value: PendingTransfer;
 };
+export declare const TRANSFER_OR_OPERAND: import("@typeberry/codec").Descriptor<TransferOrOperand, TransferOrOperand>;
 declare enum FetchContext {
     Accumulate = 0,
-    /** @deprecated since 0.7.1 */
-    LegacyAccumulate = 1,
-    /** @deprecated since 0.7.1 */
-    LegacyOnTransfer = 2,
-    Refine = 3
+    Refine = 1
 }
-type LegacyAccumulateFetchData = {
-    context: FetchContext.LegacyAccumulate;
-    entropy: EntropyHash;
-    operands: Operand[];
-};
-type LegacyOnTransferFetchData = {
-    context: FetchContext.LegacyOnTransfer;
-    entropy: EntropyHash;
-    transfers: PendingTransfer[];
-};
 type AccumulateFetchData = {
     context: FetchContext.Accumulate;
     entropy: EntropyHash;
@@ -47,9 +34,7 @@ export declare class FetchExternalities implements general.IFetchExternalities {
     private fetchData;
     private chainSpec;
     private constructor();
-    static createForPre071Accumulate(fetchData: Omit<LegacyAccumulateFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     static createForAccumulate(fetchData: Omit<AccumulateFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
-    static createForOnTransfer(fetchData: Omit<LegacyOnTransferFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     static createForRefine(fetchData: Omit<RefineFetchData, "context">, chainSpec: ChainSpec): FetchExternalities;
     constants(): BytesBlob;
     entropy(): BytesBlob | null;
@@ -63,10 +48,6 @@ export declare class FetchExternalities implements general.IFetchExternalities {
     allWorkItems(): BytesBlob | null;
     oneWorkItem(_workItem: U64): BytesBlob | null;
     workItemPayload(_workItem: U64): BytesBlob | null;
-    allOperands(): BytesBlob | null;
-    oneOperand(operandIndex: U64): BytesBlob | null;
-    allTransfers(): BytesBlob | null;
-    oneTransfer(transferIndex: U64): BytesBlob | null;
     allTransfersAndOperands(): BytesBlob | null;
     oneTransferOrOperand(index: U64): BytesBlob | null;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"fetch-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/fetch-externalities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/fetch-externalities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAgC,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAQ5E,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,oBAAY,mBAAmB;IAC7B,OAAO,IAAI;IACX,QAAQ,IAAI;CACb;AAED,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC;IAClC,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC;IACnC,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAEN,eAAO,MAAM,mBAAmB,6EAG9B,CAAC;AA2FH,aAAK,YAAY;IACf,UAAU,IAAI;IACd,MAAM,IAAI;CACX;AAED,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC;IACjC,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC;IAE7B,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAOF,qBAAa,kBAAmB,YAAW,OAAO,CAAC,mBAAmB;IAElE,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IAFnB,OAAO;IAKP,MAAM,CAAC,mBAAmB,CACxB,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,EAC/C,SAAS,EAAE,SAAS,GACnB,kBAAkB;IAIrB,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EAAE,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAI7G,SAAS,IAAI,SAAS;IAItB,OAAO,IAAI,SAAS,GAAG,IAAI;IAS3B,eAAe,IAAI,SAAS,GAAG,IAAI;IAInC,iBAAiB,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIvE,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIpE,WAAW,IAAI,SAAS,GAAG,IAAI;IAI/B,UAAU,IAAI,SAAS,GAAG,IAAI;IAI9B,kBAAkB,IAAI,SAAS,GAAG,IAAI;IAItC,aAAa,IAAI,SAAS,GAAG,IAAI;IAIjC,YAAY,IAAI,SAAS,GAAG,IAAI;IAIhC,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAI7C,eAAe,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;IAIjD,uBAAuB,IAAI,SAAS,GAAG,IAAI;IAa3C,oBAAoB,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI;CAuBnD"}

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

@@ -8,12 +8,12 @@ import { GAS_TO_INVOKE_WORK_REPORT } from "../accumulate/accumulate-state.js";
 import { Operand } from "../accumulate/operand.js";
 import { REPORT_TIMEOUT_GRACE_PERIOD } from "../assurances.js";
 import { MAX_WORK_REPORT_SIZE_BYTES } from "../reports/verify-basic.js";
-var TransferOperandKind;
+export var TransferOperandKind;
 (function (TransferOperandKind) {
     TransferOperandKind[TransferOperandKind["OPERAND"] = 0] = "OPERAND";
     TransferOperandKind[TransferOperandKind["TRANSFER"] = 1] = "TRANSFER";
 })(TransferOperandKind || (TransferOperandKind = {}));
-const TRANSFER_OR_OPERAND = codec.union("TransferOrOperand", {
+export const TRANSFER_OR_OPERAND = codec.union("TransferOrOperand", {
     [TransferOperandKind.OPERAND]: codec.object({ value: Operand.Codec }),
     [TransferOperandKind.TRANSFER]: codec.object({ value: PendingTransfer.Codec }),
 });
@@ -102,11 +102,7 @@ function getEncodedConstants(chainSpec) {
 var FetchContext;
 (function (FetchContext) {
     FetchContext[FetchContext["Accumulate"] = 0] = "Accumulate";
-    /** @deprecated since 0.7.1 */
-    FetchContext[FetchContext["LegacyAccumulate"] = 1] = "LegacyAccumulate";
-    /** @deprecated since 0.7.1 */
-    FetchContext[FetchContext["LegacyOnTransfer"] = 2] = "LegacyOnTransfer";
-    FetchContext[FetchContext["Refine"] = 3] = "Refine";
+    FetchContext[FetchContext["Refine"] = 1] = "Refine";
 })(FetchContext || (FetchContext = {}));
 export class FetchExternalities {
     fetchData;
@@ -115,15 +111,9 @@ export class FetchExternalities {
         this.fetchData = fetchData;
         this.chainSpec = chainSpec;
     }
-    static createForPre071Accumulate(fetchData, chainSpec) {
-        return new FetchExternalities({ context: FetchContext.LegacyAccumulate, ...fetchData }, chainSpec);
-    }
     static createForAccumulate(fetchData, chainSpec) {
         return new FetchExternalities({ context: FetchContext.Accumulate, ...fetchData }, chainSpec);
     }
-    static createForOnTransfer(fetchData, chainSpec) {
-        return new FetchExternalities({ context: FetchContext.LegacyOnTransfer, ...fetchData }, chainSpec);
-    }
     static createForRefine(fetchData, chainSpec) {
         return new FetchExternalities({ context: FetchContext.Refine, ...fetchData }, chainSpec);
     }
@@ -167,48 +157,6 @@ export class FetchExternalities {
     workItemPayload(_workItem) {
         return null;
     }
-    allOperands() {
-        if (this.fetchData.context === FetchContext.LegacyAccumulate) {
-            const operands = this.fetchData.operands;
-            return Encoder.encodeObject(codec.sequenceVarLen(Operand.Codec), operands, this.chainSpec);
-        }
-        return null;
-    }
-    oneOperand(operandIndex) {
-        if (this.fetchData.context === FetchContext.LegacyAccumulate) {
-            const { operands } = this.fetchData;
-            if (operandIndex >= 2n ** 32n) {
-                return null;
-            }
-            const operand = operands[Number(operandIndex)];
-            if (operand === undefined) {
-                return null;
-            }
-            return Encoder.encodeObject(Operand.Codec, operand, this.chainSpec);
-        }
-        return null;
-    }
-    allTransfers() {
-        if (this.fetchData.context === FetchContext.LegacyOnTransfer) {
-            const { transfers } = this.fetchData;
-            return Encoder.encodeObject(codec.sequenceVarLen(PendingTransfer.Codec), transfers, this.chainSpec);
-        }
-        return null;
-    }
-    oneTransfer(transferIndex) {
-        if (this.fetchData.context === FetchContext.LegacyOnTransfer) {
-            const { transfers } = this.fetchData;
-            if (transferIndex >= 2n ** 32n) {
-                return null;
-            }
-            const transfer = transfers[Number(transferIndex)];
-            if (transfer === undefined) {
-                return null;
-            }
-            return Encoder.encodeObject(PendingTransfer.Codec, transfer, this.chainSpec);
-        }
-        return null;
-    }
     allTransfersAndOperands() {
         if (this.fetchData.context === FetchContext.Accumulate) {
             const { transfers, operands } = this.fetchData;

package/packages/jam/transition/externalities/fetch-externalities.test.js

@@ -10,7 +10,7 @@ import { TRANSFER_MEMO_BYTES } from "#@typeberry/jam-host-calls/externalities/pa
 import { PendingTransfer } from "#@typeberry/jam-host-calls/externalities/pending-transfer.js";
 import { tryAsU64 } from "#@typeberry/numbers";
 import { Operand } from "../accumulate/operand.js";
-import { FetchExternalities } from "./fetch-externalities.js";
+import { FetchExternalities, TRANSFER_OR_OPERAND, TransferOperandKind, } from "./fetch-externalities.js";
 describe("fetch-externalities", () => {
     const prepareOperands = (length) => {
         const operands = [];
@@ -40,17 +40,30 @@ describe("fetch-externalities", () => {
         }
         return transfers;
     };
-    const prepareLegacyAccumulateData = ({ chainSpec, operands, entropy, }) => {
-        const defaultChainSpec = tinyChainSpec;
-        const defaultEntropy = Bytes.zero(HASH_SIZE).asOpaque();
-        const defaultOperands = [];
-        const fetchData = {
-            entropy: entropy ?? defaultEntropy,
-            operands: operands ?? defaultOperands,
-        };
-        return FetchExternalities.createForPre071Accumulate(fetchData, chainSpec ?? defaultChainSpec);
+    // allTransfersAndOperands: transfers first, then operands
+    const toAllTransfersAndOperands = (operands, transfers) => {
+        return [
+            ...transfers.map((t) => ({ kind: TransferOperandKind.TRANSFER, value: t })),
+            ...operands.map((o) => ({ kind: TransferOperandKind.OPERAND, value: o })),
+        ];
+    };
+    // oneTransferOrOperand: operands first (index < operands.length), then transfers
+    const toOneTransferOrOperandAt = (operands, transfers, index) => {
+        if (index >= operands.length + transfers.length) {
+            return null;
+        }
+        if (index < operands.length) {
+            return { kind: TransferOperandKind.OPERAND, value: operands[index] };
+        }
+        return { kind: TransferOperandKind.TRANSFER, value: transfers[index - operands.length] };
+    };
+    const encodeOneTransferOrOperand = (item, chainSpec) => {
+        if (item === null) {
+            return null;
+        }
+        return Encoder.encodeObject(TRANSFER_OR_OPERAND, item, chainSpec);
     };
-    const prepareOnTransferData = ({ chainSpec, operands, entropy, transfers, }) => {
+    const prepareAccumulateData = ({ chainSpec, operands, entropy, transfers, }) => {
         const defaultChainSpec = tinyChainSpec;
         const defaultEntropy = Bytes.zero(HASH_SIZE).asOpaque();
         const defaultOperands = [];
@@ -60,108 +73,182 @@ describe("fetch-externalities", () => {
             operands: operands ?? defaultOperands,
             transfers: transfers ?? defaultTransfers,
         };
-        return FetchExternalities.createForOnTransfer(fetchData, chainSpec ?? defaultChainSpec);
+        return FetchExternalities.createForAccumulate(fetchData, chainSpec ?? defaultChainSpec);
     };
-    it("should return different constants for different chain specs (Accumulate)", () => {
-        const tinyFetchExternalities = prepareLegacyAccumulateData({ chainSpec: tinyChainSpec });
-        const fullFetchExternalities = prepareLegacyAccumulateData({ chainSpec: fullChainSpec });
-        const tinyContants = tinyFetchExternalities.constants();
-        const fullContants = fullFetchExternalities.constants();
-        assert.notStrictEqual(tinyContants.length, 0);
-        assert.notStrictEqual(fullContants.length, 0);
-        assert.notDeepStrictEqual(tinyContants, fullContants);
-    });
-    it("should return different constants for different chain specs (OnTransfer)", () => {
-        const tinyFetchExternalities = prepareOnTransferData({ chainSpec: tinyChainSpec });
-        const fullFetchExternalities = prepareOnTransferData({ chainSpec: fullChainSpec });
-        const tinyContants = tinyFetchExternalities.constants();
-        const fullContants = fullFetchExternalities.constants();
-        assert.notStrictEqual(tinyContants.length, 0);
-        assert.notStrictEqual(fullContants.length, 0);
-        assert.notDeepStrictEqual(tinyContants, fullContants);
-    });
-    it("should return entropy hash (Accumulate)", () => {
-        const expectedEntropy = Bytes.fill(HASH_SIZE, 5).asOpaque();
-        const fetchExternalities = prepareLegacyAccumulateData({ entropy: expectedEntropy });
-        const entropy = fetchExternalities.entropy();
-        assert.deepStrictEqual(entropy, expectedEntropy);
-    });
-    it("should return entropy hash (OnTransfer)", () => {
-        const expectedEntropy = Bytes.fill(HASH_SIZE, 5).asOpaque();
-        const fetchExternalities = prepareOnTransferData({ entropy: expectedEntropy });
-        const entropy = fetchExternalities.entropy();
-        assert.deepStrictEqual(entropy, expectedEntropy);
-    });
-    it("should return all operands", () => {
-        const expectedOperands = prepareOperands(5);
-        const chainSpec = tinyChainSpec;
-        const encodedOperands = Encoder.encodeObject(codec.sequenceVarLen(Operand.Codec), expectedOperands, chainSpec);
-        const fetchExternalities = prepareLegacyAccumulateData({ operands: expectedOperands, chainSpec });
-        const operands = fetchExternalities.allOperands();
-        assert.deepStrictEqual(operands, encodedOperands);
-    });
-    it("should null when operand index is not U32", () => {
-        const operands = prepareOperands(5);
-        const chainSpec = tinyChainSpec;
-        const expectedOperandIndex = 2 ** 32 + 3;
-        const expectedOperand = null;
-        const fetchExternalities = prepareLegacyAccumulateData({ operands, chainSpec });
-        const operand = fetchExternalities.oneOperand(tryAsU64(expectedOperandIndex));
-        assert.deepStrictEqual(operand, expectedOperand);
-    });
-    it("should null when operand index is U32 but is incorrect", () => {
-        const operands = prepareOperands(5);
-        const chainSpec = tinyChainSpec;
-        const expectedOperandIndex = 153;
-        const expectedOperand = null;
-        const fetchExternalities = prepareLegacyAccumulateData({ operands, chainSpec });
-        const operand = fetchExternalities.oneOperand(tryAsU64(expectedOperandIndex));
-        assert.deepStrictEqual(operand, expectedOperand);
-    });
-    it("should return one operand", () => {
-        const operands = prepareOperands(5);
-        const chainSpec = tinyChainSpec;
-        const expectedOperandIndex = 3;
-        const expectedOperand = operands[expectedOperandIndex];
-        const encodedOperand = Encoder.encodeObject(Operand.Codec, expectedOperand, chainSpec);
-        const fetchExternalities = prepareLegacyAccumulateData({ operands, chainSpec });
-        const operand = fetchExternalities.oneOperand(tryAsU64(expectedOperandIndex));
-        assert.deepStrictEqual(operand, encodedOperand);
-    });
-    it("should return all transfers", () => {
-        const transfersToEncode = prepareTransfers(5);
-        const chainSpec = tinyChainSpec;
-        const encodedTransfers = Encoder.encodeObject(codec.sequenceVarLen(PendingTransfer.Codec), transfersToEncode, chainSpec);
-        const fetchExternalities = prepareOnTransferData({ transfers: transfersToEncode, chainSpec });
-        const transfers = fetchExternalities.allTransfers();
-        assert.deepStrictEqual(transfers, encodedTransfers);
-    });
-    it("should null when transfer index is not U32", () => {
-        const transfers = prepareTransfers(5);
-        const chainSpec = tinyChainSpec;
-        const expectedTransferIndex = tryAsU64(2 ** 32 + 3);
-        const expectedTransfer = null;
-        const fetchExternalities = prepareOnTransferData({ transfers, chainSpec });
-        const transfer = fetchExternalities.oneTransfer(expectedTransferIndex);
-        assert.deepStrictEqual(transfer, expectedTransfer);
-    });
-    it("should null when transfer index is U32 but is incorrect", () => {
-        const transfers = prepareTransfers(5);
-        const chainSpec = tinyChainSpec;
-        const expectedTransferIndex = tryAsU64(153);
-        const expectedTransfer = null;
-        const fetchExternalities = prepareOnTransferData({ transfers, chainSpec });
-        const transfer = fetchExternalities.oneTransfer(expectedTransferIndex);
-        assert.deepStrictEqual(transfer, expectedTransfer);
+    const prepareRefineData = ({ chainSpec } = {}) => {
+        const defaultChainSpec = tinyChainSpec;
+        return FetchExternalities.createForRefine({ entropy: undefined }, chainSpec ?? defaultChainSpec);
+    };
+    describe("Accumulate", () => {
+        it("should return different constants for different chain specs", () => {
+            const tinyFetchExternalities = prepareAccumulateData({ chainSpec: tinyChainSpec });
+            const fullFetchExternalities = prepareAccumulateData({ chainSpec: fullChainSpec });
+            const tinyConstants = tinyFetchExternalities.constants();
+            const fullConstants = fullFetchExternalities.constants();
+            assert.notStrictEqual(tinyConstants.length, 0);
+            assert.notStrictEqual(fullConstants.length, 0);
+            assert.notDeepStrictEqual(tinyConstants, fullConstants);
+        });
+        it("should return entropy hash", () => {
+            const expectedEntropy = Bytes.fill(HASH_SIZE, 5).asOpaque();
+            const fetchExternalities = prepareAccumulateData({ entropy: expectedEntropy });
+            const entropy = fetchExternalities.entropy();
+            assert.deepStrictEqual(entropy, expectedEntropy);
+        });
+        it("should return all transfers and operands", () => {
+            const operands = prepareOperands(3);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const expected = toAllTransfersAndOperands(operands, transfers);
+            const encodedExpected = Encoder.encodeObject(codec.sequenceVarLen(TRANSFER_OR_OPERAND), expected, chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            const result = fetchExternalities.allTransfersAndOperands();
+            assert.deepStrictEqual(result, encodedExpected);
+        });
+        it("should return empty encoded sequence when no transfers and no operands", () => {
+            const chainSpec = tinyChainSpec;
+            const encodedExpected = Encoder.encodeObject(codec.sequenceVarLen(TRANSFER_OR_OPERAND), [], chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands: [], transfers: [], chainSpec });
+            const result = fetchExternalities.allTransfersAndOperands();
+            assert.deepStrictEqual(result, encodedExpected);
+        });
+        it("should return one operand by index", () => {
+            const operands = prepareOperands(3);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const encodedExpected = encodeOneTransferOrOperand(toOneTransferOrOperandAt(operands, transfers, 0), chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            // Operands come first (indices 0..2), then transfers (indices 3..4)
+            const result = fetchExternalities.oneTransferOrOperand(tryAsU64(0));
+            assert.deepStrictEqual(result, encodedExpected);
+        });
+        it("should return one transfer by index", () => {
+            const operands = prepareOperands(3);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const encodedExpected = encodeOneTransferOrOperand(toOneTransferOrOperandAt(operands, transfers, 3), chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            // Transfers start after operands, so index 3 is the first transfer
+            const result = fetchExternalities.oneTransferOrOperand(tryAsU64(3));
+            assert.deepStrictEqual(result, encodedExpected);
+        });
+        it("should return null when index is out of bounds", () => {
+            const operands = prepareOperands(3);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            // Total items: 3 operands + 2 transfers = 5, so index 5 is out of bounds
+            const result = fetchExternalities.oneTransferOrOperand(tryAsU64(5));
+            assert.strictEqual(result, null);
+        });
+        it("should return null when index is far out of bounds", () => {
+            const operands = prepareOperands(3);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            const result = fetchExternalities.oneTransferOrOperand(tryAsU64(153));
+            assert.strictEqual(result, null);
+        });
+        it("should have consistent encoding between all and one", () => {
+            const operands = prepareOperands(2);
+            const transfers = prepareTransfers(2);
+            const chainSpec = tinyChainSpec;
+            const allItems = toAllTransfersAndOperands(operands, transfers);
+            const encodedAll = Encoder.encodeObject(codec.sequenceVarLen(TRANSFER_OR_OPERAND), allItems, chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands, transfers, chainSpec });
+            const all = fetchExternalities.allTransfersAndOperands();
+            assert.deepStrictEqual(all, encodedAll);
+            for (let i = 0; i < operands.length + transfers.length; i++) {
+                const one = fetchExternalities.oneTransferOrOperand(tryAsU64(i));
+                const encodedOne = encodeOneTransferOrOperand(toOneTransferOrOperandAt(operands, transfers, i), chainSpec);
+                assert.deepStrictEqual(one, encodedOne, `Mismatch at index ${i}`);
+            }
+            const outOfRange = fetchExternalities.oneTransferOrOperand(tryAsU64(operands.length + transfers.length));
+            assert.strictEqual(outOfRange, null);
+        });
+        it("should handle only operands without transfers", () => {
+            const operands = prepareOperands(5);
+            const chainSpec = tinyChainSpec;
+            const allItems = toAllTransfersAndOperands(operands, []);
+            const encodedAll = Encoder.encodeObject(codec.sequenceVarLen(TRANSFER_OR_OPERAND), allItems, chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands, transfers: [], chainSpec });
+            const result = fetchExternalities.allTransfersAndOperands();
+            assert.deepStrictEqual(result, encodedAll);
+            for (let i = 0; i < operands.length; i++) {
+                const one = fetchExternalities.oneTransferOrOperand(tryAsU64(i));
+                const encodedOne = encodeOneTransferOrOperand(toOneTransferOrOperandAt(operands, [], i), chainSpec);
+                assert.deepStrictEqual(one, encodedOne, `Mismatch at operand index ${i}`);
+            }
+            const outOfRange = fetchExternalities.oneTransferOrOperand(tryAsU64(operands.length));
+            assert.strictEqual(outOfRange, null);
+        });
+        it("should handle only transfers without operands", () => {
+            const transfers = prepareTransfers(5);
+            const chainSpec = tinyChainSpec;
+            const allItems = toAllTransfersAndOperands([], transfers);
+            const encodedAll = Encoder.encodeObject(codec.sequenceVarLen(TRANSFER_OR_OPERAND), allItems, chainSpec);
+            const fetchExternalities = prepareAccumulateData({ operands: [], transfers, chainSpec });
+            const result = fetchExternalities.allTransfersAndOperands();
+            assert.deepStrictEqual(result, encodedAll);
+            for (let i = 0; i < transfers.length; i++) {
+                const one = fetchExternalities.oneTransferOrOperand(tryAsU64(i));
+                const encodedOne = encodeOneTransferOrOperand(toOneTransferOrOperandAt([], transfers, i), chainSpec);
+                assert.deepStrictEqual(one, encodedOne, `Mismatch at transfer index ${i}`);
+            }
+            const outOfRange = fetchExternalities.oneTransferOrOperand(tryAsU64(transfers.length));
+            assert.strictEqual(outOfRange, null);
+        });
+        it("should return null for unimplemented methods", () => {
+            const fetchExternalities = prepareAccumulateData({});
+            assert.strictEqual(fetchExternalities.authorizerTrace(), null);
+            assert.strictEqual(fetchExternalities.workItemExtrinsic(null, tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workItemImport(null, tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workPackage(), null);
+            assert.strictEqual(fetchExternalities.authorizer(), null);
+            assert.strictEqual(fetchExternalities.authorizationToken(), null);
+            assert.strictEqual(fetchExternalities.refineContext(), null);
+            assert.strictEqual(fetchExternalities.allWorkItems(), null);
+            assert.strictEqual(fetchExternalities.oneWorkItem(tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workItemPayload(tryAsU64(0)), null);
+        });
     });
-    it("should return one transfer", () => {
-        const transfers = prepareTransfers(5);
-        const chainSpec = tinyChainSpec;
-        const expectedOperandIndex = 3;
-        const expectedTransfer = transfers[expectedOperandIndex];
-        const encodedTransfer = Encoder.encodeObject(PendingTransfer.Codec, expectedTransfer, chainSpec);
-        const fetchExternalities = prepareOnTransferData({ transfers, chainSpec });
-        const transfer = fetchExternalities.oneTransfer(tryAsU64(expectedOperandIndex));
-        assert.deepStrictEqual(transfer, encodedTransfer);
+    describe("Refine", () => {
+        it("should return different constants for different chain specs", () => {
+            const tinyFetchExternalities = prepareRefineData({ chainSpec: tinyChainSpec });
+            const fullFetchExternalities = prepareRefineData({ chainSpec: fullChainSpec });
+            const tinyConstants = tinyFetchExternalities.constants();
+            const fullConstants = fullFetchExternalities.constants();
+            assert.notStrictEqual(tinyConstants.length, 0);
+            assert.notStrictEqual(fullConstants.length, 0);
+            assert.notDeepStrictEqual(tinyConstants, fullConstants);
+        });
+        it("should return null entropy", () => {
+            const fetchExternalities = prepareRefineData();
+            const entropy = fetchExternalities.entropy();
+            assert.strictEqual(entropy, null);
+        });
+        it("should return null for allTransfersAndOperands", () => {
+            const fetchExternalities = prepareRefineData();
+            const result = fetchExternalities.allTransfersAndOperands();
+            assert.strictEqual(result, null);
+        });
+        it("should return null for oneTransferOrOperand", () => {
+            const fetchExternalities = prepareRefineData();
+            const result = fetchExternalities.oneTransferOrOperand(tryAsU64(0));
+            assert.strictEqual(result, null);
+        });
+        it("should return null for unimplemented methods", () => {
+            const fetchExternalities = prepareRefineData();
+            assert.strictEqual(fetchExternalities.authorizerTrace(), null);
+            assert.strictEqual(fetchExternalities.workItemExtrinsic(null, tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workItemImport(null, tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workPackage(), null);
+            assert.strictEqual(fetchExternalities.authorizer(), null);
+            assert.strictEqual(fetchExternalities.authorizationToken(), null);
+            assert.strictEqual(fetchExternalities.refineContext(), null);
+            assert.strictEqual(fetchExternalities.allWorkItems(), null);
+            assert.strictEqual(fetchExternalities.oneWorkItem(tryAsU64(0)), null);
+            assert.strictEqual(fetchExternalities.workItemPayload(tryAsU64(0)), null);
+        });
     });
 });

package/packages/jam/transition/statistics.d.ts

@@ -27,13 +27,6 @@ export type Input = {
      * https://graypaper.fluffylabs.dev/#/cc517d7/171f05171f05?v=0.6.5
      */
     accumulationStatistics: Map<ServiceId, CountAndGasUsed>;
-    /**
-     * `X`: Deffered transfer statistics
-     * TODO [MaSo] Use fields from accumulation.
-     *
-     * https://graypaper.fluffylabs.dev/#/cc517d7/18dd0018dd00?v=0.6.5
-     */
-    transferStatistics: Map<ServiceId, CountAndGasUsed>;
     reporters: readonly Ed25519Key[];
     currentValidatorData: State["currentValidatorData"];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,QAAQ,EAIb,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAsB,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAqB,KAAK,KAAK,EAAuC,MAAM,kBAAkB,CAAC;AAGtG,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,cAAc,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB;;;;OAIG;IACH,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B;;;;OAIG;IACH,gBAAgB,EAAE,UAAU,EAAE,CAAC;IAC/B;;;;;OAKG;IACH,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD;;;;;OAKG;IACH,kBAAkB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACpD,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC,oBAAoB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,CAAC,GAAG;IACrE;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;CAC9D,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AAExE,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,SAAS;aACV,KAAK,EAAE,eAAe;gBADrB,SAAS,EAAE,SAAS,EACrB,KAAK,EAAE,eAAe;IAGxC,OAAO,CAAC,aAAa;IAyBrB,sEAAsE;IACtE,OAAO,CAAC,oBAAoB;IAe5B,sEAAsE;IACtE,OAAO,CAAC,oBAAoB;IA+B5B,sEAAsE;IACtE,OAAO,CAAC,6BAA6B;IAoBrC;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAwBzB;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,qBAAqB;CAgJhD"}
+{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,QAAQ,EAIb,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAsB,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAqB,KAAK,KAAK,EAAuC,MAAM,kBAAkB,CAAC;AAGtG,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,cAAc,CAAC;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB;;;;OAIG;IACH,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B;;;;OAIG;IACH,gBAAgB,EAAE,UAAU,EAAE,CAAC;IAC/B;;;;;OAKG;IACH,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC,oBAAoB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,CAAC,GAAG;IACrE;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;CAC9D,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AAExE,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,SAAS;aACV,KAAK,EAAE,eAAe;gBADrB,SAAS,EAAE,SAAS,EACrB,KAAK,EAAE,eAAe;IAGxC,OAAO,CAAC,aAAa;IAyBrB,sEAAsE;IACtE,OAAO,CAAC,oBAAoB;IAe5B,sEAAsE;IACtE,OAAO,CAAC,oBAAoB;IA+B5B,sEAAsE;IACtE,OAAO,CAAC,6BAA6B;IAoBrC;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAoBzB;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,qBAAqB;CAwIhD"}

package/packages/jam/transition/statistics.js

@@ -96,7 +96,7 @@ export class Statistics {
      *
      * https://graypaper.fluffylabs.dev/#/cc517d7/195f04195f04?v=0.6.5
      */
-    collectServiceIds(preimages, workResults, accumulationKeys, transferKeys) {
+    collectServiceIds(preimages, workResults, accumulationKeys) {
         const serviceIds = new Set();
         for (const preimage of preimages) {
             serviceIds.add(preimage.requester);
@@ -107,9 +107,6 @@ export class Statistics {
         for (const serviceId of accumulationKeys) {
             serviceIds.add(serviceId);
         }
-        for (const serviceId of transferKeys) {
-            serviceIds.add(serviceId);
-        }
         return serviceIds;
     }
     /**
@@ -195,7 +192,7 @@ export class Statistics {
         }
         /** Update services statistics */
         services.clear();
-        const serviceIds = this.collectServiceIds(extrinsic.preimages, incomingReports.flatMap((wr) => wr.results), input.accumulationStatistics.keys(), input.transferStatistics.keys());
+        const serviceIds = this.collectServiceIds(extrinsic.preimages, incomingReports.flatMap((wr) => wr.results), input.accumulationStatistics.keys());
         for (const serviceId of serviceIds) {
             const workResults = incomingReports.flatMap((wr) => wr.results.filter((r) => r.serviceId === serviceId));
             const { gasUsed, imported, extrinsicCount, extrinsicSize, exported } = this.calculateRefineScore(workResults);
@@ -205,10 +202,6 @@ export class Statistics {
                 count: tryAsU32(0),
                 gasUsed: tryAsServiceGas(0n),
             };
-            const { count: transfersCount, gasUsed: transfersGasUsed } = input.transferStatistics.get(serviceId) ?? {
-                count: tryAsU32(0),
-                gasUsed: tryAsServiceGas(0n),
-            };
             /**
              * Service statistics are tracked only per-block basis, so we override previous values.
              * https://graypaper.fluffylabs.dev/#/cc517d7/190201190501?v=0.6.5
@@ -226,8 +219,6 @@ export class Statistics {
             serviceStatistics.providedSize = providedSize;
             serviceStatistics.accumulateCount = accumulatedCount;
             serviceStatistics.accumulateGasUsed = accumulatedGasUsed;
-            serviceStatistics.onTransfersCount = transfersCount;
-            serviceStatistics.onTransfersGasUsed = transfersGasUsed;
             services.set(serviceId, serviceStatistics);
         }
         /** Update state */