@typeberry/lib 0.5.10-ec38e0b → 0.5.11-10b197e

package/packages/core/trie/trie.js

@@ -11,7 +11,7 @@ export class InMemoryTrie {
     root;
     /** Create an empty in-memory trie. */
     static empty(hasher) {
-        return new InMemoryTrie(new WriteableNodesDb(hasher));
+        return new InMemoryTrie(WriteableNodesDb.new(hasher));
     }
     /** Given a collection of leaves, compute the state root. */
     static computeStateRoot(hasher, leaves) {
@@ -99,7 +99,7 @@ export class InMemoryTrie {
     static fromLeaves(hasher, leaves) {
         // TODO [ToDr] [opti] Pair up the leaves and build upper levels.
         let root = null;
-        const nodes = new WriteableNodesDb(hasher);
+        const nodes = WriteableNodesDb.new(hasher);
         for (const leaf of leaves) {
             root = trieInsert(root, nodes, leaf);
         }

package/packages/extensions/ipc/index.js

@@ -20,7 +20,7 @@ export var FuzzVersion;
 export function startFuzzTarget(version, socket, api) {
     const socketName = socket ?? "jam_target.sock";
     if (version === FuzzVersion.V1) {
-        return startIpcServer(socketName, (sender) => new v1.FuzzTarget(new FuzzHandler(api), sender, api.chainSpec));
+        return startIpcServer(socketName, (sender) => v1.FuzzTarget.new(FuzzHandler.new(api), sender, api.chainSpec));
     }
     assertNever(version);
 }
@@ -43,13 +43,16 @@ function startJamnpExtension(api) {
     };
     const getKeyValuePairs = (_hash, startKey) => {
         const value = BytesBlob.blobFromNumbers([255, 255, 0, 0]);
-        return [new ce129.KeyValuePair(startKey, value)];
+        return [ce129.KeyValuePair.new(startKey, value)];
     };
     return startJamnpIpcServer(api.nodeName, api.chainSpec, announcements, getHandshake, getBoundaryNodes, getKeyValuePairs);
 }
 const logger = Logger.new(import.meta.filename, "ext-ipc");
 class FuzzHandler {
     api;
+    static new(api) {
+        return new FuzzHandler(api);
+    }
     constructor(api) {
         this.api = api;
     }

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

@@ -14,7 +14,8 @@ export declare class JamnpIpcHandler implements IpcHandler {
     private readonly streamHandlers;
     /** termination promise + resolvers */
     private readonly onEnd;
-    constructor(sender: IpcSender);
+    static new(sender: IpcSender): JamnpIpcHandler;
+    private constructor();
     /** Register stream handlers. */
     registerStreamHandlers(...handlers: StreamHandler[]): void;
     /** Re-use an existing stream of given kind if present. */
@@ -34,7 +35,8 @@ declare class EnvelopeSender implements StreamMessageSender {
     private readonly ipcStreamId;
     private readonly sender;
     readonly streamId: StreamId;
-    constructor(ipcStreamId: IpcStreamId, sender: IpcSender);
+    static new(ipcStreamId: IpcStreamId, sender: IpcSender): EnvelopeSender;
+    private constructor();
     open(newStream: NewStream): void;
     bufferAndSend(msg: BytesBlob): boolean;
     close(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,YAAY,EACjB,KAAK,mBAAmB,EAEzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAsC,MAAM,aAAa,CAAC;AAS9F,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;AAWhF,qBAAa,eAAgB,YAAW,UAAU;IAUpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IATnC,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IACtE,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwC;IACvE,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,sCAAsC;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;gBAED,MAAM,EAAE,SAAS;IAe9C,gCAAgC;IAChC,sBAAsB,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE;IAMnD,0DAA0D;IAC1D,gBAAgB,CAAC,QAAQ,SAAS,aAAa,EAC7C,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAClC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IAWP,uCAAuC;IACvC,aAAa,CAAC,QAAQ,SAAS,aAAa,EAC1C,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IA2BP,8CAA8C;IACxC,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmErD,yDAAyD;IACzD,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAkBpC,qEAAqE;IACrE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B;AAED,cAAM,cAAe,YAAW,mBAAmB;IAI/C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,SAAgB,QAAQ,EAAE,QAAQ,CAAC;gBAGhB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,SAAS;IAKpC,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,aAAa,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAWtC,KAAK,IAAI,IAAI;CAYd"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/extensions/ipc/jamnp/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,YAAY,EACjB,KAAK,mBAAmB,EAEzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAE,SAAS,EAAsC,MAAM,aAAa,CAAC;AAS9F,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;AAWhF,qBAAa,eAAgB,YAAW,UAAU;IAc5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAb3C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IACtE,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwC;IACvE,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,sCAAsC;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAE9B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS;IAI5B,OAAO;IAeP,gCAAgC;IAChC,sBAAsB,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE;IAMnD,0DAA0D;IAC1D,gBAAgB,CAAC,QAAQ,SAAS,aAAa,EAC7C,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAClC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IAWP,uCAAuC;IACvC,aAAa,CAAC,QAAQ,SAAS,aAAa,EAC1C,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,GACxD,IAAI;IA2BP,8CAA8C;IACxC,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmErD,yDAAyD;IACzD,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAkBpC,qEAAqE;IACrE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B;AAED,cAAM,cAAe,YAAW,mBAAmB;IAQ/C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IAEnC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS;IAItD,OAAO;IAOP,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,aAAa,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAWtC,KAAK,IAAI,IAAI;CAYd"}

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

@@ -20,6 +20,9 @@ export class JamnpIpcHandler {
     streamHandlers = new Map();
     /** termination promise + resolvers */
     onEnd;
+    static new(sender) {
+        return new JamnpIpcHandler(sender);
+    }
     constructor(sender) {
         this.sender = sender;
         let resolve = () => { };
@@ -46,7 +49,7 @@ export class JamnpIpcHandler {
         // find first stream id with given kind
         for (const [ipcStreamId, handler] of this.streams.entries()) {
             if (handler.kind === streamKind) {
-                work(handler, new EnvelopeSender(ipcStreamId, this.sender));
+                work(handler, EnvelopeSender.new(ipcStreamId, this.sender));
                 return;
             }
         }
@@ -71,7 +74,7 @@ export class JamnpIpcHandler {
         // register the stream
         this.streams.set(ipcStreamId, handler);
         this.pendingStreams.set(ipcStreamId, true);
-        const sender = new EnvelopeSender(ipcStreamId, this.sender);
+        const sender = EnvelopeSender.new(ipcStreamId, this.sender);
         sender.open(NewStream.create({ streamByte: kind }));
         work(handler, sender);
     }
@@ -83,7 +86,7 @@ export class JamnpIpcHandler {
         logger.log `[${ipcStreamId}] incoming message: ${envelope.type} ${envelope.data}`;
         // check if this is a already known stream id
         const streamHandler = this.streams.get(ipcStreamId);
-        const streamSender = new EnvelopeSender(ipcStreamId, this.sender);
+        const streamSender = EnvelopeSender.new(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.
@@ -165,6 +168,9 @@ class EnvelopeSender {
     ipcStreamId;
     sender;
     streamId;
+    static new(ipcStreamId, sender) {
+        return new EnvelopeSender(ipcStreamId, sender);
+    }
     constructor(ipcStreamId, sender) {
         this.ipcStreamId = ipcStreamId;
         this.sender = sender;

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

@@ -4,7 +4,7 @@ import { JamnpIpcHandler } from "./handler.js";
 /** An IPC endpoint exposing network-like messaging protocol. */
 export function startJamnpIpcServer(nodeName, chainSpec, announcements, getHandshake, getBoundaryNodes, getKeyValuePairs) {
     return startIpcServer(`typeberry-jamnp-${nodeName}`, (sender) => {
-        const handler = new JamnpIpcHandler(sender);
+        const handler = JamnpIpcHandler.new(sender);
         // Send block announcements
         const listener = (announcement) => {
             if (announcement instanceof up0.Announcement) {
@@ -20,8 +20,8 @@ export function startJamnpIpcServer(nodeName, chainSpec, announcements, getHands
         handler.waitForEnd().finally(() => {
             announcements.off(listener);
         });
-        handler.registerStreamHandlers(new up0.Handler(chainSpec, getHandshake, () => { }, () => { }));
-        handler.registerStreamHandlers(new ce129.Handler(true, getBoundaryNodes, getKeyValuePairs));
+        handler.registerStreamHandlers(up0.Handler.new(chainSpec, getHandshake, () => { }, () => { }));
+        handler.registerStreamHandlers(ce129.Handler.new(true, getBoundaryNodes, getKeyValuePairs));
         return handler;
     });
 }

package/packages/extensions/ipc/server.d.ts

@@ -4,7 +4,8 @@ import type { IpcHandler } from "#@typeberry/fuzz-proto";
 /** Sending data abstraction on a socket. */
 export declare class IpcSender {
     private readonly socket;
-    constructor(socket: Socket);
+    static new(socket: Socket): IpcSender;
+    private constructor();
     /** Write given data to the outgoing socket. */
     send(data: BytesBlob): void;
     /** Close the socket. */

package/packages/extensions/ipc/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../packages/extensions/ipc/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAIrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD,4CAA4C;AAC5C,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAE3C,+CAA+C;IAC/C,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAI3B,wBAAwB;IACxB,KAAK,IAAI,IAAI;CAGd;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,UAAU,cAiFhG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../packages/extensions/ipc/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAIrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD,4CAA4C;AAC5C,qBAAa,SAAS;IAKA,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJ3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM;IAIzB,OAAO;IAEP,+CAA+C;IAC/C,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAI3B,wBAAwB;IACxB,KAAK,IAAI,IAAI;CAGd;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,UAAU,cAiFhG"}

package/packages/extensions/ipc/server.js

@@ -7,6 +7,9 @@ import { encodeMessageLength, handleMessageFragmentation } from "#@typeberry/net
 /** Sending data abstraction on a socket. */
 export class IpcSender {
     socket;
+    static new(socket) {
+        return new IpcSender(socket);
+    }
     constructor(socket) {
         this.socket = socket;
     }
@@ -28,7 +31,7 @@ export function startIpcServer(name, newMessageHandler) {
     // Create the IPC server
     const server = createServer((socket) => {
         logger.log `Client connected`;
-        const messageHandler = newMessageHandler(new IpcSender(socket));
+        const messageHandler = newMessageHandler(IpcSender.new(socket));
         // Handle incoming data from the client
         socket.on("data", handleMessageFragmentation(async (data) => {
             try {

package/packages/jam/block/header.js

@@ -163,7 +163,7 @@ class HeaderViewWithHash extends WithHash {
         data: Header.Codec.View,
     });
     static create({ hash, data }) {
-        return new WithHash(hash, data);
+        return WithHash.new(hash, data);
     }
 }
 /** Encoding of header + hash. */

package/packages/jam/config/chain-spec.d.ts

@@ -78,7 +78,8 @@ export declare class ChainSpec extends WithDebug {
     readonly maxRefineGas: U64;
     /** `L`: The maximum age in timeslots of the lookup anchor. */
     readonly maxLookupAnchorAge: U32;
-    constructor(data: Omit<ChainSpec, "validatorsSuperMajority" | "thirdOfValidators" | "erasureCodedPieceSize">);
+    static new(data: Omit<ChainSpec, "validatorsSuperMajority" | "thirdOfValidators" | "erasureCodedPieceSize">): ChainSpec;
+    private constructor();
 }
 /** Set of values for "tiny" chain as defined in JAM test vectors. */
 export declare const tinyChainSpec: ChainSpec;

package/packages/jam/config/chain-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-spec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/config/chain-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,EAAE,EAAE,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,OAAO,CAAC;AACnC;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,MAAM,CAAC;AACjD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,MAAM,CAAC;AAC7B;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,MAAM,CAAC;AAEpC,+DAA+D;AAC/D,eAAO,MAAM,eAAe,OAAO,CAAC;AAEpC;;GAEG;AACH,qBAAa,SAAU,SAAQ,SAAS;IACtC,6CAA6C;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC;IAC9B,kCAAkC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAChC,sCAAsC;IACtC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,CAAC;IACtC,uBAAuB;IACvB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC;IACpC,yCAAyC;IACzC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC;IAC1B,kDAAkD;IAClD,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,sBAAsB,EAAE,EAAE,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAC7B,8DAA8D;IAC9D,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC;IACvC,gGAAgG;IAChG,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC;IACpC,8DAA8D;IAC9D,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAC3B,8DAA8D;IAC9D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC;gBAErB,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,yBAAyB,GAAG,mBAAmB,GAAG,uBAAuB,CAAC;CAqB7G;AAED,qEAAqE;AACrE,eAAO,MAAM,aAAa,WAiBxB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,WAexB,CAAC"}
+{"version":3,"file":"chain-spec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/config/chain-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,EAAE,EAAE,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,OAAO,CAAC;AACnC;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,MAAM,CAAC;AACjD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,MAAM,CAAC;AAC7B;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,MAAM,CAAC;AAEpC,+DAA+D;AAC/D,eAAO,MAAM,eAAe,OAAO,CAAC;AAEpC;;GAEG;AACH,qBAAa,SAAU,SAAQ,SAAS;IACtC,6CAA6C;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC;IAC9B,kCAAkC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;IAChC,sCAAsC;IACtC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,CAAC;IACtC,uBAAuB;IACvB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC;IACpC,yCAAyC;IACzC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC;IAC1B,kDAAkD;IAClD,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC;IACjC,4EAA4E;IAC5E,QAAQ,CAAC,sBAAsB,EAAE,EAAE,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAC7B,8DAA8D;IAC9D,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC;IACvC,gGAAgG;IAChG,QAAQ,CAAC,qBAAqB,EAAE,GAAG,CAAC;IACpC,8DAA8D;IAC9D,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAC3B,8DAA8D;IAC9D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC;IAEjC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,yBAAyB,GAAG,mBAAmB,GAAG,uBAAuB,CAAC;IAI3G,OAAO;CAuBR;AAED,qEAAqE;AACrE,eAAO,MAAM,aAAa,WAiBxB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,WAexB,CAAC"}

package/packages/jam/config/chain-spec.js

@@ -78,6 +78,9 @@ export class ChainSpec extends WithDebug {
     maxRefineGas;
     /** `L`: The maximum age in timeslots of the lookup anchor. */
     maxLookupAnchorAge;
+    static new(data) {
+        return new ChainSpec(data);
+    }
     constructor(data) {
         super();
         this.name = data.name;
@@ -100,7 +103,7 @@ export class ChainSpec extends WithDebug {
     }
 }
 /** Set of values for "tiny" chain as defined in JAM test vectors. */
-export const tinyChainSpec = new ChainSpec({
+export const tinyChainSpec = ChainSpec.new({
     name: "tiny",
     validatorsCount: tryAsU16(6),
     coresCount: tryAsU16(2),
@@ -122,7 +125,7 @@ export const tinyChainSpec = new ChainSpec({
  * Set of values for "full" chain as defined in JAM test vectors.
  * Please note that only validatorsCount and epochLength are "full", the rest is copied from "tiny".
  */
-export const fullChainSpec = new ChainSpec({
+export const fullChainSpec = ChainSpec.new({
     name: "full",
     validatorsCount: tryAsU16(1023),
     coresCount: tryAsU16(341),

package/packages/jam/config/network.d.ts

@@ -16,13 +16,8 @@ export declare class Bootnode implements PeerAddress {
     readonly ip: string;
     /** Port number on which the bootnode is listening for new connections */
     readonly port: number;
-    constructor(
-    /** Network address derived from the node's cryptographic public key (always 53-character?) */
-    id: PeerId, 
-    /** IP address (either IPv4 or IPv6) of the bootnode */
-    ip: string, 
-    /** Port number on which the bootnode is listening for new connections */
-    port: number);
+    static new(id: PeerId, ip: string, port: number): Bootnode;
+    private constructor();
     get host(): string;
     toString(): string;
 }

package/packages/jam/config/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/config/network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,eAAe;AACf,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE9C,+BAA+B;AAC/B,MAAM,MAAM,WAAW,GAAG;IACxB,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,sEAAsE;AACtE,qBAAa,QAAS,YAAW,WAAW;IAExC,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,yEAAyE;IACzE,QAAQ,CAAC,IAAI,EAAE,MAAM;;IALrB,8FAA8F;IACrF,EAAE,EAAE,MAAM;IACnB,uDAAuD;IAC9C,EAAE,EAAE,MAAM;IACnB,yEAAyE;IAChE,IAAI,EAAE,MAAM;IAGvB,IAAI,IAAI,WAEP;IAED,QAAQ;CAGT"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/config/network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,eAAe;AACf,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAE9C,+BAA+B;AAC/B,MAAM,MAAM,WAAW,GAAG;IACxB,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,sEAAsE;AACtE,qBAAa,QAAS,YAAW,WAAW;IAMxC,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,yEAAyE;IACzE,QAAQ,CAAC,IAAI,EAAE,MAAM;IAVvB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAI/C,OAAO;IASP,IAAI,IAAI,WAEP;IAED,QAAQ;CAGT"}

package/packages/jam/config/network.js

@@ -3,6 +3,9 @@ export class Bootnode {
     id;
     ip;
     port;
+    static new(id, ip, port) {
+        return new Bootnode(id, ip, port);
+    }
     constructor(
     /** Network address derived from the node's cryptographic public key (always 53-character?) */
     id, 

package/packages/jam/config-node/jip-chain-spec.js

@@ -17,7 +17,7 @@ export function parseBootnode(v) {
         throw new Error(`Invalid port number: "${port}"`);
     }
     // TODO [ToDr] we should probably validate the name!
-    return new Bootnode(asOpaqueType(name), ip, portNumber);
+    return Bootnode.new(asOpaqueType(name), ip, portNumber);
 }
 /**
  * Configuration file for any blockchain network built on the JAM protocol

package/packages/jam/database/blocks.test.js

@@ -24,7 +24,7 @@ describe("InMemoryDatabase", () => {
         const db = InMemoryBlocks.new();
         const block = testBlockView();
         const headerHash = blake2b.hashBytes(block.header.view().encoded()).asOpaque();
-        db.insertBlock(new WithHash(headerHash, block));
+        db.insertBlock(WithHash.new(headerHash, block));
         assert.deepStrictEqual(db.getHeader(headerHash)?.materialize(), block.header.materialize());
         assert.deepStrictEqual(db.getExtrinsic(headerHash)?.materialize(), block.extrinsic.materialize());
     });

package/packages/jam/database/states.d.ts

@@ -42,7 +42,8 @@ export declare class InMemoryStates implements StatesDb<InMemoryState> {
     private readonly spec;
     private readonly db;
     private readonly blake2b;
-    constructor(spec: ChainSpec);
+    static new(spec: ChainSpec): InMemoryStates;
+    private constructor();
     updateAndSetState(headerHash: HeaderHash, state: InMemoryState, update: Partial<State & ServicesUpdate>): Promise<Result<OK, StateUpdateError>>;
     getStateRoot(state: InMemoryState): Promise<StateRootHash>;
     /** Insert a full state into the database. */

package/packages/jam/database/states.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,KAAK,cAAc,EAAE,KAAK,KAAK,EAAe,MAAM,kBAAkB,CAAC;AAE/F,OAAO,EAAe,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE3D,0DAA0D;AAC1D,oBAAY,gBAAgB;IAC1B,oDAAoD;IACpD,QAAQ,IAAI;IACZ,iDAAiD;IACjD,MAAM,IAAI;CACX;AAED,wFAAwF;AACxF,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK;IACrC,qEAAqE;IACrE,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACpG;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK;IAC/C,4CAA4C;IAC5C,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE/C;;;;OAIG;IACH,iBAAiB,CACf,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEzC,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC;IAEvC,4EAA4E;IAC5E,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAErC,6CAA6C;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,qBAAa,cAAe,YAAW,QAAQ,CAAC,aAAa,CAAC;IAIhD,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAmE;IACtF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;gBAEd,IAAI,EAAE,SAAS;IAItC,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAgBlC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAKhE,6CAA6C;IACvC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAM7G,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAStD,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI9B,KAAK;CACZ"}
+{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,KAAK,cAAc,EAAE,KAAK,KAAK,EAAe,MAAM,kBAAkB,CAAC;AAE/F,OAAO,EAAe,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE3D,0DAA0D;AAC1D,oBAAY,gBAAgB;IAC1B,oDAAoD;IACpD,QAAQ,IAAI;IACZ,iDAAiD;IACjD,MAAM,IAAI;CACX;AAED,wFAAwF;AACxF,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK;IACrC,qEAAqE;IACrE,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACpG;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK;IAC/C,4CAA4C;IAC5C,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE/C;;;;OAIG;IACH,iBAAiB,CACf,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEzC,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC;IAEvC,4EAA4E;IAC5E,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAErC,6CAA6C;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,qBAAa,cAAe,YAAW,QAAQ,CAAC,aAAa,CAAC;IAQxC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAPzC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAmE;IACtF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAE3C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS;IAI1B,OAAO;IAID,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAgBlC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAKhE,6CAA6C;IACvC,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAM7G,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAStD,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI9B,KAAK;CACZ"}

package/packages/jam/database/states.js

@@ -15,6 +15,9 @@ export class InMemoryStates {
     spec;
     db = HashDictionary.new();
     blake2b;
+    static new(spec) {
+        return new InMemoryStates(spec);
+    }
     constructor(spec) {
         this.spec = spec;
         this.blake2b = Blake2b.createHasher();

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

@@ -7,7 +7,7 @@ import { deepEqual } from "#@typeberry/utils";
 import { InMemoryStates } from "./states.js";
 describe("InMemoryState", () => {
     it("should write and read some state", async () => {
-        const db = new InMemoryStates(tinyChainSpec);
+        const db = InMemoryStates.new(tinyChainSpec);
         const root = Bytes.parseBytes(TEST_STATE_ROOT, HASH_SIZE).asOpaque();
         deepEqual(db.getState(root), null);
         await db.insertInitialState(root, testState());

package/packages/jam/database-lmdb/blocks.d.ts

@@ -9,7 +9,8 @@ export declare class LmdbBlocks implements BlocksDb {
     private readonly extrinsics;
     private readonly headers;
     private readonly postStateRoots;
-    constructor(chainSpec: ChainSpec, root: LmdbRoot);
+    static new(chainSpec: ChainSpec, root: LmdbRoot): LmdbBlocks;
+    private constructor();
     setPostStateRoot(hash: HeaderHash, postStateRoot: StateRootHash): Promise<void>;
     getPostStateRoot(hash: HeaderHash): StateRootHash | null;
     insertBlock(block: WithHash<HeaderHash, BlockView>): Promise<void>;

package/packages/jam/database-lmdb/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAS,MAAM,WAAW,CAAC;AAQjD,qBAAa,UAAW,YAAW,QAAQ;IAMvC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IANvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;gBAGpB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,QAAQ;IAa3B,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQlD,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,iBAAiB,IAAI,UAAU;IAS/B,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;IAS9C,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQpD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAM5B,KAAK;CAGZ"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAElB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAS,MAAM,WAAW,CAAC;AAQjD,qBAAa,UAAW,YAAW,QAAQ;IAUvC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAVvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IAEvC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ;IAI/C,OAAO;IAeD,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQlD,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASlE,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,iBAAiB,IAAI,UAAU;IAS/B,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;IAS9C,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,IAAI;IAQpD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAM5B,KAAK;CAGZ"}

package/packages/jam/database-lmdb/blocks.js

@@ -13,6 +13,9 @@ export class LmdbBlocks {
     extrinsics;
     headers;
     postStateRoots;
+    static new(chainSpec, root) {
+        return new LmdbBlocks(chainSpec, root);
+    }
     constructor(chainSpec, root) {
         this.chainSpec = chainSpec;
         this.root = root;

package/packages/jam/database-lmdb/root.d.ts

@@ -3,7 +3,8 @@ export type SubDb = lmdb.Database<Uint8Array, lmdb.Key>;
 /** A thin abstraction over lmdb database interface. */
 export declare class LmdbRoot {
     readonly db: lmdb.RootDatabase<Uint8Array, lmdb.Key>;
-    constructor(dbPath: string, readOnly?: boolean);
+    static new(dbPath: string, readOnly?: boolean): LmdbRoot;
+    private constructor();
     /** Open a sub-database under the same path. */
     subDb(name: string): SubDb;
     /** Close the database and all sub-databases. */

package/packages/jam/database-lmdb/root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAExD,uDAAuD;AACvD,qBAAa,QAAQ;IACnB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBAEzC,MAAM,EAAE,MAAM,EAAE,QAAQ,UAAQ;IAS5C,+CAA+C;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAI1B,gDAAgD;IAC1C,KAAK;CAGZ"}
+{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAExD,uDAAuD;AACvD,qBAAa,QAAQ;IACnB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAErD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,UAAQ;IAI3C,OAAO;IASP,+CAA+C;IAC/C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK;IAI1B,gDAAgD;IAC1C,KAAK;CAGZ"}

package/packages/jam/database-lmdb/root.js

@@ -2,6 +2,9 @@ import * as lmdb from "lmdb";
 /** A thin abstraction over lmdb database interface. */
 export class LmdbRoot {
     db;
+    static new(dbPath, readOnly = false) {
+        return new LmdbRoot(dbPath, readOnly);
+    }
     constructor(dbPath, readOnly = false) {
         this.db = lmdb.open(dbPath, {
             compression: true,

package/packages/jam/database-lmdb/states.d.ts

@@ -61,7 +61,8 @@ export declare class LmdbStates implements StatesDb<SerializedState<LeafDb>>, In
     private readonly root;
     private readonly states;
     private readonly values;
-    constructor(spec: ChainSpec, blake2b: Blake2b, root: LmdbRoot);
+    static new(spec: ChainSpec, blake2b: Blake2b, root: LmdbRoot): LmdbStates;
+    private constructor();
     insertInitialState(headerHash: HeaderHash, serializedState: StateEntries): Promise<Result<OK, StateUpdateError>>;
     private updateAndCommit;
     updateAndSetState(headerHash: HeaderHash, state: SerializedState<LeafDb>, update: Partial<State & ServicesUpdate>): Promise<Result<OK, StateUpdateError>>;

package/packages/jam/database-lmdb/states.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,gBAAgB,EAAe,MAAM,qBAAqB,CAAC;AAC9G,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAgD,MAAM,gCAAgC,CAAC;AAG/G,OAAO,EAAE,EAAE,EAAE,MAAM,EAAkB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAS,MAAM,WAAW,CAAC;AAGjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,qBAAa,UAAW,YAAW,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC;IAK5F,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAGZ,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,QAAQ;IAM3B,kBAAkB,CACtB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAQ1B,eAAe;IA0BvB,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAWlC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAI1E,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI;IAsB1D,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI9B,KAAK;CAGZ"}
+{"version":3,"file":"states.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/database-lmdb/states.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,gBAAgB,EAAe,MAAM,qBAAqB,CAAC;AAC9G,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAgD,MAAM,gCAAgC,CAAC;AAG/G,OAAO,EAAE,EAAE,EAAE,MAAM,EAAkB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAS,MAAM,WAAW,CAAC;AAGjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,qBAAa,UAAW,YAAW,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC;IAS5F,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAVvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAE/B,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ;IAI5D,OAAO;IASD,kBAAkB,CACtB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAQ1B,eAAe;IA0BvB,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAWlC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAI1E,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI;IAsB1D,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI9B,KAAK;CAGZ"}

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

@@ -60,6 +60,9 @@ export class LmdbStates {
     root;
     states;
     values;
+    static new(spec, blake2b, root) {
+        return new LmdbStates(spec, blake2b, root);
+    }
     constructor(spec, blake2b, root) {
         this.spec = spec;
         this.blake2b = blake2b;

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

@@ -37,8 +37,8 @@ describe("LMDB States database", () => {
     const headerHash = Bytes.zero(HASH_SIZE).asOpaque();
     const spec = tinyChainSpec;
     it("should import state and read state", async () => {
-        const root = new LmdbRoot(tmpDir);
-        const states = new LmdbStates(spec, blake2b, root);
+        const root = LmdbRoot.new(tmpDir);
+        const states = LmdbStates.new(spec, blake2b, root);
         try {
             const emptyState = InMemoryState.empty(spec);
             const serialized = StateEntries.serializeInMemory(spec, blake2b, emptyState);
@@ -58,15 +58,15 @@ describe("LMDB States database", () => {
         }
     });
     it("should update the state", async () => {
-        const root = new LmdbRoot(tmpDir);
-        const states = new LmdbStates(spec, blake2b, root);
+        const root = LmdbRoot.new(tmpDir);
+        const states = LmdbStates.new(spec, blake2b, root);
         try {
             const state = InMemoryState.empty(spec);
             await states.insertInitialState(headerHash, StateEntries.serializeInMemory(spec, blake2b, state));
             const newState = states.getState(headerHash);
             assert.ok(newState !== null);
             const headerHash2 = Bytes.fill(HASH_SIZE, 2).asOpaque();
-            const lookupHistory = new LookupHistoryItem(Bytes.fill(HASH_SIZE, 0xff).asOpaque(), tryAsU32(5), tryAsLookupHistorySlots([]));
+            const lookupHistory = LookupHistoryItem.new(Bytes.fill(HASH_SIZE, 0xff).asOpaque(), tryAsU32(5), tryAsLookupHistorySlots([]));
             const stateUpdate = {
                 timeslot: tryAsTimeSlot(15),
                 privilegedServices: PrivilegedServices.create({
@@ -142,8 +142,8 @@ describe("LMDB States database", () => {
         deepEqual(Array.from(set), Array.from(SortedSet.fromArray(leafComparator, Array.from(trie.nodes.leaves()))));
     });
     it("should import more complex state", async () => {
-        const root = new LmdbRoot(tmpDir);
-        const states = new LmdbStates(spec, blake2b, root);
+        const root = LmdbRoot.new(tmpDir);
+        const states = LmdbStates.new(spec, blake2b, root);
         try {
             const initialState = testState();
             const initialService = initialState.services.get(tryAsServiceId(0));
@@ -167,8 +167,8 @@ describe("LMDB States database", () => {
         }
     });
     it("should update more complex entries", async () => {
-        const root = new LmdbRoot(tmpDir);
-        const states = new LmdbStates(spec, blake2b, root);
+        const root = LmdbRoot.new(tmpDir);
+        const states = LmdbStates.new(spec, blake2b, root);
         try {
             const state = testState();
             const initialService = state.services.get(tryAsServiceId(0));

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

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

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

@@ -1 +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"}
+{"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,iBAAiB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC5E,cAAc,mBAAmB,CAAC"}

package/packages/jam/executor/index.js

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

package/packages/jam/executor/pvm-executor.js

@@ -55,60 +55,60 @@ export class PvmExecutor {
     constructor(serviceCode, hostCallHandlers, entrypoint, pvmInstanceManager) {
         this.serviceCode = serviceCode;
         this.entrypoint = entrypoint;
-        this.hostCalls = new HostCalls({
+        this.hostCalls = HostCalls.new({
             missing: new general.Missing(),
             handlers: hostCallHandlers,
         });
-        this.pvm = new HostCallsExecutor(pvmInstanceManager, this.hostCalls);
+        this.pvm = HostCallsExecutor.new(pvmInstanceManager, this.hostCalls);
     }
     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));
+        const refineHandlers = REFINE_HOST_CALL_CLASSES.map((HandlerClass) => HandlerClass.new(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),
+            general.LogHostCall.new(serviceId),
+            general.GasHostCall.new(serviceId),
+            general.Fetch.new(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));
+        const accumulateHandlers = ACCUMULATE_HOST_CALL_CLASSES.map((HandlerClass) => HandlerClass.new(serviceId, externalities.partialState, chainSpec));
         /** https://graypaper.fluffylabs.dev/#/ab2cdbd/30d00130d001?v=0.7.2 */
         const generalHandlers = [
-            new general.LogHostCall(serviceId),
-            new general.GasHostCall(serviceId),
-            new general.Read(serviceId, externalities.serviceExternalities),
-            new general.Write(serviceId, externalities.serviceExternalities),
-            new general.Fetch(serviceId, externalities.fetchExternalities),
-            new general.Lookup(serviceId, externalities.serviceExternalities),
-            new general.Info(serviceId, externalities.serviceExternalities),
+            general.LogHostCall.new(serviceId),
+            general.GasHostCall.new(serviceId),
+            general.Read.new(serviceId, externalities.serviceExternalities),
+            general.Write.new(serviceId, externalities.serviceExternalities),
+            general.Fetch.new(serviceId, externalities.fetchExternalities),
+            general.Lookup.new(serviceId, externalities.serviceExternalities),
+            general.Info.new(serviceId, externalities.serviceExternalities),
         ];
         return accumulateHandlers.concat(generalHandlers);
     }
     /** Prepare is-authorized host call handlers */
     static prepareIsAuthorizedHostCalls(serviceId, externalities) {
         const generalHandlers = [
-            new general.LogHostCall(serviceId),
-            new general.GasHostCall(serviceId),
-            new general.Fetch(serviceId, externalities.fetchExternalities),
+            general.LogHostCall.new(serviceId),
+            general.GasHostCall.new(serviceId),
+            general.Fetch.new(serviceId, externalities.fetchExternalities),
         ];
         return generalHandlers;
     }
     /** Prepare on transfer host call handlers */
     static prepareOnTransferHostCalls(serviceId, externalities) {
         const generalHandlers = [
-            new general.LogHostCall(serviceId),
-            new general.GasHostCall(serviceId),
-            new general.Fetch(serviceId, externalities.fetchExternalities),
-            new general.Read(serviceId, externalities.partialState),
-            new general.Write(serviceId, externalities.partialState),
-            new general.Lookup(serviceId, externalities.partialState),
-            new general.Info(serviceId, externalities.partialState),
+            general.LogHostCall.new(serviceId),
+            general.GasHostCall.new(serviceId),
+            general.Fetch.new(serviceId, externalities.fetchExternalities),
+            general.Read.new(serviceId, externalities.partialState),
+            general.Write.new(serviceId, externalities.partialState),
+            general.Lookup.new(serviceId, externalities.partialState),
+            general.Info.new(serviceId, externalities.partialState),
         ];
         return generalHandlers;
     }

package/packages/jam/fuzz-proto/v1/handler.d.ts

@@ -31,7 +31,8 @@ export declare class FuzzTarget implements IpcHandler {
     readonly sender: IpcSender;
     readonly spec: ChainSpec;
     private sessionFeatures;
-    constructor(msgHandler: FuzzMessageHandler, sender: IpcSender, spec: ChainSpec);
+    static new(msgHandler: FuzzMessageHandler, sender: IpcSender, spec: ChainSpec): FuzzTarget;
+    private constructor();
     onSocketMessage(msg: Uint8Array): Promise<void>;
     private processAndRespond;
     onClose({ error }: {

package/packages/jam/fuzz-proto/v1/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/fuzz-proto/v1/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAe,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EACL,YAAY,EAEZ,KAAK,UAAU,EACf,KAAK,QAAQ,EAKb,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AAIpB;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAEvD;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;IAE5E,gEAAgE;IAChE,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CAC5D;AAED,qBAAa,UAAW,YAAW,UAAU;aAIzB,UAAU,EAAE,kBAAkB;aAC9B,MAAM,EAAE,SAAS;aACjB,IAAI,EAAE,SAAS;IALjC,OAAO,CAAC,eAAe,CAAK;gBAGV,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS;IAG3B,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAiBvC,iBAAiB;IA2H/B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GAAG,IAAI;IAI3C,4DAA4D;IAC5D,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGrC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/fuzz-proto/v1/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAe,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EACL,YAAY,EAEZ,KAAK,UAAU,EACf,KAAK,QAAQ,EAKb,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AAIpB;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAEvD;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;IAE5E,gEAAgE;IAChE,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CAC5D;AAED,qBAAa,UAAW,YAAW,UAAU;aAQzB,UAAU,EAAE,kBAAkB;aAC9B,MAAM,EAAE,SAAS;aACjB,IAAI,EAAE,SAAS;IATjC,OAAO,CAAC,eAAe,CAAK;IAE5B,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAI7E,OAAO;IAMD,eAAe,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAiBvC,iBAAiB;IA2H/B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GAAG,IAAI;IAI3C,4DAA4D;IAC5D,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGrC"}