@typeberry/lib 0.5.3-355fdf7 → 0.5.3-5a6cfcc

package/packages/extensions/ipc/jamnp/handler.js

@@ -1,7 +1,14 @@
 import { BytesBlob } from "#@typeberry/bytes";
 import { Decoder, Encoder } from "#@typeberry/codec";
+import { tryAsStreamId, } from "#@typeberry/jamnp-s";
 import { Logger } from "#@typeberry/logger";
+import { assertNever } from "#@typeberry/utils";
 import { NewStream, StreamEnvelope, StreamEnvelopeType } from "./stream.js";
+const IPC_PEER_ID = "ipc-peer";
+/** Construct a protocol-level StreamId from an IPC-level numeric stream ID. */
+function toStreamId(ipcStreamId) {
+    return tryAsStreamId(`${IPC_PEER_ID}:${ipcStreamId}`);
+}
 const logger = Logger.new(import.meta.filename, "ext-ipc-jamnp");
 export class JamnpIpcHandler {
     sender;
@@ -37,9 +44,9 @@ export class JamnpIpcHandler {
     /** Re-use an existing stream of given kind if present. */
     withStreamOfKind(streamKind, work) {
         // find first stream id with given kind
-        for (const [streamId, handler] of this.streams.entries()) {
+        for (const [ipcStreamId, handler] of this.streams.entries()) {
             if (handler.kind === streamKind) {
-                work(handler, new EnvelopeSender(streamId, this.sender));
+                work(handler, new EnvelopeSender(ipcStreamId, this.sender));
                 return;
             }
         }
@@ -52,19 +59,19 @@ export class JamnpIpcHandler {
             throw new Error(`Stream with unregistered handler of kind: ${kind} was requested to be opened.`);
         }
         // pick a stream id
-        const getRandomStreamId = () => Math.floor(Math.random() * 2 ** 16);
+        const getRandomIpcStreamId = () => Math.floor(Math.random() * 2 ** 32);
         const streams = this.streams;
-        const streamId = (function findStreamId() {
-            const s = getRandomStreamId();
+        const ipcStreamId = (function findStreamId() {
+            const s = getRandomIpcStreamId();
             if (!streams.has(s)) {
                 return s;
             }
             return findStreamId();
         })();
         // register the stream
-        this.streams.set(streamId, handler);
-        this.pendingStreams.set(streamId, true);
-        const sender = new EnvelopeSender(streamId, this.sender);
+        this.streams.set(ipcStreamId, handler);
+        this.pendingStreams.set(ipcStreamId, true);
+        const sender = new EnvelopeSender(ipcStreamId, this.sender);
         sender.open(NewStream.create({ streamByte: kind }));
         work(handler, sender);
     }
@@ -72,24 +79,24 @@ export class JamnpIpcHandler {
     async onSocketMessage(msg) {
         // decode the message as `StreamEnvelope`
         const envelope = Decoder.decodeObject(StreamEnvelope.Codec, msg);
-        const streamId = envelope.streamId;
-        logger.log `[${streamId}] incoming message: ${envelope.type} ${envelope.data}`;
+        const ipcStreamId = envelope.streamId;
+        logger.log `[${ipcStreamId}] incoming message: ${envelope.type} ${envelope.data}`;
         // check if this is a already known stream id
-        const streamHandler = this.streams.get(streamId);
-        const streamSender = new EnvelopeSender(streamId, this.sender);
+        const streamHandler = this.streams.get(ipcStreamId);
+        const streamSender = new EnvelopeSender(ipcStreamId, this.sender);
         // we don't know that stream yet, so it has to be a new one
         if (streamHandler === undefined) {
             // closing or message of unknown stream - ignore.
             if (envelope.type !== StreamEnvelopeType.Open) {
-                logger.warn `[${streamId}] (unknown) got invalid type ${envelope.type}.`;
+                logger.warn `[${ipcStreamId}] (unknown) got invalid type ${envelope.type}.`;
                 return;
             }
             const newStream = Decoder.decodeObject(NewStream.Codec, envelope.data);
             const handler = this.streamHandlers.get(newStream.streamByte);
             if (handler !== undefined) {
-                logger.log `[${streamId}] new stream for ${handler.kind}`;
+                logger.log `[${ipcStreamId}] new stream for ${handler.kind}`;
                 // insert the stream
-                this.streams.set(streamId, handler);
+                this.streams.set(ipcStreamId, handler);
                 // Just send back the same stream byte.
                 streamSender.open(newStream);
                 return;
@@ -98,31 +105,47 @@ export class JamnpIpcHandler {
             streamSender.close();
             return;
         }
-        // close the stream
-        if (envelope.type === StreamEnvelopeType.Close) {
-            const handler = this.streams.get(streamId);
-            handler?.onClose(streamId, false);
-            this.streams.delete(streamId);
-            return;
-        }
-        if (envelope.type !== StreamEnvelopeType.Msg) {
+        if (envelope.type === StreamEnvelopeType.Open) {
             // display a warning but only if the stream was not pending for confirmation.
-            if (!this.pendingStreams.delete(streamId)) {
-                logger.warn `[${streamId}] got invalid type ${envelope.type}.`;
+            if (!this.pendingStreams.delete(ipcStreamId)) {
+                logger.warn `[${ipcStreamId}] got invalid type ${envelope.type}.`;
             }
             return;
         }
+        // reject stream messages without open ack first.
+        if (this.pendingStreams.has(ipcStreamId)) {
+            logger.warn `[${ipcStreamId}] got invalid type ${envelope.type}. Expected Open.`;
+            // closing the connection and removing the stream from pending.
+            this.pendingStreams.delete(ipcStreamId);
+            // the stream should not be in the collection yet, but we remove it just for safety.
+            this.streams.delete(ipcStreamId);
+            streamSender.close();
+            return;
+        }
         // this is a known stream, so just dispatch the message.
-        streamHandler.onStreamMessage(streamSender, envelope.data);
+        if (envelope.type === StreamEnvelopeType.Msg) {
+            streamHandler.onStreamMessage(streamSender, envelope.data);
+            return;
+        }
+        // close the stream
+        if (envelope.type === StreamEnvelopeType.Close) {
+            streamHandler.onClose(toStreamId(ipcStreamId), false);
+            this.streams.delete(ipcStreamId);
+            // not really needed, but just for sure.
+            this.pendingStreams.delete(ipcStreamId);
+            return;
+        }
+        assertNever(envelope.type);
     }
     /** Notify about termination of the underlying socket. */
     onClose({ error }) {
         logger.log `Closing the handler. Reason: ${error !== undefined ? error.message : "close"}.`;
         // Socket closed - we should probably clear everything.
-        for (const [streamId, handler] of this.streams.entries()) {
-            handler.onClose(streamId, error === undefined);
+        for (const [ipcStreamId, handler] of this.streams.entries()) {
+            handler.onClose(toStreamId(ipcStreamId), error !== undefined);
         }
         this.streams.clear();
+        this.pendingStreams.clear();
         // finish the handler.
         this.onEnd.finished = true;
         if (error !== undefined) {
@@ -139,24 +162,26 @@ export class JamnpIpcHandler {
     }
 }
 class EnvelopeSender {
-    streamId;
+    ipcStreamId;
     sender;
-    constructor(streamId, sender) {
-        this.streamId = streamId;
+    streamId;
+    constructor(ipcStreamId, sender) {
+        this.ipcStreamId = ipcStreamId;
         this.sender = sender;
+        this.streamId = toStreamId(ipcStreamId);
     }
     open(newStream) {
         const msg = Encoder.encodeObject(NewStream.Codec, newStream);
-        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.streamId, type: StreamEnvelopeType.Open, data: msg })));
+        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.ipcStreamId, type: StreamEnvelopeType.Open, data: msg })));
     }
     bufferAndSend(msg) {
-        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.streamId, type: StreamEnvelopeType.Msg, data: msg })));
+        this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({ streamId: this.ipcStreamId, type: StreamEnvelopeType.Msg, data: msg })));
         // we are buffering until we run OOM
         return true;
     }
     close() {
         this.sender.send(Encoder.encodeObject(StreamEnvelope.Codec, StreamEnvelope.create({
-            streamId: this.streamId,
+            streamId: this.ipcStreamId,
             type: StreamEnvelopeType.Close,
             data: BytesBlob.blobFromNumbers([]),
         })));

package/packages/extensions/ipc/jamnp/stream.d.ts

@@ -1,18 +1,20 @@
 import type { BytesBlob } from "#@typeberry/bytes";
 import { type CodecRecord } from "#@typeberry/codec";
-import type { StreamId, StreamKind } from "#@typeberry/jamnp-s";
-import { type U8 } from "#@typeberry/numbers";
+import type { StreamKind } from "#@typeberry/jamnp-s";
+import { type U8, type U32 } from "#@typeberry/numbers";
+/** IPC-level stream identifier (u32), used for multiplexing streams over a single socket. */
+export type IpcStreamId = U32;
 export declare enum StreamEnvelopeType {
     Msg = 0,
     Open = 1,
     Close = 2
 }
 export declare class StreamEnvelope {
-    readonly streamId: StreamId;
+    readonly streamId: IpcStreamId;
     readonly type: StreamEnvelopeType;
     readonly data: BytesBlob;
     static Codec: import("@typeberry/codec").Descriptor<StreamEnvelope, import("@typeberry/codec").ViewOf<StreamEnvelope, {
-        streamId: import("@typeberry/codec").Descriptor<import("@typeberry/numbers").U32, import("@typeberry/bytes").Bytes<4>>;
+        streamId: import("@typeberry/codec").Descriptor<U32, import("@typeberry/bytes").Bytes<4>>;
         type: import("@typeberry/codec").Descriptor<StreamEnvelopeType, U8>;
         data: import("@typeberry/codec").Descriptor<BytesBlob, BytesBlob>;
     }>>;

package/packages/extensions/ipc/jamnp/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAW,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,kBAAkB;IAC5B,GAAG,IAAI;IACP,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAED,qBAAa,cAAc;aA0BP,QAAQ,EAAE,QAAQ;aAClB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,SAAS;IA3BjC,MAAM,CAAC,KAAK;;;;QAkBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC;IAInE,OAAO;CAKR;AAED,qBAAa,SAAS;aASgB,UAAU,EAAE,UAAU;IAR1D,MAAM,CAAC,KAAK;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC;IAIpD,OAAO;CACR"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAW,KAAK,EAAE,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEhE,6FAA6F;AAC7F,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC;AAE9B,oBAAY,kBAAkB;IAC5B,GAAG,IAAI;IACP,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAED,qBAAa,cAAc;aA0BP,QAAQ,EAAE,WAAW;aACrB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,SAAS;IA3BjC,MAAM,CAAC,KAAK;;;;QAkBT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,cAAc,CAAC;IAInE,OAAO;CAKR;AAED,qBAAa,SAAS;aASgB,UAAU,EAAE,UAAU;IAR1D,MAAM,CAAC,KAAK;;QAET;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC;IAIpD,OAAO;CACR"}

package/packages/jam/block/work-item.d.ts

@@ -8,6 +8,19 @@ import type { ServiceGas, ServiceId } from "./common.js";
 import type { CodeHash } from "./hash.js";
 import { MAX_NUMBER_OF_SEGMENTS, type SegmentIndex } from "./work-item-segment.js";
 type WorkItemExtrinsicHash = Opaque<OpaqueHash, "ExtrinsicHash">;
+/**
+ * An opaque piece of data that the work item brings in.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/1a1b001a1d00?v=0.7.2
+ */
+export type WorkItemExtrinsic = Opaque<BytesBlob, "Extrinsic">;
+/**
+ * Extrinsics that are needed by all [`WorkItem`]s and are specified via [`WorkItemExtrinsicSpec`].
+ *
+ * This is a flat-package of all extrinsics in a work package across all work items.
+ * For encoding it also requires the length of items to be known in advance.
+ */
+export type WorkPackageExtrinsics = KnownSizeArray<Bytes<U32>, "Count of all extrinsics within work items in a work package">;
 /**
  * Definition of data segment that was exported by some work package earlier
  * and now is being imported by another work-item.
@@ -40,10 +53,6 @@ export declare class WorkItemExtrinsicSpec extends WithDebug {
     static create({ hash, len }: CodecRecord<WorkItemExtrinsicSpec>): WorkItemExtrinsicSpec;
     private constructor();
 }
-/**
- * Extrinsics that are needed by [`WorkItem`]s and are specified via [`WorkItemExtrinsicSpec`].
- */
-export type WorkItemExtrinsics = KnownSizeArray<Bytes<U32>, "Count of all extrinsics within work items in a work package">;
 /**
  * To encode/decode extrinsics that are specified via [`WorkItemExtrinsicSpec`]
  * we need to know their lenghts. Hence this is created dynamically.

package/packages/jam/block/work-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-item.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-item.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAU,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnF,KAAK,qBAAqB,GAAG,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AAEjE;;;GAGG;AACH,qBAAa,UAAW,SAAQ,SAAS;IAWrC;;;OAGG;aACa,QAAQ,EAAE,UAAU;IACpC,2CAA2C;aAC3B,KAAK,EAAE,YAAY;IAhBrC,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC;IAI1D,OAAO;CAWR;AAED,gDAAgD;AAChD,qBAAa,qBAAsB,SAAQ,SAAS;IAWhD,+FAA+F;aAC/E,IAAI,EAAE,qBAAqB;IAC3C,2DAA2D;aAC3C,GAAG,EAAE,GAAG;IAb1B,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAI/D,OAAO;CAQR;AACD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAC7C,KAAK,CAAC,GAAG,CAAC,EACV,6DAA6D,CAC9D,CAAC;AAEF;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,qSAgC5D;AAED;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,SAAS;IAuCnC,2BAA2B;aACX,OAAO,EAAE,SAAS;IAClC;;;;;OAKG;aACa,QAAQ,EAAE,QAAQ;IAClC,wBAAwB;aACR,OAAO,EAAE,SAAS;IAClC,sCAAsC;aACtB,cAAc,EAAE,UAAU;IAC1C,0CAA0C;aAC1B,kBAAkB,EAAE,UAAU;IAC9C,wFAAwF;aACxE,cAAc,EAAE,cAAc,CAAC,UAAU,EAAE,aAAa,OAAO,sBAAsB,EAAE,CAAC;IACxG,8EAA8E;aAC9D,SAAS,EAAE,qBAAqB,EAAE;IAClD,+DAA+D;aAC/C,WAAW,EAAE,GAAG;IA1DlC,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;QAaT;IAEH,MAAM,CAAC,MAAM,CAAC,EACZ,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,WAAW,GACZ,EAAE,WAAW,CAAC,QAAQ,CAAC;IAaxB,OAAO;CAyBR"}
+{"version":3,"file":"work-item.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-item.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAU,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnF,KAAK,qBAAqB,GAAG,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AAEjE;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,GAAG,cAAc,CAChD,KAAK,CAAC,GAAG,CAAC,EACV,6DAA6D,CAC9D,CAAC;AAEF;;;GAGG;AACH,qBAAa,UAAW,SAAQ,SAAS;IAWrC;;;OAGG;aACa,QAAQ,EAAE,UAAU;IACpC,2CAA2C;aAC3B,KAAK,EAAE,YAAY;IAhBrC,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC;IAI1D,OAAO;CAWR;AAED,gDAAgD;AAChD,qBAAa,qBAAsB,SAAQ,SAAS;IAWhD,+FAA+F;aAC/E,IAAI,EAAE,qBAAqB;IAC3C,2DAA2D;aAC3C,GAAG,EAAE,GAAG;IAb1B,MAAM,CAAC,KAAK;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAI/D,OAAO;CAQR;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,qSAgC5D;AAED;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,SAAS;IAuCnC,2BAA2B;aACX,OAAO,EAAE,SAAS;IAClC;;;;;OAKG;aACa,QAAQ,EAAE,QAAQ;IAClC,wBAAwB;aACR,OAAO,EAAE,SAAS;IAClC,sCAAsC;aACtB,cAAc,EAAE,UAAU;IAC1C,0CAA0C;aAC1B,kBAAkB,EAAE,UAAU;IAC9C,wFAAwF;aACxE,cAAc,EAAE,cAAc,CAAC,UAAU,EAAE,aAAa,OAAO,sBAAsB,EAAE,CAAC;IACxG,8EAA8E;aAC9D,SAAS,EAAE,qBAAqB,EAAE;IAClD,+DAA+D;aAC/C,WAAW,EAAE,GAAG;IA1DlC,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;QAaT;IAEH,MAAM,CAAC,MAAM,CAAC,EACZ,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,WAAW,GACZ,EAAE,WAAW,CAAC,QAAQ,CAAC;IAaxB,OAAO;CAyBR"}

package/packages/jam/block/work-result.d.ts

@@ -45,11 +45,9 @@ export declare class WorkExecResult extends WithDebug {
     /** Optional octet sequence - available only if `kind === ok` */
     readonly okBlob: BytesBlob | null;
     static Codec: import("@typeberry/codec").Descriptor<WorkExecResult, WorkExecResultUnion>;
-    constructor(
-    /** The execution result tag. */
-    kind: WorkExecResultKind, 
-    /** Optional octet sequence - available only if `kind === ok` */
-    okBlob?: BytesBlob | null);
+    static ok(blob: BytesBlob): WorkExecResult;
+    static error(kind: Exclude<WorkExecResultKind, WorkExecResultKind.ok>): WorkExecResult;
+    private constructor();
 }
 /**
  * Five fields describing the level of activity which this workload

package/packages/jam/block/work-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-result.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,wDAAwD;AACxD,oBAAY,kBAAkB;IAC5B,6EAA6E;IAC7E,EAAE,IAAI;IACN,yDAAyD;IACzD,QAAQ,IAAI;IACZ,2CAA2C;IAC3C,KAAK,IAAI;IACT,8DAA8D;IAC9D,wBAAwB,IAAI;IAC5B,wFAAwF;IACxF,YAAY,IAAI;IAChB,iEAAiE;IACjE,OAAO,IAAI;IACX,0EAA0E;IAC1E,YAAY,IAAI;CACjB;AAED,KAAK,mBAAmB,GACpB;IAAE,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,kBAAkB,CAAC,QAAQ,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,kBAAkB,CAAC,wBAAwB,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,kBAAkB,CAAC,YAAY,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,kBAAkB,CAAC,YAAY,CAAA;CAAE,CAAC;AAE9C,iDAAiD;AACjD,qBAAa,cAAe,SAAQ,SAAS;IAsBzC,gCAAgC;aAChB,IAAI,EAAE,kBAAkB;IACxC,gEAAgE;aAChD,MAAM,EAAE,SAAS,GAAG,IAAI;IAxB1C,MAAM,CAAC,KAAK,6EAkBR;;IAGF,gCAAgC;IAChB,IAAI,EAAE,kBAAkB;IACxC,gEAAgE;IAChD,MAAM,GAAE,SAAS,GAAG,IAAW;CAIlD;AAED;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,SAAS;IAoBzC,wDAAwD;aACxC,OAAO,EAAE,UAAU;IACnC,4CAA4C;aAC5B,gBAAgB,EAAE,GAAG;IACrC,+DAA+D;aAC/C,cAAc,EAAE,GAAG;IACnC,6DAA6D;aAC7C,aAAa,EAAE,GAAG;IAClC,4CAA4C;aAC5B,gBAAgB,EAAE,GAAG;IA5BvC,MAAM,CAAC,KAAK;;;;;;QAMT;IAEH,MAAM,CAAC,MAAM,CAAC,EACZ,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,GACjB,EAAE,WAAW,CAAC,cAAc,CAAC;IAI9B,OAAO;CAcR;AAED;;;;GAIG;AACH,qBAAa,UAAU;IAenB,wFAAwF;aACxE,SAAS,EAAE,SAAS;IACpC,0EAA0E;aAC1D,QAAQ,EAAE,QAAQ;IAClC;;;;;;OAMG;aACa,WAAW,EAAE,UAAU;IACvC;;;;;OAKG;aACa,GAAG,EAAE,UAAU;IAC/B,6DAA6D;aAC7C,MAAM,EAAE,cAAc;IACtC;;;;;;OAMG;aACa,IAAI,EAAE,cAAc;IA1CtC,MAAM,CAAC,KAAK;;;;;;;;;;;;;QAOT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC;IAI9F,OAAO;CA+BR"}
+{"version":3,"file":"work-result.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block/work-result.ts"],"names":[],"mappings":"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"}

package/packages/jam/block/work-result.js

@@ -40,6 +40,12 @@ export class WorkExecResult extends WithDebug {
         }
         return { kind: x.kind };
     }, (x) => new WorkExecResult(x.kind, x.kind === WorkExecResultKind.ok ? x.okBlob : null));
+    static ok(blob) {
+        return new WorkExecResult(WorkExecResultKind.ok, blob);
+    }
+    static error(kind) {
+        return new WorkExecResult(kind, null);
+    }
     constructor(
     /** The execution result tag. */
     kind, 

package/packages/jam/block-json/work-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-result.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block-json/work-result.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsD,UAAU,EAAE,MAAM,iCAAiC,CAAC;AA6EjH,eAAO,MAAM,kBAAkB,0EAkB9B,CAAC"}
+{"version":3,"file":"work-result.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/block-json/work-result.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsD,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAkFjH,eAAO,MAAM,kBAAkB,0EAkB9B,CAAC"}

package/packages/jam/block-json/work-result.js

@@ -15,22 +15,22 @@ const workExecResultFromJson = json.object({
 }, (val) => {
     const { ok, out_of_gas, panic, bad_code, code_oversize, output_oversize } = val;
     if (ok !== undefined) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.ok), ok);
+        return WorkExecResult.ok(ok);
     }
     if (out_of_gas === null) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.outOfGas));
+        return WorkExecResult.error(WorkExecResultKind.outOfGas);
     }
     if (panic === null) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.panic));
+        return WorkExecResult.error(WorkExecResultKind.panic);
     }
     if (bad_code === null) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.badCode));
+        return WorkExecResult.error(WorkExecResultKind.badCode);
     }
     if (code_oversize === null) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.codeOversize));
+        return WorkExecResult.error(WorkExecResultKind.codeOversize);
     }
     if (output_oversize === null) {
-        return new WorkExecResult(tryAsU32(WorkExecResultKind.digestTooBig));
+        return WorkExecResult.error(WorkExecResultKind.digestTooBig);
     }
     throw new Error("Invalid WorkExecResult");
 });

package/packages/jam/database-lmdb/states.test.js

@@ -6,8 +6,7 @@ import { Bytes, BytesBlob } from "#@typeberry/bytes";
 import { SortedSet } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
-import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { MAX_VALUE } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
+import { MAX_VALUE_U32, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { InMemoryState, LookupHistoryItem, PrivilegedServices, ServiceAccountInfo, tryAsLookupHistorySlots, tryAsPerCore, UpdateService, } from "#@typeberry/state";
 import { testState } from "#@typeberry/state/test.utils.js";
 import { StateEntries } from "#@typeberry/state-merkleization";
@@ -74,7 +73,9 @@ describe("LMDB States database", () => {
                     manager: tryAsServiceId(1),
                     assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(2)), spec),
                     delegator: tryAsServiceId(3),
-                    registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? tryAsServiceId(4) : tryAsServiceId(MAX_VALUE),
+                    registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
+                        ? tryAsServiceId(4)
+                        : tryAsServiceId(MAX_VALUE_U32),
                     autoAccumulateServices: new Map(),
                 }),
                 updated: new Map([

package/packages/jam/executor/index.d.ts

@@ -0,0 +1,4 @@
+export type { ReturnValue } from "#@typeberry/pvm-host-calls";
+export { ReturnStatus } from "#@typeberry/pvm-host-calls";
+export * from "./pvm-executor.js";
+//# sourceMappingURL=index.d.ts.map

package/packages/jam/executor/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/executor/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,cAAc,mBAAmB,CAAC"}

package/packages/jam/executor/index.js

@@ -0,0 +1,2 @@
+export { ReturnStatus } from "#@typeberry/pvm-host-calls";
+export * from "./pvm-executor.js";

package/packages/jam/{transition/accumulate → executor}/pvm-executor.d.ts

@@ -1,10 +1,14 @@
-import type { ServiceId } from "#@typeberry/block";
+import { type ServiceGas, type ServiceId } from "#@typeberry/block";
 import type { BytesBlob } from "#@typeberry/bytes";
 import type { ChainSpec, PvmBackend } from "#@typeberry/config";
 import { general } from "#@typeberry/jam-host-calls";
 import type { PartialState } from "#@typeberry/jam-host-calls/externalities/partial-state.js";
-import type { Gas } from "#@typeberry/pvm-interface";
-type AccumulateHostCallExternalities = {
+import { type RefineExternalities } from "#@typeberry/jam-host-calls/externalities/refine-externalities.js";
+export type RefineHostCallExternalities = {
+    refine: RefineExternalities;
+    fetchExternalities: general.IFetchExternalities;
+};
+export type AccumulateHostCallExternalities = {
     partialState: PartialState;
     fetchExternalities: general.IFetchExternalities;
     serviceExternalities: general.AccountsInfo & general.AccountsLookup & general.AccountsWrite & general.AccountsRead;
@@ -23,6 +27,8 @@ export declare class PvmExecutor {
     private hostCalls;
     private constructor();
     private static prepareBackend;
+    /** Prepare refine host call handlers */
+    private static prepareRefineHostCalls;
     /** Prepare accumulation host call handlers */
     private static prepareAccumulateHostCalls;
     /** Prepare on transfer host call handlers */
@@ -32,21 +38,18 @@ export declare class PvmExecutor {
      *
      * @param args additional arguments that will be placed in PVM memory before execution
      * @param gas gas limit
-     * @returns `ReturnValue` object that can be a status or memory slice
+     * @returns `ReturnValue` object containing consumed gas, status and an optional memory slice
      */
-    run(args: BytesBlob, gas: Gas): Promise<{
-        consumedGas: Gas;
-        status: import("@typeberry/pvm-interface").Status | null;
-        memorySlice: Uint8Array | null;
-        hasMemorySlice(): this is /*elided*/ any & {
-            status: null;
-            memorySlice: Uint8Array;
-        };
-        hasStatus(): this is /*elided*/ any & {
-            status: import("@typeberry/pvm-interface").Status;
-            memorySlice: null;
-        };
+    run(args: BytesBlob, gas: ServiceGas): Promise<{
+        consumedGas: bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">;
+        status: import("@typeberry/pvm-host-calls").ReturnStatus.OK;
+        memorySlice: Uint8Array;
+    } | {
+        consumedGas: bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">;
+        status: import("@typeberry/pvm-host-calls").ReturnStatus.OOG | import("@typeberry/pvm-host-calls").ReturnStatus.PANIC;
     }>;
+    /** A utility function that can be used to prepare refine executor */
+    static createRefineExecutor(serviceId: ServiceId, serviceCode: BytesBlob, externalities: RefineHostCallExternalities, pvm: PvmBackend): Promise<PvmExecutor>;
     /** A utility function that can be used to prepare accumulate executor */
     static createAccumulateExecutor(serviceId: ServiceId, serviceCode: BytesBlob, externalities: AccumulateHostCallExternalities, chainSpec: ChainSpec, pvm: PvmBackend): Promise<PvmExecutor>;
     /** A utility function that can be used to prepare on transfer executor */

package/packages/jam/executor/pvm-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pvm-executor.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/executor/pvm-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAmB,MAAM,kBAAkB,CAAC;AACpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAc,OAAO,EAAU,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0DAA0D,CAAC;AAC7F,OAAO,EAEL,KAAK,mBAAmB,EAEzB,MAAM,iEAAiE,CAAC;AAuCzE,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAChD,oBAAoB,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;CACpH,CAAC;AAEF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAC3G,kBAAkB,EAAE,OAAO,CAAC,mBAAmB,CAAC;CACjD,CAAC;AAUF;;GAEG;AACH,qBAAa,WAAW;IAKpB,OAAO,CAAC,WAAW;IAEnB,OAAO,CAAC,UAAU;IANpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO;mBAac,cAAc;IAInC,wCAAwC;IACxC,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAerC,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAuBzC,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAazC;;;;;;OAMG;IACG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU;;;;;;;;IAQ1C,qEAAqE;WACxD,oBAAoB,CAC/B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,2BAA2B,EAC1C,GAAG,EAAE,UAAU;IAOjB,yEAAyE;WAC5D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,UAAU;IAQjB,0EAA0E;WAC7D,wBAAwB,CACnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,+BAA+B,EAC9C,GAAG,EAAE,UAAU;CAMlB"}

package/packages/jam/{transition/accumulate → executor}/pvm-executor.js

@@ -1,6 +1,26 @@
-import { accumulate, general } from "#@typeberry/jam-host-calls";
+import { tryAsServiceGas } from "#@typeberry/block";
+import { accumulate, general, refine } from "#@typeberry/jam-host-calls";
 import { tryAsProgramCounter, } from "#@typeberry/jam-host-calls/externalities/refine-externalities.js";
 import { HostCalls, HostCallsExecutor, PvmInstanceManager } from "#@typeberry/pvm-host-calls";
+import { tryAsGas } from "#@typeberry/pvm-interface";
+/**
+ * Refine-specific host calls with common constructor.
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/2fa7022fa702?v=0.7.2
+ */
+const REFINE_HOST_CALL_CLASSES = [
+    refine.HistoricalLookup,
+    refine.Export,
+    refine.Machine,
+    refine.Peek,
+    refine.Poke,
+    refine.Pages,
+    refine.Invoke,
+    refine.Expunge,
+];
+/**
+ * Accumulate-specific host calls with common constructor.
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/30d00130d001?v=0.7.2
+ */
 const ACCUMULATE_HOST_CALL_CLASSES = [
     accumulate.Bless,
     accumulate.Assign,
@@ -21,6 +41,7 @@ var entrypoint;
     entrypoint.IS_AUTHORIZED = tryAsProgramCounter(0);
     entrypoint.REFINE = tryAsProgramCounter(0);
     entrypoint.ACCUMULATE = tryAsProgramCounter(5);
+    /** @deprecated since 0.7.1 */
     entrypoint.ON_TRANSFER = tryAsProgramCounter(10);
 })(entrypoint || (entrypoint = {}));
 /**
@@ -43,9 +64,21 @@ export class PvmExecutor {
     static async prepareBackend(pvm) {
         return PvmInstanceManager.new(pvm);
     }
+    /** Prepare refine host call handlers */
+    static prepareRefineHostCalls(serviceId, externalities) {
+        const refineHandlers = REFINE_HOST_CALL_CLASSES.map((HandlerClass) => new HandlerClass(externalities.refine));
+        /** https://graypaper.fluffylabs.dev/#/ab2cdbd/2fa7022fa702?v=0.7.2 */
+        const generalHandlers = [
+            new general.LogHostCall(serviceId),
+            new general.GasHostCall(serviceId),
+            new general.Fetch(serviceId, externalities.fetchExternalities),
+        ];
+        return refineHandlers.concat(generalHandlers);
+    }
     /** Prepare accumulation host call handlers */
     static prepareAccumulateHostCalls(serviceId, externalities, chainSpec) {
         const accumulateHandlers = ACCUMULATE_HOST_CALL_CLASSES.map((HandlerClass) => new HandlerClass(serviceId, externalities.partialState, chainSpec));
+        /** https://graypaper.fluffylabs.dev/#/ab2cdbd/30d00130d001?v=0.7.2 */
         const generalHandlers = [
             new general.LogHostCall(serviceId),
             new general.GasHostCall(serviceId),
@@ -75,10 +108,20 @@ export class PvmExecutor {
      *
      * @param args additional arguments that will be placed in PVM memory before execution
      * @param gas gas limit
-     * @returns `ReturnValue` object that can be a status or memory slice
+     * @returns `ReturnValue` object containing consumed gas, status and an optional memory slice
      */
     async run(args, gas) {
-        return this.pvm.runProgram(this.serviceCode.raw, args.raw, Number(this.entrypoint), gas);
+        const ret = await this.pvm.runProgram(this.serviceCode.raw, args.raw, Number(this.entrypoint), tryAsGas(gas));
+        return {
+            ...ret,
+            consumedGas: tryAsServiceGas(ret.consumedGas),
+        };
+    }
+    /** A utility function that can be used to prepare refine executor */
+    static async createRefineExecutor(serviceId, serviceCode, externalities, pvm) {
+        const hostCallHandlers = PvmExecutor.prepareRefineHostCalls(serviceId, externalities);
+        const instances = await PvmExecutor.prepareBackend(pvm);
+        return new PvmExecutor(serviceCode, hostCallHandlers, entrypoint.REFINE, instances);
     }
     /** A utility function that can be used to prepare accumulate executor */
     static async createAccumulateExecutor(serviceId, serviceCode, externalities, chainSpec, pvm) {

package/packages/jam/in-core/externalities/refine.d.ts

@@ -0,0 +1,24 @@
+import type { Segment, SegmentIndex, ServiceId } from "#@typeberry/block";
+import type { BytesBlob } from "#@typeberry/bytes";
+import type { Blake2bHash } from "#@typeberry/hash";
+import type { MachineId, MachineResult, MemoryOperation, NoMachineError, PagesError, PeekPokeError, ProgramCounter, RefineExternalities, SegmentExportError, ZeroVoidError } from "#@typeberry/jam-host-calls";
+import type { U64 } from "#@typeberry/numbers";
+import type { HostCallMemory, HostCallRegisters } from "#@typeberry/pvm-host-calls";
+import type { BigGas } from "#@typeberry/pvm-interface";
+import type { ProgramDecoderError } from "#@typeberry/pvm-interpreter";
+import type { OK, Result } from "#@typeberry/utils";
+export declare class RefineExternalitiesImpl implements RefineExternalities {
+    static create(): RefineExternalitiesImpl;
+    private constructor();
+    machineExpunge(_machineIndex: MachineId): Promise<Result<ProgramCounter, NoMachineError>>;
+    machinePages(_machineIndex: MachineId, _pageStart: U64, _pageCount: U64, _requestType: MemoryOperation | null): Promise<Result<OK, PagesError>>;
+    machineVoidPages(_machineIndex: MachineId, _pageStart: U64, _pageCount: U64): Promise<Result<OK, ZeroVoidError>>;
+    machineZeroPages(_machineIndex: MachineId, _pageStart: U64, _pageCount: U64): Promise<Result<OK, ZeroVoidError>>;
+    machinePeekFrom(_machineIndex: MachineId, _destinationStart: U64, _sourceStart: U64, _length: U64, _destination: HostCallMemory): Promise<Result<OK, PeekPokeError>>;
+    machinePokeInto(_machineIndex: MachineId, _sourceStart: U64, _destinationStart: U64, _length: U64, _source: HostCallMemory): Promise<Result<OK, PeekPokeError>>;
+    machineInit(_code: BytesBlob, _programCounter: ProgramCounter): Promise<Result<MachineId, ProgramDecoderError>>;
+    machineInvoke(_machineIndex: MachineId, _gas: BigGas, _registers: HostCallRegisters): Promise<Result<MachineResult, NoMachineError>>;
+    exportSegment(_segment: Segment): Result<SegmentIndex, SegmentExportError>;
+    historicalLookup(_serviceId: ServiceId | null, _hash: Blake2bHash): Promise<BytesBlob | null>;
+}
+//# sourceMappingURL=refine.d.ts.map

package/packages/jam/in-core/externalities/refine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/in-core/externalities/refine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,qBAAa,uBAAwB,YAAW,mBAAmB;IACjE,MAAM,CAAC,MAAM;IAIb,OAAO;IAEP,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAIzF,YAAY,CACV,aAAa,EAAE,SAAS,EACxB,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,GAAG,EACf,YAAY,EAAE,eAAe,GAAG,IAAI,GACnC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAIlC,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAIhH,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAIhH,eAAe,CACb,aAAa,EAAE,SAAS,EACxB,iBAAiB,EAAE,GAAG,EACtB,YAAY,EAAE,GAAG,EACjB,OAAO,EAAE,GAAG,EACZ,YAAY,EAAE,cAAc,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAIrC,eAAe,CACb,aAAa,EAAE,SAAS,EACxB,YAAY,EAAE,GAAG,EACjB,iBAAiB,EAAE,GAAG,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;IAIrC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAI/G,aAAa,CACX,aAAa,EAAE,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAIjD,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAI1E,gBAAgB,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;CAG9F"}

package/packages/jam/in-core/externalities/refine.js

@@ -0,0 +1,36 @@
+export class RefineExternalitiesImpl {
+    static create() {
+        return new RefineExternalitiesImpl();
+    }
+    constructor() { }
+    machineExpunge(_machineIndex) {
+        throw new Error("Method not implemented.");
+    }
+    machinePages(_machineIndex, _pageStart, _pageCount, _requestType) {
+        throw new Error("Method not implemented.");
+    }
+    machineVoidPages(_machineIndex, _pageStart, _pageCount) {
+        throw new Error("Method not implemented.");
+    }
+    machineZeroPages(_machineIndex, _pageStart, _pageCount) {
+        throw new Error("Method not implemented.");
+    }
+    machinePeekFrom(_machineIndex, _destinationStart, _sourceStart, _length, _destination) {
+        throw new Error("Method not implemented.");
+    }
+    machinePokeInto(_machineIndex, _sourceStart, _destinationStart, _length, _source) {
+        throw new Error("Method not implemented.");
+    }
+    machineInit(_code, _programCounter) {
+        throw new Error("Method not implemented.");
+    }
+    machineInvoke(_machineIndex, _gas, _registers) {
+        throw new Error("Method not implemented.");
+    }
+    exportSegment(_segment) {
+        throw new Error("Method not implemented.");
+    }
+    historicalLookup(_serviceId, _hash) {
+        throw new Error("Method not implemented.");
+    }
+}