@typeberry/jam 0.0.4 → 0.0.5

package/importer/index.js

@@ -25330,6 +25330,8 @@ class Importer {
     stf;
     // TODO [ToDr] we cannot assume state reference does not change.
     state;
+    // Hash of the block that we have the posterior state for in `state`.
+    currentHash;
     constructor(spec, hasher, logger, blocks, states) {
         this.logger = logger;
         this.blocks = blocks;
@@ -25342,6 +25344,7 @@ class Importer {
         this.verifier = new BlockVerifier(hasher, blocks);
         this.stf = new OnChain(spec, state, blocks, hasher, { enableParallelSealVerification: true });
         this.state = state;
+        this.currentHash = currentBestHeaderHash;
         logger.info(`😎 Best time slot: ${state.timeslot} (header hash: ${currentBestHeaderHash})`);
     }
     /** Attempt to pre-verify the seal to speed up importing. */
@@ -25368,6 +25371,20 @@ class Importer {
         if (hash.isError) {
             return importerError(ImporterErrorKind.Verifier, hash);
         }
+        // TODO [ToDr] This is incomplete/temporary fork support!
+        const parentHash = block.header.view().parentHeaderHash.materialize();
+        if (!this.currentHash.isEqualTo(parentHash)) {
+            const state = this.states.getState(parentHash);
+            if (state === null) {
+                const e = result_Result.error(BlockVerifierError.StateRootNotFound);
+                if (!e.isError) {
+                    throw new Error("unreachable, just adding to make compiler happy");
+                }
+                return importerError(ImporterErrorKind.Verifier, e);
+            }
+            this.state.updateBackend(state?.backend);
+            this.currentHash = parentHash;
+        }
         const timeSlot = block.header.view().timeSlotIndex.materialize();
         const headerHash = hash.ok;
         logger.log(`🧱 Verified block: Got hash ${headerHash} for block at slot ${timeSlot}.`);
@@ -25392,6 +25409,7 @@ class Importer {
         // TODO [ToDr] This is a temporary measure. We should rather read
         // the state of a parent block to support forks and create a fresh STF.
         this.state.updateBackend(newState.backend);
+        this.currentHash = headerHash;
         logger.log(timerState());
         // insert new state and the block to DB.
         const timerDb = measure("import:db");