diff --git a/packages/api/src/beacon/routes/validator.ts b/packages/api/src/beacon/routes/validator.ts index cedc0deff52c..78fc1a67d32c 100644 --- a/packages/api/src/beacon/routes/validator.ts +++ b/packages/api/src/beacon/routes/validator.ts @@ -746,13 +746,13 @@ export function getReturnTypes(): ReturnTypes { if (data.executionPayloadBlinded) { return { execution_payload_blinded: true, - executionPayloadSource: data.executionPayloadSource, + execution_payload_source: data.executionPayloadSource, ...(produceBlindedBlock.toJson(data) as Record), }; } else { return { execution_payload_blinded: false, - executionPayloadSource: data.executionPayloadSource, + execution_payload_source: data.executionPayloadSource, ...(produceBlockOrContents.toJson(data) as Record), }; } diff --git a/packages/beacon-node/src/api/impl/validator/index.ts b/packages/beacon-node/src/api/impl/validator/index.ts index a1f59d62911b..395684960c7f 100644 --- 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 index ec3b0039ec03..b59902870c92 100644 --- 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 => { 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`,