@typeberry/jam 0.2.0-a46bfc7 → 0.2.0-b525add

package/index.js

@@ -33214,7 +33214,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;
@@ -40433,17 +40433,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));
     }
 }
 /**
@@ -40455,21 +40454,39 @@ class AccumulateDataItem {
 class AccumulateData {
     reportsDataByServiceId;
     transfersByServiceId;
-    autoAccumulateServicesByServiceId;
+    gasLimitByServiceId;
     serviceIds;
     constructor(reports, transfers, autoAccumulateServices) {
-        const { autoAccumulateServicesByServiceId, serviceIds: serviceIdsFromAutoAccumulate } = this.transformAutoAccumulateServices(autoAccumulateServices);
-        this.autoAccumulateServicesByServiceId = autoAccumulateServicesByServiceId;
-        const { reportsDataByServiceId, serviceIds: serviceIdsFromReports } = this.transformReports(reports);
+        const { serviceIds: serviceIdsFromAutoAccumulate, gasLimitByServiceId: autoAccumulateGasLimitByServiceId } = this.transformAutoAccumulateServices(autoAccumulateServices);
+        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, autoAccumulateGasLimitByServiceId, 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) {
@@ -40481,50 +40498,74 @@ 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 };
+        return { transfersByServiceId, serviceIds, gasLimitByServiceId };
     }
-    /** Transform the list of auto-accumulate services into a map by service id. */
+    /**
+     * Transform the list of auto accumulate services into:
+     * - map: gas limit by service id
+     * - set: service ids
+     */
     transformAutoAccumulateServices(autoAccumulateServices) {
         const serviceIds = new Set();
-        const autoAccumulateServicesByServiceId = new Map();
+        const gasLimitByServiceId = new Map();
         for (const autoAccumulate of autoAccumulateServices) {
-            autoAccumulateServicesByServiceId.set(autoAccumulate.service, autoAccumulate);
+            gasLimitByServiceId.set(autoAccumulate.service, autoAccumulate.gasLimit);
             serviceIds.add(autoAccumulate.service);
         }
-        return { autoAccumulateServicesByServiceId, serviceIds };
+        return { 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
@@ -40538,19 +40579,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) {
@@ -40564,14 +40593,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;
@@ -47100,6 +47129,7 @@ class PvmExecutor {
 
 
 
+
 const ACCUMULATION_ERROR = "duplicate service created";
 var PvmInvocationError;
 (function (PvmInvocationError) {
@@ -47300,8 +47330,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, []);
         assertEmpty(seqRest);
         return {
             accumulatedReports: numbers_tryAsU32(i + accumulatedReports),
@@ -47327,7 +47364,7 @@ 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) };
@@ -47347,7 +47384,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,
@@ -48885,7 +48922,6 @@ class Statistics {
 
 
 
-
 class DbHeaderChain {
     blocks;
     constructor(blocks) {
@@ -48956,7 +48992,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;