Skip to content

Commit b1ac53c

Browse files
authored
Set defaultEngineTimeout = 2 * time.Second (#15043)
1 parent 27ab68c commit b1ac53c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

beacon-chain/execution/engine_client.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ const (
9494
// GetBlobsV2 request string for JSON-RPC.
9595
GetBlobsV2 = "engine_getBlobsV2"
9696
// Defines the seconds before timing out engine endpoints with non-block execution semantics.
97-
defaultEngineTimeout = time.Second
97+
// TODO: Remove temporarily needed hack since geth takes an input blobs txs with blobs proofs, and
98+
// does the heavy lifting of building cells proofs, while normally this is done by the tx sender.
99+
// This is a cool hack because it lets the CL to act as if the tx sender actually computed the cells proofs.
100+
// The only counter part is the `engine_getPayloadv<x>` takes a lot of time.
101+
// defaultEngineTimeout = time.Second
102+
defaultEngineTimeout = 2 * time.Second
98103
)
99104

100105
var errInvalidPayloadBodyResponse = errors.New("engine api payload body response is invalid")
@@ -711,7 +716,10 @@ func (s *Service) ReconstructDataColumnSidecars(ctx context.Context, block inter
711716
verifiedRODataColumns[i] = blocks.NewVerifiedRODataColumn(roDataColumn)
712717
}
713718

714-
log.WithField("root", fmt.Sprintf("%x", blockRoot)).Debug("Data columns reconstructed successfully from EL")
719+
log.WithFields(logrus.Fields{
720+
"root": fmt.Sprintf("%#x", blockRoot),
721+
"slot": block.Block().Slot(),
722+
}).Debug("Data columns successfully reconstructed from EL")
715723

716724
return verifiedRODataColumns, nil
717725
}

beacon-chain/sync/data_columns_reconstruct.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (s *Service) reconstructDataColumns(ctx context.Context, verifiedRODataColu
119119
}
120120
}
121121

122-
log.WithField("root", fmt.Sprintf("%x", blockRoot)).Debug("Data columns reconstructed and saved successfully")
122+
log.WithField("root", fmt.Sprintf("%#x", blockRoot)).Debug("Data columns successfully reconstructed from database and saved")
123123

124124
// Schedule the broadcast.
125125
if err := s.scheduleReconstructedDataColumnsBroadcast(ctx, blockRoot, verifiedRODataColumn); err != nil {

0 commit comments

Comments
 (0)