@typeberry/lib 0.5.3 → 0.5.4-61ca416

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.5.3",
+  "version": "0.5.4-61ca416",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",
@@ -218,8 +218,12 @@
     "#@typeberry/database/*": "./packages/jam/database/*",
     "#@typeberry/database-lmdb": "./packages/jam/database-lmdb/index.js",
     "#@typeberry/database-lmdb/*": "./packages/jam/database-lmdb/*",
+    "#@typeberry/executor": "./packages/jam/executor/index.js",
+    "#@typeberry/executor/*": "./packages/jam/executor/*",
     "#@typeberry/fuzz-proto": "./packages/jam/fuzz-proto/index.js",
     "#@typeberry/fuzz-proto/*": "./packages/jam/fuzz-proto/*",
+    "#@typeberry/in-core": "./packages/jam/in-core/index.js",
+    "#@typeberry/in-core/*": "./packages/jam/in-core/*",
     "#@typeberry/jam-host-calls": "./packages/jam/jam-host-calls/index.js",
     "#@typeberry/jam-host-calls/*": "./packages/jam/jam-host-calls/*",
     "#@typeberry/jamnp-s": "./packages/jam/jamnp-s/index.js",
@@ -238,6 +242,8 @@
     "#@typeberry/state-json/*": "./packages/jam/state-json/*",
     "#@typeberry/state-merkleization": "./packages/jam/state-merkleization/index.js",
     "#@typeberry/state-merkleization/*": "./packages/jam/state-merkleization/*",
+    "#@typeberry/state-vectors": "./packages/jam/state-vectors/index.js",
+    "#@typeberry/state-vectors/*": "./packages/jam/state-vectors/*",
     "#@typeberry/transition": "./packages/jam/transition/index.js",
     "#@typeberry/transition/*": "./packages/jam/transition/*",
     "#@typeberry/disputes": "./packages/jam/transition/disputes/index.js",
@@ -253,9 +259,7 @@
     "#@typeberry/importer": "./packages/workers/importer/index.js",
     "#@typeberry/importer/*": "./packages/workers/importer/*",
     "#@typeberry/jam-network": "./packages/workers/jam-network/index.js",
-    "#@typeberry/jam-network/*": "./packages/workers/jam-network/*",
-    "#@typeberry/state-vectors": "./packages/jam/state-vectors/index.js",
-    "#@typeberry/state-vectors/*": "./packages/jam/state-vectors/*"
+    "#@typeberry/jam-network/*": "./packages/workers/jam-network/*"
   },
   "dependencies": {
     "@fluffylabs/anan-as": "^1.1.5",

package/packages/core/hash/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../../../../packages/core/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,KAAK,CAAC;AAC5B,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC;AAEzC,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC;AAE7D,4BAA4B;AAC5B,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE3C,yBAAyB;AACzB,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAEvD,eAAO,MAAM,SAAS,WAAwB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,SAAS;aAEpD,IAAI,EAAE,KAAK;aACX,IAAI,EAAE,KAAK;gBADX,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK;CAI9B;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;aAIzE,OAAO,EAAE,SAAS;gBAFlC,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACK,OAAO,EAAE,SAAS;CAIrC"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../../../../packages/core/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,KAAK,CAAC;AAC5B,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC;AAEzC,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC;AAE7D,4BAA4B;AAC5B,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE3C,yBAAyB;AACzB,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE1C,sBAAsB;AACtB,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC;AAEvD,eAAO,MAAM,SAAS,WAAwB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,SAAS;aAGpD,IAAI,EAAE,KAAK;aACX,IAAI,EAAE,KAAK;gBADX,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK;CAI9B;AAED;;GAEG;AACH,qBAAa,gBAAgB,CAAC,KAAK,SAAS,UAAU,EAAE,KAAK,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;aAIzE,OAAO,EAAE,SAAS;gBAFlC,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACK,OAAO,EAAE,SAAS;CAIrC"}

package/packages/core/hash/hash.js

@@ -19,6 +19,7 @@ export const ZERO_HASH = Bytes.zero(HASH_SIZE);
 export class WithHash extends WithDebug {
     hash;
     data;
+    // TODO [ToDr] use static method and make constructor private
     constructor(hash, data) {
         super();
         this.hash = hash;

package/packages/core/json-parser/descriptors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"descriptors.d.ts","sourceRoot":"","sources":["../../../../../packages/core/json-parser/descriptors.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEhF,yBAAiB,IAAI,CAAC;IACpB,kDAAkD;IAClD,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAElG;IAED,kDAAkD;IAClD,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAElG;IAED,4DAA4D;IAC5D,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAUnG;IAED,mDAAmD;IACnD,SAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,uCAE9C;IAED,+DAA+D;IAC/D,SAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAEjG;IAED,wFAAwF;IACxF,SAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,CAEtE;IAED,sEAAsE;IACtE,SAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,CAEjE;IAED,6CAA6C;IAC7C,SAAgB,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAErE;IAED,kDAAkD;IAClD,SAAgB,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAWpF;IAED,uCAAuC;IACvC,SAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAWrG;IAED,0FAA0F;IAC1F,SAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,EACzC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,EACrB,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAC7B,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAKpC;CACF"}
+{"version":3,"file":"descriptors.d.ts","sourceRoot":"","sources":["../../../../../packages/core/json-parser/descriptors.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEhF,yBAAiB,IAAI,CAAC;IACpB,kDAAkD;IAClD,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAElG;IAED,kDAAkD;IAClD,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAElG;IAED,4DAA4D;IAC5D,SAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAUnG;IAED,mDAAmD;IACnD,SAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,uCAE9C;IAED,+DAA+D;IAC/D,SAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAEjG;IAED,wFAAwF;IACxF,SAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,CAEtE;IAED,sEAAsE;IACtE,SAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,CAEjE;IAED,6CAA6C;IAC7C,SAAgB,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAErE;IAED,kDAAkD;IAClD,SAAgB,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAWpF;IAED,uCAAuC;IACvC,SAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAcrG;IAED,0FAA0F;IAC1F,SAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,EACzC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,EACrB,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAC7B,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAKpC;CACF"}

package/packages/core/json-parser/descriptors.js

@@ -69,6 +69,9 @@ export var json;
             if (typeof inJson !== "object" || inJson === null) {
                 throw new Error("Expected map for parsing");
             }
+            if (Array.isArray(inJson)) {
+                throw new Error("Expected map, got array");
+            }
             const result = new Map();
             for (const [key, value] of Object.entries(inJson)) {
                 result.set(parseFromJson(key, K, `${context}.key`), parseFromJson(value, V, `${context}.value`));

package/packages/core/json-parser/index.test.js

@@ -135,4 +135,34 @@ test("JSON parser", async (t) => {
         assert.strictEqual(result.k, undefined);
         assert.strictEqual(result.v, true);
     });
+    await t.test("map", () => {
+        const j = `{"k": { "a": "b", "c": "d" } }`;
+        class TestClass {
+            static fromJson = {
+                k: json.map("string", "string"),
+            };
+            k = new Map();
+        }
+        const result = parseFromJson(JSON.parse(j), TestClass.fromJson);
+        assert.deepStrictEqual(result.k, new Map([
+            ["a", "b"],
+            ["c", "d"],
+        ]));
+    });
+    await t.test("map type mismatch", () => {
+        const j = `{"k": [["a", "b"], ["c", "d"]]}`;
+        class TestClass {
+            static fromJson = {
+                k: json.map("string", "string"),
+            };
+            k = new Map();
+        }
+        try {
+            parseFromJson(JSON.parse(j), TestClass.fromJson);
+            assert.fail("Expected error to be thrown");
+        }
+        catch (e) {
+            assert.strictEqual(`${e}`, "Error: [<root>.k] Error while parsing the value: Error: Expected map, got array");
+        }
+    });
 });

package/packages/core/networking/certificate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"certificate.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/certificate.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAErF,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAezC,oBAAY,eAAe;IACzB,aAAa,IAAI;IACjB,UAAU,IAAI;IACd,qBAAqB,IAAI;IACzB,eAAe,IAAI;IACnB,kBAAkB,IAAI;CACvB;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAwDvG;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IACtD,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,CAcD;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,mBAQ5D;AAED,wFAAwF;AACxF,wBAAsB,mBAAmB,CAAC,EACxC,MAAM,EACN,cAAc,EACd,aAAa,EACb,iBAAsB,EACtB,gBAAqB,EACrB,GAAgB,GACjB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACvD,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CA6EhC;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,SAAS,UAElD;AACD,wBAAgB,UAAU,CAAC,aAAa,EAAE,UAAU,UAGnD;AA4BD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,UAEnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,cAAc,CAkBpF"}
+{"version":3,"file":"certificate.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/certificate.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAErF,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAezC,oBAAY,eAAe;IACzB,aAAa,IAAI;IACjB,UAAU,IAAI;IACd,qBAAqB,IAAI;IACzB,eAAe,IAAI;IACnB,kBAAkB,IAAI;CACvB;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAyDvG;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC;IACtD,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,CAcD;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,mBAQ5D;AAED,wFAAwF;AACxF,wBAAsB,mBAAmB,CAAC,EACxC,MAAM,EACN,cAAc,EACd,aAAa,EACb,iBAAsB,EACtB,gBAAqB,EACrB,GAAgB,GACjB,EAAE;IACD,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,cAAc,CAAC;IAC9B,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACvD,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CA6EhC;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,SAAS,UAElD;AACD,wBAAgB,UAAU,CAAC,aAAa,EAAE,UAAU,UAGnD;AA4BD,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,UAEnD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,cAAc,CAkBpF"}

package/packages/core/networking/certificate.js

@@ -54,6 +54,7 @@ export async function verifyCertificate(certs) {
     }
     const key = Buffer.from(jwk.x ?? "", "base64url");
     if (!xc.verify(xc.publicKey)) {
+        logger.log `Certificate validation failed: incorrect signature`;
         return Result.error(VerifyCertError.IncorrectSignature, () => "Certificate validation failed: incorrect signature");
     }
     const publicKey = Bytes.fromBlob(new Uint8Array(key), ED25519_KEY_BYTES);

package/packages/core/networking/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/networking",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "QUIC-based p2p networking.",
     "license": "MPL-2.0",
     "author": "Fluffy Labs",

package/packages/core/networking/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAgBhE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,sCAAsC;AACtC,MAAM,MAAM,OAAO,GAAG;IACpB,yBAAyB;IACzB,GAAG,EAAE,WAAW,CAAC;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAQF,qBAAa,IAAI;IACf,6DAA6D;WAChD,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;CAkKlF"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../packages/core/networking/setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAiBhE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,sCAAsC;AACtC,MAAM,MAAM,OAAO,GAAG;IACpB,yBAAyB;IACzB,GAAG,EAAE,WAAW,CAAC;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAQF,qBAAa,IAAI;IACf,6DAA6D;WAChD,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;CAsKlF"}

package/packages/core/networking/setup.js

@@ -3,7 +3,7 @@ import { events, QUICClient, QUICServer, QUICSocket } from "@matrixai/quic";
 import { BytesBlob } from "#@typeberry/bytes";
 import { Level, Logger } from "#@typeberry/logger";
 import { now } from "#@typeberry/utils";
-import { altNameRaw, certToPEM, ed25519AsJsonWebKeyPair, generateCertificate, privateKeyToPEM, } from "./certificate.js";
+import { altNameRaw, certToPEM, ed25519AsJsonWebKeyPair, generateCertificate, privateKeyToPEM, verifyCertificate, } from "./certificate.js";
 import { getQuicClientCrypto, getQuicServerCrypto } from "./crypto.js";
 import * as metrics from "./metrics.js";
 import { peerVerification } from "./peer-verification.js";
@@ -34,7 +34,6 @@ export class Quic {
             subjectKeyPair: keyPair,
             issuerKeyPair: keyPair,
         });
-        const lastConnectedPeer = peerVerification();
         // QUICConfig
         const config = {
             keepAliveIntervalTime: 3000,
@@ -43,7 +42,9 @@ export class Quic {
             cert: certToPEM(cert),
             key: privKeyPEM,
             verifyPeer: true,
-            verifyCallback: lastConnectedPeer.verifyCallback,
+            // Server accepts TLS and verifies the certificate in the connection handler
+            // (EventQUICServerConnection). Client overrides this with peerVerification() per dial.
+            verifyCallback: async () => undefined,
         };
         logger.info `🆔 Peer id: ** ${altNameRaw(key.pubKey)}@${host}:${port} ** (pubkey: ${key.pubKey})`;
         // Shared injected UDP socket
@@ -67,27 +68,30 @@ export class Quic {
             const conn = ev.detail;
             const peerAddress = `${conn.remoteHost}:${conn.remotePort}`;
             networkMetrics.recordConnectingIn(peerAddress);
-            if (lastConnectedPeer.info === null) {
-                networkMetrics.recordConnectInFailed("no_peer_info");
+            // Verify the peer's certificate and extract peer info.
+            const remoteCerts = conn.getRemoteCertsChain();
+            const verification = await verifyCertificate(remoteCerts);
+            if (verification.isError) {
+                networkMetrics.recordConnectInFailed("cert_verification_failed");
                 await conn.stop();
                 return;
             }
-            if (lastConnectedPeer.info.key.isEqualTo(key.pubKey)) {
+            const peerInfo = verification.ok;
+            if (peerInfo.key.isEqualTo(key.pubKey)) {
                 logger.log `🛜 Rejecting connection from ourself from ${conn.remoteHost}:${conn.remotePort}`;
                 networkMetrics.recordConnectionRefused(peerAddress);
                 await conn.stop({ isApp: true, errorCode: CloseReason.ConnectionFromOurself });
                 return;
             }
-            if (peers.isConnected(lastConnectedPeer.info.id)) {
-                logger.log `🛜 Rejecting duplicate connection with peer ${lastConnectedPeer.info.id} from ${conn.remoteHost}:${conn.remotePort}`;
+            if (peers.isConnected(peerInfo.id)) {
+                logger.log `🛜 Rejecting duplicate connection with peer ${peerInfo.id} from ${conn.remoteHost}:${conn.remotePort}`;
                 networkMetrics.recordConnectionRefused(peerAddress);
-                await conn.stop({ isApp: true, errorCode: CloseReason.DuplicateConnection });
+                await conn.stop({ isApp: true, errorCode: CloseReason.DuplicateConnection, force: false });
                 return;
             }
             logger.log `🛜 Server handshake with ${conn.remoteHost}:${conn.remotePort}`;
-            newPeer(conn, lastConnectedPeer.info, "in");
-            networkMetrics.recordConnectedIn(lastConnectedPeer.info.id);
-            lastConnectedPeer.info = null;
+            newPeer(conn, peerInfo, "in");
+            networkMetrics.recordConnectedIn(peerInfo.id);
             await conn.start();
         });
         // connecting to a peer

package/packages/core/numbers/index.d.ts

@@ -5,12 +5,16 @@ export type WithBytesRepresentation<Bytes extends number> = {
 export type FixedSizeNumber<Bytes extends number> = number & WithBytesRepresentation<Bytes>;
 /** Unsigned integer that can be represented as one byte. */
 export type U8 = FixedSizeNumber<1>;
+export declare const MAX_VALUE_U8 = 255;
 /** Unsigned integer that can be represented as two bytes. */
 export type U16 = FixedSizeNumber<2>;
+export declare const MAX_VALUE_U16 = 65535;
 /** Unsigned integer that can be represented as 4 bytes. */
 export type U32 = FixedSizeNumber<4>;
+export declare const MAX_VALUE_U32 = 4294967295;
 /** Unsigned integer that can be represented as 8 bytes. */
 export type U64 = bigint & WithBytesRepresentation<8>;
+export declare const MAX_VALUE_U64 = 18446744073709551615n;
 /** Attempt to cast an input number into U8. */
 export declare const tryAsU8: (v: number) => U8;
 /** Check if given number is a valid U8 number. */

package/packages/core/numbers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/numbers/index.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,CAAC,MAAM,wBAAwB,EAAE,OAAO,MAAM,CAAC;AAE7D,MAAM,MAAM,uBAAuB,CAAC,KAAK,SAAS,MAAM,IAAI;IAC1D,QAAQ,CAAC,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC;CAC5C,CAAC;AAKF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,IAAI,MAAM,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;AAE5F,4DAA4D;AAC5D,MAAM,MAAM,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAEpC,6DAA6D;AAC7D,MAAM,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAErC,2DAA2D;AAC3D,MAAM,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAErC,2DAA2D;AAC3D,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;AAGtD,+CAA+C;AAC/C,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,KAAG,EAGnC,CAAC;AACF,kDAAkD;AAClD,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,EAA8B,CAAC;AAErE,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,KAAG,GAGpC,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAgC,CAAC;AAExE,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,KAAG,GAGpC,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAsC,CAAC;AAE9E,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,GAAG,MAAM,KAAG,GAI7C,CAAC;AAEF,mDAAmD;AACnD,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,GAAgC,CAAC;AAExE,0CAA0C;AAC1C,eAAO,MAAM,YAAY,GAAI,kBAAkB;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE,KAAG,GAG3E,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,YAAY,GAAI,GAAG,GAAG,KAAG;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAS7D,CAAC;AAEF,qCAAqC;AACrC,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI;IACtB,uCAAuC;IACvC,QAAQ,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAEF;;;GAGG;AACH,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE;;;EAWtC;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE;;;EAWtC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,UAAU,CAEnD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,GAAG,CAGxD;AAED,iFAAiF;AACjF,eAAO,MAAM,MAAM,GAAI,GAAG,GAAG,EAAE,GAAG,QAAQ,GAAG,EAAE,KAAG,GAAoE,CAAC;AAEvH,gFAAgF;AAChF,eAAO,MAAM,MAAM,GAAI,GAAG,GAAG,EAAE,GAAG,QAAQ,GAAG,EAAE,KAAG,GAAoE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/core/numbers/index.ts"],"names":[],"mappings":"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"}

package/packages/core/numbers/index.js

@@ -1,9 +1,9 @@
 import { check } from "#@typeberry/utils";
 const asTypedNumber = (v) => v;
-const MAX_VALUE_U8 = 0xff;
-const MAX_VALUE_U16 = 0xffff;
-const MAX_VALUE_U32 = 0xffff_ffff;
-const MAX_VALUE_U64 = 0xffffffffffffffffn;
+export const MAX_VALUE_U8 = 0xff;
+export const MAX_VALUE_U16 = 0xffff;
+export const MAX_VALUE_U32 = 0xffff_ffff;
+export const MAX_VALUE_U64 = 0xffffffffffffffffn;
 /** Attempt to cast an input number into U8. */
 export const tryAsU8 = (v) => {
     check `${isU8(v)} input must have one-byte representation, got ${v}`;

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

@@ -1,23 +1,30 @@
-import { type Gas, Status } from "#@typeberry/pvm-interface";
+import { type Gas } from "#@typeberry/pvm-interface";
 import { EcalliTraceLogger } from "./ecalli-trace-logger.js";
 import type { HostCalls } from "./host-calls.js";
 import type { PvmInstanceManager } from "./pvm-instance-manager.js";
-declare class ReturnValue {
-    consumedGas: Gas;
-    status: Status | null;
-    memorySlice: Uint8Array | null;
-    private constructor();
-    static fromStatus(consumedGas: Gas, status: Status): ReturnValue;
-    static fromMemorySlice(consumedGas: Gas, memorySlice: Uint8Array): ReturnValue;
-    hasMemorySlice(): this is this & {
-        status: null;
-        memorySlice: Uint8Array;
-    };
-    hasStatus(): this is this & {
-        status: Status;
-        memorySlice: null;
-    };
+/**
+ * Outer VM return status.
+ *
+ * This is a limited status returned by outer VM.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/24a10124a101?v=0.7.2
+ */
+export declare enum ReturnStatus {
+    /** Execution succesful. */
+    OK = 0,
+    /** Execution went out of gas. */
+    OOG = 1,
+    /** Execution trapped or panicked. */
+    PANIC = 2
 }
+export type ReturnValue<TGas = Gas> = {
+    consumedGas: TGas;
+} & ({
+    status: ReturnStatus.OK;
+    memorySlice: Uint8Array;
+} | {
+    status: ReturnStatus.OOG | ReturnStatus.PANIC;
+});
 export declare class HostCallsExecutor {
     private pvmInstanceManager;
     private hostCalls;
@@ -27,5 +34,4 @@ export declare class HostCallsExecutor {
     private execute;
     runProgram(program: Uint8Array, args: Uint8Array, initialPc: number, initialGas: Gas): Promise<ReturnValue>;
 }
-export {};
 //# sourceMappingURL=host-calls-executor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"host-calls-executor.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAwB,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,cAAM,WAAW;IAEN,WAAW,EAAE,GAAG;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI;IACrB,WAAW,EAAE,UAAU,GAAG,IAAI;IAHvC,OAAO;IAWP,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAIlD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU;IAIhE,cAAc,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,WAAW,EAAE,UAAU,CAAA;KAAE;IAI1E,SAAS,IAAI,IAAI,IAAI,IAAI,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE;CAGlE;AAED,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,iBAAiB,GAAG,IAAiC;IAGzE,OAAO,CAAC,cAAc;YAoCR,OAAO;IAiFf,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;CAWlH"}
+{"version":3,"file":"host-calls-executor.d.ts","sourceRoot":"","sources":["../../../../../packages/core/pvm-host-calls/host-calls-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAgC,MAAM,0BAA0B,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;;;;GAMG;AACH,oBAAY,YAAY;IACtB,2BAA2B;IAC3B,EAAE,IAAI;IACN,iCAAiC;IACjC,GAAG,IAAI;IACP,qCAAqC;IACrC,KAAK,IAAI;CACV;AAED,MAAM,MAAM,WAAW,CAAC,IAAI,GAAG,GAAG,IAAI;IACpC,WAAW,EAAE,IAAI,CAAC;CACnB,GAAG,CACA;IACE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;IACxB,WAAW,EAAE,UAAU,CAAC;CACzB,GACD;IACE,MAAM,EAAE,YAAY,CAAC,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC;CAC/C,CACJ,CAAC;AAEF,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,SAAS,EACpB,QAAQ,GAAE,iBAAiB,GAAG,IAAiC;IAGzE,OAAO,CAAC,cAAc;YAqCR,OAAO;IAkFf,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;CAWlH"}

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

@@ -4,32 +4,22 @@ import { EcalliTraceLogger } from "./ecalli-trace-logger.js";
 import { PvmExecution, tryAsHostCallIndex } from "./host-call-handler.js";
 import { HostCallMemory } from "./host-call-memory.js";
 import { HostCallRegisters } from "./host-call-registers.js";
-class ReturnValue {
-    consumedGas;
-    status;
-    memorySlice;
-    constructor(consumedGas, status, memorySlice) {
-        this.consumedGas = consumedGas;
-        this.status = status;
-        this.memorySlice = memorySlice;
-        check `
-      ${(status === null && memorySlice !== null) || (status !== null && memorySlice === null)}
-      'status' and 'memorySlice' must not both be null or both be non-null — exactly one must be provided
-    `;
-    }
-    static fromStatus(consumedGas, status) {
-        return new ReturnValue(consumedGas, status, null);
-    }
-    static fromMemorySlice(consumedGas, memorySlice) {
-        return new ReturnValue(consumedGas, null, memorySlice);
-    }
-    hasMemorySlice() {
-        return this.memorySlice instanceof Uint8Array && this.status === null;
-    }
-    hasStatus() {
-        return !this.hasMemorySlice();
-    }
-}
+/**
+ * Outer VM return status.
+ *
+ * This is a limited status returned by outer VM.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/24a10124a101?v=0.7.2
+ */
+export var ReturnStatus;
+(function (ReturnStatus) {
+    /** Execution succesful. */
+    ReturnStatus[ReturnStatus["OK"] = 0] = "OK";
+    /** Execution went out of gas. */
+    ReturnStatus[ReturnStatus["OOG"] = 1] = "OOG";
+    /** Execution trapped or panicked. */
+    ReturnStatus[ReturnStatus["PANIC"] = 2] = "PANIC";
+})(ReturnStatus || (ReturnStatus = {}));
 export class HostCallsExecutor {
     pvmInstanceManager;
     hostCalls;
@@ -40,26 +30,27 @@ export class HostCallsExecutor {
         this.ioTracer = ioTracer;
     }
     getReturnValue(status, pvmInstance, registers, memory) {
-        const gasConsumed = pvmInstance.gas.used();
+        const consumedGas = pvmInstance.gas.used();
         const pc = pvmInstance.getPC();
         const gas = pvmInstance.gas.get();
         if (status === Status.OOG) {
             this.ioTracer?.logOog(pc, gas, registers);
-            return ReturnValue.fromStatus(gasConsumed, status);
+            return { consumedGas, status: ReturnStatus.OOG };
         }
         if (status === Status.HALT) {
             this.ioTracer?.logHalt(pc, gas, registers);
             const address = registers.get(7);
+            // NOTE we are taking the the lower U32 part of the register, hence it's safe.
             const length = Number(registers.get(8) & 0xffffffffn);
             const result = safeAllocUint8Array(length);
             const loadResult = memory.loadInto(result, address);
             if (loadResult.isError) {
-                return ReturnValue.fromMemorySlice(gasConsumed, new Uint8Array());
+                return { consumedGas, status: ReturnStatus.OK, memorySlice: new Uint8Array() };
             }
-            return ReturnValue.fromMemorySlice(gasConsumed, result);
+            return { consumedGas, status: ReturnStatus.OK, memorySlice: result };
         }
         this.ioTracer?.logPanic(pvmInstance.getExitParam() ?? 0, pc, gas, registers);
-        return ReturnValue.fromStatus(gasConsumed, Status.PANIC);
+        return { consumedGas, status: ReturnStatus.PANIC };
     }
     async execute(pvmInstance) {
         const ioTracker = this.ioTracer?.tracker() ?? null;
@@ -89,6 +80,7 @@ export class HostCallsExecutor {
             const hostCallIndex = tryAsHostCallIndex(exitParam);
             // retrieve the host call
             const hostCall = this.hostCalls.get(hostCallIndex);
+            // NOTE: `basicGasCost(regs)` function is for compatibility reasons: pre GP 0.7.2
             const basicGasCost = typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(registers);
             // calculate gas
             const gasBefore = gas.get();

package/packages/core/pvm-interpreter/ops/math-consts.d.ts

@@ -1,6 +1,5 @@
-export declare const MAX_VALUE = 4294967295;
-export declare const MAX_VALUE_U64: bigint;
-export declare const MIN_VALUE: number;
+export declare const MAX_VALUE_I64: bigint;
+export declare const MIN_VALUE_I32: number;
 export declare const MAX_SHIFT_U32 = 32;
 export declare const MAX_SHIFT_U64 = 64n;
 //# sourceMappingURL=math-consts.d.ts.map

package/packages/core/pvm-interpreter/ops/math-consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"math-consts.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/pvm-interpreter/ops/math-consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,aAAa,CAAC;AACpC,eAAO,MAAM,aAAa,QAAY,CAAC;AACvC,eAAO,MAAM,SAAS,QAAa,CAAC;AACpC,eAAO,MAAM,aAAa,KAAK,CAAC;AAChC,eAAO,MAAM,aAAa,MAAM,CAAC"}
+{"version":3,"file":"math-consts.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/pvm-interpreter/ops/math-consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAY,CAAC;AACvC,eAAO,MAAM,aAAa,QAAa,CAAC;AACxC,eAAO,MAAM,aAAa,KAAK,CAAC;AAChC,eAAO,MAAM,aAAa,MAAM,CAAC"}

package/packages/core/pvm-interpreter/ops/math-consts.js

@@ -1,5 +1,4 @@
-export const MAX_VALUE = 4294967295;
-export const MAX_VALUE_U64 = 2n ** 63n;
-export const MIN_VALUE = -(2 ** 31);
+export const MAX_VALUE_I64 = 2n ** 63n;
+export const MIN_VALUE_I32 = -(2 ** 31);
 export const MAX_SHIFT_U32 = 32;
 export const MAX_SHIFT_U64 = 64n;

package/packages/core/pvm-interpreter/ops/math-ops.js

@@ -1,5 +1,5 @@
 import { signExtend32To64 } from "../registers.js";
-import { MIN_VALUE } from "./math-consts.js";
+import { MIN_VALUE_I32 } from "./math-consts.js";
 import { addWithOverflowU32, addWithOverflowU64, maxBigInt, minBigInt, mulLowerUnsignedU32, mulU64, mulUpperSS, mulUpperSU, mulUpperUU, subU32, subU64, } from "./math-utils.js";
 export class MathOps {
     regs;
@@ -61,7 +61,7 @@ export class MathOps {
         if (this.regs.getLowerU32(secondIndex) === 0) {
             this.regs.setU64(resultIndex, 2n ** 64n - 1n);
         }
-        else if (this.regs.getLowerI32(secondIndex) === -1 && this.regs.getLowerI32(firstIndex) === MIN_VALUE) {
+        else if (this.regs.getLowerI32(secondIndex) === -1 && this.regs.getLowerI32(firstIndex) === MIN_VALUE_I32) {
             this.regs.setU64(resultIndex, signExtend32To64(this.regs.getLowerU32(firstIndex)));
         }
         else {
@@ -99,7 +99,7 @@ export class MathOps {
         if (this.regs.getLowerU32(secondIndex) === 0) {
             this.regs.setU64(resultIndex, BigInt(this.regs.getLowerI32(firstIndex)));
         }
-        else if (this.regs.getLowerI32(secondIndex) === -1 && this.regs.getLowerI32(firstIndex) === MIN_VALUE) {
+        else if (this.regs.getLowerI32(secondIndex) === -1 && this.regs.getLowerI32(firstIndex) === MIN_VALUE_I32) {
             this.regs.setU64(resultIndex, 0n);
         }
         else {

package/packages/core/pvm-interpreter/ops/math-utils.js

@@ -1,25 +1,25 @@
+import { MAX_VALUE_U32 } from "#@typeberry/numbers";
 import { check } from "#@typeberry/utils";
-import { MAX_VALUE } from "./math-consts.js";
 /**
  * Overflowing addition for two-complement representation of 32-bit signed numbers.
  */
 export function addWithOverflowU32(a, b) {
-    if (a > MAX_VALUE - b) {
+    if (a > MAX_VALUE_U32 - b) {
         /**
-         * MAX_VALUE is equal to 2 ** 32 - 1
-         * MAX_VALUE - ( (MAX_VALUE - a) + (MAX_VALUE - b) ) - 1
-         * = MAX_VALUE - (2MAX_VALUE - a - b) -1
-         * = MAX_VALUE - 2MAX_VALUE + a + b - 1
-         * = a + b - MAX_VALUE - 1
+         * MAX_VALUE_U32 is equal to 2 ** 32 - 1
+         * MAX_VALUE_U32 - ( (MAX_VALUE_U32 - a) + (MAX_VALUE_U32 - b) ) - 1
+         * = MAX_VALUE_U32 - (2MAX_VALUE_U32 - a - b) -1
+         * = MAX_VALUE_U32 - 2MAX_VALUE_U32 + a + b - 1
+         * = a + b - MAX_VALUE_U32 - 1
          * = a + b - 2 ** 32
-         * but we know that 2MAX_VALUE > a + b > MAX_VALUE so in this case:
+         * but we know that 2MAX_VALUE_U32 > a + b > MAX_VALUE_U32 so in this case:
          * a + b - 2 ** 32 <=> (a + b) % 2 ** 32
-         * = (a + b) % (MAX_VALUE + 1)
+         * = (a + b) % (MAX_VALUE_U32 + 1)
          */
-        const spaceToMaxA = MAX_VALUE - a;
-        const spaceToMaxB = MAX_VALUE - b;
+        const spaceToMaxA = MAX_VALUE_U32 - a;
+        const spaceToMaxB = MAX_VALUE_U32 - b;
         const overflowSum = spaceToMaxA + spaceToMaxB;
-        return MAX_VALUE - overflowSum - 1;
+        return MAX_VALUE_U32 - overflowSum - 1;
     }
     return a + b;
 }
@@ -34,7 +34,7 @@ export function addWithOverflowU64(a, b) {
  */
 export function subU32(a, b) {
     if (b > a) {
-        return MAX_VALUE - b + a + 1;
+        return MAX_VALUE_U32 - b + a + 1;
     }
     return a - b;
 }

package/packages/core/pvm-interpreter/ops/math-utils.test.js

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { MAX_VALUE, MAX_VALUE_U64 } from "./math-consts.js";
+import { MAX_VALUE_U32 } from "#@typeberry/numbers";
+import { MAX_VALUE_I64 } from "./math-consts.js";
 import { addWithOverflowU32, addWithOverflowU64, maxBigInt, minBigInt, mulLowerUnsignedU32, mulU64, mulUpperSS, mulUpperSU, mulUpperUU, subU32, subU64, unsignedRightShiftBigInt, } from "./math-utils.js";
 describe("math-utils", () => {
     describe("addWithOverflow", () => {
@@ -12,7 +13,7 @@ describe("math-utils", () => {
             assert.strictEqual(result, expectedResult);
         });
         it("should add two numbers (big and small) without overflow", () => {
-            const a = MAX_VALUE;
+            const a = MAX_VALUE_U32;
             const b = 6;
             const expectedResult = 5;
             const result = addWithOverflowU32(a, b);
@@ -26,9 +27,9 @@ describe("math-utils", () => {
             assert.strictEqual(result, expectedResult);
         });
         it("should add max values with overflow", () => {
-            const a = MAX_VALUE;
-            const b = MAX_VALUE;
-            const expectedResult = MAX_VALUE - 1;
+            const a = MAX_VALUE_U32;
+            const b = MAX_VALUE_U32;
+            const expectedResult = MAX_VALUE_U32 - 1;
             const result = addWithOverflowU32(a, b);
             assert.strictEqual(result, expectedResult);
         });
@@ -44,7 +45,7 @@ describe("math-utils", () => {
         it("should subtract two numbers with overflow", () => {
             const a = 5;
             const b = 6;
-            const expectedResult = MAX_VALUE;
+            const expectedResult = MAX_VALUE_U32;
             const result = subU32(a, b);
             assert.strictEqual(result, expectedResult);
         });
@@ -95,29 +96,29 @@ describe("math-utils", () => {
             assert.strictEqual(result, expectedResult);
         });
         it("should multiply two big positive numbers", () => {
-            const a = MAX_VALUE_U64;
-            const b = MAX_VALUE_U64;
+            const a = MAX_VALUE_I64;
+            const b = MAX_VALUE_I64;
             const expectedResult = 0x4000000000000000n;
             const result = mulUpperUU(a, b);
             assert.strictEqual(result, expectedResult);
         });
         it("should multiply two big positive and negative numbers", () => {
-            const a = MAX_VALUE_U64;
-            const b = -MAX_VALUE_U64;
+            const a = MAX_VALUE_I64;
+            const b = -MAX_VALUE_I64;
             const expectedResult = 4611686018427387904n;
             const result = mulUpperUU(a, b);
             assert.strictEqual(result, expectedResult);
         });
         it("should multiply two big negative and positive numbers", () => {
-            const a = -MAX_VALUE_U64;
-            const b = MAX_VALUE_U64;
+            const a = -MAX_VALUE_I64;
+            const b = MAX_VALUE_I64;
             const expectedResult = 4611686018427387904n;
             const result = mulUpperUU(a, b);
             assert.strictEqual(result, expectedResult);
         });
         it("should multiply two big negative numbers", () => {
-            const a = -MAX_VALUE_U64;
-            const b = -MAX_VALUE_U64;
+            const a = -MAX_VALUE_I64;
+            const b = -MAX_VALUE_I64;
             const expectedResult = 0x4000000000000000n;
             const result = mulUpperUU(a, b);
             assert.strictEqual(result, expectedResult);
@@ -153,8 +154,8 @@ describe("math-utils", () => {
             assert.strictEqual(result, expectedResult);
         });
         it("should multiply two big positive numbers", () => {
-            const a = MAX_VALUE_U64;
-            const b = MAX_VALUE_U64;
+            const a = MAX_VALUE_I64;
+            const b = MAX_VALUE_I64;
             const expectedResult = 0x4000000000000000n;
             const result = mulUpperSU(a, b);
             assert.strictEqual(result, expectedResult);

package/packages/core/telemetry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typeberry/telemetry",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "OpenTelemetry initialization utilities for Typeberry",
     "license": "MPL-2.0",
     "author": "Fluffy Labs",

package/packages/core/utils/compatibility.d.ts

@@ -1,5 +1,4 @@
 export declare enum GpVersion {
-    V0_7_0 = "0.7.0",
     V0_7_1 = "0.7.1",
     V0_7_2 = "0.7.2"
 }