@typeberry/lib 0.5.10-9567cee → 0.5.10-9ffd7ac

package/packages/core/pvm-host-calls/host-calls.d.ts

@@ -5,10 +5,12 @@ import type { HostCallRegisters } from "./host-call-registers.js";
 export declare class HostCalls {
     private readonly hostCalls;
     private readonly missing;
-    constructor({ missing, handlers, }: {
+    /** Build a `HostCalls` registry, verifying that no two handlers share an index. */
+    static new({ missing, handlers }: {
         missing: HostCallHandler;
         handlers?: HostCallHandler[];
-    });
+    }): HostCalls;
+    private constructor();
     /** Get a host call by index. */
     get(hostCallIndex: HostCallIndex): HostCallHandler;
     traceHostCall(context: string, hostCallIndex: HostCallIndex, hostCallHandler: HostCallHandler, registers: HostCallRegisters, gas: Gas): void;

package/packages/core/pvm-host-calls/host-calls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-calls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,8CAA8C;AAC9C,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAEb,EACV,OAAO,EACP,QAAa,GACd,EAAE;QACD,OAAO,EAAE,eAAe,CAAC;QACzB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;KAC9B;IASD,gCAAgC;IAChC,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,eAAe;IAIlD,aAAa,CACX,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,iBAAiB,EAC5B,GAAG,EAAE,GAAG;CAkBX;AAED,qBAAa,WAAY,YAAW,eAAe;IACjD,KAAK,iIAAmC;IACxC,YAAY,4HAAoB;IAChC,gBAAgB,mCAAe;IAC/B,eAAe,UAAM;IAEf,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAGnD"}
+{"version":3,"file":"host-calls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,8CAA8C;AAC9C,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAEzB,mFAAmF;IACnF,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,QAAa,EAAE,EAAE;QAAE,OAAO,EAAE,eAAe,CAAC;QAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAA;KAAE;IASjG,OAAO;IAIP,gCAAgC;IAChC,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,eAAe;IAIlD,aAAa,CACX,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,iBAAiB,EAC5B,GAAG,EAAE,GAAG;CAkBX;AAED,qBAAa,WAAY,YAAW,eAAe;IACjD,KAAK,iIAAmC;IACxC,YAAY,4HAAoB;IAChC,gBAAgB,mCAAe;IAC/B,eAAe,UAAM;IAEf,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;CAGnD"}

package/packages/core/pvm-host-calls/host-calls.js

@@ -8,12 +8,17 @@ const logger = Logger.new(import.meta.filename, "host-calls-pvm");
 export class HostCalls {
     hostCalls = new Map();
     missing;
-    constructor({ missing, handlers = [], }) {
-        this.missing = missing;
+    /** Build a `HostCalls` registry, verifying that no two handlers share an index. */
+    static new({ missing, handlers = [] }) {
+        const hostCalls = new HostCalls(missing);
         for (const handler of handlers) {
-            check `${this.hostCalls.get(handler.index) === undefined} Overwriting host call handler at index ${handler.index}`;
-            this.hostCalls.set(handler.index, handler);
+            check `${hostCalls.hostCalls.get(handler.index) === undefined} Overwriting host call handler at index ${handler.index}`;
+            hostCalls.hostCalls.set(handler.index, handler);
         }
+        return hostCalls;
+    }
+    constructor(missing) {
+        this.missing = missing;
     }
     /** Get a host call by index. */
     get(hostCallIndex) {

package/packages/core/pvm-host-calls/pvm-instance-manager.js

@@ -13,7 +13,7 @@ export class PvmInstanceManager {
         const instances = [];
         switch (interpreter) {
             case PvmBackend.BuiltIn:
-                instances.push(new Interpreter({
+                instances.push(Interpreter.new({
                     useSbrkGas: false,
                 }));
                 break;

package/packages/core/pvm-interpreter/args-decoder/args-decoder.js

@@ -5,7 +5,7 @@ import { NibblesDecoder } from "./decoders/nibbles-decoder.js";
 const IMMEDIATE_AND_OFFSET_MAX_LENGTH = 4;
 export class ArgsDecoder {
     nibblesDecoder = new NibblesDecoder();
-    offsetDecoder = new ImmediateDecoder();
+    offsetDecoder = ImmediateDecoder.new();
     code = new Uint8Array();
     mask = Mask.empty();
     reset(code, mask) {

package/packages/core/pvm-interpreter/args-decoder/args-decoder.test.js

@@ -11,19 +11,19 @@ import { ImmediateDecoder } from "./decoders/immediate-decoder.js";
 describe("ArgsDecoder", () => {
     function prepareData({ programBytes, maskBytes, argumentType, }) {
         const code = new Uint8Array(programBytes);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array(maskBytes), programBytes.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array(maskBytes), programBytes.length));
         const argsDecoder = new ArgsDecoder();
         argsDecoder.reset(code, mask);
         const result = createResults()[argumentType];
         return { argsDecoder, result, argumentType };
     }
     function prepareImmediate(bytes) {
-        const immediate = new ImmediateDecoder();
+        const immediate = ImmediateDecoder.new();
         immediate.setBytes(new Uint8Array(bytes));
         return immediate;
     }
     function prepareExtendedWidthImmediate(bytes) {
-        const immediate = new ExtendedWitdthImmediateDecoder();
+        const immediate = ExtendedWitdthImmediateDecoder.new();
         immediate.setBytes(new Uint8Array(bytes));
         return immediate;
     }

package/packages/core/pvm-interpreter/args-decoder/args-decoding-results.js

@@ -11,7 +11,7 @@ export const createResults = () => {
     results[ArgumentType.ONE_IMMEDIATE] = {
         type: ArgumentType.ONE_IMMEDIATE,
         noOfBytesToSkip: 1,
-        immediateDecoder: new ImmediateDecoder(),
+        immediateDecoder: ImmediateDecoder.new(),
     };
     results[ArgumentType.TWO_REGISTERS] = {
         type: ArgumentType.TWO_REGISTERS,
@@ -30,7 +30,7 @@ export const createResults = () => {
         type: ArgumentType.ONE_REGISTER_ONE_IMMEDIATE_ONE_OFFSET,
         noOfBytesToSkip: 1,
         registerIndex: 0,
-        immediateDecoder: new ImmediateDecoder(),
+        immediateDecoder: ImmediateDecoder.new(),
         nextPc: 0,
     };
     results[ArgumentType.TWO_REGISTERS_ONE_OFFSET] = {
@@ -45,20 +45,20 @@ export const createResults = () => {
         noOfBytesToSkip: 1,
         firstRegisterIndex: 0,
         secondRegisterIndex: 0,
-        immediateDecoder: new ImmediateDecoder(),
+        immediateDecoder: ImmediateDecoder.new(),
     };
     results[ArgumentType.ONE_REGISTER_ONE_IMMEDIATE] = {
         type: ArgumentType.ONE_REGISTER_ONE_IMMEDIATE,
         noOfBytesToSkip: 1,
         registerIndex: 0,
-        immediateDecoder: new ImmediateDecoder(),
+        immediateDecoder: ImmediateDecoder.new(),
     };
     results[ArgumentType.ONE_REGISTER_TWO_IMMEDIATES] = {
         type: ArgumentType.ONE_REGISTER_TWO_IMMEDIATES,
         noOfBytesToSkip: 1,
         registerIndex: 0,
-        firstImmediateDecoder: new ImmediateDecoder(),
-        secondImmediateDecoder: new ImmediateDecoder(),
+        firstImmediateDecoder: ImmediateDecoder.new(),
+        secondImmediateDecoder: ImmediateDecoder.new(),
     };
     results[ArgumentType.ONE_OFFSET] = {
         type: ArgumentType.ONE_OFFSET,
@@ -68,14 +68,14 @@ export const createResults = () => {
     results[ArgumentType.TWO_IMMEDIATES] = {
         type: ArgumentType.TWO_IMMEDIATES,
         noOfBytesToSkip: 1,
-        firstImmediateDecoder: new ImmediateDecoder(),
-        secondImmediateDecoder: new ImmediateDecoder(),
+        firstImmediateDecoder: ImmediateDecoder.new(),
+        secondImmediateDecoder: ImmediateDecoder.new(),
     };
     results[ArgumentType.TWO_REGISTERS_TWO_IMMEDIATES] = {
         type: ArgumentType.TWO_REGISTERS_TWO_IMMEDIATES,
         noOfBytesToSkip: 1,
-        firstImmediateDecoder: new ImmediateDecoder(),
-        secondImmediateDecoder: new ImmediateDecoder(),
+        firstImmediateDecoder: ImmediateDecoder.new(),
+        secondImmediateDecoder: ImmediateDecoder.new(),
         firstRegisterIndex: 0,
         secondRegisterIndex: 0,
     };
@@ -83,7 +83,7 @@ export const createResults = () => {
         type: ArgumentType.ONE_REGISTER_ONE_EXTENDED_WIDTH_IMMEDIATE,
         noOfBytesToSkip: 9,
         registerIndex: 0,
-        immediateDecoder: new ExtendedWitdthImmediateDecoder(),
+        immediateDecoder: ExtendedWitdthImmediateDecoder.new(),
     };
     return results;
 };

package/packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.d.ts

@@ -1,7 +1,8 @@
 export declare class ExtendedWitdthImmediateDecoder {
     private unsignedImmediate;
     private bytes;
-    constructor();
+    static new(): ExtendedWitdthImmediateDecoder;
+    private constructor();
     setBytes(bytes: Uint8Array): void;
     getValue(): bigint;
     getBytesAsLittleEndian(): Uint8Array<ArrayBufferLike>;

package/packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extended-with-immediate-decoder.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.ts"],"names":[],"mappings":"AAEA,qBAAa,8BAA8B;IACzC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,KAAK,CAAa;;IAQ1B,QAAQ,CAAC,KAAK,EAAE,UAAU;IAW1B,QAAQ;IAIR,sBAAsB;CAGvB"}
+{"version":3,"file":"extended-with-immediate-decoder.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.ts"],"names":[],"mappings":"AAEA,qBAAa,8BAA8B;IACzC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,KAAK,CAAa;IAE1B,MAAM,CAAC,GAAG;IAIV,OAAO;IAMP,QAAQ,CAAC,KAAK,EAAE,UAAU;IAW1B,QAAQ;IAIR,sBAAsB;CAGvB"}

package/packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.js

@@ -2,6 +2,9 @@ const IMMEDIATE_SIZE = 8;
 export class ExtendedWitdthImmediateDecoder {
     unsignedImmediate;
     bytes;
+    static new() {
+        return new ExtendedWitdthImmediateDecoder();
+    }
     constructor() {
         const buffer = new ArrayBuffer(IMMEDIATE_SIZE);
         this.unsignedImmediate = new BigUint64Array(buffer);

package/packages/core/pvm-interpreter/args-decoder/decoders/extended-with-immediate-decoder.test.js

@@ -4,7 +4,7 @@ import { ExtendedWitdthImmediateDecoder } from "./extended-with-immediate-decode
 describe("ExtendedWitdthImmediateDecoder", () => {
     describe("reading bytes as unsigned number", () => {
         it("8-bytes number", () => {
-            const decoder = new ExtendedWitdthImmediateDecoder();
+            const decoder = ExtendedWitdthImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88]);
             const expectedValue = 0x8899aabbccddeeffn;
             decoder.setBytes(encodedBytes);
@@ -13,7 +13,7 @@ describe("ExtendedWitdthImmediateDecoder", () => {
     });
     describe("read immediate as bytes (little endian)", () => {
         it("8-bytes number", () => {
-            const decoder = new ExtendedWitdthImmediateDecoder();
+            const decoder = ExtendedWitdthImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88]);
             const expectedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88]);
             decoder.setBytes(encodedBytes);

package/packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.d.ts

@@ -5,7 +5,8 @@ export declare class ImmediateDecoder {
     private i64;
     private view;
     private bytes;
-    constructor();
+    static new(): ImmediateDecoder;
+    private constructor();
     setBytes(bytes: Uint8Array): void;
     /**
      * @deprecated Use getU32 instead

package/packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"immediate-decoder.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,KAAK,CAAa;;IAY1B,QAAQ,CAAC,KAAK,EAAE,UAAU;IAe1B;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,SAAS;IAIT,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,sBAAsB;IAItB,8BAA8B;CAG/B"}
+{"version":3,"file":"immediate-decoder.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,KAAK,CAAa;IAE1B,MAAM,CAAC,GAAG;IAIV,OAAO;IAUP,QAAQ,CAAC,KAAK,EAAE,UAAU;IAe1B;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,SAAS;IAIT,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,sBAAsB;IAItB,8BAA8B;CAG/B"}

package/packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.js

@@ -9,6 +9,9 @@ export class ImmediateDecoder {
     i64;
     view;
     bytes;
+    static new() {
+        return new ImmediateDecoder();
+    }
     constructor() {
         const buffer = new ArrayBuffer(BUFFER_SIZE);
         this.u32 = new Uint32Array(buffer);

package/packages/core/pvm-interpreter/args-decoder/decoders/immediate-decoder.test.js

@@ -4,7 +4,7 @@ import { ImmediateDecoder } from "./immediate-decoder.js";
 describe("ImmediateDecoder", () => {
     describe("reading bytes as signed and unsigned number U32", () => {
         it("Positive number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01, 0x00, 0x00, 0x00]);
             const expectedSigned = 1;
             const expectedUnsigned = 1;
@@ -13,7 +13,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Negative number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0xff, 0xff]);
             const expectedSigned = -1;
             const expectedUnsigned = 2 ** 32 - 1;
@@ -22,7 +22,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Positive number with elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01]);
             const expectedSigned = 1;
             const expectedUnsigned = 1;
@@ -31,7 +31,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Negative number with elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff]);
             const expectedSigned = -1;
             const expectedUnsigned = 2 ** 32 - 1;
@@ -40,7 +40,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Large positive number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0x7f, 0x00]);
             const expectedSigned = 0x00_7f_ff_ff;
             const expectedUnsigned = 0x00_7f_ff_ff;
@@ -49,7 +49,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Large negative number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01, 0x00, 0x80, 0xff]);
             const expectedSigned = -0x00_7f_ff_ff;
             const expectedUnsigned = 0xff_80_00_01;
@@ -58,7 +58,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Maximum positive value", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0xff, 0x7f]);
             const expectedSigned = 0x7f_ff_ff_ff;
             const expectedUnsigned = 0x7f_ff_ff_ff;
@@ -67,7 +67,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Maximum negative value", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x00, 0x00, 0x00, 0x80]);
             const expectedSigned = -(2 ** 31);
             const expectedUnsigned = 0x80_00_00_00;
@@ -76,7 +76,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getUnsigned(), expectedUnsigned);
         });
         it("Empty bytes array", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([]);
             const expectedSigned = 0;
             const expectedUnsigned = 0;
@@ -87,7 +87,7 @@ describe("ImmediateDecoder", () => {
     });
     describe("reading bytes as signed and unsigned number U64", () => {
         it("Positive number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01, 0x00, 0x00, 0x00]);
             const expectedSigned = 1n;
             const expectedUnsigned = 1n;
@@ -96,7 +96,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Negative number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0xff, 0xff]);
             const expectedSigned = -1n;
             const expectedUnsigned = 2n ** 64n - 1n;
@@ -105,7 +105,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Positive number with elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01]);
             const expectedSigned = 1n;
             const expectedUnsigned = 1n;
@@ -114,7 +114,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Negative number with elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff]);
             const expectedSigned = -1n;
             const expectedUnsigned = 2n ** 64n - 1n;
@@ -123,7 +123,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Large positive number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0x7f, 0x00]);
             const expectedSigned = 0x007fffffn;
             const expectedUnsigned = 0x007fffffn;
@@ -132,7 +132,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Large negative number without elided octets", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x01, 0x00, 0x80, 0xff]);
             const expectedSigned = -0x007fffffn;
             const expectedUnsigned = 0xffffffffff800001n;
@@ -141,7 +141,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Maximum positive value", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xff, 0xff, 0x7f]);
             const expectedSigned = 0x7fffffffn;
             const expectedUnsigned = 0x7fffffffn;
@@ -150,7 +150,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Maximum negative value", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0x00, 0x00, 0x00, 0x80]);
             const expectedSigned = -(2n ** 31n);
             const expectedUnsigned = 0xffffffff80000000n;
@@ -159,7 +159,7 @@ describe("ImmediateDecoder", () => {
             assert.strictEqual(decoder.getU64(), expectedUnsigned);
         });
         it("Empty bytes array", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([]);
             const expectedSigned = 0n;
             const expectedUnsigned = 0n;
@@ -170,28 +170,28 @@ describe("ImmediateDecoder", () => {
     });
     describe("getBytesAsLittleEndian", () => {
         it("should return empty bytes array", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([]);
             const expectedBytes = new Uint8Array([0, 0, 0, 0]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u8 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff]);
             const expectedBytes = new Uint8Array([0xff, 0xff, 0xff, 0xff]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u16 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee]);
             const expectedBytes = new Uint8Array([0xff, 0xee, 0xff, 0xff]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u32 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc]);
             const expectedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc]);
             decoder.setBytes(encodedBytes);
@@ -200,28 +200,28 @@ describe("ImmediateDecoder", () => {
     });
     describe("getExtendedBytesAsLittleEndian", () => {
         it("should return empty bytes array", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([]);
             const expectedBytes = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getExtendedBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u8 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff]);
             const expectedBytes = new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getExtendedBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u16 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee]);
             const expectedBytes = new Uint8Array([0xff, 0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
             decoder.setBytes(encodedBytes);
             assert.deepStrictEqual(decoder.getExtendedBytesAsLittleEndian(), expectedBytes);
         });
         it("should return u32 number correctly encoded as little endian", () => {
-            const decoder = new ImmediateDecoder();
+            const decoder = ImmediateDecoder.new();
             const encodedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc]);
             const expectedBytes = new Uint8Array([0xff, 0xee, 0xdd, 0xcc, 0xff, 0xff, 0xff, 0xff]);
             decoder.setBytes(encodedBytes);

package/packages/core/pvm-interpreter/basic-blocks/basic-blocks.test.js

@@ -7,7 +7,7 @@ import { BasicBlocks } from "./basic-blocks.js";
 describe("BasicBlocks", () => {
     it("should return true for the first instruction even it is a termination block instruction", () => {
         const code = new Uint8Array([Instruction.TRAP]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0000_0001]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0000_0001]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 0;
@@ -16,7 +16,7 @@ describe("BasicBlocks", () => {
     });
     it("should return true for the first instruction after a termination block instruction", () => {
         const code = new Uint8Array([Instruction.TRAP, Instruction.ADD_32, 5, 7]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 1;
@@ -25,7 +25,7 @@ describe("BasicBlocks", () => {
     });
     it("should return false for the second instruction after a termination block instruction", () => {
         const code = new Uint8Array([Instruction.TRAP, Instruction.ADD_32, 5, 7, Instruction.SUB_32, 5, 7]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0001_0011]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0001_0011]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 4;
@@ -34,7 +34,7 @@ describe("BasicBlocks", () => {
     });
     it("should return false for a termination block instruction that is not the first instruction in the program", () => {
         const code = new Uint8Array([Instruction.TRAP, Instruction.ADD_32, 5, 7, Instruction.TRAP]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0001_0011]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0001_0011]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 4;
@@ -43,7 +43,7 @@ describe("BasicBlocks", () => {
     });
     it("should return true for a beginning of basic block instruction that is not the first instruction after a block termination instruction that has some args", () => {
         const code = new Uint8Array([Instruction.BRANCH_EQ, 135, 25, Instruction.ADD_32, 5, 7, Instruction.TRAP]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0100_1001]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0100_1001]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 3;
@@ -52,7 +52,7 @@ describe("BasicBlocks", () => {
     });
     it("should return true for a termination block instruction that is the after a termination instruction", () => {
         const code = new Uint8Array([Instruction.TRAP, Instruction.TRAP]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = 1;
@@ -61,7 +61,7 @@ describe("BasicBlocks", () => {
     });
     it("should return false for a negative number", () => {
         const code = new Uint8Array([Instruction.TRAP, Instruction.TRAP]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0000_0011]), code.length));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const index = -1;
@@ -103,7 +103,7 @@ describe("BasicBlocks", () => {
             0,
             Instruction.JUMP_IND,
         ]);
-        const mask = new Mask(BitVec.fromBlob(new Uint8Array([0b0000_0001, 0b0000_0000, 0b0000_0000, 0b1000_0000]), 32));
+        const mask = Mask.new(BitVec.fromBlob(new Uint8Array([0b0000_0001, 0b0000_0000, 0b0000_0000, 0b1000_0000]), 32));
         const basicBlocks = new BasicBlocks();
         basicBlocks.reset(code, mask);
         const expectedStartingBasicBlockIndices = [0, 26];

package/packages/core/pvm-interpreter/bin.js

@@ -4,7 +4,7 @@ const program = new Uint8Array([
     0, 0, 33, 51, 8, 1, 51, 9, 1, 40, 3, 0, 149, 119, 255, 81, 7, 12, 100, 138, 200, 152, 8, 100, 169, 40, 243, 100, 135,
     51, 8, 51, 9, 1, 50, 0, 73, 147, 82, 213, 0,
 ]);
-const pvm = new Interpreter();
+const pvm = Interpreter.new();
 pvm.resetGeneric(program, 0, tryAsGas(1000));
 // biome-ignore lint/suspicious/noConsole: We do want to print that.
 console.table(pvm.dumpProgram());

package/packages/core/pvm-interpreter/debugger-adapter.d.ts

@@ -3,7 +3,8 @@ import { type Memory } from "./memory/index.js";
 import { Registers } from "./registers.js";
 export declare class DebuggerAdapter {
     private readonly pvm;
-    constructor(useSbrkGas?: boolean);
+    static new(useSbrkGas?: boolean): DebuggerAdapter;
+    private constructor();
     resetJAM(jamProgram: Uint8Array, pc: number, gas: bigint, args: Uint8Array, hasMetadata?: boolean): void;
     resetGeneric(rawProgram: Uint8Array, flatRegisters: Uint8Array, initialGas: bigint): void;
     reset(rawProgram: Uint8Array, pc: number, gas: bigint, maybeRegisters?: Registers, maybeMemory?: Memory): void;

package/packages/core/pvm-interpreter/debugger-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debugger-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-interpreter/debugger-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;gBAEtB,UAAU,UAAQ;IAI9B,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,UAAQ;IAI/F,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM;IAIlF,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM;IAIvG,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU;IAmBlD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAI5C,UAAU,IAAI,MAAM;IAIpB,SAAS,IAAI,MAAM;IAInB,QAAQ,IAAI,OAAO;IAInB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAW9B,YAAY,IAAI,UAAU;IAI1B,YAAY,CAAC,SAAS,EAAE,UAAU;IAIlC,iBAAiB,IAAI,MAAM;IAI3B,qBAAqB,CAAC,MAAM,EAAE,MAAM;IAIpC,UAAU,IAAI,MAAM;IAIpB,UAAU,CAAC,GAAG,EAAE,MAAM;CAGvB"}
+{"version":3,"file":"debugger-adapter.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-interpreter/debugger-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;IAElC,MAAM,CAAC,GAAG,CAAC,UAAU,UAAQ;IAI7B,OAAO;IAIP,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,UAAQ;IAI/F,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM;IAIlF,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM;IAIvG,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU;IAmBlD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAI5C,UAAU,IAAI,MAAM;IAIpB,SAAS,IAAI,MAAM;IAInB,QAAQ,IAAI,OAAO;IAInB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAW9B,YAAY,IAAI,UAAU;IAI1B,YAAY,CAAC,SAAS,EAAE,UAAU;IAIlC,iBAAiB,IAAI,MAAM;IAI3B,qBAAqB,CAAC,MAAM,EAAE,MAAM;IAIpC,UAAU,IAAI,MAAM;IAIpB,UAAU,CAAC,GAAG,EAAE,MAAM;CAGvB"}

package/packages/core/pvm-interpreter/debugger-adapter.js

@@ -6,14 +6,17 @@ import { PAGE_SIZE } from "./memory/memory-consts.js";
 import { Registers } from "./registers.js";
 export class DebuggerAdapter {
     pvm;
+    static new(useSbrkGas = false) {
+        return new DebuggerAdapter(useSbrkGas);
+    }
     constructor(useSbrkGas = false) {
-        this.pvm = new Interpreter({ useSbrkGas });
+        this.pvm = Interpreter.new({ useSbrkGas });
     }
     resetJAM(jamProgram, pc, gas, args, hasMetadata = false) {
         this.pvm.resetJam(jamProgram, args, pc, tryAsGas(gas), hasMetadata);
     }
     resetGeneric(rawProgram, flatRegisters, initialGas) {
-        this.pvm.resetGeneric(rawProgram, 0, tryAsGas(initialGas), new Registers(flatRegisters));
+        this.pvm.resetGeneric(rawProgram, 0, tryAsGas(initialGas), Registers.fromBytes(flatRegisters));
     }
     reset(rawProgram, pc, gas, maybeRegisters, maybeMemory) {
         this.pvm.resetGeneric(rawProgram, pc, tryAsGas(gas), maybeRegisters, maybeMemory);
@@ -59,7 +62,7 @@ export class DebuggerAdapter {
         return this.pvm.registers.getAllEncoded();
     }
     setRegisters(registers) {
-        this.pvm.registers.copyFrom(new Registers(registers));
+        this.pvm.registers.copyFrom(Registers.fromBytes(registers));
     }
     getProgramCounter() {
         return this.pvm.getPC();

package/packages/core/pvm-interpreter/gas.js

@@ -2,11 +2,14 @@ import { tryAsU64 } from "#@typeberry/numbers";
 import { tryAsGas } from "#@typeberry/pvm-interface";
 /** Create a new gas counter instance depending on the gas value. */
 export function gasCounter(gas) {
-    return new GasCounterU64(tryAsU64(gas));
+    return GasCounterU64.new(tryAsU64(gas));
 }
 class GasCounterU64 {
     gas;
     initialGas;
+    static new(gas) {
+        return new GasCounterU64(gas);
+    }
     constructor(gas) {
         this.gas = gas;
         this.initialGas = tryAsGas(gas);

package/packages/core/pvm-interpreter/interpreter.d.ts

@@ -32,7 +32,8 @@ export declare class Interpreter implements IPvmInterpreter {
     private argsDecodingResults;
     private basicBlocks;
     private jumpTable;
-    constructor({ useSbrkGas }?: InterpreterOptions);
+    static new(options?: InterpreterOptions): Interpreter;
+    private constructor();
     resetJam(program: Uint8Array, args: Uint8Array, pc: number, gas: Gas, hasMetadata?: boolean): void;
     resetGeneric(rawProgram: Uint8Array, pc: number, gas: Gas, maybeRegisters?: Registers, maybeMemory?: Memory): void;
     dumpProgram(): (string | number)[][];

package/packages/core/pvm-interpreter/interpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-interpreter/interpreter.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,eAAe,EAAE,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAW5F,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,KAAK,kBAAkB,GAAG;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAIF,qBAAa,WAAY,YAAW,eAAe;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,QAAQ,CAAC,SAAS,YAAmB;IACrC,QAAQ,CAAC,MAAM,SAAgB;IAC/B,GAAG,iDAA2B;IAC9B,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,EAAE,CAAK;IACf,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,uBAAuB,CAA0B;IACzD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,+BAA+B,CAAkC;IACzE,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,uBAAuB,CAA0B;IACzD,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,yBAAyB,CAA4B;IAC7D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,mBAAmB,CAAmB;IAC9C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAqB;gBAE1B,EAAE,UAAkB,EAAE,GAAE,kBAAuB;IA0C3D,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,UAAO;IAKxF,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM;IA0B3G,WAAW;IAIX,UAAU;IAIV,QAAQ;IAgHR,KAAK;IAIL,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,SAAS;IAIT,YAAY,IAAI,IAAI,GAAG,GAAG;IAK1B,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU;IAIpD,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAsB7C"}
+{"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-interpreter/interpreter.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,eAAe,EAAE,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAW5F,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,KAAK,kBAAkB,GAAG;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAIF,qBAAa,WAAY,YAAW,eAAe;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,QAAQ,CAAC,SAAS,YAAqB;IACvC,QAAQ,CAAC,MAAM,SAAgB;IAC/B,GAAG,iDAA2B;IAC9B,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,EAAE,CAAK;IACf,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,uBAAuB,CAA0B;IACzD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,+BAA+B,CAAkC;IACzE,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,uBAAuB,CAA0B;IACzD,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,yBAAyB,CAA4B;IAC7D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,mBAAmB,CAAmB;IAC9C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAqB;IAEtC,MAAM,CAAC,GAAG,CAAC,OAAO,GAAE,kBAAuB;IAI3C,OAAO;IA0CP,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,UAAO;IAKxF,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM;IA0B3G,WAAW;IAIX,UAAU;IAIV,QAAQ;IAgHR,KAAK;IAIL,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,SAAS;IAIT,YAAY,IAAI,IAAI,GAAG,GAAG;IAK1B,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU;IAIpD,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAsB7C"}