@typeberry/lib 0.5.4 → 0.5.5-befa219

package/packages/jam/state/statistics.js

@@ -1,9 +1,7 @@
 import { codecPerValidator, tryAsServiceGas, } from "#@typeberry/block";
 import { codec } from "#@typeberry/codec";
 import { tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { codecPerCore } from "./common.js";
-import { ignoreValueWithDefault } from "./service.js";
 /**
  * Activity Record of a single validator.
  *
@@ -134,42 +132,20 @@ export class ServiceStatistics {
     extrinsicCount;
     accumulateCount;
     accumulateGasUsed;
-    onTransfersCount;
-    onTransfersGasUsed;
-    static Codec = Compatibility.selectIfGreaterOrEqual({
-        fallback: codec.Class(ServiceStatistics, {
-            providedCount: codecVarU16,
-            providedSize: codec.varU32,
-            refinementCount: codec.varU32,
-            refinementGasUsed: codecVarGas,
-            imports: codecVarU16,
-            extrinsicCount: codecVarU16,
-            extrinsicSize: codec.varU32,
-            exports: codecVarU16,
-            accumulateCount: codec.varU32,
-            accumulateGasUsed: codecVarGas,
-            onTransfersCount: codec.varU32,
-            onTransfersGasUsed: codecVarGas,
-        }),
-        versions: {
-            [GpVersion.V0_7_1]: codec.Class(ServiceStatistics, {
-                providedCount: codecVarU16,
-                providedSize: codec.varU32,
-                refinementCount: codec.varU32,
-                refinementGasUsed: codecVarGas,
-                imports: codecVarU16,
-                extrinsicCount: codecVarU16,
-                extrinsicSize: codec.varU32,
-                exports: codecVarU16,
-                accumulateCount: codec.varU32,
-                accumulateGasUsed: codecVarGas,
-                onTransfersCount: ignoreValueWithDefault(tryAsU32(0)),
-                onTransfersGasUsed: ignoreValueWithDefault(tryAsServiceGas(0)),
-            }),
-        },
+    static Codec = codec.Class(ServiceStatistics, {
+        providedCount: codecVarU16,
+        providedSize: codec.varU32,
+        refinementCount: codec.varU32,
+        refinementGasUsed: codecVarGas,
+        imports: codecVarU16,
+        extrinsicCount: codecVarU16,
+        extrinsicSize: codec.varU32,
+        exports: codecVarU16,
+        accumulateCount: codec.varU32,
+        accumulateGasUsed: codecVarGas,
     });
     static create(v) {
-        return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed, v.onTransfersCount, v.onTransfersGasUsed);
+        return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed);
     }
     constructor(
     /** `p.0` */
@@ -191,11 +167,7 @@ export class ServiceStatistics {
     /** `a.0` */
     accumulateCount, 
     /** `a.1` */
-    accumulateGasUsed, 
-    /** `t.0` @deprecated since 0.7.1 */
-    onTransfersCount, 
-    /** `t.1` @deprecated since 0.7.1 */
-    onTransfersGasUsed) {
+    accumulateGasUsed) {
         this.providedCount = providedCount;
         this.providedSize = providedSize;
         this.refinementCount = refinementCount;
@@ -206,14 +178,12 @@ export class ServiceStatistics {
         this.extrinsicCount = extrinsicCount;
         this.accumulateCount = accumulateCount;
         this.accumulateGasUsed = accumulateGasUsed;
-        this.onTransfersCount = onTransfersCount;
-        this.onTransfersGasUsed = onTransfersGasUsed;
     }
     static empty() {
         const zero = tryAsU32(0);
         const zero16 = tryAsU16(0);
         const zeroGas = tryAsServiceGas(0);
-        return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas, zero, zeroGas);
+        return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas);
     }
 }
 /** `pi`: Statistics of each validator, cores statistics and services statistics. */

package/packages/jam/state/statistics.test.js

@@ -2,16 +2,9 @@ import { describe, it } from "node:test";
 import { BytesBlob } from "#@typeberry/bytes";
 import { Decoder } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { StatisticsData } from "./statistics.js";
 describe("Statistics", () => {
-    const STATISTICS = Compatibility.selectIfGreaterOrEqual({
-        fallback: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e0000000000000000000100000000000001000000000000000000",
-        versions: {
-            // varu32 for serviceid + no onTransfer
-            [GpVersion.V0_7_1]: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
-        },
-    });
+    const STATISTICS = "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000";
     it("should decode statistics data with no error", () => {
         Decoder.decodeObject(StatisticsData.Codec, BytesBlob.parseBlob(STATISTICS), tinyChainSpec);
     });

package/packages/jam/state/test.utils.d.ts

@@ -1,5 +1,5 @@
 import { InMemoryState } from "./index.js";
 export declare const testState: () => InMemoryState;
-export declare const TEST_STATE_ROOT: string;
+export declare const TEST_STATE_ROOT = "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a";
 export declare const TEST_STATE: string[][];
 //# sourceMappingURL=test.utils.d.ts.map

package/packages/jam/state/test.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAUL,aAAa,EAYd,MAAM,YAAY,CAAC;AAKpB,eAAO,MAAM,SAAS,QAAO,aAyT5B,CAAC;AAqCF,eAAO,MAAM,eAAe,QAK1B,CAAC;AAEH,eAAO,MAAM,UAAU,YAkHtB,CAAC"}
+{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"AAmBA,OAAO,EAUL,aAAa,EAYd,MAAM,YAAY,CAAC;AAKpB,eAAO,MAAM,SAAS,QAAO,aAuT5B,CAAC;AAqCF,eAAO,MAAM,eAAe,uEAAuE,CAAC;AAEpG,eAAO,MAAM,UAAU,YAsGtB,CAAC"}

package/packages/jam/state/test.utils.js

@@ -7,7 +7,6 @@ import { tinyChainSpec } from "#@typeberry/config";
 import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { MAX_VALUE_U32, tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { AUTHORIZATION_QUEUE_SIZE, AvailabilityAssignment, accumulationOutputComparator, BlockState, CoreStatistics, DisputesRecords, ENTROPY_ENTRIES, hashComparator, InMemoryService, InMemoryState, LookupHistoryItem, PreimageItem, PrivilegedServices, RecentBlocks, SafroleSealingKeysData, ServiceAccountInfo, ServiceStatistics, StatisticsData, tryAsPerCore, ValidatorData, ValidatorStatistics, } from "./index.js";
 const spec = tinyChainSpec;
 // based on jamduna/assurances/state_snapshots/1_004.json
@@ -187,8 +186,6 @@ export const testState = () => {
                         refinementGasUsed: tryAsServiceGas(0),
                         accumulateCount: tryAsU32(0),
                         accumulateGasUsed: tryAsServiceGas(0),
-                        onTransfersCount: tryAsU32(0),
-                        onTransfersGasUsed: tryAsServiceGas(0),
                     }),
                 ],
             ]),
@@ -295,12 +292,7 @@ const testValidatorData = () => Decoder.decodeObject(codecPerValidator(Validator
 const TEST_AVAILABILITY_ASSIGNMENT = "0xac9928d4eb0c942a07c40157fa4498b2efbbc65136819517dc94d50ff2ca9f490e010000ebb6b040a0ea039a8f9593e3a4b29005b1ebea1c5465c2753db1031a3ef30c85000000000000000000000000000000000000000000000000000000000000000000001a7d753af2e2be12f88dfcb7ca5c704641534094b061c8c3aa258d4b0acbf5c85e8f73cf5d9f94cb3a8313361a3b48e97968a9ac52ab9c29b4e88f4159c21560ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb53a31fd60656cb3de2c6ba9fafb8dee8d4c45d4bc87ca248cdda7625a68b987fb0e00000000000b27478648cd19b4f812f897a26976ecf312eac28508b4368d0c63ea949c7cb0000000010000000015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081584796f4f11ace690fc5a5bdb847db1e63cb36c97ef8f90f067a0846b654bf1c294260000000000000024ccbea4bf12716bc7f7583dd834aac2ca1b05af8dc5be285336156d0de73d9b9e20620000000000000010000000";
 const TEST_VALIDATOR_DATA = "0x5e465beb01dbafe160ce8216047f2155dd0569f058afd52dcea601025a8d161d3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29b27150a1f1cd24bccc792ba7ba4220a1e8c36636e35a969d1d14b4c89bce7d1d463474fb186114a89dd70e88506fefc9830756c27a7845bec1cb6ee31e07211afd0dde34f0dc5d89231993cd323973faa23d84d521fd574e840b8617c75d1a1d0102aa3c71999137001a77464ced6bb2885c460be760c709009e26395716a52c8c52e6e23906a455b4264e7d0c75466e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003d5e5a51aab2b048f8686ecd79712a80e3265a114cc73f14bdb2a59233fb66d022351e22105a19aabb42589162ad7f1ea0df1c25cebf0e4a9fcd261301274862a2534be5b2f761dc898160a9b4762eb46bd171222f6cdf87f5127a9e8970a54c44fe7b2e12dda098854a9aaab03c3a47953085668673a84b0cedb4b0391ed6ae2deb1c3e04f0bc618a2bc1287d8599e8a1c47ff715cd4cbd3fe80e2607744d4514b491ed2ef76ae114ecb1af99ba6af32189bf0471c06aa3e6acdaf82e7a959cb24a5c1444cac3a6678f5182459fd8ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa2b95f7572875b0d0f186552ae745ba8222fc0b5bd456554bfe51c68938f8bce68e0cf7f26c59f963b5846202d2327cc8bc0c4eff8cb9abd4012f9a71decf008faee314528448651e50bea6d2e7e5d3176698fea0b932405a4ec0a19775e72325e44a6d28f99fba887e04eb818f13d1b73f75f0161644283df61e7fbaad7713fae0ef79fe92499202834c97f512d744515a57971badf2df62e23697e9fe347f168fed0adb9ace131f49bbd500a324e2469569423f37c5d3b430990204ae17b383fcd582cb864168c8b46be8d779e7ca00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007f6190116d118d643a98878e294ccf62b509e214299931aad8ff9764181a4e33b3e0e096b02e2ec98a3441410aeddd78c95e27a0da6f411a09c631c0f2bea6e98dfdac3e2f604ecda637e4969a139ceb70c534bd5edc4210eb5ac71178c1d62f0c977197a2c6a9e8ada6a14395bc9aa3a384d35f40c3493e20cb7efaa799f66d1cedd5b2928f8e34438b07072bbae404d7dfcee3f457f9103173805ee163ba550854e4660ccec49e25fafdb00e6adfbc8e875de1a9541e1721e956b972ef2b135cc7f71682615e12bb7d6acd353d7681000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000048e5fcdce10e0b64ec4eebd0d9211c7bac2f27ce54bca6f7776ff6fee86ab3e35c7f34a4bd4f2d04076a8c6f9060a0c8d2c6bdd082ceb3eda7df381cb260faffb78a95d81f6c7cdc517a36d81191b6f7718dcf44e76c0ce9fb724d3aea39fdb3c5f4ee31eb1f45e55b783b687b1e9087b092a18341c7cda102b4100685b0a014d55f1ccdb7600ec0db14bb90f7fc3126dc2625945bb44f302fc80df0c225546c06fa1952ef05bdc83ceb7a23373de0637cd9914272e3e3d1a455db6c48cc6b2b2c17e1dcf7cd1586a235821308aee0010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f16e5352840afb47e206b5c89f560f2611835855cf2e6ebad1acc9520a72591d837ce344bc9defceb0d7de7e9e9925096768b7adb4dad932e532eb6551e0ea02b0b9121622bf8a9a9e811ee926740a876dd0d9036f2f3060ebfab0c7c489a338a7728ee2da4a265696edcc389fe02b2caf20b5b83aeb64aaf4184bedf127f4eea1d737875854411d58ca4a2b69b066b0a0c09d2a0b7121ade517687c51954df913fe930c227723dd8f58aa2415946044dc3fb15c367a2185d0fc1f7d2bb102ff14a230d5f81cfc8ad445e51efddbf4260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 // from post state of jamduna/assurances/1_004.json
-export const TEST_STATE_ROOT = Compatibility.selectIfGreaterOrEqual({
-    fallback: "0xa48088ed900219e5115670c1dff1ae69396b8ca152f6a3d279d770114c458059",
-    versions: {
-        [GpVersion.V0_7_1]: "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a",
-    },
-});
+export const TEST_STATE_ROOT = "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a";
 export const TEST_STATE = [
     [
         "0x00c20098009400262ddad30703d028b614fe7572b765190496015086af3580e0",
@@ -384,21 +376,13 @@ export const TEST_STATE = [
     ["0x0b00000000000000000000000000000000000000000000000000000000000000", "0x10000000", "c11", ""],
     [
         "0x0c00000000000000000000000000000000000000000000000000000000000000",
-        Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? "0x00000000000000000000000000000000ffffffff00"
-            : "0x0000000000000000000000000000000000",
+        "0x00000000000000000000000000000000ffffffff00",
         "c12",
         "",
     ],
     [
         "0x0d00000000000000000000000000000000000000000000000000000000000000",
-        Compatibility.selectIfGreaterOrEqual({
-            fallback: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e0000000000000000000100000000000001000000000000000000",
-            versions: {
-                // varu32 for serviceid + no onTransfer
-                [GpVersion.V0_7_1]: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
-            },
-        }),
+        "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
         "c13",
         "",
     ],
@@ -407,9 +391,7 @@ export const TEST_STATE = [
     ["0x1000000000000000000000000000000000000000000000000000000000000000", "0x00", "c16", ""],
     [
         "0xff00000000000000000000000000000000000000000000000000000000000000",
-        Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? "0x0015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000"
-            : "0x15f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000",
+        "0x0015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000",
         "service_account",
         "s=0|c=0x15f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf497950815 b=10000000000 g=100 m=100 l=1296 f=1024 i=4 r=10 a=15 p=1|clen=32",
     ],

package/packages/jam/state-json/accounts.d.ts

@@ -16,6 +16,16 @@ declare class JsonStorageItem {
     value: BytesBlob;
 }
 export declare class JsonService {
+    static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, InMemoryService>;
+    id: ServiceId;
+    data: {
+        service: ServiceAccountInfo;
+        storage?: JsonStorageItem[];
+        preimage_blobs?: JsonPreimageItem[];
+        preimage_requests?: LookupHistoryItem[];
+    };
+}
+export declare class JsonServicePre072 {
     static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, InMemoryService>;
     id: ServiceId;
     data: {

package/packages/jam/state-json/accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EACL,eAAe,EACf,iBAAiB,EAEjB,YAAY,EACZ,kBAAkB,EAGnB,MAAM,kBAAkB,CAAC;AA0D1B,cAAM,gBAAgB;IACpB,MAAM,CAAC,QAAQ,6EAMb;IAEF,IAAI,EAAG,YAAY,CAAC;IACpB,IAAI,EAAG,SAAS,CAAC;CAClB;AAED,cAAM,eAAe;IACnB,MAAM,CAAC,QAAQ;;;MAGb;IAEF,GAAG,EAAG,SAAS,CAAC;IAChB,KAAK,EAAG,SAAS,CAAC;CACnB;AAkCD,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,gFAiDb;IAEF,EAAE,EAAG,SAAS,CAAC;IACf,IAAI,EAAG;QACL,OAAO,EAAE,kBAAkB,CAAC;QAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5B,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;QAClC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;KACxC,CAAC;CACH"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EACL,eAAe,EACf,iBAAiB,EAEjB,YAAY,EACZ,kBAAkB,EAGnB,MAAM,kBAAkB,CAAC;AA0D1B,cAAM,gBAAgB;IACpB,MAAM,CAAC,QAAQ,6EAMb;IAEF,IAAI,EAAG,YAAY,CAAC;IACpB,IAAI,EAAG,SAAS,CAAC;CAClB;AAED,cAAM,eAAe;IACnB,MAAM,CAAC,QAAQ;;;MAGb;IAEF,GAAG,EAAG,SAAS,CAAC;IAChB,KAAK,EAAG,SAAS,CAAC;CACnB;AAqBD,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,gFAuCb;IAEF,EAAE,EAAG,SAAS,CAAC;IACf,IAAI,EAAG;QACL,OAAO,EAAE,kBAAkB,CAAC;QAC5B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5B,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,CAAC;KACzC,CAAC;CACH;AAeD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,gFA0Cb;IAEF,EAAE,EAAG,SAAS,CAAC;IACf,IAAI,EAAG;QACL,OAAO,EAAE,kBAAkB,CAAC;QAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5B,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;QAClC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;KACxC,CAAC;CACH"}

package/packages/jam/state-json/accounts.js

@@ -5,10 +5,10 @@ import { HashDictionary } from "#@typeberry/collections";
 import { json } from "#@typeberry/json-parser";
 import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
 import { InMemoryService, LookupHistoryItem, PreimageItem, ServiceAccountInfo, StorageItem, } from "#@typeberry/state";
-import { asOpaqueType, Compatibility, GpVersion } from "#@typeberry/utils";
+import { asOpaqueType } from "#@typeberry/utils";
 class JsonServiceInfo {
     static fromJson = json.object({
-        ...(Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? { version: "number" } : {}),
+        version: "number",
         code_hash: fromJson.bytes32(),
         balance: json.fromNumber((x) => tryAsU64(x)),
         min_item_gas: json.fromNumber((x) => tryAsServiceGas(x)),
@@ -61,33 +61,61 @@ class JsonStorageItem {
     key;
     value;
 }
-const lookupMetaFromJson = json.object({
+const preimageStatusFromJson = json.object({
     key: {
         hash: fromJson.bytes32(),
         length: "number",
     },
     value: json.array("number"),
-}, ({ key, value }) => new LookupHistoryItem(key.hash, key.length, value));
-const preimageStatusFromJson = json.object({
+}, ({ key, value }) => new LookupHistoryItem(key.hash, tryAsU32(key.length), value));
+export class JsonService {
+    static fromJson = json.object({
+        id: "number",
+        data: {
+            service: JsonServiceInfo.fromJson,
+            storage: json.optional(json.array(JsonStorageItem.fromJson)),
+            preimage_blobs: json.optional(json.array(JsonPreimageItem.fromJson)),
+            preimage_requests: json.optional(json.array(preimageStatusFromJson)),
+        },
+    }, ({ id, data }) => {
+        const preimages = HashDictionary.fromEntries((data.preimage_blobs ?? []).map((x) => [x.hash, x]));
+        const lookupHistory = HashDictionary.new();
+        for (const item of data.preimage_requests ?? []) {
+            const data = lookupHistory.get(item.hash) ?? [];
+            data.push(item);
+            lookupHistory.set(item.hash, data);
+        }
+        const storage = new Map();
+        const entries = (data.storage ?? []).map(({ key, value }) => {
+            const opaqueKey = asOpaqueType(key);
+            return [opaqueKey, StorageItem.create({ key: opaqueKey, value })];
+        });
+        for (const [key, item] of entries) {
+            storage.set(key.toString(), item);
+        }
+        return new InMemoryService(id, {
+            info: data.service,
+            preimages,
+            storage,
+            lookupHistory,
+        });
+    });
+    id;
+    data;
+}
+const preimageStatusFromJson072 = json.object({
     hash: fromJson.bytes32(),
     status: json.array("number"),
 }, ({ hash, status }) => new LookupHistoryItem(hash, tryAsU32(0), status));
-export class JsonService {
+export class JsonServicePre072 {
     static fromJson = json.object({
         id: "number",
-        data: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? {
-                service: JsonServiceInfo.fromJson,
-                storage: json.optional(json.array(JsonStorageItem.fromJson)),
-                preimages_blob: json.optional(json.array(JsonPreimageItem.fromJson)),
-                preimages_status: json.optional(json.array(preimageStatusFromJson)),
-            }
-            : {
-                service: JsonServiceInfo.fromJson,
-                preimages: json.optional(json.array(JsonPreimageItem.fromJson)),
-                storage: json.optional(json.array(JsonStorageItem.fromJson)),
-                lookup_meta: json.optional(json.array(lookupMetaFromJson)),
-            },
+        data: {
+            service: JsonServiceInfo.fromJson,
+            storage: json.optional(json.array(JsonStorageItem.fromJson)),
+            preimages_blob: json.optional(json.array(JsonPreimageItem.fromJson)),
+            preimages_status: json.optional(json.array(preimageStatusFromJson072)),
+        },
     }, ({ id, data }) => {
         const preimages = HashDictionary.fromEntries((data.preimages ?? data.preimages_blob ?? []).map((x) => [x.hash, x]));
         const lookupHistory = HashDictionary.new();

package/packages/jam/state-json/dump.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/dump.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,EAKL,aAAa,EAMd,MAAM,kBAAkB,CAAC;AA4C1B,eAAO,MAAM,qBAAqB,GAAI,MAAM,SAAS,gFA2GlD,CAAC"}
+{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/dump.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,EAKL,aAAa,EAMd,MAAM,kBAAkB,CAAC;AA2C1B,eAAO,MAAM,qBAAqB,GAAI,MAAM,SAAS,gFAwGlD,CAAC"}

package/packages/jam/state-json/dump.js

@@ -1,12 +1,11 @@
-import { tryAsPerEpochBlock, tryAsServiceGas, tryAsServiceId, } from "#@typeberry/block";
+import { tryAsPerEpochBlock, tryAsServiceGas } from "#@typeberry/block";
 import { fromJson } from "#@typeberry/block-json";
 import { Bytes } from "#@typeberry/bytes";
 import { asKnownSize, HashSet, SortedArray } from "#@typeberry/collections";
 import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
 import { json } from "#@typeberry/json-parser";
 import { AUTHORIZATION_QUEUE_SIZE, accumulationOutputComparator, InMemoryState, MAX_AUTH_POOL_SIZE, PrivilegedServices, RecentBlocks, tryAsPerCore, } from "#@typeberry/state";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
-import { JsonService } from "./accounts.js";
+import { JsonServicePre072 } from "./accounts.js";
 import { accumulationOutput } from "./accumulation-output.js";
 import { availabilityAssignmentFromJson } from "./availability-assignment.js";
 import { disputesRecordsFromJson } from "./disputes.js";
@@ -36,18 +35,15 @@ export const fullStateDumpFromJson = (spec) => json.object({
         chi_m: "number",
         chi_a: json.array("number"),
         chi_v: "number",
-        chi_r: json.optional("number"),
+        chi_r: "number",
         chi_g: json.nullable(json.map("number", json.fromNumber((v) => tryAsServiceGas(v)))),
     },
     pi: JsonStatisticsData.fromJson,
     omega: json.array(json.array(notYetAccumulatedFromJson)),
     xi: json.array(json.array(fromJson.bytes32())),
     theta: json.nullable(json.array(accumulationOutput)),
-    accounts: json.array(JsonService.fromJson),
+    accounts: json.array(JsonServicePre072.fromJson),
 }, ({ alpha, varphi, beta, gamma, psi, eta, iota, kappa, lambda, rho, tau, chi, pi, omega, xi, theta, accounts, }) => {
-    if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) && chi.chi_r === undefined) {
-        throw new Error("Registrar is required in Privileges GP ^0.7.1");
-    }
     return InMemoryState.new(spec, {
         authPools: tryAsPerCore(alpha.map((perCore) => {
             if (perCore.length > MAX_AUTH_POOL_SIZE) {
@@ -77,7 +73,7 @@ export const fullStateDumpFromJson = (spec) => json.object({
             manager: chi.chi_m,
             assigners: chi.chi_a,
             delegator: chi.chi_v,
-            registrar: chi.chi_r ?? tryAsServiceId(2 ** 32 - 1),
+            registrar: chi.chi_r,
             autoAccumulateServices: chi.chi_g ?? new Map(),
         }),
         statistics: JsonStatisticsData.toStatisticsData(spec, pi),

package/packages/jam/state-json/dump.test.js

@@ -4,7 +4,6 @@ import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b } from "#@typeberry/hash";
 import { parseFromJson } from "#@typeberry/json-parser";
 import { StateEntries } from "#@typeberry/state-merkleization";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { fullStateDumpFromJson } from "./dump.js";
 let blake2b;
 before(async () => {
@@ -13,19 +12,12 @@ before(async () => {
 describe("JSON state dump", () => {
     it("should load full JSON state dump", async () => {
         const spec = tinyChainSpec;
-        const dumpFile = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? "./dump-071.example.json"
-            : "./dump.example.json";
+        const dumpFile = "./dump.example.json";
         const testState = await import(dumpFile);
         const fromJson = fullStateDumpFromJson(spec);
         const parsedState = parseFromJson(testState.default, fromJson);
         const rootHash = StateEntries.serializeInMemory(spec, blake2b, parsedState).getRootHash(blake2b);
-        const expectedRoot = Compatibility.selectIfGreaterOrEqual({
-            fallback: "0xf0c62b7961a17dba89a886c17dc881d7fb9e230f2cbf62316f2123a7fdbcfad5",
-            versions: {
-                [GpVersion.V0_7_1]: "0xeab8f2d4aebacd4ddcb73d8b5a388e5723aff1d2bc3f4aab40e931addf1862dc",
-            },
-        });
+        const expectedRoot = "0xeab8f2d4aebacd4ddcb73d8b5a388e5723aff1d2bc3f4aab40e931addf1862dc";
         strictEqual(rootHash.toString(), expectedRoot);
     });
 });

package/packages/jam/state-json/statistics.d.ts

@@ -1,7 +1,7 @@
 import { type ServiceGas, type ServiceId } from "#@typeberry/block";
 import type { ChainSpec } from "#@typeberry/config";
 import { type FromJson } from "#@typeberry/json-parser";
-import { type U16, type U32 } from "#@typeberry/numbers";
+import type { U16, U32 } from "#@typeberry/numbers";
 import { CoreStatistics, ServiceStatistics, StatisticsData, ValidatorStatistics } from "#@typeberry/state";
 export declare class JsonValidatorStatistics {
     static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, ValidatorStatistics>;

package/packages/jam/state-json/statistics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAsC,MAAM,kBAAkB,CAAC;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAY,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAgB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGxH,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,oFAmBb;IAEF,MAAM,EAAG,GAAG,CAAC;IACb,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,eAAe,EAAG,GAAG,CAAC;IACtB,UAAU,EAAG,GAAG,CAAC;IACjB,UAAU,EAAG,GAAG,CAAC;CAClB;AAED,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,+EAuBb;IAEF,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,OAAO,EAAG,GAAG,CAAC;IACd,OAAO,EAAG,GAAG,CAAC;IACd,cAAc,EAAG,GAAG,CAAC;IACrB,eAAe,EAAG,GAAG,CAAC;IACtB,WAAW,EAAG,GAAG,CAAC;IAClB,QAAQ,EAAG,UAAU,CAAC;CACvB;AAmED,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,sBAAsB,CAG3E,CAAC;AAEF,qBAAa,kBAAkB;IAC7B,YAAY,EAAG,mBAAmB,EAAE,CAAC;IACrC,SAAS,EAAG,mBAAmB,EAAE,CAAC;IAClC,KAAK,EAAG,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAK3C;IAEF,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB;CAcxE"}
+{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAsC,MAAM,kBAAkB,CAAC;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAgB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAExH,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,oFAmBb;IAEF,MAAM,EAAG,GAAG,CAAC;IACb,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,eAAe,EAAG,GAAG,CAAC;IACtB,UAAU,EAAG,GAAG,CAAC;IACjB,UAAU,EAAG,GAAG,CAAC;CAClB;AAED,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,+EAuBb;IAEF,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,OAAO,EAAG,GAAG,CAAC;IACd,OAAO,EAAG,GAAG,CAAC;IACd,cAAc,EAAG,GAAG,CAAC;IACrB,eAAe,EAAG,GAAG,CAAC;IACtB,WAAW,EAAG,GAAG,CAAC;IAClB,QAAQ,EAAG,UAAU,CAAC;CACvB;AAuDD,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,sBAAsB,CAG3E,CAAC;AAEF,qBAAa,kBAAkB;IAC7B,YAAY,EAAG,mBAAmB,EAAE,CAAC;IACrC,SAAS,EAAG,mBAAmB,EAAE,CAAC;IAClC,KAAK,EAAG,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAK3C;IAEF,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB;CAcxE"}

package/packages/jam/state-json/statistics.js

@@ -1,8 +1,6 @@
 import { tryAsPerValidator, tryAsServiceGas } from "#@typeberry/block";
 import { json } from "#@typeberry/json-parser";
-import { tryAsU32 } from "#@typeberry/numbers";
 import { CoreStatistics, ServiceStatistics, StatisticsData, tryAsPerCore, ValidatorStatistics } from "#@typeberry/state";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 export class JsonValidatorStatistics {
     static fromJson = json.object({
         blocks: "number",
@@ -71,13 +69,7 @@ class JsonServiceStatistics {
         extrinsic_count: "number",
         accumulate_count: "number",
         accumulate_gas_used: json.fromBigInt(tryAsServiceGas),
-        ...(Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? {}
-            : {
-                on_transfers_count: "number",
-                on_transfers_gas_used: json.fromBigInt(tryAsServiceGas),
-            }),
-    }, ({ provided_count, provided_size, refinement_count, refinement_gas_used, imports, exports, extrinsic_size, extrinsic_count, accumulate_count, accumulate_gas_used, on_transfers_count, on_transfers_gas_used, }) => {
+    }, ({ provided_count, provided_size, refinement_count, refinement_gas_used, imports, exports, extrinsic_size, extrinsic_count, accumulate_count, accumulate_gas_used, }) => {
         return ServiceStatistics.create({
             providedCount: provided_count,
             providedSize: provided_size,
@@ -89,8 +81,6 @@ class JsonServiceStatistics {
             extrinsicCount: extrinsic_count,
             accumulateCount: accumulate_count,
             accumulateGasUsed: accumulate_gas_used,
-            onTransfersCount: on_transfers_count ?? tryAsU32(0),
-            onTransfersGasUsed: on_transfers_gas_used ?? tryAsServiceGas(0),
         });
     });
     provided_count;
@@ -103,8 +93,6 @@ class JsonServiceStatistics {
     extrinsic_count;
     accumulate_count;
     accumulate_gas_used;
-    on_transfers_count;
-    on_transfers_gas_used;
 }
 export const serviceStatisticsEntryFromJson = {
     id: "number",