@typeberry/jam 0.0.5-d373345 → 0.0.5-f91bac5

package/importer/index.js

@@ -3561,7 +3561,6 @@ var __webpack_exports__ = {};
 
 // EXPORTS
 __nccwpck_require__.d(__webpack_exports__, {
-  F: () => (/* binding */ createImporter),
   i: () => (/* binding */ main)
 });
 
@@ -24438,8 +24437,7 @@ function verifyRefineContexts(minLookupSlot, contexts, recentBlocksPartialUpdate
          *
          * https://graypaper.fluffylabs.dev/#/5f542d7/155c01155f01
          */
-        const isInChain = recentBlocks.has(context.lookupAnchor) ||
-            headerChain.isAncestor(context.lookupAnchorSlot, context.lookupAnchor, context.anchor);
+        const isInChain = recentBlocks.has(context.lookupAnchor) || headerChain.isAncestor(context.lookupAnchor);
         if (!isInChain) {
             if (process.env.SKIP_LOOKUP_ANCHOR_CHECK !== undefined) {
                 verify_contextual_logger.warn(`Lookup anchor check for ${context.lookupAnchor} would fail, but override is active.`);
@@ -25147,25 +25145,11 @@ class DbHeaderChain {
     constructor(blocks) {
         this.blocks = blocks;
     }
-    isAncestor(pastHeaderSlot, pastHeader, currentHeader) {
-        let currentHash = currentHeader;
-        for (;;) {
-            // success = we found the right header in the DB
-            if (currentHash.isEqualTo(pastHeader)) {
-                return true;
-            }
-            const current = this.blocks.getHeader(currentHash);
-            // fail if we don't find a parent (unlikely?)
-            if (current === null) {
-                return false;
-            }
-            // fail if we went pass that time slot index
-            if (current.timeSlotIndex.materialize() < pastHeaderSlot) {
-                return false;
-            }
-            // move one block up
-            currentHash = current.parentHeaderHash.materialize();
-        }
+    isAncestor(header) {
+        // TODO [ToDr] This works only for simple forks scenario. We rather
+        // should make sure that the `header` we are checking is a descendant
+        // of the current header (i.e. there is a direct path when going by parent).
+        return this.blocks.getHeader(header) !== null;
     }
 }
 const OFFENDERS_ERROR = "offenders not matching header";
@@ -25652,7 +25636,7 @@ function importerStateMachine() {
     return new machine_StateMachine("importer", initialized, [initialized, ready, finished]);
 }
 const state_machine_logger = Logger.new(import.meta.filename, "importer");
-const importBlockResultCodec = descriptors_codec.custom({
+const importBlockCodec = descriptors_codec.custom({
     name: "Result<StateRootHash, string>",
     sizeHint: { bytes: 1, isExact: false },
 }, (e, x) => {
@@ -25720,7 +25704,7 @@ class MainReady extends State {
     async importBlock(port, block) {
         const res = await port.sendRequest("importBlock", block, [block.buffer]);
         if (res instanceof Uint8Array) {
-            return decoder_Decoder.decodeObject(importBlockResultCodec, res);
+            return decoder_Decoder.decodeObject(importBlockCodec, res);
         }
         return result_Result.error("Invalid worker response.");
     }
@@ -25768,9 +25752,6 @@ class ImporterReady extends State {
         this.importer = importer;
         this.onImporter.emit();
     }
-    setConfig(config) {
-        this.data = config;
-    }
     getConfig() {
         if (this.data === null) {
             throw new Error("Did not receive chain spec config!");
@@ -25847,7 +25828,7 @@ class ImporterReady extends State {
                 state_machine_logger.error(`${e instanceof Error ? e.stack : ""}`);
                 response = result_Result.error(`${e}`);
             }
-            const encoded = encoder_Encoder.encodeObject(importBlockResultCodec, response);
+            const encoded = encoder_Encoder.encodeObject(importBlockCodec, response);
             return {
                 response: encoded.raw,
             };
@@ -25896,18 +25877,6 @@ if (!external_node_worker_threads_namespaceObject.isMainThread) {
     channel.then((channel) => main(channel)).catch((e) => importer_logger.error(e));
 }
 const keccakHasher = KeccakHasher.create();
-async function createImporter(config) {
-    const lmdb = new LmdbRoot(config.dbPath);
-    const blocks = new LmdbBlocks(config.chainSpec, lmdb);
-    const states = new LmdbStates(config.chainSpec, lmdb);
-    const hasher = new TransitionHasher(config.chainSpec, await keccakHasher, new allocator_SimpleAllocator());
-    const importer = new Importer(config.chainSpec, hasher, importer_logger, blocks, states);
-    return {
-        lmdb,
-        blocks,
-        importer,
-    };
-}
 /**
  * The `BlockImporter` listens to `block` signals, where it expects
  * RAW undecoded block objects (typically coming from the network).
@@ -25921,7 +25890,11 @@ async function main(channel) {
     const ready = await channel.waitForState("ready(importer)");
     const finished = await ready.doUntil("finished", async (worker, port) => {
         const config = worker.getConfig();
-        const { blocks, importer } = await createImporter(config);
+        const lmdb = new LmdbRoot(config.dbPath);
+        const blocks = new LmdbBlocks(config.chainSpec, lmdb);
+        const states = new LmdbStates(config.chainSpec, lmdb);
+        const hasher = new TransitionHasher(config.chainSpec, await keccakHasher, new allocator_SimpleAllocator());
+        const importer = new Importer(config.chainSpec, hasher, importer_logger, blocks, states);
         // TODO [ToDr] this is shit, since we have circular dependency.
         worker.setImporter(importer);
         importer_logger.info("📥 Importer waiting for blocks.");
@@ -25982,8 +25955,7 @@ async function main(channel) {
     finished.currentState().close(channel);
 }
 
-var __webpack_exports__createImporter = __webpack_exports__.F;
 var __webpack_exports__main = __webpack_exports__.i;
-export { __webpack_exports__createImporter as createImporter, __webpack_exports__main as main };
+export { __webpack_exports__main as main };
 
 //# sourceMappingURL=index.js.map