@typeberry/lib 0.5.10-9567cee → 0.5.10-9ffd7ac

package/packages/workers/importer/importer.js

@@ -12,11 +12,6 @@ export var ImporterErrorKind;
 })(ImporterErrorKind || (ImporterErrorKind = {}));
 const importerError = (kind, nested) => Result.taggedError(ImporterErrorKind, kind, nested);
 export class Importer {
-    hasher;
-    logger;
-    blocks;
-    states;
-    options;
     verifier;
     stf;
     // TODO [ToDr] we cannot assume state reference does not change.
@@ -24,24 +19,44 @@ export class Importer {
     // Hash of the block that we have the posterior state for in `state`.
     currentHash;
     metrics;
-    constructor(spec, pvm, hasher, logger, blocks, states, options = {}) {
-        this.hasher = hasher;
-        this.logger = logger;
-        this.blocks = blocks;
-        this.states = states;
-        this.options = options;
-        this.metrics = metrics.createMetrics();
-        const currentBestHeaderHash = this.blocks.getBestHeaderHash();
-        const state = states.getState(currentBestHeaderHash);
+    hasher;
+    logger;
+    blocks;
+    states;
+    options;
+    /**
+     * Build an {@link Importer} connected to the best state loaded from `states`.
+     *
+     * Throws if the best state cannot be loaded — callers are expected to treat that
+     * as a programmer error (the DB should be initialized before reaching here).
+     */
+    static open(args) {
+        const currentBestHeaderHash = args.blocks.getBestHeaderHash();
+        const state = args.states.getState(currentBestHeaderHash);
         if (state === null) {
             throw new Error(`Unable to load best state from header hash: ${currentBestHeaderHash}.`);
         }
-        this.verifier = new BlockVerifier(hasher, blocks);
-        this.stf = new OnChain(spec, state, hasher, { pvm, accumulateSequentially: false }, DbHeaderChain.new(blocks));
+        return new Importer(args, state, currentBestHeaderHash);
+    }
+    constructor(args, state, currentBestHeaderHash) {
+        this.hasher = args.hasher;
+        this.logger = args.logger;
+        this.blocks = args.blocks;
+        this.states = args.states;
+        this.options = args.options ?? {};
+        this.metrics = metrics.createMetrics();
+        this.verifier = BlockVerifier.new(args.hasher, args.blocks);
+        this.stf = OnChain.assemble({
+            chainSpec: args.spec,
+            state,
+            hasher: args.hasher,
+            options: { pvm: args.pvm, accumulateSequentially: false },
+            headerChain: DbHeaderChain.new(args.blocks),
+        });
         this.state = state;
         this.currentHash = currentBestHeaderHash;
         this.prepareForNextEpoch();
-        logger.info `😎 Best time slot: ${state.timeslot} (header hash: ${currentBestHeaderHash})`;
+        args.logger.info `😎 Best time slot: ${state.timeslot} (header hash: ${currentBestHeaderHash})`;
     }
     /** Do some extra work for preparation for the next epoch. */
     async prepareForNextEpoch() {
@@ -134,7 +149,7 @@ export class Importer {
         logger.log `${timerState()}`;
         // insert new state and the block to DB.
         const timerDb = measure("import:db");
-        const writeBlocks = this.blocks.insertBlock(new WithHash(headerHash, block));
+        const writeBlocks = this.blocks.insertBlock(WithHash.new(headerHash, block));
         // Computation of the state root may happen asynchronously,
         // but we still need to wait for it before next block can be imported
         const stateRoot = await this.states.getStateRoot(this.state);
@@ -157,7 +172,7 @@ export class Importer {
                 }
             }
         }
-        return Result.ok(new WithHash(headerHash, block.header.view()));
+        return Result.ok(WithHash.new(headerHash, block.header.view()));
     }
     getBestStateRootHash() {
         const bestHeaderHash = this.blocks.getBestHeaderHash();

package/packages/workers/importer/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtE,MAAM,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAM,MAAM,qBAAqB,GAAG;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;CACxC,CAAC,CAsBD;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,iBAwCjE"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/importer/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtE,MAAM,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAM,MAAM,qBAAqB,GAAG;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;CACxC,CAAC,CA8BD;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,iBAwCjE"}

package/packages/workers/importer/main.js

@@ -17,11 +17,19 @@ export async function createImporter(config, options = {}) {
     const dummyFinalityDepth = config.workerParams.dummyFinalityDepth ?? 0;
     const finalizer = dummyFinalityDepth > 0 ? DummyFinalizer.create(blocks, dummyFinalityDepth) : undefined;
     const pruneBlocks = config.workerParams.pruneBlocks ?? false;
-    const hasher = new TransitionHasher(await keccakHasher, await blake2b);
-    const importer = new Importer(chainSpec, pvm, hasher, logger, blocks, states, {
-        ...options,
-        finalizer,
-        pruneBlocks,
+    const hasher = TransitionHasher.new(await keccakHasher, await blake2b);
+    const importer = Importer.open({
+        spec: chainSpec,
+        pvm,
+        hasher,
+        logger,
+        blocks,
+        states,
+        options: {
+            ...options,
+            finalizer,
+            pruneBlocks,
+        },
     });
     return {
         importer,