@typeberry/convert 0.2.0-a46bfc7 → 0.2.0-b525add

package/index.js

@@ -5223,7 +5223,7 @@ const asTypedNumber = (v) => v;
 const MAX_VALUE_U8 = 0xff;
 const MAX_VALUE_U16 = 0xffff;
 const MAX_VALUE_U32 = 0xffff_ffff;
-const MAX_VALUE_U64 = 0xffffffffffffffffn;
+const numbers_MAX_VALUE_U64 = 0xffffffffffffffffn;
 /** Attempt to cast an input number into U8. */
 const tryAsU8 = (v) => {
     debug_check `${isU8(v)} input must have one-byte representation, got ${v}`;
@@ -5252,7 +5252,7 @@ const numbers_tryAsU64 = (x) => {
     return asTypedNumber(v);
 };
 /** Check if given number is a valid U64 number. */
-const numbers_isU64 = (v) => (v & MAX_VALUE_U64) === v;
+const numbers_isU64 = (v) => (v & numbers_MAX_VALUE_U64) === v;
 /** Collate two U32 parts into one U64. */
 const u64FromParts = ({ lower, upper }) => {
     const val = (BigInt(upper) << 32n) + BigInt(lower);
@@ -18734,17 +18734,16 @@ class fetch_externalities_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([], tryAsU32(0), tryAsServiceGas(0n));
+        return new AccumulateDataItem([], tryAsU32(0));
     }
 }
 /**
@@ -18756,21 +18755,39 @@ class AccumulateDataItem {
 class accumulate_data_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 ? MAX_VALUE_U64 : value));
+        }
+        return gasByServiceId;
     }
     /** Merge two sets of service ids */
     mergeServiceIds(...sources) {
@@ -18782,50 +18799,74 @@ class accumulate_data_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 ? 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 ? 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 = 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
@@ -18839,19 +18880,7 @@ class accumulate_data_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) {
@@ -18865,14 +18894,14 @@ class accumulate_data_AccumulateData {
     getReportsLength(serviceId) {
         return this.reportsDataByServiceId.get(serviceId)?.reportsLength ?? 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;
@@ -24589,6 +24618,7 @@ class pvm_executor_PvmExecutor {
 
 
 
+
 const ACCUMULATION_ERROR = "duplicate service created";
 var PvmInvocationError;
 (function (PvmInvocationError) {
@@ -24789,8 +24819,15 @@ class accumulate_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 ? MAX_VALUE_U64 : newGasLimit), reportsToAccumulateSequentially, newTransfers, slot, entropy, statistics, stateAfterParallelAcc, []);
         assertEmpty(seqRest);
         return {
             accumulatedReports: tryAsU32(i + accumulatedReports),
@@ -24816,7 +24853,7 @@ class accumulate_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: tryAsU32(0), gasUsed: tryAsServiceGas(0) };
@@ -24836,7 +24873,7 @@ class accumulate_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,
@@ -26374,7 +26411,6 @@ class statistics_Statistics {
 
 
 
-
 class DbHeaderChain {
     blocks;
     constructor(blocks) {
@@ -26445,7 +26481,7 @@ class chain_stf_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;
@@ -26739,7 +26775,6 @@ function state_loader_loadState(spec, blake2b, keyvals) {
 
 
 
-
 class StateTransitionGenesis {
     static fromJson = {
         header: headerFromJson,
@@ -26769,7 +26804,7 @@ class StateTransition {
 }
 const keccakHasher = keccak_KeccakHasher.create();
 const cachedBlocks = new Map();
-function loadBlocks(testPath) {
+function loadBlocks(testPath, spec) {
     const dir = path.dirname(testPath);
     const fromCache = cachedBlocks.get(dir);
     if (fromCache !== undefined) {
@@ -26777,20 +26812,19 @@ function loadBlocks(testPath) {
     }
     const blocks = [];
     for (const file of fs.readdirSync(dir)) {
-        if (!file.endsWith(".json")) {
+        if (!file.endsWith(".bin")) {
             continue;
         }
-        const data = fs.readFileSync(path.join(dir, file), "utf8");
-        const parsed = JSON.parse(data);
+        const data = fs.readFileSync(path.join(dir, file));
         try {
-            if (file.endsWith("genesis.json")) {
-                const content = parseFromJson(parsed, StateTransitionGenesis.fromJson);
-                const genesisBlock = Block.create({ header: content.header, extrinsic: emptyBlock().extrinsic });
+            if (file.endsWith("genesis.bin")) {
+                const genesis = Decoder.decodeObject(StateTransitionGenesis.Codec, data, spec);
+                const genesisBlock = Block.create({ header: genesis.header, extrinsic: emptyBlock().extrinsic });
                 blocks.push(genesisBlock);
             }
             else {
-                const content = parseFromJson(parsed, StateTransition.fromJson);
-                blocks.push(content.block);
+                const test = Decoder.decodeObject(StateTransition.Codec, data, spec);
+                blocks.push(test.block);
             }
         }
         catch {
@@ -26812,20 +26846,20 @@ const jamConformance070V0Spec = new ChainSpec({
     ...chain_spec_tinyChainSpec,
     maxLookupAnchorAge: numbers_tryAsU32(14_400),
 });
-async function runStateTransition(testContent, testPath, t) {
+async function runStateTransition(testContent, testPath, t, chainSpec) {
     const blake2b = await Blake2b.createHasher();
     // a bit of a hack, but the new value for `maxLookupAnchorAge` was proposed with V1
     // version of the fuzzer, yet these tests were still depending on the older value.
     // To simplify the chain spec, we just special case this one vector here.
     const spec = testPath.includes("fuzz-reports/0.7.0/traces/1756548916/00000082.json")
         ? jamConformance070V0Spec
-        : tinyChainSpec;
+        : chainSpec;
     const preState = loadState(spec, blake2b, testContent.pre_state.keyvals);
     const postState = loadState(spec, blake2b, testContent.post_state.keyvals);
     const preStateRoot = preState.backend.getRootHash(blake2b);
     const postStateRoot = postState.backend.getRootHash(blake2b);
     const blockView = blockAsView(spec, testContent.block);
-    const allBlocks = loadBlocks(testPath);
+    const allBlocks = loadBlocks(testPath, spec);
     const myBlockIndex = allBlocks.findIndex(({ header }) => header.timeSlotIndex === testContent.block.header.timeSlotIndex);
     const previousBlocks = allBlocks.slice(0, myBlockIndex);
     const hasher = new TransitionHasher(spec, await keccakHasher, blake2b);
@@ -26834,7 +26868,7 @@ async function runStateTransition(testContent, testPath, t) {
         const headerHash = hasher.header(blockView.header.view());
         return new WithHash(headerHash.hash, blockView);
     }));
-    const stf = new OnChain(spec, preState, blocksDb, hasher);
+    const stf = new OnChain(spec, preState, blocksDb, hasher, PvmBackend.BuiltIn);
     // verify that we compute the state root exactly the same.
     assert.deepStrictEqual(testContent.pre_state.state_root.toString(), preStateRoot.toString());
     assert.deepStrictEqual(testContent.post_state.state_root.toString(), postStateRoot.toString());