Skip to content

Commit 1e72cdb

Browse files
rjl493456442devopsbo3
authored andcommitted
eth/catalyst: disable full payload when not in dev mode (ethereum#27921)
eth/catalyst: only enable full payload in dev mode
1 parent 2aa9c9c commit 1e72cdb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

eth/catalyst/api.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ func (api *ConsensusAPI) ExchangeTransitionConfigurationV1(config engine.Transit
395395

396396
// GetPayloadV1 returns a cached payload by id.
397397
func (api *ConsensusAPI) GetPayloadV1(payloadID engine.PayloadID) (*engine.ExecutableData, error) {
398-
data, err := api.getPayload(payloadID)
398+
data, err := api.getPayload(payloadID, false)
399399
if err != nil {
400400
return nil, err
401401
}
@@ -404,17 +404,17 @@ func (api *ConsensusAPI) GetPayloadV1(payloadID engine.PayloadID) (*engine.Execu
404404

405405
// GetPayloadV2 returns a cached payload by id.
406406
func (api *ConsensusAPI) GetPayloadV2(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
407-
return api.getPayload(payloadID)
407+
return api.getPayload(payloadID, false)
408408
}
409409

410410
// GetPayloadV3 returns a cached payload by id.
411411
func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
412-
return api.getPayload(payloadID)
412+
return api.getPayload(payloadID, false)
413413
}
414414

415-
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
415+
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {
416416
log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID)
417-
data := api.localBlocks.get(payloadID, true)
417+
data := api.localBlocks.get(payloadID, full)
418418
if data == nil {
419419
return nil, engine.UnknownPayload
420420
}

eth/catalyst/simulated_beacon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal) error {
153153
return fmt.Errorf("error calling forkchoice update: %v", err)
154154
}
155155

156-
envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID)
156+
envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true)
157157
if err != nil {
158158
return fmt.Errorf("error retrieving payload: %v", err)
159159
}

0 commit comments

Comments
 (0)