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

package/index.js

@@ -24295,7 +24295,8 @@ var __webpack_exports__ = {};
 __nccwpck_require__.d(__webpack_exports__, {
   uB: () => (/* reexport */ Command),
   _$: () => (/* reexport */ HELP),
-  Zy: () => (/* reexport */ parseArgs)
+  Zy: () => (/* reexport */ parseArgs),
+  P3: () => (/* reexport */ parseSharedOptions)
 });
 
 ;// CONCATENATED MODULE: ./packages/core/utils/compatibility.ts
@@ -24304,44 +24305,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 = typeof process === "undefined" ? {} : process.env;
 let CURRENT_VERSION = parseCurrentVersion(env.GP_VERSION) ?? DEFAULT_VERSION;
 let CURRENT_SUITE = parseCurrentSuite(env.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) {
@@ -24502,6 +24499,13 @@ class WithDebug {
         return debug_inspect(this);
     }
 }
+function lazyInspect(obj) {
+    return {
+        toString() {
+            return debug_inspect(obj);
+        },
+    };
+}
 
 ;// CONCATENATED MODULE: ./packages/core/utils/dev.ts
 const dev_env = typeof process === "undefined" ? {} : process.env;
@@ -31593,7 +31597,7 @@ const DEV_CONFIG = "dev";
 const DEFAULT_CONFIG = "default";
 const NODE_DEFAULTS = {
     name: isBrowser() ? "browser" : external_node_os_default().hostname(),
-    config: DEFAULT_CONFIG,
+    config: [DEFAULT_CONFIG],
     pvm: PvmBackend.BuiltIn,
 };
 /** Chain spec chooser. */
@@ -31646,25 +31650,137 @@ class NodeConfiguration {
         this.authorship = authorship;
     }
 }
-function loadConfig(configPath) {
-    if (configPath === DEFAULT_CONFIG) {
-        logger.log `🔧 Loading DEFAULT config`;
-        return parseFromJson(configs.default, NodeConfiguration.fromJson);
-    }
-    if (configPath === DEV_CONFIG) {
-        logger.log `🔧 Loading DEV config`;
-        return parseFromJson(configs.dev, NodeConfiguration.fromJson);
+function loadConfig(config, withRelPath) {
+    logger.log `🔧 Loading config`;
+    let mergedJson = {};
+    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 (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 = external_node_fs_default().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 = external_node_fs_default().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}`);
+    }
+}
+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 = external_node_fs_default().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);
+}
 
 ;// CONCATENATED MODULE: ./packages/jam/config-node/index.ts
 
@@ -33218,7 +33334,7 @@ function hashComparator(a, b) {
 
 ;// CONCATENATED MODULE: ./packages/core/pvm-interpreter/ops/math-consts.ts
 const MAX_VALUE = 4294967295;
-const math_consts_MAX_VALUE_U64 = (/* unused pure expression or super */ null && (2n ** 63n));
+const math_consts_MAX_VALUE_U64 = 2n ** 63n;
 const MIN_VALUE = -(2 ** 31);
 const MAX_SHIFT_U32 = 32;
 const MAX_SHIFT_U64 = 64n;
@@ -34003,26 +34119,6 @@ class InMemoryStateView {
 
 
 
-/** Dictionary entry of services that auto-accumulate every block. */
-class AutoAccumulate {
-    service;
-    gasLimit;
-    static Codec = descriptors_codec.Class(AutoAccumulate, {
-        service: descriptors_codec.u32.asOpaque(),
-        gasLimit: descriptors_codec.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
  */
@@ -34040,7 +34136,9 @@ class PrivilegedServices {
         registrar: Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)
             ? descriptors_codec.u32.asOpaque()
             : ignoreValueWithDefault(tryAsServiceId(2 ** 32 - 1)),
-        autoAccumulateServices: readonlyArray(descriptors_codec.sequenceVarLen(AutoAccumulate.Codec)),
+        autoAccumulateServices: descriptors_codec.dictionary(descriptors_codec.u32.asOpaque(), descriptors_codec.u64.asOpaque(), {
+            sortKeys: (a, b) => a - b,
+        }),
     });
     static create(a) {
         return new PrivilegedServices(a.manager, a.delegator, a.registrar, a.assigners, a.autoAccumulateServices);
@@ -34673,7 +34771,7 @@ class in_memory_state_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(),
@@ -39395,7 +39493,7 @@ class AccumulateExternalities {
     updatedState;
     currentServiceId;
     currentTimeslot;
-    checkpointedState = null;
+    checkpointedState;
     /** `x_i`: next service id we are going to create. */
     nextNewServiceId;
     constructor(chainSpec, blake2b, updatedState, 
@@ -39406,13 +39504,14 @@ class AccumulateExternalities {
         this.updatedState = updatedState;
         this.currentServiceId = currentServiceId;
         this.currentTimeslot = currentTimeslot;
+        this.checkpointedState = AccumulationStateUpdate.copyFrom(updatedState.stateUpdate);
         this.nextNewServiceId = this.getNextAvailableServiceId(nextNewServiceIdCandidate);
         const service = this.updatedState.getServiceInfo(this.currentServiceId);
         if (service === null) {
             throw new Error(`Invalid state initialization. Service info missing for ${this.currentServiceId}.`);
         }
     }
-    /** Return the underlying state update and checkpointed state (if any). */
+    /** Return the underlying state update and checkpointed state. */
     getStateUpdates() {
         return [this.updatedState.stateUpdate, this.checkpointedState];
     }
@@ -39779,7 +39878,7 @@ class AccumulateExternalities {
                 assigners: authorizers,
                 delegator: delegator,
                 registrar: registrar ?? tryAsServiceId(0),
-                autoAccumulateServices: autoAccumulate.map(([service, gasLimit]) => AutoAccumulate.create({ service, gasLimit })),
+                autoAccumulateServices: autoAccumulate,
             });
             return result_Result.ok(result_OK);
         }
@@ -39803,9 +39902,7 @@ class AccumulateExternalities {
             isAlreadyChanged: currentAssigner !== original.assigners[index],
         }));
         const newManager = isManager ? manager : current.manager;
-        const newAutoAccumulateServices = isManager
-            ? autoAccumulate.map(([service, gasLimit]) => AutoAccumulate.create({ service, gasLimit }))
-            : current.autoAccumulateServices;
+        const newAutoAccumulateServices = isManager ? autoAccumulate : current.autoAccumulateServices;
         // finally update the privileges
         this.updatedState.stateUpdate.privilegedServices = PrivilegedServices.create({
             manager: newManager,
@@ -40437,17 +40534,16 @@ class FetchExternalities {
 
 
 
+
 class AccumulateDataItem {
     operands;
     reportsLength;
-    gasCost;
-    constructor(operands, reportsLength, gasCost) {
+    constructor(operands, reportsLength) {
         this.operands = operands;
         this.reportsLength = reportsLength;
-        this.gasCost = gasCost;
     }
     static empty() {
-        return new AccumulateDataItem([], numbers_tryAsU32(0), tryAsServiceGas(0n));
+        return new AccumulateDataItem([], numbers_tryAsU32(0));
     }
 }
 /**
@@ -40457,23 +40553,43 @@ class AccumulateDataItem {
  * - gas cost and reports length for each service (statistics)
  */
 class AccumulateData {
+    autoAccumulateServicesByServiceId;
     reportsDataByServiceId;
     transfersByServiceId;
-    autoAccumulateServicesByServiceId;
     serviceIds;
-    constructor(reports, transfers, autoAccumulateServices) {
-        const { autoAccumulateServicesByServiceId, serviceIds: serviceIdsFromAutoAccumulate } = this.transformAutoAccumulateServices(autoAccumulateServices);
+    gasLimitByServiceId;
+    constructor(reports, transfers, autoAccumulateServicesByServiceId) {
         this.autoAccumulateServicesByServiceId = autoAccumulateServicesByServiceId;
-        const { reportsDataByServiceId, serviceIds: serviceIdsFromReports } = this.transformReports(reports);
+        const serviceIdsFromAutoAccumulate = new Set(autoAccumulateServicesByServiceId.keys());
+        const { reportsDataByServiceId, serviceIds: serviceIdsFromReports, gasLimitByServiceId: reportsGasLimitByServiceId, } = this.transformReports(reports);
         this.reportsDataByServiceId = reportsDataByServiceId;
-        const { transfersByServiceId, serviceIds: serviceIdsFromTransfers } = this.transformTransfers(transfers);
+        const { transfersByServiceId, serviceIds: serviceIdsFromTransfers, gasLimitByServiceId: transfersGasLimitByServiceId, } = this.transformTransfers(transfers);
         this.transfersByServiceId = transfersByServiceId;
         /**
          * Merge service ids from reports, auto-accumulate services and transfers.
          *
-         * https://graypaper.fluffylabs.dev/#/68eaa1f/175f01175f01?v=0.6.4
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/173803174b03?v=0.7.2
          */
         this.serviceIds = this.mergeServiceIds(serviceIdsFromReports, serviceIdsFromAutoAccumulate, serviceIdsFromTransfers);
+        /**
+         * Merge gas limits from reports, auto-accumulate services and transfers.
+         *
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/182001183701?v=0.7.2
+         */
+        this.gasLimitByServiceId = this.mergeGasLimitByServiceId(this.serviceIds, autoAccumulateServicesByServiceId, reportsGasLimitByServiceId, transfersGasLimitByServiceId);
+    }
+    /**
+     * Calculate the gas limit implied by the selected deferred-transfers, work-reports and gas-privileges.
+     *
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/182001183701?v=0.7.2
+     */
+    mergeGasLimitByServiceId(serviceIds, ...gasLimitByServiceIdMaps) {
+        const gasByServiceId = new Map();
+        for (const serviceId of serviceIds) {
+            const { overflow, value } = sumU64(...gasLimitByServiceIdMaps.map((map) => map.get(serviceId) ?? tryAsServiceGas(0)));
+            gasByServiceId.set(serviceId, tryAsServiceGas(overflow ? math_consts_MAX_VALUE_U64 : value));
+        }
+        return gasByServiceId;
     }
     /** Merge two sets of service ids */
     mergeServiceIds(...sources) {
@@ -40485,50 +40601,60 @@ class AccumulateData {
         }
         return Array.from(merged);
     }
+    /**
+     * Transform the list of pending transfers into:
+     * - map: transfers by service id
+     * - map: gas limit by service id
+     * - set: service ids
+     */
     transformTransfers(transfersToTransform) {
         const transfersByServiceId = new Map();
         const serviceIds = new Set();
+        const gasLimitByServiceId = new Map();
         for (const transfer of transfersToTransform) {
             const serviceId = transfer.destination;
             const transfers = transfersByServiceId.get(serviceId) ?? [];
+            const gas = gasLimitByServiceId.get(serviceId) ?? tryAsServiceGas(0n);
+            const { value, overflow } = sumU64(gas, transfer.gas);
+            gasLimitByServiceId.set(serviceId, tryAsServiceGas(overflow ? math_consts_MAX_VALUE_U64 : value));
             transfers.push(transfer);
             transfersByServiceId.set(serviceId, transfers);
             serviceIds.add(serviceId);
         }
-        return { transfersByServiceId, serviceIds };
-    }
-    /** Transform the list of auto-accumulate services into a map by service id. */
-    transformAutoAccumulateServices(autoAccumulateServices) {
-        const serviceIds = new Set();
-        const autoAccumulateServicesByServiceId = new Map();
-        for (const autoAccumulate of autoAccumulateServices) {
-            autoAccumulateServicesByServiceId.set(autoAccumulate.service, autoAccumulate);
-            serviceIds.add(autoAccumulate.service);
-        }
-        return { autoAccumulateServicesByServiceId, serviceIds };
+        return { transfersByServiceId, serviceIds, gasLimitByServiceId };
     }
     /**
      * A function that transform reports into a list of operands and data needed for statistics (gas cost and reports length).
      */
+    /**
+     * Transform the list of reports into:
+     * - map: AccumulateDataItem by service id
+     * - map: gas limit by service id
+     * - set: service ids
+     */
     transformReports(reports) {
         const reportsDataByServiceId = new Map();
+        const gasLimitByServiceId = new Map();
         const serviceIds = new Set();
         for (const report of reports) {
             for (const result of report.results) {
                 const serviceId = result.serviceId;
                 serviceIds.add(serviceId);
                 const item = reportsDataByServiceId.get(serviceId) ?? AccumulateDataItem.empty();
+                const gas = gasLimitByServiceId.get(serviceId) ?? tryAsServiceGas(0n);
+                const { value, overflow } = sumU64(gas, result.gas);
+                const newGas = tryAsServiceGas(overflow ? math_consts_MAX_VALUE_U64 : value);
+                gasLimitByServiceId.set(serviceId, newGas);
                 /**
                  * We count the report results and gas cost for each service to update service statistics.
                  *
-                 * https://graypaper.fluffylabs.dev/#/68eaa1f/171e04174a04?v=0.6.4
+                 * https://graypaper.fluffylabs.dev/#/ab2cdbd/180504182604?v=0.7.2
                  */
                 item.reportsLength = numbers_tryAsU32(item.reportsLength + 1);
-                item.gasCost = tryAsServiceGas(item.gasCost + result.gas);
                 /**
                  * Transform report into an operand
                  *
-                 * https://graypaper.fluffylabs.dev/#/68eaa1f/17bf02176f03?v=0.6.4
+                 * https://graypaper.fluffylabs.dev/#/ab2cdbd/185901181402?v=0.7.2
                  */
                 item.operands.push(Operand.new({
                     gas: result.gas, // g
@@ -40542,19 +40668,7 @@ class AccumulateData {
                 reportsDataByServiceId.set(serviceId, item);
             }
         }
-        /**
-         * Add initial gas cost - it is `U(f_s, 0)` from this formula:
-         *
-         * https://graypaper.fluffylabs.dev/#/68eaa1f/17b00217b002?v=0.6.4
-         */
-        for (const serviceId of serviceIds) {
-            const item = reportsDataByServiceId.get(serviceId) ?? null;
-            const autoAccumulateService = this.autoAccumulateServicesByServiceId.get(serviceId) ?? null;
-            if (item !== null && autoAccumulateService !== null) {
-                item.gasCost = tryAsServiceGas(item.gasCost + autoAccumulateService.gasLimit);
-            }
-        }
-        return { reportsDataByServiceId, serviceIds };
+        return { reportsDataByServiceId, serviceIds, gasLimitByServiceId };
     }
     /** Returns the list of operands for a given service id */
     getOperands(serviceId) {
@@ -40568,14 +40682,14 @@ class AccumulateData {
     getReportsLength(serviceId) {
         return this.reportsDataByServiceId.get(serviceId)?.reportsLength ?? numbers_tryAsU32(0);
     }
-    /** Returns the gas cost for a given service id */
-    getGasCost(serviceId) {
-        return this.reportsDataByServiceId.get(serviceId)?.gasCost ?? tryAsServiceGas(0n);
+    /** Returns the gas limit for a given service id */
+    getGasLimit(serviceId) {
+        return this.gasLimitByServiceId.get(serviceId) ?? tryAsServiceGas(0n);
     }
     /**
      * Returns a list of service ids that should be accumulated.
      *
-     * https://graypaper.fluffylabs.dev/#/68eaa1f/175f01175f01?v=0.6.4
+     * https://graypaper.fluffylabs.dev/#/ab2cdbd/173803174a03?v=0.7.2
      */
     getServiceIds() {
         return this.serviceIds;
@@ -45763,7 +45877,7 @@ class Bless {
          * `z`: array of key-value pairs serviceId -> gas that auto-accumulate every block
          * https://graypaper.fluffylabs.dev/#/7e6ff6a/368100368100?v=0.6.7
          */
-        const autoAccumulateEntries = [];
+        const autoAccumulate = new Map();
         const result = safe_alloc_uint8array_safeAllocUint8Array(tryAsExactBytes(serviceIdAndGasCodec.sizeHint));
         const decoder = decoder_Decoder.fromBlob(result);
         let memIndex = sourceStart;
@@ -45776,7 +45890,7 @@ class Bless {
                 return PvmExecution.Panic;
             }
             const { serviceId, gas } = decoder.object(serviceIdAndGasCodec);
-            autoAccumulateEntries.push([serviceId, gas]);
+            autoAccumulate.set(serviceId, gas);
             // we allow the index to go beyond `MEMORY_SIZE` (i.e. 2**32) and have the next `loadInto` fail with page fault.
             memIndex = numbers_tryAsU64(memIndex + numbers_tryAsU64(decoder.bytesRead()));
         }
@@ -45785,26 +45899,26 @@ class Bless {
         const authorizersDecoder = decoder_Decoder.fromBlob(res);
         const memoryReadResult = memory.loadInto(res, authorization);
         if (memoryReadResult.isError) {
-            logger_logger.trace `BLESS(${manager}, ${delegator}, ${registrar}, ${autoAccumulateEntries}) <- PANIC`;
+            logger_logger.trace `BLESS(${manager}, ${delegator}, ${registrar}, ${lazyInspect(autoAccumulate)}) <- PANIC`;
             return PvmExecution.Panic;
         }
         // `a`
         const authorizers = tryAsPerCore(authorizersDecoder.sequenceFixLen(descriptors_codec.u32.asOpaque(), this.chainSpec.coresCount), this.chainSpec);
-        const updateResult = this.partialState.updatePrivilegedServices(manager, authorizers, delegator, registrar, autoAccumulateEntries);
+        const updateResult = this.partialState.updatePrivilegedServices(manager, authorizers, delegator, registrar, autoAccumulate);
         if (updateResult.isOk) {
-            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${autoAccumulateEntries}) <- OK`;
+            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${lazyInspect(autoAccumulate)}) <- OK`;
             regs.set(bless_IN_OUT_REG, HostCallResult.OK);
             return;
         }
         const e = updateResult.error;
         // NOTE: `UpdatePrivilegesError.UnprivilegedService` won't happen in 0.7.1+
         if (e === UpdatePrivilegesError.UnprivilegedService) {
-            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${autoAccumulateEntries}) <- HUH`;
+            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${lazyInspect(autoAccumulate)}) <- HUH`;
             regs.set(bless_IN_OUT_REG, HostCallResult.HUH);
             return;
         }
         if (e === UpdatePrivilegesError.InvalidServiceId) {
-            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${autoAccumulateEntries}) <- WHO`;
+            logger_logger.trace `BLESS(${manager}, ${authorizers}, ${delegator}, ${registrar}, ${lazyInspect(autoAccumulate)}) <- WHO`;
             regs.set(bless_IN_OUT_REG, HostCallResult.WHO);
             return;
         }
@@ -47104,6 +47218,7 @@ class PvmExecutor {
 
 
 
+
 const ACCUMULATION_ERROR = "duplicate service created";
 var PvmInvocationError;
 (function (PvmInvocationError) {
@@ -47272,7 +47387,7 @@ class Accumulate {
         const { gasCost, state: stateAfterParallelAcc, ...rest } = await this.accumulateInParallel(accumulateData, slot, entropy, statistics, stateUpdate);
         assertEmpty(rest);
         // NOTE [ToDr] recursive invocation
-        const { accumulatedReports, gasCost: seqGasCost, state, ...seqRest } = await this.accumulateSequentiallyLegacy(tryAsServiceGas(gasLimit - gasCost), reportsToAccumulateSequentially, slot, entropy, statistics, stateAfterParallelAcc, []);
+        const { accumulatedReports, gasCost: seqGasCost, state, ...seqRest } = await this.accumulateSequentiallyLegacy(tryAsServiceGas(gasLimit - gasCost), reportsToAccumulateSequentially, slot, entropy, statistics, stateAfterParallelAcc, new Map());
         assertEmpty(seqRest);
         return {
             accumulatedReports: numbers_tryAsU32(i + accumulatedReports),
@@ -47304,8 +47419,15 @@ class Accumulate {
         const { gasCost, state: stateAfterParallelAcc, ...rest } = await this.accumulateInParallel(accumulateData, slot, entropy, statistics, stateUpdate);
         const newTransfers = stateAfterParallelAcc.takeTransfers();
         assertEmpty(rest);
+        /**
+         * Gas limit from transfers is added to the next round of accumulation
+         *
+         * https://graypaper.fluffylabs.dev/#/ab2cdbd/172b02172b02?v=0.7.2
+         */
+        const transfersGas = transfers.map((t) => t.gas);
+        const { value: newGasLimit, overflow } = sumU64(tryAsServiceGas(gasLimit - gasCost), ...transfersGas);
         // NOTE [ToDr] recursive invocation
-        const { accumulatedReports, gasCost: seqGasCost, state, ...seqRest } = await this.accumulateSequentially(tryAsServiceGas(gasLimit - gasCost), reportsToAccumulateSequentially, newTransfers, slot, entropy, statistics, stateAfterParallelAcc, []);
+        const { accumulatedReports, gasCost: seqGasCost, state, ...seqRest } = await this.accumulateSequentially(tryAsServiceGas(overflow ? math_consts_MAX_VALUE_U64 : newGasLimit), reportsToAccumulateSequentially, newTransfers, slot, entropy, statistics, stateAfterParallelAcc, new Map());
         assertEmpty(seqRest);
         return {
             accumulatedReports: numbers_tryAsU32(i + accumulatedReports),
@@ -47331,14 +47453,16 @@ class Accumulate {
         for (const serviceId of serviceIds) {
             const checkpoint = AccumulationStateUpdate.copyFrom(currentState);
             const operands = accumulateData.getOperands(serviceId);
-            const { consumedGas, stateUpdate } = await this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), operands, accumulateData.getGasCost(serviceId), slot, entropy, currentState);
+            const { consumedGas, stateUpdate } = await this.accumulateSingleService(serviceId, accumulateData.getTransfers(serviceId), operands, accumulateData.getGasLimit(serviceId), slot, entropy, currentState);
             gasCost = tryAsServiceGas(gasCost + consumedGas);
             // https://graypaper.fluffylabs.dev/#/ab2cdbd/193b05193b05?v=0.7.2
             const serviceStatistics = statistics.get(serviceId) ?? { count: numbers_tryAsU32(0), gasUsed: tryAsServiceGas(0) };
             const count = accumulateData.getReportsLength(serviceId);
             // [0.7.1]: do not update statistics, if the service only had incoming transfers
             if ((Compatibility.isLessThan(GpVersion.V0_7_2) && count > 0) ||
-                (Compatibility.isGreaterOrEqual(GpVersion.V0_7_2) && (count > 0 || consumedGas > 0n))) {
+                ((Compatibility.isGreaterOrEqual(GpVersion.V0_7_2) ||
+                    (Compatibility.isSuite(TestSuite.W3F_DAVXY) && Compatibility.is(GpVersion.V0_7_1))) &&
+                    (count > 0 || consumedGas > 0n))) {
                 serviceStatistics.count = numbers_tryAsU32(serviceStatistics.count + count);
                 serviceStatistics.gasUsed = tryAsServiceGas(serviceStatistics.gasUsed + consumedGas);
                 statistics.set(serviceId, serviceStatistics);
@@ -47351,7 +47475,7 @@ class Accumulate {
                     // Since serviceIds already contains newV, this service gets accumulated twice.
                     // To avoid double-counting, we skip stats and gas cost tracking here.
                     // We need this accumulation to get the correct `delegator`
-                    const { stateUpdate } = await this.accumulateSingleService(newV, [], accumulateData.getOperands(newV), accumulateData.getGasCost(newV), slot, entropy, checkpoint);
+                    const { stateUpdate } = await this.accumulateSingleService(newV, [], accumulateData.getOperands(newV), accumulateData.getGasLimit(newV), slot, entropy, checkpoint);
                     const correctV = stateUpdate?.privilegedServices?.delegator ?? this.state.privilegedServices.delegator;
                     currentState.privilegedServices = PrivilegedServices.create({
                         ...currentState.privilegedServices,
@@ -47417,7 +47541,7 @@ class Accumulate {
      */
     getGasLimit() {
         const calculatedGasLimit = GAS_TO_INVOKE_WORK_REPORT * BigInt(this.chainSpec.coresCount) +
-            this.state.privilegedServices.autoAccumulateServices.reduce((acc, { gasLimit }) => acc + gasLimit, 0n);
+            Array.from(this.state.privilegedServices.autoAccumulateServices.values()).reduce((acc, gasLimit) => acc + gasLimit, 0n);
         const gasLimit = tryAsServiceGas(this.chainSpec.maxBlockGas > calculatedGasLimit ? this.chainSpec.maxBlockGas : calculatedGasLimit);
         return tryAsServiceGas(gasLimit);
     }
@@ -47570,9 +47694,8 @@ class DeferredTransfers {
                 consumedGas = (await executor.run(args, tryAsGas(gas))).consumedGas;
             }
             transferStatistics.set(serviceId, { count: numbers_tryAsU32(transfers.length), gasUsed: tryAsServiceGas(consumedGas) });
-            const [updatedState, checkpointedState] = partialState.getStateUpdates();
+            const [updatedState] = partialState.getStateUpdates();
             currentStateUpdate = updatedState;
-            debug_check `${checkpointedState === null} On transfer cannot invoke checkpoint.`;
         }
         return result_Result.ok({
             // NOTE: we return only services, since it's impossible to update
@@ -48889,7 +49012,6 @@ class Statistics {
 
 
 
-
 class DbHeaderChain {
     blocks;
     constructor(blocks) {
@@ -48960,7 +49082,7 @@ class OnChain {
     // chapter 13: https://graypaper.fluffylabs.dev/#/68eaa1f/18b60118b601?v=0.6.4
     statistics;
     isReadyForNextEpoch = Promise.resolve(false);
-    constructor(chainSpec, state, blocks, hasher, pvm = PvmBackend.BuiltIn) {
+    constructor(chainSpec, state, blocks, hasher, pvm) {
         this.chainSpec = chainSpec;
         this.state = state;
         this.hasher = hasher;
@@ -52697,7 +52819,15 @@ Usage:
 Options:
   --name                Override node name. Affects networking key and db location.
                         [default: ${NODE_DEFAULTS.name}]
-  --config              Path to a config file or one of: ['${DEV_CONFIG}', '${DEFAULT_CONFIG}'].
+  --config              Configuration directives. If specified more than once, they are evaluated and merged from left to right.
+                        A configuration directive can be a path to a config file, an inline JSON object, a pseudo-jq query or one of predefined configs ['${DEV_CONFIG}', '${DEFAULT_CONFIG}'].
+                        Pseudo-jq queries are a way to modify the config using a subset of jq syntax.
+                        Example: --config=dev --config=.chain_spec+={"bootnodes": []}      -- will modify only the bootnodes property of the chain spec (merge).
+                        Example: --config=dev --config=.chain_spec={"bootnodes": []}       -- will replace the entire chain spec property with the provided JSON object.
+                        Example: --config=dev --config=.chain_spec+=bootnodes.json         -- you may also use JSON files in your queries. This one will merge the contents of bootnodes.json onto the chain spec.
+                        Example: --config=dev --config={"chain_spec": { "bootnodes": [] }} -- will merge the provided JSON object onto the "dev" config.
+                        Example: --config=dev --config=bootnodes.json                      -- will merge the contents of bootnodes.json onto the "dev" config.
+                        Example: --config=custom-config.json                               -- will use the contents of custom-config.json as the config.
                         [default: ${NODE_DEFAULTS.config}]
   --pvm                 PVM Backend, one of: [${PvmBackendNames.join(", ")}].
                         [default: ${PvmBackendNames[NODE_DEFAULTS.pvm]}]
@@ -52716,9 +52846,9 @@ var Command;
     /** Run as a Fuzz Target. */
     Command["FuzzTarget"] = "fuzz-target";
 })(Command || (Command = {}));
-function parseSharedOptions(args, withRelPath, defaultConfig = NODE_DEFAULTS.config) {
+function parseSharedOptions(args, defaultConfig = NODE_DEFAULTS.config) {
     const { name } = parseStringOption(args, "name", (v) => v, NODE_DEFAULTS.name);
-    const { config } = parseStringOption(args, "config", (v) => (v === DEV_CONFIG || v === DEFAULT_CONFIG ? v : withRelPath(v)), defaultConfig);
+    const { config } = parseValueOptionAsArray(args, "config", "string", (v) => (v === "" ? null : v), defaultConfig);
     const { pvm } = parseStringOption(args, "pvm", (v) => {
         const pvm = PvmBackendNames.indexOf(v);
         if (pvm >= 0) {
@@ -52728,7 +52858,7 @@ function parseSharedOptions(args, withRelPath, defaultConfig = NODE_DEFAULTS.con
     }, NODE_DEFAULTS.pvm);
     return {
         nodeName: name,
-        configPath: config,
+        config,
         pvm,
     };
 }
@@ -52741,12 +52871,12 @@ function parseArgs(input, withRelPath) {
     }
     switch (command) {
         case Command.Run: {
-            const data = parseSharedOptions(args, withRelPath);
+            const data = parseSharedOptions(args);
             assertNoMoreArgs(args);
             return { command: Command.Run, args: data };
         }
         case Command.Dev: {
-            const data = parseSharedOptions(args, withRelPath, DEV_CONFIG);
+            const data = parseSharedOptions(args, [DEV_CONFIG]);
             const index = args._.shift();
             if (index === undefined) {
                 throw new Error("Missing dev-validator index.");
@@ -52759,7 +52889,7 @@ function parseArgs(input, withRelPath) {
             return { command: Command.Dev, args: { ...data, index: numIndex } };
         }
         case Command.FuzzTarget: {
-            const data = parseSharedOptions(args, withRelPath);
+            const data = parseSharedOptions(args);
             const { version } = parseValueOption(args, "version", "number", parseFuzzVersion, 1);
             const socket = args._.shift() ?? null;
             assertNoMoreArgs(args);
@@ -52773,7 +52903,7 @@ function parseArgs(input, withRelPath) {
             };
         }
         case Command.Import: {
-            const data = parseSharedOptions(args, withRelPath);
+            const data = parseSharedOptions(args);
             const files = args._.map((f) => withRelPath(f));
             args._ = [];
             assertNoMoreArgs(args);
@@ -52786,7 +52916,7 @@ function parseArgs(input, withRelPath) {
             };
         }
         case Command.Export: {
-            const data = parseSharedOptions(args, withRelPath);
+            const data = parseSharedOptions(args);
             const output = args._.shift();
             if (output === undefined) {
                 throw new Error("Missing output directory.");
@@ -52810,6 +52940,29 @@ function parseArgs(input, withRelPath) {
 function parseStringOption(args, option, parser, defaultValue) {
     return parseValueOption(args, option, "string", parser, defaultValue);
 }
+function parseValueOptionAsArray(args, option, typeOfX, parser, defaultValue) {
+    if (args[option] === undefined) {
+        return {
+            [option]: defaultValue,
+        };
+    }
+    const vals = Array.isArray(args[option]) ? args[option] : [args[option]];
+    delete args[option];
+    const parsedVals = vals.reduce((result, val) => {
+        const valType = typeof val;
+        if (valType !== typeOfX) {
+            throw new Error(`Option '--${option}' requires an argument of type: ${typeOfX}, got: ${valType}.`);
+        }
+        const parsed = parser(val);
+        if (parsed !== null) {
+            result.push(parsed);
+        }
+        return result;
+    }, []);
+    return {
+        [option]: parsedVals.length > 0 ? parsedVals : defaultValue,
+    };
+}
 function parseValueOption(args, option, typeOfX, parser, defaultValue) {
     const val = args[option];
     if (val === undefined) {
@@ -52817,6 +52970,9 @@ function parseValueOption(args, option, typeOfX, parser, defaultValue) {
             [option]: defaultValue,
         };
     }
+    if (Array.isArray(val)) {
+        throw new Error(`Option '--${option}' has been specified more than once. Only one value was expected.`);
+    }
     delete args[option];
     const valType = typeof val;
     if (valType !== typeOfX) {
@@ -52890,9 +53046,9 @@ running.catch((e) => {
     console.error(`${e}`);
     process.exit(-1);
 });
-async function prepareConfigFile(args, blake2b) {
+async function prepareConfigFile(args, blake2b, withRelPath) {
     const { nodeName: defaultNodeName } = args.args;
-    const nodeConfig = loadConfig(args.args.configPath);
+    const nodeConfig = loadConfig(args.args.config, withRelPath);
     const nodeName = args.command === Command.Dev ? devNodeName(defaultNodeName, args.args.index) : defaultNodeName;
     const devPortShift = args.command === Command.Dev ? args.args.index : 0;
     const devBootnodes = args.command === Command.Dev
@@ -52920,7 +53076,7 @@ async function prepareConfigFile(args, blake2b) {
 }
 async function startNode(args, withRelPath) {
     const blake2b = await blake2b_Blake2b.createHasher();
-    const jamNodeConfig = await prepareConfigFile(args, blake2b);
+    const jamNodeConfig = await prepareConfigFile(args, blake2b, withRelPath);
     // Start fuzz-target
     if (args.command === Command.FuzzTarget) {
         const version = args.args.version;
@@ -52960,6 +53116,7 @@ function devNetworkingSeed(blake2b, name) {
 var __webpack_exports__Command = __webpack_exports__.uB;
 var __webpack_exports__HELP = __webpack_exports__._$;
 var __webpack_exports__parseArgs = __webpack_exports__.Zy;
-export { __webpack_exports__Command as Command, __webpack_exports__HELP as HELP, __webpack_exports__parseArgs as parseArgs };
+var __webpack_exports__parseSharedOptions = __webpack_exports__.P3;
+export { __webpack_exports__Command as Command, __webpack_exports__HELP as HELP, __webpack_exports__parseArgs as parseArgs, __webpack_exports__parseSharedOptions as parseSharedOptions };
 
 //# sourceMappingURL=index.js.map