Merge remote-tracking branch 'origin/main' into release/v0.5.x

da/avail/avail.go

@@ -360,7 +360,10 @@ func (c *DataAvailabilityLayerClient) broadcastTx(tx []byte) (uint64, error) {
 	c.logger.Info("Submitted batch to avail. Waiting for inclusion event")
 
 	defer sub.Unsubscribe()
-	timeout := time.After(c.txInclusionTimeout)
+
+	inclusionTimer := time.NewTimer(c.txInclusionTimeout)
+	defer inclusionTimer.Stop()
+
 	for {
 		select {
 		case <-c.ctx.Done():
@@ -378,13 +381,18 @@ func (c *DataAvailabilityLayerClient) broadcastTx(tx []byte) (uint64, error) {
 				return blockHeight, nil
 			} else if status.IsInBlock {
 				c.logger.Debug(fmt.Sprintf("Batch included inside a block with hash %v, waiting for finalization.", status.AsInBlock.Hex()))
+				inclusionTimer.Reset(c.txInclusionTimeout)
 				continue
 			} else {
-				c.logger.Debug("unsupported status, still waiting for inclusion", "status", status)
+				recievedStatus, err := status.MarshalJSON()
+				if err != nil {
+					return 0, fmt.Errorf("%s: %s", "failed to MarshalJSON of received status", err)
+				}
+				c.logger.Debug("unsupported status, still waiting for inclusion", "status", string(recievedStatus))
 				continue
 			}
-		case <-timeout:
-			return 0, fmt.Errorf("%w: %s", da.ErrTxBroadcastTimeout, err)
+		case <-inclusionTimer.C:
+			return 0, da.ErrTxBroadcastTimeout
 		}
 	}
 }
@@ -402,9 +410,9 @@ func (c *DataAvailabilityLayerClient) CheckBatchAvailability(dataLayerHeight uin
 // getHeightFromHash returns the block height from the block hash
 func (c *DataAvailabilityLayerClient) getHeightFromHash(hash availtypes.Hash) (uint64, error) {
 	c.logger.Debug("Getting block height from hash", "hash", hash)
-	block, err := c.client.GetBlock(hash)
+	header, err := c.client.GetHeader(hash)
 	if err != nil {
 		return 0, fmt.Errorf("cannot get block by hash:%w", err)
 	}
-	return uint64(block.Block.Header.Number), nil
+	return uint64(header.Number), nil
 }