Fix return txid in history endpoint

Author: altafan

api-spec/openapi/swagger/ark/v1/indexer.swagger.json

@@ -721,16 +721,10 @@
     "v1IndexerTxHistoryRecord": {
       "type": "object",
       "properties": {
-        "boardingTxid": {
-          "type": "string"
-        },
         "commitmentTxid": {
           "type": "string"
         },
-        "sweepTxid": {
-          "type": "string"
-        },
-        "arkTxid": {
+        "virtualTxid": {
           "type": "string"
         },
         "type": {

api-spec/protobuf/ark/v1/indexer.proto

@@ -187,16 +187,14 @@ message IndexerChain {
 
 message IndexerTxHistoryRecord {
   oneof key {
-    string boarding_txid = 1;
-    string commitment_txid = 2;
-    string sweep_txid = 3;
-    string ark_txid = 4;
+    string commitment_txid = 1;
+    string virtual_txid = 2;
   }
-  IndexerTxType type = 5;
-  uint64 amount = 6;
-  int64 created_at = 7;
-  int64 confirmed_at = 8;
-  bool is_settled = 9;
+  IndexerTxType type = 3;
+  uint64 amount = 4;
+  int64 created_at = 5;
+  int64 confirmed_at = 6;
+  bool is_settled = 7;
 }
 
 enum IndexerTxType {

api-spec/protobuf/gen/ark/v1/indexer.pb.go

@@ -352,12 +352,13 @@ const (
 )
 
 type TxHistoryRecord struct {
-	Txid        string
-	Type        TxType
-	Amount      uint64
-	CreatedAt   int64
-	ConfirmedAt int64
-	IsSettled   bool
+	CommitmentTxid string
+	VirtualTxid    string
+	Type           TxType
+	Amount         uint64
+	CreatedAt      int64
+	ConfirmedAt    int64
+	IsSettled      bool
 }
 
 type TransactionHistoryResponse struct {

pkg/client-sdk/client/client.go

@@ -708,12 +708,13 @@ func (a *grpcClient) GetTransactionHistory(ctx context.Context, address string,
 	history := make([]client.TxHistoryRecord, 0, len(resp.GetHistory()))
 	for _, record := range resp.GetHistory() {
 		history = append(history, client.TxHistoryRecord{
-			Txid:        getTxidFromHistoryRecord(record),
-			Type:        client.TxType(record.GetType()),
-			Amount:      record.GetAmount(),
-			CreatedAt:   record.GetCreatedAt(),
-			ConfirmedAt: record.GetConfirmedAt(),
-			IsSettled:   record.GetIsSettled(),
+			CommitmentTxid: record.GetCommitmentTxid(),
+			VirtualTxid:    record.GetVirtualTxid(),
+			Type:           client.TxType(record.GetType()),
+			Amount:         record.GetAmount(),
+			CreatedAt:      record.GetCreatedAt(),
+			ConfirmedAt:    record.GetConfirmedAt(),
+			IsSettled:      record.GetIsSettled(),
 		})
 	}
 
@@ -727,21 +728,6 @@ func (a *grpcClient) GetTransactionHistory(ctx context.Context, address string,
 	}, nil
 }
 
-func getTxidFromHistoryRecord(record *arkv1.IndexerTxHistoryRecord) string {
-	switch {
-	case record.GetBoardingTxid() != "":
-		return record.GetBoardingTxid()
-	case record.GetCommitmentTxid() != "":
-		return record.GetCommitmentTxid()
-	case record.GetSweepTxid() != "":
-		return record.GetSweepTxid()
-	case record.GetArkTxid() != "":
-		return record.GetArkTxid()
-	default:
-		return ""
-	}
-}
-
 func (a *grpcClient) GetVtxoChain(ctx context.Context, outpoint client.Outpoint, page client.PageRequest) (*client.VtxoChainResponse, error) {
 	req := &arkv1.GetVtxoChainRequest{
 		Outpoint: &arkv1.IndexerOutpoint{

pkg/client-sdk/client/grpc/client.go

@@ -1196,18 +1196,6 @@ func (a *restClient) GetTransactionHistory(ctx context.Context, address string,
 			return nil, err
 		}
 
-		var txid string
-		switch {
-		case record.BoardingTxid != "":
-			txid = record.BoardingTxid
-		case record.CommitmentTxid != "":
-			txid = record.CommitmentTxid
-		case record.SweepTxid != "":
-			txid = record.SweepTxid
-		case record.ArkTxid != "":
-			txid = record.ArkTxid
-		}
-
 		// Use a zero value for TxType if Type is nil, otherwise use a numeric conversion
 		var txType client.TxType
 		if record.Type != nil {
@@ -1227,12 +1215,13 @@ func (a *restClient) GetTransactionHistory(ctx context.Context, address string,
 		}
 
 		history = append(history, client.TxHistoryRecord{
-			Txid:        txid,
-			Type:        txType,
-			Amount:      amount,
-			CreatedAt:   createdAt,
-			ConfirmedAt: confirmedAt,
-			IsSettled:   record.IsSettled,
+			CommitmentTxid: record.CommitmentTxid,
+			VirtualTxid:    record.VirtualTxid,
+			Type:           txType,
+			Amount:         amount,
+			CreatedAt:      createdAt,
+			ConfirmedAt:    confirmedAt,
+			IsSettled:      record.IsSettled,
 		})
 	}
 

pkg/client-sdk/client/rest/client.go

@@ -411,19 +411,22 @@ func vtxosToTxs(spendable, spent []domain.Vtxo) ([]TxHistoryRecord, error) {
 			continue // settlement or change, ignore
 		}
 
-		txid := vtxo.RoundTxid
+		commitmentTxid := vtxo.RoundTxid
+		virtualTxid := ""
 		settled := !vtxo.IsPending()
 		if vtxo.IsPending() {
-			txid = vtxo.Txid
+			virtualTxid = vtxo.Txid
+			commitmentTxid = ""
 			settled = vtxo.SpentBy != ""
 		}
 
 		txs = append(txs, TxHistoryRecord{
-			Txid:      txid,
-			Amount:    vtxo.Amount - settleAmount - spentAmount,
-			Type:      TxReceived,
-			CreatedAt: time.Unix(vtxo.CreatedAt, 0),
-			Settled:   settled,
+			CommitmentTxid: commitmentTxid,
+			VirtualTxid:    virtualTxid,
+			Amount:         vtxo.Amount - settleAmount - spentAmount,
+			Type:           TxReceived,
+			CreatedAt:      time.Unix(vtxo.CreatedAt, 0),
+			Settled:        settled,
 		})
 	}
 
@@ -455,17 +458,20 @@ func vtxosToTxs(spendable, spent []domain.Vtxo) ([]TxHistoryRecord, error) {
 
 		vtxo := getVtxo(resultedVtxos, vtxosBySpentBy[sb])
 
-		txid := vtxo.RoundTxid
+		commitmentTxid := vtxo.RoundTxid
+		virtualTxid := ""
 		if vtxo.IsPending() {
-			txid = vtxo.Txid
+			virtualTxid = vtxo.Txid
+			commitmentTxid = ""
 		}
 
 		txs = append(txs, TxHistoryRecord{
-			Txid:      txid,
-			Amount:    spentAmount - resultedAmount,
-			Type:      TxSent,
-			CreatedAt: time.Unix(vtxo.CreatedAt, 0),
-			Settled:   true,
+			CommitmentTxid: commitmentTxid,
+			VirtualTxid:    virtualTxid,
+			Amount:         spentAmount - resultedAmount,
+			Type:           TxSent,
+			CreatedAt:      time.Unix(vtxo.CreatedAt, 0),
+			Settled:        true,
 		})
 
 	}

pkg/client-sdk/client/rest/service/models/v1_indexer_tx_history_record.go

@@ -223,12 +223,13 @@ type TxHistoryResp struct {
 }
 
 type TxHistoryRecord struct {
-	Txid        string
-	Type        TxType
-	Amount      uint64
-	CreatedAt   time.Time
-	ConfirmedAt int64
-	Settled     bool
+	CommitmentTxid string
+	VirtualTxid    string
+	Type           TxType
+	Amount         uint64
+	CreatedAt      time.Time
+	ConfirmedAt    int64
+	Settled        bool
 }
 
 type Page struct {