@typeberry/convert 0.2.0-0e2cdac → 0.2.0-2ecdea0

package/index.js

@@ -8413,6 +8413,8 @@ const chain_spec_EC_SEGMENT_SIZE = 4104;
  * Additional data that has to be passed to the codec to correctly parse incoming bytes.
  */
 class ChainSpec extends WithDebug {
+    /** Human-readable name of the chain spec. */
+    name;
     /** Number of validators. */
     validatorsCount;
     /** 1/3 of number of validators */
@@ -8455,6 +8457,7 @@ class ChainSpec extends WithDebug {
     maxLookupAnchorAge;
     constructor(data) {
         super();
+        this.name = data.name;
         this.validatorsCount = data.validatorsCount;
         this.thirdOfValidators = numbers_tryAsU16(Math.floor(data.validatorsCount / 3));
         this.validatorsSuperMajority = numbers_tryAsU16(Math.floor(data.validatorsCount / 3) * 2 + 1);
@@ -8475,6 +8478,7 @@ class ChainSpec extends WithDebug {
 }
 /** Set of values for "tiny" chain as defined in JAM test vectors. */
 const chain_spec_tinyChainSpec = new ChainSpec({
+    name: "tiny",
     validatorsCount: numbers_tryAsU16(6),
     coresCount: numbers_tryAsU16(2),
     epochLength: numbers_tryAsU32(12),
@@ -8496,6 +8500,7 @@ const chain_spec_tinyChainSpec = new ChainSpec({
  * Please note that only validatorsCount and epochLength are "full", the rest is copied from "tiny".
  */
 const chain_spec_fullChainSpec = new ChainSpec({
+    name: "full",
     validatorsCount: numbers_tryAsU16(1023),
     coresCount: numbers_tryAsU16(341),
     epochLength: numbers_tryAsU32(600),
@@ -10789,7 +10794,7 @@ const DEFAULT_CONFIG = "default";
 const NODE_DEFAULTS = {
     name: isBrowser() ? "browser" : external_node_os_default().hostname(),
     config: [DEFAULT_CONFIG],
-    pvm: pvm_backend_PvmBackend.BuiltIn,
+    pvm: pvm_backend_PvmBackend.Ananas,
 };
 /** Chain spec chooser. */
 var KnownChainSpec;
@@ -12880,6 +12885,15 @@ class InMemoryService extends WithDebug {
             }),
         };
     }
+    /** Return identical `InMemoryService` which does not share any references. */
+    clone() {
+        return new InMemoryService(this.serviceId, {
+            info: service_ServiceAccountInfo.create(this.data.info),
+            preimages: hash_dictionary_HashDictionary.fromEntries(Array.from(this.data.preimages.entries())),
+            lookupHistory: hash_dictionary_HashDictionary.fromEntries(Array.from(this.data.lookupHistory.entries()).map(([k, v]) => [k, v.slice()])),
+            storage: new Map(this.data.storage.entries()),
+        });
+    }
     /**
      * Create a new in-memory service from another state service
      * by copying all given entries.
@@ -15062,7 +15076,6 @@ function* serializeRemovedServices(servicesRemoved) {
         return;
     }
     for (const serviceId of servicesRemoved) {
-        // TODO [ToDr] what about all data associated with a service?
         const codec = serialize.serviceData(serviceId);
         yield [serialize_state_update_StateEntryUpdateAction.Remove, codec.key, EMPTY_BLOB];
     }
@@ -15874,7 +15887,6 @@ class InMemoryStates {
 
 
 
-
 /** Helper function to create most used hashes in the block */
 class hasher_TransitionHasher {
     context;
@@ -15923,15 +15935,6 @@ class hasher_TransitionHasher {
         const encoded = BytesBlob.blobFromParts([et.raw, ep.raw, eg.raw, ea.raw, ed.raw]);
         return new WithHashAndBytes(this.blake2b.hashBytes(encoded).asOpaque(), extrinsicView, encoded);
     }
-    /** Creates hash for given WorkPackage */
-    workPackage(workPackage) {
-        return this.encode(WorkPackage.Codec, workPackage);
-    }
-    encode(codec, data) {
-        // TODO [ToDr] Use already allocated encoding destination and hash bytes from some arena.
-        const encoded = Encoder.encodeObject(codec, data, this.context);
-        return new WithHashAndBytes(this.blake2b.hashBytes(encoded).asOpaque(), data, encoded);
-    }
 }
 
 ;// CONCATENATED MODULE: ./packages/jam/transition/preimages.ts
@@ -15944,7 +15947,6 @@ var PreimagesErrorCode;
     PreimagesErrorCode["PreimagesNotSortedUnique"] = "preimages_not_sorted_unique";
     PreimagesErrorCode["AccountNotFound"] = "account_not_found";
 })(PreimagesErrorCode || (PreimagesErrorCode = {}));
-// TODO [SeKo] consider whether this module is the right place to remove expired preimages
 class preimages_Preimages {
     state;
     blake2b;
@@ -16514,7 +16516,7 @@ var ResultValues;
  * reach the epoch change block.
  */
 const ringCommitmentCache = [];
-// TODO [ToDr] We export the entire object to allow mocking in tests.
+// NOTE [ToDr] We export the entire object to allow mocking in tests.
 // Ideally we would just export functions and figure out how to mock
 // properly in ESM.
 /* harmony default export */ const bandersnatch_vrf = ({
@@ -17539,13 +17541,6 @@ var partial_state_ForgetPreimageError;
 })(partial_state_ForgetPreimageError || (partial_state_ForgetPreimageError = {}));
 /**
  * Errors that may occur when the transfer is invoked.
- *
- * TODO [ToDr] Since I don't fully understand yet which of these
- * could be checked directly in the host call (i.e. if we will
- * have access to the service account state there) for now I keep
- * them safely in the `AccumulationPartialState` implementation.
- * However, if possible, these should be moved directly to the
- * host call implementation.
  */
 var partial_state_TransferError;
 (function (TransferError) {
@@ -17876,7 +17871,7 @@ class accumulate_externalities_AccumulateExternalities {
         const status = slots === null ? null : slotsToPreimageStatus(slots.slots);
         // The previous code needs to be forgotten and expired.
         if (status?.status !== PreimageStatusKind.Unavailable) {
-            return [false, "wrong status"];
+            return [false, `wrong status: ${status !== null ? PreimageStatusKind[status.status] : null}`];
         }
         const t = this.currentTimeslot;
         const isExpired = status.data[1] < t - this.chainSpec.preimageExpungePeriod;
@@ -18266,7 +18261,8 @@ class accumulate_externalities_AccumulateExternalities {
     }
     eject(destination, previousCodeHash) {
         const service = this.getServiceInfo(destination);
-        if (service === null || destination === null) {
+        const isRemoved = this.updatedState.stateUpdate.services.removed.find((serviceId) => serviceId === destination) !== undefined;
+        if (service === null || destination === null || isRemoved) {
             return Result.error(EjectError.InvalidService, () => "Service missing");
         }
         const currentService = this.getCurrentServiceInfo();
@@ -23038,18 +23034,11 @@ class interpreter_Interpreter {
 
 
 
-;// CONCATENATED MODULE: external "node:url"
-const external_node_url_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:url");
 ;// CONCATENATED MODULE: ./packages/core/pvm-interpreter-ananas/index.ts
 
 
 
 
-
-
-// TODO [ToDr] Temporary solution. We need to inline WASM files for the final build.
-const wasmPath = (0,external_node_url_namespaceObject.fileURLToPath)(new URL(import.meta.resolve("@fluffylabs/anan-as/release-mini.wasm"), import.meta.url));
-const wasmBuffer = (0,external_node_fs_namespaceObject.readFileSync)(wasmPath);
 // Max u32 value
 const INF_STEPS = (/* unused pure expression or super */ null && (2 ** 32 - 1));
 class AnanasRegisters {
@@ -23135,8 +23124,7 @@ class pvm_interpreter_ananas_AnanasInterpreter {
         this.gas = new AnanasGasCounter(instance);
     }
     static async new() {
-        const wasmModule = await WebAssembly.compile(wasmBuffer);
-        const instance = await instantiate(wasmModule, {
+        const instance = await instantiate({
             env: {
                 abort: () => {
                     throw new Error("Abort called from WASM");
@@ -23584,17 +23572,19 @@ class Eject {
             return;
         }
         const result = this.partialState.eject(serviceId, previousCodeHash);
-        logger_logger.trace `EJECT(${serviceId}, ${previousCodeHash}) <- ${result_resultToString(result)}`;
         // All good!
         if (result.isOk) {
+            logger_logger.trace `EJECT(${serviceId}, ${previousCodeHash}) <- OK`;
             regs.set(eject_IN_OUT_REG, results_HostCallResult.OK);
             return;
         }
         const e = result.error;
         if (e === partial_state_EjectError.InvalidService) {
+            logger_logger.trace `EJECT(${serviceId}, ${previousCodeHash}) <- WHO ${result_resultToString(result)}`;
             regs.set(eject_IN_OUT_REG, results_HostCallResult.WHO);
         }
         else if (e === partial_state_EjectError.InvalidPreimage) {
+            logger_logger.trace `EJECT(${serviceId}, ${previousCodeHash}) <- HUH ${result_resultToString(result)}`;
             regs.set(eject_IN_OUT_REG, results_HostCallResult.HUH);
         }
         else {
@@ -24839,7 +24829,7 @@ class accumulate_Accumulate {
      * https://graypaper.fluffylabs.dev/#/7e6ff6a/18d70118d701?v=0.6.7
      */
     async accumulateSingleService(serviceId, transfers, operands, gasCost, slot, entropy, inputStateUpdate) {
-        accumulate_logger.log `Accumulating service ${serviceId}, transfers: ${transfers.length} operands: ${operands.length} at slot: ${slot}.`;
+        accumulate_logger.log `Accumulating service ${serviceId}, transfers: ${transfers.length} operands: ${operands.length} at slot: ${slot}`;
         const updatedState = new PartiallyUpdatedState(this.state, inputStateUpdate);
         // update service balance from incoming transfers
         if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1)) {
@@ -26542,6 +26532,7 @@ class statistics_Statistics {
 
 
 
+
 class DbHeaderChain {
     blocks;
     constructor(blocks) {
@@ -26735,7 +26726,7 @@ class chain_stf_OnChain {
         }
         const { preimages, ...preimagesRest } = preimagesResult.ok;
         assertEmpty(preimagesRest);
-        const timerAccumulate = measure("import:accumulate");
+        const timerAccumulate = measure(`import:accumulate (${PvmBackend[this.accumulate.pvm]})`);
         // accumulate
         const accumulateResult = await this.accumulate.transition({
             slot: timeSlot,
@@ -26975,22 +26966,24 @@ function blockAsView(spec, block) {
 // that were run pre-V1 fuzzer version.
 const jamConformance070V0Spec = new ChainSpec({
     ...chain_spec_tinyChainSpec,
+    name: "jam-conformance-v070v0",
     maxLookupAnchorAge: numbers_tryAsU32(14_400),
 });
-async function runStateTransition(testContent, testPath, t, chainSpec) {
+async function runStateTransition(testContent, options, variant) {
+    const pvm = variant === "ananas" ? PvmBackend.Ananas : PvmBackend.BuiltIn;
     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")
+    const spec = options.path.includes("fuzz-reports/0.7.0/traces/1756548916/00000082.json")
         ? jamConformance070V0Spec
-        : chainSpec;
+        : options.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, spec);
+    const allBlocks = loadBlocks(options.path, 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);
@@ -26999,7 +26992,7 @@ async function runStateTransition(testContent, testPath, t, chainSpec) {
         const headerHash = hasher.header(blockView.header.view());
         return new WithHash(headerHash.hash, blockView);
     }));
-    const stf = new OnChain(spec, preState, blocksDb, hasher, PvmBackend.BuiltIn);
+    const stf = new OnChain(spec, preState, blocksDb, hasher, pvm);
     // 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());
@@ -27024,7 +27017,7 @@ async function runStateTransition(testContent, testPath, t, chainSpec) {
     preState.backend.applyUpdate(serializeStateUpdate(spec, blake2b, stfResult.ok));
     // some conformance test vectors have an empty state, we run them, yet do not perform any assertions.
     if (testContent.post_state.keyvals.length === 0) {
-        t.skip(`Successfuly run a test vector with empty post state!. Please verify: ${testPath}`);
+        options.test.skip(`Successfuly run a test vector with empty post state!. Please verify: ${options.path}`);
         return;
     }
     // if the stf was successful compare the resulting state and the root (redundant, but double checking).
@@ -27091,8 +27084,8 @@ const workItemFromJson = json.object({
     extrinsic,
     exportCount: export_count,
 }));
-async function runWorkItemTest(test, file) {
-    runCodecTest(WorkItem.Codec, test, file);
+async function runWorkItemTest(test, { path }) {
+    runCodecTest(WorkItem.Codec, test, path);
 }
 
 ;// CONCATENATED MODULE: ./bin/test-runner/w3f/codec/work-package.ts
@@ -27138,7 +27131,7 @@ const workPackageFromJson = compatibility_Compatibility.isGreaterOrEqual(compati
         context,
         items: sized_array_FixedSizeArray.new(items, tryAsWorkItemsCount(items.length)),
     }));
-async function runWorkPackageTest(test, file) {
+async function runWorkPackageTest(test, { path: file }) {
     runCodecTest(WorkPackage.Codec, test, file);
 }