Add TransactionID to retainer

pkg/retainer/retainer/retainer.go

@@ -162,12 +162,13 @@ func (r *Retainer) BlockMetadata(blockID iotago.BlockID) (*retainer.BlockMetadat
 		blockStatus = api.BlockStatePending
 	}
 
-	txStatus, txFailureReason := r.transactionStatus(blockID)
+	txID, txStatus, txFailureReason := r.transactionStatus(blockID)
 
 	return &retainer.BlockMetadata{
 		BlockID:                  blockID,
 		BlockState:               blockStatus,
 		BlockFailureReason:       blockFailureReason,
+		TransactionID:            txID,
 		TransactionState:         txStatus,
 		TransactionFailureReason: txFailureReason,
 	}, nil
@@ -240,16 +241,16 @@ func (r *Retainer) blockStatus(blockID iotago.BlockID) (api.BlockState, api.Bloc
 	return blockData.State, blockData.FailureReason
 }
 
-func (r *Retainer) transactionStatus(blockID iotago.BlockID) (api.TransactionState, api.TransactionFailureReason) {
+func (r *Retainer) transactionStatus(blockID iotago.BlockID) (iotago.TransactionID, api.TransactionState, api.TransactionFailureReason) {
 	store, err := r.store(blockID.Slot())
 	if err != nil {
 		r.errorHandler(ierrors.Wrapf(err, "could not get retainer store for slot %d", blockID.Slot()))
-		return api.TransactionStateNoTransaction, api.TxFailureNone
+		return iotago.EmptyTransactionID, api.TransactionStateNoTransaction, api.TxFailureNone
 	}
 
 	txData, exists := store.GetTransaction(blockID)
 	if !exists {
-		return api.TransactionStateNoTransaction, api.TxFailureNone
+		return iotago.EmptyTransactionID, api.TransactionStateNoTransaction, api.TxFailureNone
 	}
 
 	// for confirmed and finalized we need to check for the block status
@@ -258,13 +259,13 @@ func (r *Retainer) transactionStatus(blockID iotago.BlockID) (api.TransactionSta
 
 		switch blockState {
 		case api.BlockStateConfirmed:
-			return api.TransactionStateConfirmed, api.TxFailureNone
+			return txData.TransactionID, api.TransactionStateConfirmed, api.TxFailureNone
 		case api.BlockStateFinalized:
-			return api.TransactionStateFinalized, api.TxFailureNone
+			return txData.TransactionID, api.TransactionStateFinalized, api.TxFailureNone
 		}
 	}
 
-	return txData.State, txData.FailureReason
+	return txData.TransactionID, txData.State, txData.FailureReason
 }
 
 func (r *Retainer) onBlockAttached(blockID iotago.BlockID) error {

pkg/retainer/transaction_metadata.go

@@ -0,0 +1,20 @@
+package retainer
+
+import (
+	iotago "github.com/iotaledger/iota.go/v4"
+	"github.com/iotaledger/iota.go/v4/api"
+)
+
+type TransactionMetadata struct {
+	TransactionID            iotago.TransactionID
+	TransactionState         api.TransactionState
+	TransactionFailureReason api.TransactionFailureReason
+}
+
+func (m *TransactionMetadata) Response() *api.TransactionMetadataResponse {
+	return &api.TransactionMetadataResponse{
+		TransactionID:            m.TransactionID,
+		TransactionState:         m.TransactionState.String(),
+		TransactionFailureReason: m.TransactionFailureReason,
+	}
+}

pkg/storage/prunable/slotstore/retainer.go

@@ -49,13 +49,17 @@ func BlockRetainerDataFromBytes(bytes []byte) (*BlockRetainerData, int, error) {
 }
 
 type TransactionRetainerData struct {
+	TransactionID iotago.TransactionID
 	State         api.TransactionState
 	FailureReason api.TransactionFailureReason
 }
 
 func (t *TransactionRetainerData) Bytes() ([]byte, error) {
 	byteBuffer := stream.NewByteBuffer(2)
 
+	if err := stream.Write(byteBuffer, t.TransactionID); err != nil {
+		return nil, ierrors.Wrap(err, "failed to write transaction ID")
+	}
 	if err := stream.Write(byteBuffer, t.State); err != nil {
 		return nil, ierrors.Wrap(err, "failed to write transaction state")
 	}
@@ -72,6 +76,9 @@ func TransactionRetainerDataFromBytes(bytes []byte) (*TransactionRetainerData, i
 	var err error
 	t := new(TransactionRetainerData)
 
+	if t.TransactionID, err = stream.Read[iotago.TransactionID](byteReader); err != nil {
+		return nil, 0, ierrors.Wrap(err, "failed to read transaction ID")
+	}
 	if t.State, err = stream.Read[api.TransactionState](byteReader); err != nil {
 		return nil, 0, ierrors.Wrap(err, "failed to read transaction state")
 	}