feat: always use produceBlockV3 post deneb

ChainSafe · Jan 8, 2024 · 75ef3ae · 75ef3ae
1 parent fce884d
commit 75ef3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/cli/src/cmds/validator/options.ts b/packages/cli/src/cmds/validator/options.ts
@@ -257,7 +257,7 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
 
   useProduceBlockV3: {
     type: "boolean",
-    description: "Enable/disable usage of produceBlockV3 that might not be supported by all beacon clients yet",
+    description: "Enable/disable usage of produceBlockV3 pre deneb that might not be supported by all beacon clients yet",
     defaultDescription: `${defaultOptions.useProduceBlockV3}`,
   },
 

diff --git a/packages/validator/src/services/block.ts b/packages/validator/src/services/block.ts
@@ -125,19 +125,20 @@ export class BlockProposingService {
         this.validatorStore.getBuilderSelectionParams(pubkeyHex);
       const feeRecipient = this.validatorStore.getFeeRecipient(pubkeyHex);
       const blindedLocal = this.opts.blindedLocal;
+      const useProduceBlockV3 = this.config.getForkSeq(slot) >= ForkSeq.deneb || this.opts.useProduceBlockV3;
 
       this.logger.debug("Producing block", {
         ...debugLogCtx,
         builderSelection,
         builderBoostFactor,
         feeRecipient,
         strictFeeRecipientCheck,
-        useProduceBlockV3: this.opts.useProduceBlockV3,
+        useProduceBlockV3,
         blindedLocal,
       });
       this.metrics?.proposerStepCallProduceBlock.observe(this.clock.secFromSlot(slot));
 
-      const produceBlockFn = this.opts.useProduceBlockV3 ? this.produceBlockWrapper : this.produceBlockV2Wrapper;
+      const produceBlockFn = useProduceBlockV3 ? this.produceBlockWrapper : this.produceBlockV2Wrapper;
       const produceOpts = {
         feeRecipient,
         strictFeeRecipientCheck,