debug and fix issues

ChainSafe · Dec 26, 2023 · dc09a0e · dc09a0e
1 parent 1f7aad0
commit dc09a0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packages/api/src/beacon/routes/validator.ts b/packages/api/src/beacon/routes/validator.ts
@@ -746,13 +746,13 @@ export function getReturnTypes(): ReturnTypes<Api> {
         if (data.executionPayloadBlinded) {
           return {
             execution_payload_blinded: true,
-            executionPayloadSource: data.executionPayloadSource,
+            execution_payload_source: data.executionPayloadSource,
             ...(produceBlindedBlock.toJson(data) as Record<string, unknown>),
           };
         } else {
           return {
             execution_payload_blinded: false,
-            executionPayloadSource: data.executionPayloadSource,
+            execution_payload_source: data.executionPayloadSource,
             ...(produceBlockOrContents.toJson(data) as Record<string, unknown>),
           };
         }

diff --git a/packages/beacon-node/src/api/impl/validator/index.ts b/packages/beacon-node/src/api/impl/validator/index.ts
@@ -668,7 +668,8 @@ export function getValidatorApi({
       skipRandaoVerification,
       opts
     );
-    if (opts.blindedLocal === true) {
+
+    if (opts.blindedLocal === true && ForkSeq[produceBlockEngineOrBuilderRes.version] >= ForkSeq.bellatrix) {
       if (produceBlockEngineOrBuilderRes.executionPayloadBlinded) {
         return produceBlockEngineOrBuilderRes;
       } else {

diff --git a/packages/validator/src/services/block.ts b/packages/validator/src/services/block.ts
@@ -195,18 +195,20 @@ export class BlockProposingService {
     slot: Slot,
     randaoReveal: BLSSignature,
     graffiti: string,
-    {feeRecipient, strictFeeRecipientCheck, builderSelection}: routes.validator.ExtraProduceBlockOps
+    {feeRecipient, strictFeeRecipientCheck, builderSelection, blindedLocal}: routes.validator.ExtraProduceBlockOps
   ): Promise<FullOrBlindedBlockWithContents & DebugLogCtx> => {
     const res = await this.api.validator.produceBlockV3(slot, randaoReveal, graffiti, false, {
       feeRecipient,
       builderSelection,
       strictFeeRecipientCheck,
+      blindedLocal,
     });
     ApiError.assert(res, "Failed to produce block: validator.produceBlockV2");
     const {response} = res;
 
     const debugLogCtx = {
-      source: response.executionPayloadBlinded ? ProducedBlockSource.builder : ProducedBlockSource.engine,
+      executionPayloadSource: response.executionPayloadSource,
+      executionPayloadBlinded: response.executionPayloadBlinded,
       // winston logger doesn't like bigint
       executionPayloadValue: `${formatBigDecimal(response.executionPayloadValue, ETH_TO_WEI, MAX_DECIMAL_FACTOR)} ETH`,
       consensusBlockValue: `${formatBigDecimal(response.consensusBlockValue, ETH_TO_GWEI, MAX_DECIMAL_FACTOR)} ETH`,