improve interface

ChainSafe · Oct 19, 2023 · 3daae60 · 3daae60
1 parent 9605754
commit 3daae60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/packages/validator/src/services/block.ts b/packages/validator/src/services/block.ts
@@ -18,7 +18,7 @@ import {IClock, LoggerVc} from "../util/index.js";
 import {PubkeyHex} from "../types.js";
 import {Metrics} from "../metrics.js";
 import {formatBigDecimal} from "../util/format.js";
-import {ValidatorStore, defaultOptions} from "./validatorStore.js";
+import {ValidatorStore} from "./validatorStore.js";
 import {BlockDutiesService, GENESIS_SLOT} from "./blockDuties.js";
 
 const ETH_TO_WEI = BigInt("1000000000000000000");
@@ -70,7 +70,7 @@ export class BlockProposingService {
     private readonly clock: IClock,
     private readonly validatorStore: ValidatorStore,
     private readonly metrics: Metrics | null,
-    private readonly useProduceBlockV3: boolean = defaultOptions.useProduceBlockV3
+    private readonly opts: {useProduceBlockV3: boolean}
   ) {
     this.dutiesService = new BlockDutiesService(
       config,
@@ -127,11 +127,11 @@ export class BlockProposingService {
         builderSelection,
         feeRecipient,
         strictFeeRecipientCheck,
-        useProduceBlockV3: this.useProduceBlockV3,
+        useProduceBlockV3: this.opts.useProduceBlockV3,
       });
       this.metrics?.proposerStepCallProduceBlock.observe(this.clock.secFromSlot(slot));
 
-      const produceBlockFn = this.useProduceBlockV3 ? this.produceBlockWrapper : this.produceBlockV2Wrapper;
+      const produceBlockFn = this.opts.useProduceBlockV3 ? this.produceBlockWrapper : this.produceBlockV2Wrapper;
       const blockContents = await produceBlockFn(this.config, slot, randaoReveal, graffiti, {
         feeRecipient,
         strictFeeRecipientCheck,

diff --git a/packages/validator/src/validator.ts b/packages/validator/src/validator.ts
@@ -16,7 +16,7 @@ import {Interchange, InterchangeFormatVersion, ISlashingProtection} from "./slas
 import {assertEqualParams, getLoggerVc, NotEqualParamsError} from "./util/index.js";
 import {ChainHeaderTracker} from "./services/chainHeaderTracker.js";
 import {ValidatorEventEmitter} from "./services/emitter.js";
-import {ValidatorStore, Signer, ValidatorProposerConfig} from "./services/validatorStore.js";
+import {ValidatorStore, Signer, ValidatorProposerConfig, defaultOptions} from "./services/validatorStore.js";
 import {LodestarValidatorDatabaseController, ProcessShutdownCallback, PubkeyHex} from "./types.js";
 import {BeaconHealth, Metrics} from "./metrics.js";
 import {MetaDataRepository} from "./repositories/metaDataRepository.js";
@@ -206,15 +206,9 @@ export class Validator {
 
     const chainHeaderTracker = new ChainHeaderTracker(logger, api, emitter);
 
-    const blockProposingService = new BlockProposingService(
-      config,
-      loggerVc,
-      api,
-      clock,
-      validatorStore,
-      metrics,
-      opts.useProduceBlockV3
-    );
+    const blockProposingService = new BlockProposingService(config, loggerVc, api, clock, validatorStore, metrics, {
+      useProduceBlockV3: opts.useProduceBlockV3 ?? defaultOptions.useProduceBlockV3,
+    });
 
     const attestationService = new AttestationService(
       loggerVc,

diff --git a/packages/validator/test/unit/services/block.test.ts b/packages/validator/test/unit/services/block.test.ts
@@ -50,7 +50,9 @@ describe("BlockDutiesService", function () {
 
     const clock = new ClockMock();
     // use produceBlockV3
-    const blockService = new BlockProposingService(config, loggerVc, api, clock, validatorStore, null, true);
+    const blockService = new BlockProposingService(config, loggerVc, api, clock, validatorStore, null, {
+      useProduceBlockV3: true,
+    });
 
     const signedBlock = ssz.phase0.SignedBeaconBlock.defaultValue();
     validatorStore.signRandao.resolves(signedBlock.message.body.randaoReveal);