@typeberry/lib 0.2.0-5746fdc → 0.2.0-79dc2d4

package/index.cjs

@@ -11,44 +11,40 @@ var GpVersion;
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1";
-    GpVersion["V0_7_2"] = "0.7.2-preview";
+    GpVersion["V0_7_2"] = "0.7.2";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const DEFAULT_VERSION = GpVersion.V0_7_1;
+const DEFAULT_VERSION = GpVersion.V0_7_2;
 const env$1 = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case GpVersion.V0_6_7:
-        case GpVersion.V0_7_0:
-        case GpVersion.V0_7_1:
-        case GpVersion.V0_7_2:
-            return env;
-        default:
-            throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
+    for (const v of Object.values(GpVersion)) {
+        if (env === v) {
+            return v;
+        }
     }
+    throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
 }
 function parseCurrentSuite(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case TestSuite.W3F_DAVXY:
-        case TestSuite.JAMDUNA:
-            return env;
-        default:
-            throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    for (const s of Object.values(TestSuite)) {
+        if (env === s) {
+            return s;
+        }
     }
+    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
 }
 class Compatibility {
     static override(version) {
@@ -208,6 +204,13 @@ class WithDebug {
         return inspect(this);
     }
 }
+function lazyInspect(obj) {
+    return {
+        toString() {
+            return inspect(obj);
+        },
+    };
+}
 
 const env = typeof process === "undefined" ? {} : process.env;
 /**
@@ -602,6 +605,7 @@ var index$u = /*#__PURE__*/Object.freeze({
   deepEqual: deepEqual,
   inspect: inspect,
   isBrowser: isBrowser,
+  lazyInspect: lazyInspect,
   measure: measure,
   resultToString: resultToString,
   safeAllocUint8Array: safeAllocUint8Array,
@@ -7744,7 +7748,7 @@ const DEV_CONFIG = "dev";
 const DEFAULT_CONFIG = "default";
 const NODE_DEFAULTS = {
     name: isBrowser() ? "browser" : os.hostname(),
-    config: DEFAULT_CONFIG,
+    config: [DEFAULT_CONFIG],
     pvm: PvmBackend.BuiltIn,
 };
 /** Chain spec chooser. */
@@ -7797,25 +7801,137 @@ class NodeConfiguration {
         this.authorship = authorship;
     }
 }
-function loadConfig(configPath) {
-    if (configPath === DEFAULT_CONFIG) {
-        logger$5.log `🔧 Loading DEFAULT config`;
-        return parseFromJson(configs.default, NodeConfiguration.fromJson);
-    }
-    if (configPath === DEV_CONFIG) {
-        logger$5.log `🔧 Loading DEV config`;
-        return parseFromJson(configs.dev, NodeConfiguration.fromJson);
+function loadConfig(config, withRelPath) {
+    logger$5.log `🔧 Loading config`;
+    let mergedJson = {};
+    for (const entry of config) {
+        logger$5.log `🔧 Applying '${entry}'`;
+        if (entry === DEV_CONFIG) {
+            mergedJson = structuredClone(configs.dev); // clone to avoid mutating the original config. not doing a merge since dev and default should theoretically replace all properties.
+            continue;
+        }
+        if (entry === DEFAULT_CONFIG) {
+            mergedJson = structuredClone(configs.default);
+            continue;
+        }
+        // try to parse as JSON
+        try {
+            const parsed = JSON.parse(entry);
+            deepMerge(mergedJson, parsed);
+            continue;
+        }
+        catch { }
+        // if not, try to load as file
+        if (entry.indexOf("=") === -1 && entry.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(entry), "utf8");
+                const parsed = JSON.parse(configFile);
+                deepMerge(mergedJson, parsed);
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${entry}: ${e}`);
+            }
+        }
+        else {
+            // finally try to process as a pseudo-jq query
+            try {
+                processQuery(mergedJson, entry, withRelPath);
+            }
+            catch (e) {
+                throw new Error(`Error while processing '${entry}': ${e}`);
+            }
+        }
     }
     try {
-        logger$5.log `🔧 Loading config from ${configPath}`;
-        const configFile = fs.readFileSync(configPath, "utf8");
-        const parsed = JSON.parse(configFile);
-        return parseFromJson(parsed, NodeConfiguration.fromJson);
+        const parsed = parseFromJson(mergedJson, NodeConfiguration.fromJson);
+        logger$5.log `🔧 Config ready`;
+        return parsed;
     }
     catch (e) {
-        throw new Error(`Unable to load config file from ${configPath}: ${e}`);
+        throw new Error(`Unable to parse config: ${e}`);
     }
 }
+function deepMerge(target, source) {
+    if (!isJsonObject(source)) {
+        throw new Error(`Expected object, got ${source}`);
+    }
+    for (const key in source) {
+        if (isJsonObject(source[key])) {
+            if (!isJsonObject(target[key])) {
+                target[key] = {};
+            }
+            deepMerge(target[key], source[key]);
+        }
+        else {
+            target[key] = source[key];
+        }
+    }
+}
+/**
+ * Caution: updates input directly.
+ * Processes a pseudo-jq query. Syntax:
+ * .path.to.value = { ... } - updates value with the specified object by replacement
+ * .path.to.value += { ... } - updates value with the specified object by merging
+ * .path.to.value = file.json - updates value with the contents of file.json
+ * .path.to.value += file.json - merges the contents of file.json onto value
+ */
+function processQuery(input, query, withRelPath) {
+    const queryParts = query.split("=");
+    if (queryParts.length === 2) {
+        let [path, value] = queryParts.map((part) => part.trim());
+        let merge = false;
+        // detect += syntax
+        if (path.endsWith("+")) {
+            merge = true;
+            path = path.slice(0, -1);
+        }
+        let parsedValue;
+        if (value.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(value), "utf8");
+                const parsed = JSON.parse(configFile);
+                parsedValue = parsed;
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${value}: ${e}`);
+            }
+        }
+        else {
+            try {
+                parsedValue = JSON.parse(value);
+            }
+            catch (e) {
+                throw new Error(`Unrecognized syntax '${value}': ${e}`);
+            }
+        }
+        let pathParts = path.split(".");
+        // allow leading dot in path
+        if (pathParts[0] === "") {
+            pathParts = pathParts.slice(1);
+        }
+        let target = input;
+        for (let i = 0; i < pathParts.length; i++) {
+            const part = pathParts[i];
+            if (!isJsonObject(target[part])) {
+                target[part] = {};
+            }
+            if (i === pathParts.length - 1) {
+                if (merge) {
+                    deepMerge(target[part], parsedValue);
+                }
+                else {
+                    target[part] = parsedValue;
+                }
+                return;
+            }
+            target = target[part];
+        }
+    }
+    throw new Error("Unrecognized syntax.");
+}
+function isJsonObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 var index$h = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -8958,26 +9074,6 @@ class InMemoryStateView {
     }
 }
 
-/** Dictionary entry of services that auto-accumulate every block. */
-class AutoAccumulate {
-    service;
-    gasLimit;
-    static Codec = codec$1.Class(AutoAccumulate, {
-        service: codec$1.u32.asOpaque(),
-        gasLimit: codec$1.u64.asOpaque(),
-    });
-    static create({ service, gasLimit }) {
-        return new AutoAccumulate(service, gasLimit);
-    }
-    constructor(
-    /** Service id that auto-accumulates. */
-    service, 
-    /** Gas limit for auto-accumulation. */
-    gasLimit) {
-        this.service = service;
-        this.gasLimit = gasLimit;
-    }
-}
 /**
  * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
  */
@@ -8995,7 +9091,9 @@ class PrivilegedServices {
         registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
             ? codec$1.u32.asOpaque()
             : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-        autoAccumulateServices: readonlyArray(codec$1.sequenceVarLen(AutoAccumulate.Codec)),
+        autoAccumulateServices: codec$1.dictionary(codec$1.u32.asOpaque(), codec$1.u64.asOpaque(), {
+            sortKeys: (a, b) => a - b,
+        }),
     });
     static create(a) {
         return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
@@ -9600,7 +9698,7 @@ class InMemoryState extends WithDebug {
                 assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
                 delegator: tryAsServiceId(0),
                 registrar: tryAsServiceId(MAX_VALUE),
-                autoAccumulateServices: [],
+                autoAccumulateServices: new Map(),
             }),
             accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),
             services: new Map(),
@@ -9623,7 +9721,6 @@ var index$g = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AUTHORIZATION_QUEUE_SIZE: AUTHORIZATION_QUEUE_SIZE,
   AccumulationOutput: AccumulationOutput,
-  AutoAccumulate: AutoAccumulate,
   AvailabilityAssignment: AvailabilityAssignment,
   BASE_SERVICE_BALANCE: BASE_SERVICE_BALANCE,
   BlockState: BlockState,
@@ -17606,6 +17703,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   instructionArgumentTypeMap: instructionArgumentTypeMap,
   interpreter: index$5,
   isBrowser: isBrowser,
+  lazyInspect: lazyInspect,
   measure: measure,
   numbers: index$r,
   resultToString: resultToString,
@@ -18012,10 +18110,7 @@ const fullStateDumpFromJson = (spec) => json.object({
         chi_a: json.array("number"),
         chi_v: "number",
         chi_r: json.optional("number"),
-        chi_g: json.nullable(json.array({
-            service: "number",
-            gasLimit: json.fromNumber((v) => tryAsServiceGas(v)),
-        })),
+        chi_g: json.nullable(json.map("number", json.fromNumber((v) => tryAsServiceGas(v)))),
     },
     pi: JsonStatisticsData.fromJson,
     omega: json.array(json.array(notYetAccumulatedFromJson)),
@@ -18056,7 +18151,7 @@ const fullStateDumpFromJson = (spec) => json.object({
             assigners: chi.chi_a,
             delegator: chi.chi_v,
             registrar: chi.chi_r ?? tryAsServiceId(2 ** 32 - 1),
-            autoAccumulateServices: chi.chi_g ?? [],
+            autoAccumulateServices: chi.chi_g ?? new Map(),
         }),
         statistics: JsonStatisticsData.toStatisticsData(spec, pi),
         accumulationQueue: omega,

package/index.d.ts

@@ -2,7 +2,7 @@ declare enum GpVersion {
   V0_6_7 = "0.6.7",
   V0_7_0 = "0.7.0",
   V0_7_1 = "0.7.1",
-  V0_7_2 = "0.7.2-preview",
+  V0_7_2 = "0.7.2",
 }
 
 declare enum TestSuite {
@@ -10,43 +10,39 @@ declare enum TestSuite {
   JAMDUNA = "jamduna",
 }
 
+declare const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
+
 declare const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-declare const DEFAULT_VERSION = GpVersion.V0_7_1;
+declare const DEFAULT_VERSION = GpVersion.V0_7_2;
 declare let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 declare let CURRENT_SUITE = parseCurrentSuite(env.TEST_SUITE) ?? DEFAULT_SUITE;
 
-declare const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
-
 declare function parseCurrentVersion(env?: string): GpVersion | undefined {
   if (env === undefined) {
     return undefined;
   }
-  switch (env) {
-    case GpVersion.V0_6_7:
-    case GpVersion.V0_7_0:
-    case GpVersion.V0_7_1:
-    case GpVersion.V0_7_2:
-      return env;
-    default:
-      throw new Error(
-        `Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`,
-      );
+  for (const v of Object.values(GpVersion)) {
+    if (env === v) {
+      return v;
+    }
   }
+  throw new Error(
+    `Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`,
+  );
 }
 
 declare function parseCurrentSuite(env?: string): TestSuite | undefined {
   if (env === undefined) {
     return undefined;
   }
-  switch (env) {
-    case TestSuite.W3F_DAVXY:
-    case TestSuite.JAMDUNA:
-      return env;
-    default:
-      throw new Error(
-        `Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`,
-      );
+  for (const s of Object.values(TestSuite)) {
+    if (env === s) {
+      return s;
+    }
   }
+  throw new Error(
+    `Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`,
+  );
 }
 
 declare class Compatibility {
@@ -242,6 +238,14 @@ declare abstract class WithDebug {
   }
 }
 
+declare function lazyInspect<T>(obj: T) {
+  return {
+    toString() {
+      return inspect(obj);
+    },
+  };
+}
+
 /**
  * The function will produce relative path resolver that is adjusted
  * for package location within the workspace.
@@ -769,6 +773,7 @@ declare const index$u_inspect: typeof inspect;
 declare const index$u_isBrowser: typeof isBrowser;
 declare const index$u_isResult: typeof isResult;
 declare const index$u_isTaggedError: typeof isTaggedError;
+declare const index$u_lazyInspect: typeof lazyInspect;
 declare const index$u_maybeTaggedErrorToString: typeof maybeTaggedErrorToString;
 declare const index$u_measure: typeof measure;
 declare const index$u_oomWarningPrinted: typeof oomWarningPrinted;
@@ -780,7 +785,7 @@ declare const index$u_seeThrough: typeof seeThrough;
 declare const index$u_trimStack: typeof trimStack;
 declare const index$u_workspacePathFix: typeof workspacePathFix;
 declare namespace index$u {
-  export { index$u_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$u_CURRENT_SUITE as CURRENT_SUITE, index$u_CURRENT_VERSION as CURRENT_VERSION, index$u_Compatibility as Compatibility, index$u_DEFAULT_SUITE as DEFAULT_SUITE, index$u_DEFAULT_VERSION as DEFAULT_VERSION, index$u_ErrorsCollector as ErrorsCollector, index$u_GpVersion as GpVersion, MAX_LENGTH$1 as MAX_LENGTH, Result$2 as Result, index$u_RichTaggedError as RichTaggedError, index$u_TEST_COMPARE_USING as TEST_COMPARE_USING, index$u_TestSuite as TestSuite, index$u_WithDebug as WithDebug, index$u___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$u_asOpaqueType as asOpaqueType, index$u_assertEmpty as assertEmpty, index$u_assertNever as assertNever, index$u_callCompareFunction as callCompareFunction, index$u_check as check, index$u_deepEqual as deepEqual, index$u_getAllKeysSorted as getAllKeysSorted, index$u_inspect as inspect, index$u_isBrowser as isBrowser, index$u_isResult as isResult, index$u_isTaggedError as isTaggedError, index$u_maybeTaggedErrorToString as maybeTaggedErrorToString, index$u_measure as measure, index$u_oomWarningPrinted as oomWarningPrinted, index$u_parseCurrentSuite as parseCurrentSuite, index$u_parseCurrentVersion as parseCurrentVersion, index$u_resultToString as resultToString, index$u_safeAllocUint8Array as safeAllocUint8Array, index$u_seeThrough as seeThrough, index$u_trimStack as trimStack, index$u_workspacePathFix as workspacePathFix };
+  export { index$u_ALL_VERSIONS_IN_ORDER as ALL_VERSIONS_IN_ORDER, index$u_CURRENT_SUITE as CURRENT_SUITE, index$u_CURRENT_VERSION as CURRENT_VERSION, index$u_Compatibility as Compatibility, index$u_DEFAULT_SUITE as DEFAULT_SUITE, index$u_DEFAULT_VERSION as DEFAULT_VERSION, index$u_ErrorsCollector as ErrorsCollector, index$u_GpVersion as GpVersion, MAX_LENGTH$1 as MAX_LENGTH, Result$2 as Result, index$u_RichTaggedError as RichTaggedError, index$u_TEST_COMPARE_USING as TEST_COMPARE_USING, index$u_TestSuite as TestSuite, index$u_WithDebug as WithDebug, index$u___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$u_asOpaqueType as asOpaqueType, index$u_assertEmpty as assertEmpty, index$u_assertNever as assertNever, index$u_callCompareFunction as callCompareFunction, index$u_check as check, index$u_deepEqual as deepEqual, index$u_getAllKeysSorted as getAllKeysSorted, index$u_inspect as inspect, index$u_isBrowser as isBrowser, index$u_isResult as isResult, index$u_isTaggedError as isTaggedError, index$u_lazyInspect as lazyInspect, index$u_maybeTaggedErrorToString as maybeTaggedErrorToString, index$u_measure as measure, index$u_oomWarningPrinted as oomWarningPrinted, index$u_parseCurrentSuite as parseCurrentSuite, index$u_parseCurrentVersion as parseCurrentVersion, index$u_resultToString as resultToString, index$u_safeAllocUint8Array as safeAllocUint8Array, index$u_seeThrough as seeThrough, index$u_trimStack as trimStack, index$u_workspacePathFix as workspacePathFix };
   export type { index$u_DeepEqualOptions as DeepEqualOptions, index$u_EnumMapping as EnumMapping, index$u_ErrorResult as ErrorResult, index$u_OK as OK, index$u_OkResult as OkResult, index$u_Opaque as Opaque, index$u_StringLiteral as StringLiteral, index$u_TaggedError as TaggedError, index$u_TokenOf as TokenOf, index$u_Uninstantiable as Uninstantiable, index$u_WithOpaque as WithOpaque };
 }
 
@@ -8168,7 +8173,7 @@ declare const DEFAULT_CONFIG = "default";
 
 declare const NODE_DEFAULTS = {
   name: isBrowser() ? "browser" : os.hostname(),
-  config: DEFAULT_CONFIG,
+  config: [DEFAULT_CONFIG],
   pvm: PvmBackend.BuiltIn,
 };
 
@@ -8222,52 +8227,173 @@ declare class NodeConfiguration {
   ) {}
 }
 
-declare function loadConfig(configPath: string): NodeConfiguration {
-  if (configPath === DEFAULT_CONFIG) {
-    logger.log`🔧 Loading DEFAULT config`;
-    return parseFromJson(configs.default, NodeConfiguration.fromJson);
-  }
+declare function loadConfig(config: string[], withRelPath: (p: string) => string): NodeConfiguration {
+  logger.log`🔧 Loading config`;
+  let mergedJson: AnyJsonObject = {};
+
+  for (const entry of config) {
+    logger.log`🔧 Applying '${entry}'`;
+
+    if (entry === DEV_CONFIG) {
+      mergedJson = structuredClone(configs.dev); // clone to avoid mutating the original config. not doing a merge since dev and default should theoretically replace all properties.
+      continue;
+    }
 
-  if (configPath === DEV_CONFIG) {
-    logger.log`🔧 Loading DEV config`;
-    return parseFromJson(configs.dev, NodeConfiguration.fromJson);
+    if (entry === DEFAULT_CONFIG) {
+      mergedJson = structuredClone(configs.default);
+      continue;
+    }
+
+    // try to parse as JSON
+    try {
+      const parsed = JSON.parse(entry);
+      deepMerge(mergedJson, parsed);
+      continue;
+    } catch {}
+
+    // if not, try to load as file
+    if (entry.indexOf("=") === -1 && entry.endsWith(".json")) {
+      try {
+        const configFile = fs.readFileSync(withRelPath(entry), "utf8");
+        const parsed = JSON.parse(configFile);
+        deepMerge(mergedJson, parsed);
+      } catch (e) {
+        throw new Error(`Unable to load config from ${entry}: ${e}`);
+      }
+    } else {
+      // finally try to process as a pseudo-jq query
+      try {
+        processQuery(mergedJson, entry, withRelPath);
+      } catch (e) {
+        throw new Error(`Error while processing '${entry}': ${e}`);
+      }
+    }
   }
 
   try {
-    logger.log`🔧 Loading config from ${configPath}`;
-    const configFile = fs.readFileSync(configPath, "utf8");
-    const parsed = JSON.parse(configFile);
-    return parseFromJson(parsed, NodeConfiguration.fromJson);
+    const parsed = parseFromJson(mergedJson, NodeConfiguration.fromJson);
+    logger.log`🔧 Config ready`;
+    return parsed;
   } catch (e) {
-    throw new Error(`Unable to load config file from ${configPath}: ${e}`);
+    throw new Error(`Unable to parse config: ${e}`);
   }
 }
 
+declare function deepMerge(target: AnyJsonObject, source: JsonValue): void {
+  if (!isJsonObject(source)) {
+    throw new Error(`Expected object, got ${source}`);
+  }
+  for (const key in source) {
+    if (isJsonObject(source[key])) {
+      if (!isJsonObject(target[key])) {
+        target[key] = {};
+      }
+      deepMerge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+}
+
+/**
+ * Caution: updates input directly.
+ * Processes a pseudo-jq query. Syntax:
+ * .path.to.value = { ... } - updates value with the specified object by replacement
+ * .path.to.value += { ... } - updates value with the specified object by merging
+ * .path.to.value = file.json - updates value with the contents of file.json
+ * .path.to.value += file.json - merges the contents of file.json onto value
+ */
+declare function processQuery(input: AnyJsonObject, query: string, withRelPath: (p: string) => string): void {
+  const queryParts = query.split("=");
+
+  if (queryParts.length === 2) {
+    let [path, value] = queryParts.map((part) => part.trim());
+    let merge = false;
+
+    // detect += syntax
+    if (path.endsWith("+")) {
+      merge = true;
+      path = path.slice(0, -1);
+    }
+
+    let parsedValue: JsonValue;
+    if (value.endsWith(".json")) {
+      try {
+        const configFile = fs.readFileSync(withRelPath(value), "utf8");
+        const parsed = JSON.parse(configFile);
+        parsedValue = parsed;
+      } catch (e) {
+        throw new Error(`Unable to load config from ${value}: ${e}`);
+      }
+    } else {
+      try {
+        parsedValue = JSON.parse(value);
+      } catch (e) {
+        throw new Error(`Unrecognized syntax '${value}': ${e}`);
+      }
+    }
+
+    let pathParts = path.split(".");
+
+    // allow leading dot in path
+    if (pathParts[0] === "") {
+      pathParts = pathParts.slice(1);
+    }
+
+    let target = input;
+    for (let i = 0; i < pathParts.length; i++) {
+      const part = pathParts[i];
+      if (!isJsonObject(target[part])) {
+        target[part] = {};
+      }
+      if (i === pathParts.length - 1) {
+        if (merge) {
+          deepMerge(target[part], parsedValue);
+        } else {
+          target[part] = parsedValue;
+        }
+        return;
+      }
+      target = target[part];
+    }
+  }
+
+  throw new Error("Unrecognized syntax.");
+}
+
+type JsonValue = string | number | boolean | null | AnyJsonObject | JsonArray;
+
+interface AnyJsonObject {
+  [key: string]: JsonValue;
+}
+
+interface JsonArray extends Array<JsonValue> {}
+
+declare function isJsonObject(value: JsonValue): value is AnyJsonObject {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+type index$h_AnyJsonObject = AnyJsonObject;
 declare const index$h_DEFAULT_CONFIG: typeof DEFAULT_CONFIG;
 declare const index$h_DEV_CONFIG: typeof DEV_CONFIG;
 type index$h_JipChainSpec = JipChainSpec;
 declare const index$h_JipChainSpec: typeof JipChainSpec;
+type index$h_JsonArray = JsonArray;
+type index$h_JsonValue = JsonValue;
 type index$h_KnownChainSpec = KnownChainSpec;
 declare const index$h_KnownChainSpec: typeof KnownChainSpec;
 declare const index$h_NODE_DEFAULTS: typeof NODE_DEFAULTS;
 type index$h_NodeConfiguration = NodeConfiguration;
 declare const index$h_NodeConfiguration: typeof NodeConfiguration;
+declare const index$h_deepMerge: typeof deepMerge;
+declare const index$h_isJsonObject: typeof isJsonObject;
 declare const index$h_knownChainSpecFromJson: typeof knownChainSpecFromJson;
 declare const index$h_loadConfig: typeof loadConfig;
 declare const index$h_parseBootnode: typeof parseBootnode;
+declare const index$h_processQuery: typeof processQuery;
 declare namespace index$h {
-  export {
-    index$h_DEFAULT_CONFIG as DEFAULT_CONFIG,
-    index$h_DEV_CONFIG as DEV_CONFIG,
-    index$h_JipChainSpec as JipChainSpec,
-    index$h_KnownChainSpec as KnownChainSpec,
-    index$h_NODE_DEFAULTS as NODE_DEFAULTS,
-    index$h_NodeConfiguration as NodeConfiguration,
-    index$h_knownChainSpecFromJson as knownChainSpecFromJson,
-    index$h_loadConfig as loadConfig,
-    logger$2 as logger,
-    index$h_parseBootnode as parseBootnode,
-  };
+  export { index$h_DEFAULT_CONFIG as DEFAULT_CONFIG, index$h_DEV_CONFIG as DEV_CONFIG, index$h_JipChainSpec as JipChainSpec, index$h_KnownChainSpec as KnownChainSpec, index$h_NODE_DEFAULTS as NODE_DEFAULTS, index$h_NodeConfiguration as NodeConfiguration, index$h_deepMerge as deepMerge, index$h_isJsonObject as isJsonObject, index$h_knownChainSpecFromJson as knownChainSpecFromJson, index$h_loadConfig as loadConfig, logger$2 as logger, index$h_parseBootnode as parseBootnode, index$h_processQuery as processQuery };
+  export type { index$h_AnyJsonObject as AnyJsonObject, index$h_JsonArray as JsonArray, index$h_JsonValue as JsonValue };
 }
 
 /**
@@ -9992,25 +10118,6 @@ declare class LookupHistoryItem {
   }
 }
 
-/** Dictionary entry of services that auto-accumulate every block. */
-declare class AutoAccumulate {
-  static Codec = codec.Class(AutoAccumulate, {
-    service: codec.u32.asOpaque<ServiceId>(),
-    gasLimit: codec.u64.asOpaque<ServiceGas>(),
-  });
-
-  static create({ service, gasLimit }: CodecRecord<AutoAccumulate>) {
-    return new AutoAccumulate(service, gasLimit);
-  }
-
-  private constructor(
-    /** Service id that auto-accumulates. */
-    readonly service: ServiceId,
-    /** Gas limit for auto-accumulation. */
-    readonly gasLimit: ServiceGas,
-  ) {}
-}
-
 /**
  * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
  */
@@ -10023,7 +10130,9 @@ declare class PrivilegedServices {
     registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
       ? codec.u32.asOpaque<ServiceId>()
       : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-    autoAccumulateServices: readonlyArray(codec.sequenceVarLen(AutoAccumulate.Codec)),
+    autoAccumulateServices: codec.dictionary(codec.u32.asOpaque<ServiceId>(), codec.u64.asOpaque<ServiceGas>(), {
+      sortKeys: (a, b) => a - b,
+    }),
   });
 
   static create(a: CodecRecord<PrivilegedServices>) {
@@ -10048,7 +10157,7 @@ declare class PrivilegedServices {
     /** `χ_A`: Manages authorization queue one for each core. */
     readonly assigners: PerCore<ServiceId>,
     /** `χ_Z`: Dictionary of services that auto-accumulate every block with their gas limit. */
-    readonly autoAccumulateServices: readonly AutoAccumulate[],
+    readonly autoAccumulateServices: Map<ServiceId, ServiceGas>,
   ) {}
 }
 
@@ -11365,7 +11474,7 @@ declare class InMemoryState extends WithDebug implements State, WithStateView, E
         assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
         delegator: tryAsServiceId(0),
         registrar: tryAsServiceId(MAX_VALUE),
-        autoAccumulateServices: [],
+        autoAccumulateServices: new Map(),
       }),
       accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),
       services: new Map(),
@@ -11421,8 +11530,6 @@ type index$e_AccumulationQueue = AccumulationQueue;
 type index$e_AccumulationQueueView = AccumulationQueueView;
 type index$e_AuthorizationPool = AuthorizationPool;
 type index$e_AuthorizationQueue = AuthorizationQueue;
-type index$e_AutoAccumulate = AutoAccumulate;
-declare const index$e_AutoAccumulate: typeof AutoAccumulate;
 type index$e_AvailabilityAssignment = AvailabilityAssignment;
 declare const index$e_AvailabilityAssignment: typeof AvailabilityAssignment;
 type index$e_AvailabilityAssignmentsView = AvailabilityAssignmentsView;
@@ -11531,7 +11638,7 @@ declare const index$e_validatorsDataCodec: typeof validatorsDataCodec;
 declare const index$e_workReportsSortedSetCodec: typeof workReportsSortedSetCodec;
 declare const index$e_zeroSizeHint: typeof zeroSizeHint;
 declare namespace index$e {
-  export { index$e_AccumulationOutput as AccumulationOutput, index$e_AutoAccumulate as AutoAccumulate, index$e_AvailabilityAssignment as AvailabilityAssignment, index$e_BASE_SERVICE_BALANCE as BASE_SERVICE_BALANCE, index$e_BlockState as BlockState, index$e_CoreStatistics as CoreStatistics, index$e_DisputesRecords as DisputesRecords, index$e_ELECTIVE_BYTE_BALANCE as ELECTIVE_BYTE_BALANCE, index$e_ELECTIVE_ITEM_BALANCE as ELECTIVE_ITEM_BALANCE, index$e_InMemoryService as InMemoryService, index$e_InMemoryState as InMemoryState, index$e_LookupHistoryItem as LookupHistoryItem, index$e_MAX_LOOKUP_HISTORY_SLOTS as MAX_LOOKUP_HISTORY_SLOTS, index$e_NotYetAccumulatedReport as NotYetAccumulatedReport, index$e_PreimageItem as PreimageItem, index$e_PrivilegedServices as PrivilegedServices, index$e_RecentBlocks as RecentBlocks, index$e_SafroleData as SafroleData, index$e_SafroleSealingKeysData as SafroleSealingKeysData, index$e_SafroleSealingKeysKind as SafroleSealingKeysKind, index$e_ServiceAccountInfo as ServiceAccountInfo, index$e_ServiceStatistics as ServiceStatistics, index$e_StatisticsData as StatisticsData, index$e_StorageItem as StorageItem, index$e_UpdateError as UpdateError, index$e_UpdatePreimage as UpdatePreimage, index$e_UpdatePreimageKind as UpdatePreimageKind, index$e_UpdateService as UpdateService, index$e_UpdateServiceKind as UpdateServiceKind, index$e_UpdateStorage as UpdateStorage, index$e_UpdateStorageKind as UpdateStorageKind, index$e_ValidatorData as ValidatorData, index$e_ValidatorStatistics as ValidatorStatistics, index$e_accumulationOutputComparator as accumulationOutputComparator, index$e_accumulationQueueCodec as accumulationQueueCodec, index$e_authPoolsCodec as authPoolsCodec, index$e_authQueuesCodec as authQueuesCodec, index$e_availabilityAssignmentsCodec as availabilityAssignmentsCodec, index$e_codecBandersnatchKey as codecBandersnatchKey, index$e_codecPerCore as codecPerCore, index$e_codecServiceId as codecServiceId, index$e_codecVarGas as codecVarGas, index$e_codecVarU16 as codecVarU16, index$e_codecWithVersion as codecWithVersion, index$e_hashComparator as hashComparator, index$e_ignoreValueWithDefault as ignoreValueWithDefault, index$e_recentlyAccumulatedCodec as recentlyAccumulatedCodec, index$e_serviceDataCodec as serviceDataCodec, index$e_serviceEntriesCodec as serviceEntriesCodec, index$e_sortedSetCodec as sortedSetCodec, index$e_tryAsLookupHistorySlots as tryAsLookupHistorySlots, index$e_tryAsPerCore as tryAsPerCore, index$e_validatorsDataCodec as validatorsDataCodec, index$e_workReportsSortedSetCodec as workReportsSortedSetCodec, index$e_zeroSizeHint as zeroSizeHint };
+  export { index$e_AccumulationOutput as AccumulationOutput, index$e_AvailabilityAssignment as AvailabilityAssignment, index$e_BASE_SERVICE_BALANCE as BASE_SERVICE_BALANCE, index$e_BlockState as BlockState, index$e_CoreStatistics as CoreStatistics, index$e_DisputesRecords as DisputesRecords, index$e_ELECTIVE_BYTE_BALANCE as ELECTIVE_BYTE_BALANCE, index$e_ELECTIVE_ITEM_BALANCE as ELECTIVE_ITEM_BALANCE, index$e_InMemoryService as InMemoryService, index$e_InMemoryState as InMemoryState, index$e_LookupHistoryItem as LookupHistoryItem, index$e_MAX_LOOKUP_HISTORY_SLOTS as MAX_LOOKUP_HISTORY_SLOTS, index$e_NotYetAccumulatedReport as NotYetAccumulatedReport, index$e_PreimageItem as PreimageItem, index$e_PrivilegedServices as PrivilegedServices, index$e_RecentBlocks as RecentBlocks, index$e_SafroleData as SafroleData, index$e_SafroleSealingKeysData as SafroleSealingKeysData, index$e_SafroleSealingKeysKind as SafroleSealingKeysKind, index$e_ServiceAccountInfo as ServiceAccountInfo, index$e_ServiceStatistics as ServiceStatistics, index$e_StatisticsData as StatisticsData, index$e_StorageItem as StorageItem, index$e_UpdateError as UpdateError, index$e_UpdatePreimage as UpdatePreimage, index$e_UpdatePreimageKind as UpdatePreimageKind, index$e_UpdateService as UpdateService, index$e_UpdateServiceKind as UpdateServiceKind, index$e_UpdateStorage as UpdateStorage, index$e_UpdateStorageKind as UpdateStorageKind, index$e_ValidatorData as ValidatorData, index$e_ValidatorStatistics as ValidatorStatistics, index$e_accumulationOutputComparator as accumulationOutputComparator, index$e_accumulationQueueCodec as accumulationQueueCodec, index$e_authPoolsCodec as authPoolsCodec, index$e_authQueuesCodec as authQueuesCodec, index$e_availabilityAssignmentsCodec as availabilityAssignmentsCodec, index$e_codecBandersnatchKey as codecBandersnatchKey, index$e_codecPerCore as codecPerCore, index$e_codecServiceId as codecServiceId, index$e_codecVarGas as codecVarGas, index$e_codecVarU16 as codecVarU16, index$e_codecWithVersion as codecWithVersion, index$e_hashComparator as hashComparator, index$e_ignoreValueWithDefault as ignoreValueWithDefault, index$e_recentlyAccumulatedCodec as recentlyAccumulatedCodec, index$e_serviceDataCodec as serviceDataCodec, index$e_serviceEntriesCodec as serviceEntriesCodec, index$e_sortedSetCodec as sortedSetCodec, index$e_tryAsLookupHistorySlots as tryAsLookupHistorySlots, index$e_tryAsPerCore as tryAsPerCore, index$e_validatorsDataCodec as validatorsDataCodec, index$e_workReportsSortedSetCodec as workReportsSortedSetCodec, index$e_zeroSizeHint as zeroSizeHint };
   export type { index$e_AUTHORIZATION_QUEUE_SIZE as AUTHORIZATION_QUEUE_SIZE, index$e_AccumulationQueue as AccumulationQueue, index$e_AccumulationQueueView as AccumulationQueueView, index$e_AuthorizationPool as AuthorizationPool, index$e_AuthorizationQueue as AuthorizationQueue, index$e_AvailabilityAssignmentsView as AvailabilityAssignmentsView, index$e_BlocksState as BlocksState, index$e_ENTROPY_ENTRIES as ENTROPY_ENTRIES, index$e_EnumerableState as EnumerableState, index$e_FieldNames as FieldNames, index$e_InMemoryStateFields as InMemoryStateFields, index$e_LookupHistorySlots as LookupHistorySlots, index$e_MAX_AUTH_POOL_SIZE as MAX_AUTH_POOL_SIZE, index$e_MAX_RECENT_HISTORY as MAX_RECENT_HISTORY, index$e_PerCore as PerCore, index$e_RecentBlocksView as RecentBlocksView, index$e_RecentlyAccumulated as RecentlyAccumulated, index$e_RecentlyAccumulatedView as RecentlyAccumulatedView, index$e_SafroleDataView as SafroleDataView, index$e_SafroleSealingKeys as SafroleSealingKeys, index$e_Service as Service, index$e_ServiceAccountInfoView as ServiceAccountInfoView, index$e_ServiceData as ServiceData, index$e_ServiceEntries as ServiceEntries, index$e_ServicesUpdate as ServicesUpdate, index$e_State as State, index$e_StateView as StateView, index$e_StatisticsDataView as StatisticsDataView, index$e_StorageKey as StorageKey, index$e_VALIDATOR_META_BYTES as VALIDATOR_META_BYTES, index$e_ValidatorDataView as ValidatorDataView, index$e_WithStateView as WithStateView };
 }
 
@@ -14307,7 +14414,7 @@ interface PartialState {
     a: PerCore<ServiceId>,
     v: ServiceId | null,
     r: ServiceId | null,
-    z: [ServiceId, ServiceGas][],
+    z: Map<ServiceId, ServiceGas>,
   ): Result$2<OK, UpdatePrivilegesError>;
 
   /** Yield accumulation trie result hash. */
@@ -19541,6 +19648,7 @@ declare const index$3_inspect: typeof inspect;
 declare const index$3_instructionArgumentTypeMap: typeof instructionArgumentTypeMap;
 declare const index$3_isBrowser: typeof isBrowser;
 declare const index$3_isTaggedError: typeof isTaggedError;
+declare const index$3_lazyInspect: typeof lazyInspect;
 declare const index$3_maybeTaggedErrorToString: typeof maybeTaggedErrorToString;
 declare const index$3_measure: typeof measure;
 declare const index$3_preimageLenAsU32: typeof preimageLenAsU32;
@@ -19552,7 +19660,7 @@ declare const index$3_tryAsMachineId: typeof tryAsMachineId;
 declare const index$3_tryAsProgramCounter: typeof tryAsProgramCounter;
 declare const index$3_writeServiceIdAsLeBytes: typeof writeServiceIdAsLeBytes;
 declare namespace index$3 {
-  export { index$3_AccumulationStateUpdate as AccumulationStateUpdate, index$3_ArgsDecoder as ArgsDecoder, index$3_ArgumentType as ArgumentType, index$3_BasicBlocks as BasicBlocks, index$3_CURRENT_SERVICE_ID as CURRENT_SERVICE_ID, index$3_EjectError as EjectError, index$3_ExtendedWitdthImmediateDecoder as ExtendedWitdthImmediateDecoder, index$3_ForgetPreimageError as ForgetPreimageError, index$3_HostCallMemory as HostCallMemory, index$3_HostCallRegisters as HostCallRegisters, index$3_HostCallResult as HostCallResult, index$3_ImmediateDecoder as ImmediateDecoder, index$3_MAX_U32 as MAX_U32, index$3_MAX_U32_BIG_INT as MAX_U32_BIG_INT, index$3_MachineInstance as MachineInstance, index$3_Mask as Mask, index$3_MemoryOperation as MemoryOperation, index$3_MemorySegment as MemorySegment, NO_OF_REGISTERS$1 as NO_OF_REGISTERS, index$3_NewServiceError as NewServiceError, index$3_NibblesDecoder as NibblesDecoder, index$3_PagesError as PagesError, index$3_PartiallyUpdatedState as PartiallyUpdatedState, index$3_PeekPokeError as PeekPokeError, index$3_PendingTransfer as PendingTransfer, index$3_PreimageStatusKind as PreimageStatusKind, index$3_Program as Program, index$3_ProgramDecoder as ProgramDecoder, index$3_ProvidePreimageError as ProvidePreimageError, DebuggerAdapter as Pvm, index$3_Registers as Registers, index$3_RequestPreimageError as RequestPreimageError, Result$2 as Result, index$3_RichTaggedError as RichTaggedError, index$3_SERVICE_ID_BYTES as SERVICE_ID_BYTES, index$3_SpiMemory as SpiMemory, index$3_SpiProgram as SpiProgram, index$3_TransferError as TransferError, index$3_UpdatePrivilegesError as UpdatePrivilegesError, index$3_WithDebug as WithDebug, index$3_ZeroVoidError as ZeroVoidError, index$3___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$3_asOpaqueType as asOpaqueType, index$3_assertEmpty as assertEmpty, index$3_assertNever as assertNever, index$l as block, index$s as bytes, index$3_check as check, index$3_clampU64ToU32 as clampU64ToU32, index$3_createResults as createResults, index$3_decodeStandardProgram as decodeStandardProgram, index$3_deepCloneMapWithArray as deepCloneMapWithArray, index$3_emptyRegistersBuffer as emptyRegistersBuffer, index$3_extractCodeAndMetadata as extractCodeAndMetadata, index$3_getServiceId as getServiceId, index$3_getServiceIdOrCurrent as getServiceIdOrCurrent, index$p as hash, index$3_inspect as inspect, index$3_instructionArgumentTypeMap as instructionArgumentTypeMap, index$6 as interpreter, index$3_isBrowser as isBrowser, index$3_isTaggedError as isTaggedError, index$3_maybeTaggedErrorToString as maybeTaggedErrorToString, index$3_measure as measure, index$r as numbers, index$3_preimageLenAsU32 as preimageLenAsU32, index$3_resultToString as resultToString, index$3_seeThrough as seeThrough, index$3_slotsToPreimageStatus as slotsToPreimageStatus, index$3_toMemoryOperation as toMemoryOperation, index$3_tryAsMachineId as tryAsMachineId, index$3_tryAsProgramCounter as tryAsProgramCounter, index$3_writeServiceIdAsLeBytes as writeServiceIdAsLeBytes };
+  export { index$3_AccumulationStateUpdate as AccumulationStateUpdate, index$3_ArgsDecoder as ArgsDecoder, index$3_ArgumentType as ArgumentType, index$3_BasicBlocks as BasicBlocks, index$3_CURRENT_SERVICE_ID as CURRENT_SERVICE_ID, index$3_EjectError as EjectError, index$3_ExtendedWitdthImmediateDecoder as ExtendedWitdthImmediateDecoder, index$3_ForgetPreimageError as ForgetPreimageError, index$3_HostCallMemory as HostCallMemory, index$3_HostCallRegisters as HostCallRegisters, index$3_HostCallResult as HostCallResult, index$3_ImmediateDecoder as ImmediateDecoder, index$3_MAX_U32 as MAX_U32, index$3_MAX_U32_BIG_INT as MAX_U32_BIG_INT, index$3_MachineInstance as MachineInstance, index$3_Mask as Mask, index$3_MemoryOperation as MemoryOperation, index$3_MemorySegment as MemorySegment, NO_OF_REGISTERS$1 as NO_OF_REGISTERS, index$3_NewServiceError as NewServiceError, index$3_NibblesDecoder as NibblesDecoder, index$3_PagesError as PagesError, index$3_PartiallyUpdatedState as PartiallyUpdatedState, index$3_PeekPokeError as PeekPokeError, index$3_PendingTransfer as PendingTransfer, index$3_PreimageStatusKind as PreimageStatusKind, index$3_Program as Program, index$3_ProgramDecoder as ProgramDecoder, index$3_ProvidePreimageError as ProvidePreimageError, DebuggerAdapter as Pvm, index$3_Registers as Registers, index$3_RequestPreimageError as RequestPreimageError, Result$2 as Result, index$3_RichTaggedError as RichTaggedError, index$3_SERVICE_ID_BYTES as SERVICE_ID_BYTES, index$3_SpiMemory as SpiMemory, index$3_SpiProgram as SpiProgram, index$3_TransferError as TransferError, index$3_UpdatePrivilegesError as UpdatePrivilegesError, index$3_WithDebug as WithDebug, index$3_ZeroVoidError as ZeroVoidError, index$3___OPAQUE_TYPE__ as __OPAQUE_TYPE__, index$3_asOpaqueType as asOpaqueType, index$3_assertEmpty as assertEmpty, index$3_assertNever as assertNever, index$l as block, index$s as bytes, index$3_check as check, index$3_clampU64ToU32 as clampU64ToU32, index$3_createResults as createResults, index$3_decodeStandardProgram as decodeStandardProgram, index$3_deepCloneMapWithArray as deepCloneMapWithArray, index$3_emptyRegistersBuffer as emptyRegistersBuffer, index$3_extractCodeAndMetadata as extractCodeAndMetadata, index$3_getServiceId as getServiceId, index$3_getServiceIdOrCurrent as getServiceIdOrCurrent, index$p as hash, index$3_inspect as inspect, index$3_instructionArgumentTypeMap as instructionArgumentTypeMap, index$6 as interpreter, index$3_isBrowser as isBrowser, index$3_isTaggedError as isTaggedError, index$3_lazyInspect as lazyInspect, index$3_maybeTaggedErrorToString as maybeTaggedErrorToString, index$3_measure as measure, index$r as numbers, index$3_preimageLenAsU32 as preimageLenAsU32, index$3_resultToString as resultToString, index$3_seeThrough as seeThrough, index$3_slotsToPreimageStatus as slotsToPreimageStatus, index$3_toMemoryOperation as toMemoryOperation, index$3_tryAsMachineId as tryAsMachineId, index$3_tryAsProgramCounter as tryAsProgramCounter, index$3_writeServiceIdAsLeBytes as writeServiceIdAsLeBytes };
   export type { index$3_Args as Args, index$3_EnumMapping as EnumMapping, index$3_ErrorResult as ErrorResult, index$3_InsufficientFundsError as InsufficientFundsError, index$3_MachineId as MachineId, index$3_MachineResult as MachineResult, index$3_MachineStatus as MachineStatus, index$3_NoMachineError as NoMachineError, index$3_OK as OK, index$3_OkResult as OkResult, index$3_Opaque as Opaque, index$3_PartialState as PartialState, index$3_PreimageStatus as PreimageStatus, index$3_ProgramCounter as ProgramCounter, index$3_RefineExternalities as RefineExternalities, index$3_SegmentExportError as SegmentExportError, index$3_ServiceStateUpdate as ServiceStateUpdate, index$3_StateSlice as StateSlice, index$3_StringLiteral as StringLiteral, index$3_TRANSFER_MEMO_BYTES as TRANSFER_MEMO_BYTES, index$3_TaggedError as TaggedError, index$3_TokenOf as TokenOf, index$3_Uninstantiable as Uninstantiable, index$3_UnprivilegedError as UnprivilegedError, index$3_WithOpaque as WithOpaque };
 }
 
@@ -20146,10 +20254,10 @@ declare const fullStateDumpFromJson = (spec: ChainSpec) =>
         chi_v: "number",
         chi_r: json.optional("number"),
         chi_g: json.nullable(
-          json.array({
-            service: "number",
-            gasLimit: json.fromNumber((v) => tryAsServiceGas(v)),
-          }),
+          json.map(
+            "number",
+            json.fromNumber((v) => tryAsServiceGas(v)),
+          ),
         ),
       },
       pi: JsonStatisticsData.fromJson,
@@ -20216,7 +20324,7 @@ declare const fullStateDumpFromJson = (spec: ChainSpec) =>
           assigners: chi.chi_a,
           delegator: chi.chi_v,
           registrar: chi.chi_r ?? tryAsServiceId(2 ** 32 - 1),
-          autoAccumulateServices: chi.chi_g ?? [],
+          autoAccumulateServices: chi.chi_g ?? new Map(),
         }),
         statistics: JsonStatisticsData.toStatisticsData(spec, pi),
         accumulationQueue: omega,

package/index.js

@@ -8,44 +8,40 @@ var GpVersion;
     GpVersion["V0_6_7"] = "0.6.7";
     GpVersion["V0_7_0"] = "0.7.0";
     GpVersion["V0_7_1"] = "0.7.1";
-    GpVersion["V0_7_2"] = "0.7.2-preview";
+    GpVersion["V0_7_2"] = "0.7.2";
 })(GpVersion || (GpVersion = {}));
 var TestSuite;
 (function (TestSuite) {
     TestSuite["W3F_DAVXY"] = "w3f-davxy";
     TestSuite["JAMDUNA"] = "jamduna";
 })(TestSuite || (TestSuite = {}));
+const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 const DEFAULT_SUITE = TestSuite.W3F_DAVXY;
-const DEFAULT_VERSION = GpVersion.V0_7_1;
+const DEFAULT_VERSION = GpVersion.V0_7_2;
 const env$1 = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env$1.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env$1.TEST_SUITE) ?? DEFAULT_SUITE;
-const ALL_VERSIONS_IN_ORDER = [GpVersion.V0_6_7, GpVersion.V0_7_0, GpVersion.V0_7_1, GpVersion.V0_7_2];
 function parseCurrentVersion(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case GpVersion.V0_6_7:
-        case GpVersion.V0_7_0:
-        case GpVersion.V0_7_1:
-        case GpVersion.V0_7_2:
-            return env;
-        default:
-            throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
+    for (const v of Object.values(GpVersion)) {
+        if (env === v) {
+            return v;
+        }
     }
+    throw new Error(`Configured environment variable GP_VERSION is unknown: '${env}'. Use one of: ${ALL_VERSIONS_IN_ORDER}`);
 }
 function parseCurrentSuite(env) {
     if (env === undefined) {
         return undefined;
     }
-    switch (env) {
-        case TestSuite.W3F_DAVXY:
-        case TestSuite.JAMDUNA:
-            return env;
-        default:
-            throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
+    for (const s of Object.values(TestSuite)) {
+        if (env === s) {
+            return s;
+        }
     }
+    throw new Error(`Configured environment variable TEST_SUITE is unknown: '${env}'. Use one of: ${Object.values(TestSuite)}`);
 }
 class Compatibility {
     static override(version) {
@@ -205,6 +201,13 @@ class WithDebug {
         return inspect(this);
     }
 }
+function lazyInspect(obj) {
+    return {
+        toString() {
+            return inspect(obj);
+        },
+    };
+}
 
 const env = typeof process === "undefined" ? {} : process.env;
 /**
@@ -599,6 +602,7 @@ var index$u = /*#__PURE__*/Object.freeze({
   deepEqual: deepEqual,
   inspect: inspect,
   isBrowser: isBrowser,
+  lazyInspect: lazyInspect,
   measure: measure,
   resultToString: resultToString,
   safeAllocUint8Array: safeAllocUint8Array,
@@ -7741,7 +7745,7 @@ const DEV_CONFIG = "dev";
 const DEFAULT_CONFIG = "default";
 const NODE_DEFAULTS = {
     name: isBrowser() ? "browser" : os.hostname(),
-    config: DEFAULT_CONFIG,
+    config: [DEFAULT_CONFIG],
     pvm: PvmBackend.BuiltIn,
 };
 /** Chain spec chooser. */
@@ -7794,25 +7798,137 @@ class NodeConfiguration {
         this.authorship = authorship;
     }
 }
-function loadConfig(configPath) {
-    if (configPath === DEFAULT_CONFIG) {
-        logger$5.log `🔧 Loading DEFAULT config`;
-        return parseFromJson(configs.default, NodeConfiguration.fromJson);
-    }
-    if (configPath === DEV_CONFIG) {
-        logger$5.log `🔧 Loading DEV config`;
-        return parseFromJson(configs.dev, NodeConfiguration.fromJson);
+function loadConfig(config, withRelPath) {
+    logger$5.log `🔧 Loading config`;
+    let mergedJson = {};
+    for (const entry of config) {
+        logger$5.log `🔧 Applying '${entry}'`;
+        if (entry === DEV_CONFIG) {
+            mergedJson = structuredClone(configs.dev); // clone to avoid mutating the original config. not doing a merge since dev and default should theoretically replace all properties.
+            continue;
+        }
+        if (entry === DEFAULT_CONFIG) {
+            mergedJson = structuredClone(configs.default);
+            continue;
+        }
+        // try to parse as JSON
+        try {
+            const parsed = JSON.parse(entry);
+            deepMerge(mergedJson, parsed);
+            continue;
+        }
+        catch { }
+        // if not, try to load as file
+        if (entry.indexOf("=") === -1 && entry.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(entry), "utf8");
+                const parsed = JSON.parse(configFile);
+                deepMerge(mergedJson, parsed);
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${entry}: ${e}`);
+            }
+        }
+        else {
+            // finally try to process as a pseudo-jq query
+            try {
+                processQuery(mergedJson, entry, withRelPath);
+            }
+            catch (e) {
+                throw new Error(`Error while processing '${entry}': ${e}`);
+            }
+        }
     }
     try {
-        logger$5.log `🔧 Loading config from ${configPath}`;
-        const configFile = fs.readFileSync(configPath, "utf8");
-        const parsed = JSON.parse(configFile);
-        return parseFromJson(parsed, NodeConfiguration.fromJson);
+        const parsed = parseFromJson(mergedJson, NodeConfiguration.fromJson);
+        logger$5.log `🔧 Config ready`;
+        return parsed;
     }
     catch (e) {
-        throw new Error(`Unable to load config file from ${configPath}: ${e}`);
+        throw new Error(`Unable to parse config: ${e}`);
     }
 }
+function deepMerge(target, source) {
+    if (!isJsonObject(source)) {
+        throw new Error(`Expected object, got ${source}`);
+    }
+    for (const key in source) {
+        if (isJsonObject(source[key])) {
+            if (!isJsonObject(target[key])) {
+                target[key] = {};
+            }
+            deepMerge(target[key], source[key]);
+        }
+        else {
+            target[key] = source[key];
+        }
+    }
+}
+/**
+ * Caution: updates input directly.
+ * Processes a pseudo-jq query. Syntax:
+ * .path.to.value = { ... } - updates value with the specified object by replacement
+ * .path.to.value += { ... } - updates value with the specified object by merging
+ * .path.to.value = file.json - updates value with the contents of file.json
+ * .path.to.value += file.json - merges the contents of file.json onto value
+ */
+function processQuery(input, query, withRelPath) {
+    const queryParts = query.split("=");
+    if (queryParts.length === 2) {
+        let [path, value] = queryParts.map((part) => part.trim());
+        let merge = false;
+        // detect += syntax
+        if (path.endsWith("+")) {
+            merge = true;
+            path = path.slice(0, -1);
+        }
+        let parsedValue;
+        if (value.endsWith(".json")) {
+            try {
+                const configFile = fs.readFileSync(withRelPath(value), "utf8");
+                const parsed = JSON.parse(configFile);
+                parsedValue = parsed;
+            }
+            catch (e) {
+                throw new Error(`Unable to load config from ${value}: ${e}`);
+            }
+        }
+        else {
+            try {
+                parsedValue = JSON.parse(value);
+            }
+            catch (e) {
+                throw new Error(`Unrecognized syntax '${value}': ${e}`);
+            }
+        }
+        let pathParts = path.split(".");
+        // allow leading dot in path
+        if (pathParts[0] === "") {
+            pathParts = pathParts.slice(1);
+        }
+        let target = input;
+        for (let i = 0; i < pathParts.length; i++) {
+            const part = pathParts[i];
+            if (!isJsonObject(target[part])) {
+                target[part] = {};
+            }
+            if (i === pathParts.length - 1) {
+                if (merge) {
+                    deepMerge(target[part], parsedValue);
+                }
+                else {
+                    target[part] = parsedValue;
+                }
+                return;
+            }
+            target = target[part];
+        }
+    }
+    throw new Error("Unrecognized syntax.");
+}
+function isJsonObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 var index$h = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -8955,26 +9071,6 @@ class InMemoryStateView {
     }
 }
 
-/** Dictionary entry of services that auto-accumulate every block. */
-class AutoAccumulate {
-    service;
-    gasLimit;
-    static Codec = codec$1.Class(AutoAccumulate, {
-        service: codec$1.u32.asOpaque(),
-        gasLimit: codec$1.u64.asOpaque(),
-    });
-    static create({ service, gasLimit }) {
-        return new AutoAccumulate(service, gasLimit);
-    }
-    constructor(
-    /** Service id that auto-accumulates. */
-    service, 
-    /** Gas limit for auto-accumulation. */
-    gasLimit) {
-        this.service = service;
-        this.gasLimit = gasLimit;
-    }
-}
 /**
  * https://graypaper.fluffylabs.dev/#/ab2cdbd/114402114402?v=0.7.2
  */
@@ -8992,7 +9088,9 @@ class PrivilegedServices {
         registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
             ? codec$1.u32.asOpaque()
             : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-        autoAccumulateServices: readonlyArray(codec$1.sequenceVarLen(AutoAccumulate.Codec)),
+        autoAccumulateServices: codec$1.dictionary(codec$1.u32.asOpaque(), codec$1.u64.asOpaque(), {
+            sortKeys: (a, b) => a - b,
+        }),
     });
     static create(a) {
         return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
@@ -9597,7 +9695,7 @@ class InMemoryState extends WithDebug {
                 assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
                 delegator: tryAsServiceId(0),
                 registrar: tryAsServiceId(MAX_VALUE),
-                autoAccumulateServices: [],
+                autoAccumulateServices: new Map(),
             }),
             accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),
             services: new Map(),
@@ -9620,7 +9718,6 @@ var index$g = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AUTHORIZATION_QUEUE_SIZE: AUTHORIZATION_QUEUE_SIZE,
   AccumulationOutput: AccumulationOutput,
-  AutoAccumulate: AutoAccumulate,
   AvailabilityAssignment: AvailabilityAssignment,
   BASE_SERVICE_BALANCE: BASE_SERVICE_BALANCE,
   BlockState: BlockState,
@@ -17603,6 +17700,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   instructionArgumentTypeMap: instructionArgumentTypeMap,
   interpreter: index$5,
   isBrowser: isBrowser,
+  lazyInspect: lazyInspect,
   measure: measure,
   numbers: index$r,
   resultToString: resultToString,
@@ -18009,10 +18107,7 @@ const fullStateDumpFromJson = (spec) => json.object({
         chi_a: json.array("number"),
         chi_v: "number",
         chi_r: json.optional("number"),
-        chi_g: json.nullable(json.array({
-            service: "number",
-            gasLimit: json.fromNumber((v) => tryAsServiceGas(v)),
-        })),
+        chi_g: json.nullable(json.map("number", json.fromNumber((v) => tryAsServiceGas(v)))),
     },
     pi: JsonStatisticsData.fromJson,
     omega: json.array(json.array(notYetAccumulatedFromJson)),
@@ -18053,7 +18148,7 @@ const fullStateDumpFromJson = (spec) => json.object({
             assigners: chi.chi_a,
             delegator: chi.chi_v,
             registrar: chi.chi_r ?? tryAsServiceId(2 ** 32 - 1),
-            autoAccumulateServices: chi.chi_g ?? [],
+            autoAccumulateServices: chi.chi_g ?? new Map(),
         }),
         statistics: JsonStatisticsData.toStatisticsData(spec, pi),
         accumulationQueue: omega,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.2.0-5746fdc",
+  "version": "0.2.0-79dc2d4",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",