npm - @typeberry/lib - Versions diffs - 0.5.4-9233977 → 0.5.4-b101fe6 - Mend

@typeberry/lib 0.5.4-9233977 → 0.5.4-b101fe6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

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

@@ -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",

package/packages/jam/state-merkleization/in-memory-state-codec.d.ts CHANGED Viewed

@@ -177,8 +177,6 @@ export declare const inMemoryStateCodec: (spec: ChainSpec) => Descriptor<InMemor
             exports: Descriptor<import("@typeberry/numbers").U16, import("@typeberry/numbers").U32>;
             accumulateCount: Descriptor<import("@typeberry/numbers").U32, import("@typeberry/numbers").U32>;
             accumulateGasUsed: Descriptor<bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">, bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">>;
-            onTransfersCount: Descriptor<import("@typeberry/numbers").U32, import("@typeberry/numbers").U32>;
-            onTransfersGasUsed: Descriptor<bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">, bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">>;
         }>>>;
     }>>;
     accumulationQueue: Descriptor<import("@typeberry/state").AccumulationQueue, import("@typeberry/codec").SequenceView<readonly import("@typeberry/state").NotYetAccumulatedReport[], import("@typeberry/codec").SequenceView<import("@typeberry/state").NotYetAccumulatedReport, import("@typeberry/codec").ViewOf<import("@typeberry/state").NotYetAccumulatedReport, {

package/packages/jam/state-merkleization/in-memory-state-codec.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"in-memory-state-codec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/in-memory-state-codec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,0BAA0B,EAAuB,MAAM,iCAAiC,CAAC;AACvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,EACL,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAU1B,wCAAwC;AACxC,eAAO,MAAM,QAAQ,GAAI,CAAC,EACxB,OAAO,UAAU,CAAC,CAAC,CAAC,EACpB,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,EAC9B,8BAgBG,0BAA0B,CAAC,CAAC,CAAM,KACpC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CA0C3B,CAAC;AA2CF,cAAM,gBAAiB,SAAQ,eAAe;IAC5C,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;QAQT;IAEH,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;CAGjE;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqD/C,CAAC"}
1	+ {"version":3,"file":"in-memory-state-codec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/in-memory-state-codec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,0BAA0B,EAAuB,MAAM,iCAAiC,CAAC;AACvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,EACL,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAU1B,wCAAwC;AACxC,eAAO,MAAM,QAAQ,GAAI,CAAC,EACxB,OAAO,UAAU,CAAC,CAAC,CAAC,EACpB,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,EAC9B,8BAgBG,0BAA0B,CAAC,CAAC,CAAM,KACpC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CA0C3B,CAAC;AA2CF,cAAM,gBAAiB,SAAQ,eAAe;IAC5C,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;QAQT;IAEH,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;CAGjE;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqD/C,CAAC"}

package/packages/jam/state-merkleization/serialize.d.ts CHANGED Viewed

@@ -50,7 +50,7 @@ export declare namespace serialize {
     const recentlyAccumulated: StateCodec<State["recentlyAccumulated"], ReturnType<StateView["recentlyAccumulatedView"]>>;
     /** C(16): https://graypaper.fluffylabs.dev/#/38c4e62/3b46033b4603?v=0.7.0 */
     const accumulationOutputLog: StateCodec<State["accumulationOutputLog"]>;
-    /** C(255, s): https://graypaper.fluffylabs.dev/#/85129da/383103383103?v=0.6.3 */
+    /** C(255, s): https://graypaper.fluffylabs.dev/#/ab2cdbd/3b7d033b7d03?v=0.7.2 */
     const serviceData: (serviceId: ServiceId) => {
         key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
         Codec: Descriptor<ServiceAccountInfo, import("@typeberry/codec").ViewOf<ServiceAccountInfo, {
@@ -66,17 +66,17 @@ export declare namespace serialize {
             parentService: Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"ServiceId[u32]">, Bytes<4>>;
         }>>;
     };
-    /** https://graypaper.fluffylabs.dev/#/85129da/384803384803?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bac033bac03?v=0.7.2 */
     const serviceStorage: (blake2b: Blake2b, serviceId: ServiceId, key: StorageKey) => {
         key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
         Codec: Descriptor<BytesBlob, BytesBlob>;
     };
-    /** https://graypaper.fluffylabs.dev/#/85129da/385b03385b03?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bc9033bc903?v=0.7.2 */
     const servicePreimages: (blake2b: Blake2b, serviceId: ServiceId, hash: PreimageHash) => {
         key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
         Codec: Descriptor<BytesBlob, BytesBlob>;
     };
-    /** https://graypaper.fluffylabs.dev/#/85129da/387603387603?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bea033b0904?v=0.7.2 */
     const serviceLookupHistory: (blake2b: Blake2b, serviceId: ServiceId, hash: PreimageHash, len: U32) => {
         key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
         Codec: Descriptor<readonly U32[], import("@typeberry/codec").SequenceView<U32, Bytes<4>>>;

package/packages/jam/state-merkleization/serialize.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,SAAS,EAAY,MAAM,kBAAkB,CAAC;AAEzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAML,eAAe,EAGf,YAAY,EACZ,KAAK,gBAAgB,EACrB,kBAAkB,EAClB,KAAK,KAAK,EACV,cAAc,EACd,KAAK,kBAAkB,EACvB,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;~~AAEhE~~,OAAO,EAAE,KAAK,QAAQ,EAA0B,MAAM,WAAW,CAAC;AAElE,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI;IACjC,GAAG,EAAE,QAAQ,CAAC;IACd,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxB,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;CAC1B,CAAC;AAEF,kDAAkD;AAClD,yBAAiB,SAAS,CAAC;IACzB,4EAA4E;IACrE,MAAM,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAI5F,CAAC;IAEF,4EAA4E;IACrE,MAAM,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAI/F,CAAC;IAEF;;;OAGG;IACI,MAAM,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,gBAAgB,CAInE,CAAC;IAEF,4EAA4E;IACrE,MAAM,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,CAU5D,CAAC;IAEF,4EAA4E;IACrE,MAAM,eAAe,EAAE,UAAU,CAAC,eAAe,CAIvD,CAAC;IAEF,4EAA4E;IACrE,MAAM,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAIhD,CAAC;IAEF,4EAA4E;IACrE,MAAM,oBAAoB,EAAE,UAAU,CAC3C,KAAK,CAAC,yBAAyB,CAAC,EAChC,UAAU,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC,CAKrD,CAAC;IAEF,4EAA4E;IACrE,MAAM,iBAAiB,EAAE,UAAU,CACxC,KAAK,CAAC,sBAAsB,CAAC,EAC7B,UAAU,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,CAKlD,CAAC;IAEF,4EAA4E;IACrE,MAAM,kBAAkB,EAAE,UAAU,CACzC,KAAK,CAAC,uBAAuB,CAAC,EAC9B,UAAU,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,CAKnD,CAAC;IAEF,6EAA6E;IACtE,MAAM,sBAAsB,EAAE,UAAU,CAC7C,KAAK,CAAC,wBAAwB,CAAC,EAC/B,UAAU,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC,CAKpD,CAAC;IAEF,6EAA6E;IACtE,MAAM,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAIlD,CAAC;IAEF,6EAA6E;IACtE,MAAM,kBAAkB,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAItE,CAAC;IAEF,6EAA6E;IACtE,MAAM,UAAU,EAAE,UAAU,CAAC,cAAc,EAAE,kBAAkB,CAIrE,CAAC;IAEF,6EAA6E;IACtE,MAAM,iBAAiB,EAAE,UAAU,CACxC,KAAK,CAAC,mBAAmB,CAAC,EAC1B,UAAU,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC,CAK/C,CAAC;IAEF,6EAA6E;IACtE,MAAM,mBAAmB,EAAE,UAAU,CAC1C,KAAK,CAAC,qBAAqB,CAAC,EAC5B,UAAU,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAKjD,CAAC;IAEF,6EAA6E;IACtE,MAAM,qBAAqB,EAAE,UAAU,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAO5E,CAAC;IAEF,iFAAiF;IAC1E,MAAM,WAAW,GAAI,WAAW,SAAS;;;;;;;;;;;;;;~~KAK9C~~,CAAC;IAEH,sEAAsE;IAC/D,MAAM,cAAc,GAAI,SAAS,OAAO,EAAE,WAAW,SAAS,EAAE,KAAK,UAAU;;;KAGpF,CAAC;IAEH,sEAAsE;IAC/D,MAAM,gBAAgB,GAAI,SAAS,OAAO,EAAE,WAAW,SAAS,EAAE,MAAM,YAAY;;;KAGzF,CAAC;IAEH,sEAAsE;IAC/D,MAAM,oBAAoB,GAAI,SAAS,OAAO,EAAE,WAAW,SAAS,EAAE,MAAM,YAAY,EAAE,KAAK,GAAG;;;KAGvG,CAAC;CACJ;AAED;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,kCAMrB,CAAC"}
1	+ {"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialize.ts"],"names":[],"mappings":"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"}

package/packages/jam/state-merkleization/serialize.js CHANGED Viewed

@@ -7,7 +7,6 @@ import { accumulationQueueCodec, authPoolsCodec, authQueuesCodec, availabilityAs
 import { AccumulationOutput, accumulationOutputComparator } from "#@typeberry/state/accumulation-output.js";
 import { recentlyAccumulatedCodec } from "#@typeberry/state/recently-accumulated.js";
 import { SafroleData } from "#@typeberry/state/safrole-data.js";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { StateKeyIdx, stateKeys } from "./keys.js";
 /** Serialization for particular state entries. */
 export var serialize;
@@ -116,24 +115,22 @@ export var serialize;
         Codec: codec.sequenceVarLen(AccumulationOutput.Codec).convert((i) => i.array, (o) => SortedArray.fromSortedArray(accumulationOutputComparator, o)),
         extract: (s) => s.accumulationOutputLog,
     };
-    /** C(255, s): https://graypaper.fluffylabs.dev/#/85129da/383103383103?v=0.6.3 */
+    /** C(255, s): https://graypaper.fluffylabs.dev/#/ab2cdbd/3b7d033b7d03?v=0.7.2 */
     serialize.serviceData = (serviceId) => ({
         key: stateKeys.serviceInfo(serviceId),
-        Codec: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? codecWithVersion(ServiceAccountInfo.Codec)
-            : ServiceAccountInfo.Codec,
+        Codec: codecWithVersion(ServiceAccountInfo.Codec),
     });
-    /** https://graypaper.fluffylabs.dev/#/85129da/384803384803?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bac033bac03?v=0.7.2 */
     serialize.serviceStorage = (blake2b, serviceId, key) => ({
         key: stateKeys.serviceStorage(blake2b, serviceId, key),
         Codec: dumpCodec,
     });
-    /** https://graypaper.fluffylabs.dev/#/85129da/385b03385b03?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bc9033bc903?v=0.7.2 */
     serialize.servicePreimages = (blake2b, serviceId, hash) => ({
         key: stateKeys.servicePreimage(blake2b, serviceId, hash),
         Codec: dumpCodec,
     });
-    /** https://graypaper.fluffylabs.dev/#/85129da/387603387603?v=0.6.3 */
+    /** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bea033b0904?v=0.7.2 */
     serialize.serviceLookupHistory = (blake2b, serviceId, hash, len) => ({
         key: stateKeys.serviceLookupHistory(blake2b, serviceId, hash, len),
         Codec: codec.readonlyArray(codec.sequenceVarLen(codec.u32)),

package/packages/jam/state-merkleization/serialized-state-view.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serialized-state-view.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialized-state-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,gCAAgC;IAChC,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;CACtC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,sBAAsB,CAAE,YAAW,SAAS;IAEnF,OAAO,CAAC,QAAQ,CAAC,IAAI;IACd,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJT,IAAI,EAAE,SAAS,EACzB,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACnC,oBAAoB,EAAE,SAAS,EAAE,EACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC;IAG/D,OAAO,CAAC,YAAY;IAoBpB,0BAA0B,IAAI,2BAA2B;IAIzD,2BAA2B,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI7E,wBAAwB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI1E,yBAAyB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI3E,aAAa,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAI9E,cAAc,IAAI,YAAY,CAAC,kBAAkB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAIhF,gBAAgB,IAAI,gBAAgB;IAIpC,cAAc,IAAI,kBAAkB;IAIpC,qBAAqB,IAAI,qBAAqB;IAI9C,uBAAuB,IAAI,uBAAuB;IAIlD,eAAe,IAAI,eAAe;IAIlC,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,sBAAsB,GAAG,IAAI;~~CAWjE~~"}
1	+ {"version":3,"file":"serialized-state-view.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialized-state-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,gCAAgC;IAChC,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;CACtC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,sBAAsB,CAAE,YAAW,SAAS;IAEnF,OAAO,CAAC,QAAQ,CAAC,IAAI;IACd,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJT,IAAI,EAAE,SAAS,EACzB,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACnC,oBAAoB,EAAE,SAAS,EAAE,EACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC;IAG/D,OAAO,CAAC,YAAY;IAoBpB,0BAA0B,IAAI,2BAA2B;IAIzD,2BAA2B,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI7E,wBAAwB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI1E,yBAAyB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI3E,aAAa,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAI9E,cAAc,IAAI,YAAY,CAAC,kBAAkB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAIhF,gBAAgB,IAAI,gBAAgB;IAIpC,cAAc,IAAI,kBAAkB;IAIpC,qBAAqB,IAAI,qBAAqB;IAI9C,uBAAuB,IAAI,uBAAuB;IAIlD,eAAe,IAAI,eAAe;IAIlC,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,sBAAsB,GAAG,IAAI;CAYjE"}

package/packages/jam/state-merkleization/state-entries.test.js CHANGED Viewed

@@ -6,7 +6,6 @@ import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b, HASH_SIZE, TRUNCATED_HASH_SIZE } from "#@typeberry/hash";
 import { tryAsPerCore } from "#@typeberry/state/common.js";
 import { TEST_STATE, TEST_STATE_ROOT, testState } from "#@typeberry/state/test.utils.js";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 import { serializeStateUpdate } from "./serialize-state-update.js";
 import { SerializedState } from "./serialized-state.js";
 import { StateEntries } from "./state-entries.js";
@@ -43,12 +42,7 @@ describe("State Serialization", () => {
         // check the value
         const state = SerializedState.fromStateEntries(spec, blake2b, serialized);
         assert.deepStrictEqual(state.authPools, authPools);
-        const expectedRoot = Compatibility.selectIfGreaterOrEqual({
-            fallback: "0xcf33ddfb0987283f7614652d7eb4d3509e5efd93466a4b28ab4865cc912a66e1",
-            versions: {
-                [GpVersion.V0_7_1]: "0xf1dff0f8d8d5470aa6fc381d07e644f5b2f7a32bf06a7cf1dc664fe4b6298402",
-            },
-        });
+        const expectedRoot = "0xf1dff0f8d8d5470aa6fc381d07e644f5b2f7a32bf06a7cf1dc664fe4b6298402";
         assert.strictEqual(serialized.getRootHash(blake2b).toString(), expectedRoot);
     });
 });

package/packages/jam/transition/accumulate/accumulate-state.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import type { EntropyHash, ServiceId, TimeSlot } from "#@typeberry/block";
 import type { WorkReport } from "#@typeberry/block/work-report.js";
 import type { SortedArray } from "#@typeberry/collections";
 import type { OpaqueHash } from "#@typeberry/hash";
-import type { PendingTransfer, ServiceStateUpdate } from "#@typeberry/jam-host-calls";
+import type { ServiceStateUpdate } from "#@typeberry/jam-host-calls";
 import type { AccumulationOutput, State } from "#@typeberry/state";
 import type { CountAndGasUsed } from "../statistics.js";
 /** `G_A`: The gas allocated to invoke a work-report’s Accumulation logic. */
@@ -22,7 +22,6 @@ export type AccumulateStateUpdate = Pick<State, "timeslot"> & Partial<Pick<State
 export type AccumulateResult = {
     stateUpdate: AccumulateStateUpdate;
     accumulationStatistics: Map<ServiceId, CountAndGasUsed>;
-    pendingTransfers: PendingTransfer[];
     accumulationOutputLog: SortedArray<AccumulationOutput>;
 };
 //# sourceMappingURL=accumulate-state.d.ts.map

package/packages/jam/transition/accumulate/accumulate-state.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"accumulate-state.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,~~eAAe,EAAE,~~kBAAkB,EAAE,MAAM,2BAA2B,CAAC;~~AACrF~~,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,KAAK,EACH,UAAU,GACV,yBAAyB,GACzB,YAAY,GACZ,YAAY,GACZ,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,CACvB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,qBAAqB,GAAG,mBAAmB,CAAC,CAAC,GACjE,kBAAkB,CAAC;AAErB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,qBAAqB,CAAC;IACnC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD,~~gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,~~qBAAqB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;CACxD,CAAC"}
1	+ {"version":3,"file":"accumulate-state.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,YAAc,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAC5B,4BAA4B;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,6DAA6D;IAC7D,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,KAAK,EACH,UAAU,GACV,yBAAyB,GACzB,YAAY,GACZ,YAAY,GACZ,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,CACvB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,qBAAqB,GAAG,mBAAmB,CAAC,CAAC,GACjE,kBAAkB,CAAC;AAErB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,qBAAqB,CAAC;IACnC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACxD,qBAAqB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;CACxD,CAAC"}

package/packages/jam/transition/accumulate/accumulate-utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"accumulate-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;~~AAI1D~~;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGpF;AAED,KAAK,kBAAkB,GAAG;IACxB,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,sCAAsC;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAQF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EACpD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,SAAS,~~CAkBX~~"}
1	+ {"version":3,"file":"accumulate-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;AAG1D;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGpF;AAED,KAAK,kBAAkB,GAAG;IACxB,oCAAoC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,sCAAsC;IACtC,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAQF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EACpD,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,GACf,SAAS,CAeX"}

package/packages/jam/transition/accumulate/accumulate-utils.js CHANGED Viewed

@@ -4,7 +4,6 @@ import { codec, Encoder } from "#@typeberry/codec";
 import { HashSet } from "#@typeberry/collections";
 import { HASH_SIZE } from "#@typeberry/hash";
 import { leBytesAsU32 } from "#@typeberry/numbers";
-import { Compatibility, GpVersion } from "#@typeberry/utils";
 /**
  * A function that removes duplicates but does not change order - it keeps the first occurence.
  */
@@ -44,9 +43,6 @@ export function generateNextServiceId({ serviceId, entropy, timeslot }, chainSpe
     }, chainSpec);
     const result = blake2b.hashBytes(encoded).raw.subarray(0, 4);
     const number = leBytesAsU32(result) >>> 0;
-    const mod = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-        ? 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8
-        : 2 ** 32 - 2 ** 9;
-    const offset = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) ? MIN_PUBLIC_SERVICE_INDEX : 2 ** 8;
-    return tryAsServiceId((number % mod) + offset);
+    const mod = 2 ** 32 - MIN_PUBLIC_SERVICE_INDEX - 2 ** 8;
+    return tryAsServiceId((number % mod) + MIN_PUBLIC_SERVICE_INDEX);
 }

package/packages/jam/transition/accumulate/accumulate-utils.test.js CHANGED Viewed

@@ -10,7 +10,7 @@ import { FixedSizeArray, HashSet } from "#@typeberry/collections";
 import { tinyChainSpec } from "#@typeberry/config";
 import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU16, tryAsU32 } from "#@typeberry/numbers";
-import { Compatibility, deepEqual, GpVersion } from "#@typeberry/utils";
+import { deepEqual } from "#@typeberry/utils";
 import { generateNextServiceId, getWorkPackageHashes, uniquePreserveOrder } from "./accumulate-utils.js";
 let blake2b;
 before(async () => {
@@ -78,9 +78,7 @@ describe("accumulate-utils", () => {
             const serviceId = tryAsServiceId(5);
             const entropy = Bytes.fill(HASH_SIZE, 4).asOpaque();
             const timeslot = tryAsTimeSlot(6);
-            const expectedServiceId = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-                ? tryAsServiceId(2596254713)
-                : tryAsServiceId(2596189433);
+            const expectedServiceId = tryAsServiceId(2596254713);
             const result = generateNextServiceId({ serviceId, entropy, timeslot }, tinyChainSpec, blake2b);
             assert.strictEqual(result, expectedServiceId);
         });

package/packages/jam/transition/accumulate/accumulate.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAiB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;~~IAqGrC~~;;;;OAIG;YACW,uBAAuB;~~IAoDrC~~;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;~~CAwGrH~~"}
1	+ {"version":3,"file":"accumulate.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/accumulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,OAAO,EAA8B,MAAM,iBAAiB,CAAC;AAiB3E,OAAO,EAAyC,MAAM,EAAa,MAAM,kBAAkB,CAAC;AAM5F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAC9D,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC;AA2B3D,qBAAa,UAAU;aAEH,SAAS,EAAE,SAAS;aACpB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,eAAe;aACtB,OAAO,EAAE,iBAAiB;gBAH1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,iBAAiB;IAO5C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;OAIG;YACW,uBAAuB;IAmGrC;;;;OAIG;YACW,uBAAuB;IAiDrC;;;;;;;OAOG;YACW,4BAA4B;IA8D1C;;;;;;;OAOG;YACW,sBAAsB;IAsEpC,OAAO,CAAC,gBAAgB;IAuCxB,OAAO,CAAC,kBAAkB;IAsB1B;;;;;;;;;OASG;YACW,oBAAoB;IA6ClC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkDlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;;OAMG;IACI,6BAA6B,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO;IAKhE,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;CA0FrH"}

package/packages/jam/transition/accumulate/accumulate.js CHANGED Viewed

@@ -86,9 +86,7 @@ export class Accumulate {
         }
         const nextServiceId = generateNextServiceId({ serviceId, entropy, timeslot: slot }, this.chainSpec, this.blake2b);
         const partialState = new AccumulateExternalities(this.chainSpec, this.blake2b, updatedState, serviceId, nextServiceId, slot);
-        const fetchExternalities = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec)
-            : FetchExternalities.createForPre071Accumulate({ entropy, operands }, this.chainSpec);
+        const fetchExternalities = FetchExternalities.createForAccumulate({ entropy, transfers, operands }, this.chainSpec);
         const externalities = {
             partialState,
             serviceExternalities: partialState,
@@ -137,19 +135,16 @@ export class Accumulate {
     async accumulateSingleService(serviceId, transfers, operands, gasCost, slot, entropy, inputStateUpdate) {
         logger.log `Accumulating service ${serviceId}, transfers: ${transfers.length} operands: ${operands.length} at slot: ${slot}`;
         const updatedState = new PartiallyUpdatedState(this.state, inputStateUpdate);
-        // update service balance from incoming transfers
-        if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            const serviceInfo = updatedState.getServiceInfo(serviceId);
-            if (serviceInfo !== null) {
-                // update the balance from incoming tranfsers
-                const newBalance = sumU64(serviceInfo.balance, ...transfers.map((item) => item.amount));
-                if (newBalance.overflow) {
-                    logger.log `Accumulation failed because of overflowing balance ${serviceId}.`;
-                    return { stateUpdate: null, consumedGas: tryAsServiceGas(0n) };
-                }
-                const newInfo = ServiceAccountInfo.create({ ...serviceInfo, balance: newBalance.value });
-                updatedState.updateServiceInfo(serviceId, newInfo);
+        const serviceInfo = updatedState.getServiceInfo(serviceId);
+        if (serviceInfo !== null) {
+            // update the balance from incoming transfers
+            const newBalance = sumU64(serviceInfo.balance, ...transfers.map((item) => item.amount));
+            if (newBalance.overflow) {
+                logger.log `Accumulation failed because of overflowing balance ${serviceId}.`;
+                return { stateUpdate: null, consumedGas: tryAsServiceGas(0n) };
             }
+            const newInfo = ServiceAccountInfo.create({ ...serviceInfo, balance: newBalance.value });
+            updatedState.updateServiceInfo(serviceId, newInfo);
         }
         const result = await this.pvmAccumulateInvocation(slot, serviceId, transfers, operands, gasCost, entropy, updatedState);
         if (result.isError) {
@@ -384,7 +379,6 @@ export class Accumulate {
     }
     async transition({ reports, slot, entropy }) {
         const statistics = new Map();
-        const legacyTransfers = [];
         const yieldedRoots = new Map();
         const accumulateQueue = new AccumulateQueue(this.chainSpec, this.state);
         const toAccumulateImmediately = accumulateQueue.getWorkReportsToAccumulateImmediately(reports);
@@ -395,9 +389,7 @@ export class Accumulate {
         const accumulatableReports = ArrayView.from(toAccumulateImmediately.concat(queue));
         const gasLimit = this.getGasLimit();
         const autoAccumulateServices = this.state.privilegedServices.autoAccumulateServices;
-        const { accumulatedReports, gasCost, state, ...rest } = Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
-            ? await this.accumulateSequentially(gasLimit, accumulatableReports, [], slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots)
-            : await this.accumulateSequentiallyLegacy(gasLimit, accumulatableReports, slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots, legacyTransfers);
+        const { accumulatedReports, gasCost, state, ...rest } = await this.accumulateSequentially(gasLimit, accumulatableReports, [], slot, entropy, statistics, AccumulationStateUpdate.empty(), autoAccumulateServices, yieldedRoots);
         // we can safely ignore top-level gas cost from accSequentially.
         const _gasCost = gasCost;
         assertEmpty(rest);
@@ -434,7 +426,6 @@ export class Accumulate {
                 ...authQueues,
             },
             accumulationStatistics: statistics,
-            pendingTransfers: legacyTransfers,
             accumulationOutputLog: accumulationOutput,
         });
     }

package/packages/jam/transition/accumulate/index.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 export * from "./accumulate.js";
 export * from "./accumulate-state.js";
-export * from "./deferred-transfers.js";
 export * from "./options.js";
 //# sourceMappingURL=index.d.ts.map

package/packages/jam/transition/accumulate/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,~~yBAAyB,CAAC;AACxC,~~cAAc,~~cAAc,~~CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/accumulate/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC"}

package/packages/jam/transition/accumulate/index.js CHANGED Viewed

@@ -1,4 +1,3 @@
 export * from "./accumulate.js";
 export * from "./accumulate-state.js";
-export * from "./deferred-transfers.js";
 export * from "./options.js";

package/packages/jam/transition/chain-stf.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import type { SafroleErrorCode, SafroleStateUpdate } from "#@typeberry/safrole/s
 import { type SafroleSealError } from "#@typeberry/safrole/safrole-seal.js";
 import type { State, WithStateView } from "#@typeberry/state";
 import { type ErrorResult, Result, type TaggedError } from "#@typeberry/utils";
-import { type ACCUMULATION_ERROR, type AccumulateOptions, type AccumulateStateUpdate, type DeferredTransfersErrorCode } from "./accumulate/index.js";
+import { type ACCUMULATION_ERROR, type AccumulateOptions, type AccumulateStateUpdate } from "./accumulate/index.js";
 import { type AssurancesError, type AssurancesStateUpdate } from "./assurances.js";
 import { type AuthorizationStateUpdate } from "./authorization.js";
 import type { TransitionHasher } from "./hasher.js";
@@ -32,10 +32,9 @@ export declare enum StfErrorKind {
     Preimages = 4,
     SafroleSeal = 5,
     Accumulate = 6,
-    DeferredTransfers = 7,
-    Offenders = 8
+    Offenders = 7
 }
-export type StfError = TaggedError<StfErrorKind.Assurances, AssurancesError> | TaggedError<StfErrorKind.Reports, ReportsError> | TaggedError<StfErrorKind.Disputes, DisputesErrorCode> | TaggedError<StfErrorKind.Safrole, SafroleErrorCode> | TaggedError<StfErrorKind.Preimages, PreimagesErrorCode> | TaggedError<StfErrorKind.SafroleSeal, SafroleSealError> | TaggedError<StfErrorKind.Accumulate, ACCUMULATION_ERROR> | TaggedError<StfErrorKind.DeferredTransfers, DeferredTransfersErrorCode> | TaggedError<StfErrorKind.Offenders, OFFENDERS_ERROR>;
+export type StfError = TaggedError<StfErrorKind.Assurances, AssurancesError> | TaggedError<StfErrorKind.Reports, ReportsError> | TaggedError<StfErrorKind.Disputes, DisputesErrorCode> | TaggedError<StfErrorKind.Safrole, SafroleErrorCode> | TaggedError<StfErrorKind.Preimages, PreimagesErrorCode> | TaggedError<StfErrorKind.SafroleSeal, SafroleSealError> | TaggedError<StfErrorKind.Accumulate, ACCUMULATION_ERROR> | TaggedError<StfErrorKind.Offenders, OFFENDERS_ERROR>;
 export declare const stfError: <Kind extends StfErrorKind, Err extends StfError["error"]>(kind: Kind, nested: ErrorResult<Err>) => Result<Ok, {
     readonly kind: Kind;
     readonly error: Err;
@@ -55,7 +54,6 @@ export declare class OnChain {
     private readonly assurances;
     private readonly accumulate;
     private readonly accumulateOutput;
-    private readonly deferredTransfers;
     private readonly preimages;
     private readonly recentHistory;
     private readonly authorization;

package/packages/jam/transition/chain-stf.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAa,UAAU,~~EAAa~~,QAAQ,EAAE,MAAM,kBAAkB,CAAC;~~AAI9F~~,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAY,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAIpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,KAAK,EAAkB,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,~~EAIL~~,KAAK,WAAW,~~EAIhB~~,MAAM,~~EACN~~,KAAK,WAAW,~~EACjB~~,MAAM,kBAAkB,CAAC;~~AAE1B~~,OAAO,EACL,KAAK,kBAAkB,EAEvB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,~~EAE1B~~,~~KAAK,0BAA0B,EAChC,~~MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC/F,OAAO,EAAiB,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAa,KAAK,kBAAkB,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAiB,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAAE,KAAK,WAAW,EAAW,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC3G,OAAO,~~EAAoC~~,KAAK,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;~~AAE/F~~,qBAAa,aAAc,YAAW,WAAW;IAK3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJ3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ;IAI3B,OAAO;IAEP,UAAU,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,GAAG,OAAO;CAuBjG;AAED,QAAA,MAAM,eAAe,kCAAkC,CAAC;AACxD,KAAK,eAAe,GAAG,OAAO,eAAe,CAAC;AAE9C,MAAM,MAAM,EAAE,GAAG,kBAAkB,GACjC,mBAAmB,GACnB,kBAAkB,GAClB,qBAAqB,GACrB,oBAAoB,GACpB,wBAAwB,GACxB,wBAAwB,GACxB,qBAAqB,GACrB,qBAAqB,CAAC;AAExB,oBAAY,YAAY;IACtB,UAAU,IAAI;IACd,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,OAAO,IAAI;IACX,SAAS,IAAI;IACb,WAAW,IAAI;IACf,UAAU,IAAI;IACd,~~iBAAiB,IAAI;IACrB,~~SAAS,IAAI;CACd;AAED,MAAM,MAAM,QAAQ,GAChB,WAAW,CAAC,YAAY,CAAC,UAAU,EAAE,eAAe,CAAC,GACrD,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,GAC/C,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GACrD,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,GACnD,WAAW,CAAC,YAAY,CAAC,SAAS,EAAE,kBAAkB,CAAC,GACvD,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,GACvD,WAAW,CAAC,YAAY,CAAC,UAAU,EAAE,kBAAkB,CAAC,GACxD,WAAW,CAAC,YAAY,CAAC,~~iBAAiB,EAAE,0BAA0B,CAAC,GACvE,WAAW,CAAC,YAAY,CAAC,~~SAAS,EAAE,eAAe,CAAC,CAAC;AAEzD,eAAO,MAAM,QAAQ,GAAI,IAAI,SAAS,YAAY,EAAE,GAAG,SAAS,QAAQ,CAAC,OAAO,CAAC,EAC/E,MAAM,IAAI,EACV,QAAQ,WAAW,CAAC,GAAG,CAAC;;;;;;;EAGzB,CAAC;AAIF,qBAAa,OAAO;~~aA2BA~~,SAAS,EAAE,SAAS;aACpB,KAAK,EAAE,KAAK,GAAG,aAAa;aAC5B,MAAM,EAAE,gBAAgB;~~IA3B1C~~,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IAEpD,OAAO,CAAC,QAAQ,CAAC,~~iBAAiB,CAAoB;IAEtD,OAAO,CAAC,QAAQ,CAAC,~~SAAS,CAAY;IAGtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC,OAAO,CAAC,mBAAmB,CAA4C;gBAGrD,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GAAG,aAAa,EAC5B,MAAM,EAAE,gBAAgB,EACxC,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,WAAW;~~IAsB1B~~,4DAA4D;IACtD,mBAAmB;YAQX,UAAU;IAKlB,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;~~IAgPzF~~,OAAO,CAAC,uBAAuB;CAWhC"}
1	+ {"version":3,"file":"chain-stf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/transition/chain-stf.ts"],"names":[],"mappings":"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"}

package/packages/jam/transition/chain-stf.js CHANGED Viewed

@@ -5,9 +5,9 @@ import { Logger } from "#@typeberry/logger";
 import { Safrole } from "#@typeberry/safrole";
 import { BandernsatchWasm } from "#@typeberry/safrole/bandersnatch-wasm.js";
 import { SafroleSeal } from "#@typeberry/safrole/safrole-seal.js";
-import { assertEmpty, Compatibility, check, GpVersion, measure, OK, Result, } from "#@typeberry/utils";
+import { assertEmpty, measure, OK, Result } from "#@typeberry/utils";
 import { AccumulateOutput } from "./accumulate/accumulate-output.js";
-import { Accumulate, DeferredTransfers, } from "./accumulate/index.js";
+import { Accumulate, } from "./accumulate/index.js";
 import { Assurances } from "./assurances.js";
 import { Authorization } from "./authorization.js";
 import { Preimages } from "./preimages.js";
@@ -53,8 +53,7 @@ export var StfErrorKind;
     StfErrorKind[StfErrorKind["Preimages"] = 4] = "Preimages";
     StfErrorKind[StfErrorKind["SafroleSeal"] = 5] = "SafroleSeal";
     StfErrorKind[StfErrorKind["Accumulate"] = 6] = "Accumulate";
-    StfErrorKind[StfErrorKind["DeferredTransfers"] = 7] = "DeferredTransfers";
-    StfErrorKind[StfErrorKind["Offenders"] = 8] = "Offenders";
+    StfErrorKind[StfErrorKind["Offenders"] = 7] = "Offenders";
 })(StfErrorKind || (StfErrorKind = {}));
 export const stfError = (kind, nested) => {
     return Result.taggedError(StfErrorKind, kind, nested);
@@ -75,8 +74,6 @@ export class OnChain {
     // chapter 12: https://graypaper.fluffylabs.dev/#/68eaa1f/159f02159f02?v=0.6.4
     accumulate;
     accumulateOutput;
-    // chapter 12.3: https://graypaper.fluffylabs.dev/#/68eaa1f/178203178203?v=0.6.4
-    deferredTransfers;
     // chapter 12.4: https://graypaper.fluffylabs.dev/#/68eaa1f/18cc0018cc00?v=0.6.4
     preimages;
     // after accumulation
@@ -101,7 +98,6 @@ export class OnChain {
         this.assurances = new Assurances(chainSpec, state, hasher.blake2b);
         this.accumulate = new Accumulate(chainSpec, hasher.blake2b, state, options);
         this.accumulateOutput = new AccumulateOutput();
-        this.deferredTransfers = new DeferredTransfers(chainSpec, hasher.blake2b, state, options.pvm);
         this.preimages = new Preimages(state, hasher.blake2b);
         this.authorization = new Authorization(chainSpec, state);
     }
@@ -216,29 +212,10 @@ export class OnChain {
         if (accumulateResult.isError) {
             return stfError(StfErrorKind.Accumulate, accumulateResult);
         }
-        const { stateUpdate: accumulateUpdate, accumulationStatistics, pendingTransfers, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
+        const { stateUpdate: accumulateUpdate, accumulationStatistics, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
         assertEmpty(accumulateRest);
         const { privilegedServices: maybePrivilegedServices, authQueues: maybeAuthorizationQueues, designatedValidatorData: maybeDesignatedValidatorData, preimages: accumulatePreimages, accumulationQueue, recentlyAccumulated, ...servicesUpdateFromAccumulate } = accumulateUpdate;
-        let transferStatistics = new Map();
-        let servicesUpdate = { ...servicesUpdateFromAccumulate, preimages: accumulatePreimages };
-        if (!Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
-            const deferredTransfersResult = await this.deferredTransfers.transition({
-                entropy: entropy[0],
-                pendingTransfers,
-                servicesUpdate,
-                timeslot: timeSlot,
-            });
-            if (deferredTransfersResult.isError) {
-                return stfError(StfErrorKind.DeferredTransfers, deferredTransfersResult);
-            }
-            const { servicesUpdate: servicesUpdateFromDeferredTransfers, transferStatistics: transferStatisticsFromDeferredTransfers, ...deferredTransfersRest } = deferredTransfersResult.ok;
-            transferStatistics = transferStatisticsFromDeferredTransfers;
-            servicesUpdate = servicesUpdateFromDeferredTransfers;
-            assertEmpty(deferredTransfersRest);
-        }
-        else {
-            check `${pendingTransfers.length === 0} All transfers should be already accumulated.`;
-        }
+        const servicesUpdate = { ...servicesUpdateFromAccumulate, preimages: accumulatePreimages };
         const accumulateRoot = await this.accumulateOutput.transition({ accumulationOutputLog });
         // recent history
         const recentHistoryUpdate = this.recentHistory.transition({
@@ -264,7 +241,6 @@ export class OnChain {
             incomingReports: extrinsic.guarantees.map((g) => g.report),
             availableReports,
             accumulationStatistics,
-            transferStatistics,
             reporters: reporters,
             currentValidatorData,
         });

package/packages/jam/transition/externalities/accumulate-externalities.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"accumulate-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/accumulate-externalities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,QAAQ,EAId,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EACL,uBAAuB,EAEvB,UAAU,EACV,mBAAmB,EACnB,KAAK,OAAO,EACZ,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,cAAc,EAEnB,oBAAoB,EACpB,oBAAoB,EAEpB,KAAK,mBAAmB,EACxB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAsC,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EACL,KAAK,wBAAwB,EAE7B,KAAK,OAAO,EAGZ,kBAAkB,EAClB,KAAK,UAAU,EAGf,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,~~EAAgD~~,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;~~AAmB5F~~,qBAAa,uBACX,YAAW,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,cAAc;IAOhH,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAXlC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,qDAAqD;IACrD,OAAO,CAAC,gBAAgB,CAAY;gBAGjB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,qBAAqB;IACpD,YAAY;IACK,gBAAgB,EAAE,SAAS,EAC5C,yBAAyB,EAAE,SAAS,EACnB,eAAe,EAAE,QAAQ;IAW5C,iEAAiE;IACjE,eAAe,IAAI,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAIrE,yDAAyD;IACzD,mBAAmB;IAInB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;;OAMG;IACH,cAAc,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,GAAG,kBAAkB,GAAG,IAAI;IAIxE;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,qBAAqB;IAY7B,+EAA+E;IAC/E,OAAO,CAAC,yBAAyB;~~IAkBjC~~,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,cAAc,GAAG,IAAI;IAU3E,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC;IAsElF,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAAC,EAAE,EAAE,mBAAmB,CAAC;IA2FhF,QAAQ,CACN,aAAa,EAAE,SAAS,GAAG,IAAI,EAC/B,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,KAAK,CAAC,mBAAmB,CAAC,GAC/B,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC;IAiD5B,UAAU,CACR,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,GAAG,EACf,gBAAgB,EAAE,UAAU,EAC5B,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,GAAG,EAClB,eAAe,EAAE,GAAG,GACnB,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC;~~IAmGrC~~,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI;IAclE,oBAAoB,CAAC,cAAc,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,iBAAiB,CAAC;IAgBhG,UAAU,IAAI,IAAI;IAKlB,wBAAwB,CACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,cAAc,CAAC,cAAc,EAAE,wBAAwB,CAAC,EACnE,SAAS,EAAE,SAAS,GAAG,IAAI,GAC1B,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC;IA0BpC,wBAAwB,CACtB,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,GACjD,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC;~~IAiDpC~~,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAK7B,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC;IAuDnG,KAAK,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,EAAE,gBAAgB,EAAE,YAAY,GAAG,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC;IA8D5F,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAOvE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC;IAyBhF,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI;CAO1E"}
1	+ {"version":3,"file":"accumulate-externalities.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/transition/externalities/accumulate-externalities.ts"],"names":[],"mappings":"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"}