@@ -30,6 +30,7 @@ type Config struct {
3030// It is unexported; callers should use the exported Client interface.
3131type client struct {
3232 blobAPI * blobrpc.BlobAPI
33+ headerAPI * blobrpc.HeaderAPI
3334 logger zerolog.Logger
3435 defaultTimeout time.Duration
3536 namespaceBz []byte
@@ -58,6 +59,7 @@ func NewClient(cfg Config) FullClient {
5859
5960 return & client {
6061 blobAPI : & cfg .DA .Blob ,
62+ headerAPI : & cfg .DA .Header ,
6163 logger : cfg .Logger .With ().Str ("component" , "da_client" ).Logger (),
6264 defaultTimeout : cfg .DefaultTimeout ,
6365 namespaceBz : datypes .NamespaceFromString (cfg .Namespace ).Bytes (),
@@ -180,8 +182,22 @@ func (c *client) Submit(ctx context.Context, data [][]byte, _ float64, namespace
180182 }
181183}
182184
185+ // getBlockTimestamp fetches the block timestamp from the DA layer header.
186+ func (c * client ) getBlockTimestamp (ctx context.Context , height uint64 ) (time.Time , error ) {
187+ headerCtx , cancel := context .WithTimeout (ctx , c .defaultTimeout )
188+ defer cancel ()
189+
190+ header , err := c .headerAPI .GetByHeight (headerCtx , height )
191+ if err != nil {
192+ return time.Time {}, fmt .Errorf ("failed to get header timestamp for block %d: %w" , height , err )
193+ }
194+
195+ return header .Time (), nil
196+ }
197+
183198// Retrieve retrieves blobs from the DA layer at the specified height and namespace.
184199// It uses GetAll to fetch all blobs at once.
200+ // The timestamp is derived from the DA block header to ensure determinism.
185201func (c * client ) Retrieve (ctx context.Context , height uint64 , namespace []byte ) datypes.ResultRetrieve {
186202 ns , err := share .NewNamespaceFromBytes (namespace )
187203 if err != nil {
@@ -195,21 +211,29 @@ func (c *client) Retrieve(ctx context.Context, height uint64, namespace []byte)
195211 }
196212 }
197213
198- getCtx , cancel := context .WithTimeout (ctx , c .defaultTimeout )
199- defer cancel ()
214+ blobCtx , blobCancel := context .WithTimeout (ctx , c .defaultTimeout )
215+ defer blobCancel ()
200216
201- blobs , err := c .blobAPI .GetAll (getCtx , height , []share.Namespace {ns })
217+ blobs , err := c .blobAPI .GetAll (blobCtx , height , []share.Namespace {ns })
202218 if err != nil {
203219 // Handle known errors by substring because RPC may wrap them.
204220 switch {
205221 case strings .Contains (err .Error (), datypes .ErrBlobNotFound .Error ()):
206222 c .logger .Debug ().Uint64 ("height" , height ).Msg ("No blobs found at height" )
223+ // Fetch block timestamp for deterministic responses using parent context
224+ blockTime , err := c .getBlockTimestamp (ctx , height )
225+ if err != nil {
226+ c .logger .Error ().Uint64 ("height" , height ).Err (err ).Msg ("failed to get block timestamp" )
227+ blockTime = time .Now ()
228+ // TODO: we should retry fetching the timestamp. Current time may mess block time consistency for based sequencers.
229+ }
230+
207231 return datypes.ResultRetrieve {
208232 BaseResult : datypes.BaseResult {
209233 Code : datypes .StatusNotFound ,
210234 Message : datypes .ErrBlobNotFound .Error (),
211235 Height : height ,
212- Timestamp : time . Now () ,
236+ Timestamp : blockTime ,
213237 },
214238 }
215239 case strings .Contains (err .Error (), datypes .ErrHeightFromFuture .Error ()):
@@ -234,14 +258,22 @@ func (c *client) Retrieve(ctx context.Context, height uint64, namespace []byte)
234258 }
235259 }
236260
261+ // Fetch block timestamp for deterministic responses using parent context
262+ blockTime , err := c .getBlockTimestamp (ctx , height )
263+ if err != nil {
264+ c .logger .Error ().Uint64 ("height" , height ).Err (err ).Msg ("failed to get block timestamp" )
265+ blockTime = time .Now ()
266+ // TODO: we should retry fetching the timestamp. Current time may mess block time consistency for based sequencers.
267+ }
268+
237269 if len (blobs ) == 0 {
238270 c .logger .Debug ().Uint64 ("height" , height ).Msg ("No blobs found at height" )
239271 return datypes.ResultRetrieve {
240272 BaseResult : datypes.BaseResult {
241273 Code : datypes .StatusNotFound ,
242274 Message : datypes .ErrBlobNotFound .Error (),
243275 Height : height ,
244- Timestamp : time . Now () ,
276+ Timestamp : blockTime ,
245277 },
246278 }
247279 }
@@ -261,7 +293,7 @@ func (c *client) Retrieve(ctx context.Context, height uint64, namespace []byte)
261293 Code : datypes .StatusSuccess ,
262294 Height : height ,
263295 IDs : ids ,
264- Timestamp : time . Now () ,
296+ Timestamp : blockTime ,
265297 },
266298 Data : data ,
267299 }
0 commit comments