Merge remote-tracking branch origin/next-version into vtxo-chain-fix

Author: louisinger

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

@@ -1078,8 +1078,11 @@
         "spentBy": {
           "type": "string"
         },
-        "commitmentTxid": {
-          "type": "string"
+        "commitmentTxids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       }
     },

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

@@ -872,8 +872,11 @@
           "type": "string",
           "format": "int64"
         },
-        "commitmentTxid": {
-          "type": "string"
+        "commitmentTxids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
         "preconfirmed": {
           "type": "boolean"

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

@@ -280,7 +280,7 @@ message IndexerVtxo {
   bool is_redeemed = 8;
   bool is_spent = 9;
   string spent_by = 10;
-  string commitment_txid = 11;
+  repeated string commitment_txids = 11;
 }
 
 message IndexerChain {

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

@@ -25,7 +25,7 @@ message Vtxo {
   string script = 3;
   int64 created_at = 4;
   int64 expires_at = 5;
-  string commitment_txid = 6;
+  repeated string commitment_txids = 6;
   bool preconfirmed = 7;
   bool swept = 8;
   bool redeemed = 9;

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

@@ -975,30 +975,7 @@ func (a *covenantlessArkClient) GetTransactionHistory(
 		return history, nil
 	}
 
-	spendableVtxos, spentVtxos, err := a.ListVtxos(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	boardingTxs, commitmentTxsToIgnore, err := a.getBoardingTxs(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	offchainTxs, err := vtxosToTxHistory(
-		spendableVtxos, spentVtxos, commitmentTxsToIgnore, a.indexer,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	history := append(boardingTxs, offchainTxs...)
-	// Sort the slice by age
-	sort.SliceStable(history, func(i, j int) bool {
-		return history[i].CreatedAt.IsZero() || history[i].CreatedAt.After(history[j].CreatedAt)
-	})
-
-	return history, nil
+	return a.fetchTxHistory(ctx)
 }
 
 func (a *covenantlessArkClient) RegisterIntent(
@@ -1114,25 +1091,16 @@ func (a *covenantlessArkClient) listenForArkTxs(ctx context.Context) {
 
 func (a *covenantlessArkClient) refreshDb(ctx context.Context) error {
 	// fetch new data
-	spendableVtxos, spentVtxos, err := a.ListVtxos(ctx)
+	history, err := a.fetchTxHistory(ctx)
 	if err != nil {
 		return err
 	}
-
-	boardingTxs, commitmentTxsToIgnore, err := a.getBoardingTxs(ctx)
-	if err != nil {
-		return err
-	}
-
-	offchainTxs, err := vtxosToTxHistory(
-		spendableVtxos, spentVtxos, commitmentTxsToIgnore, a.indexer,
-	)
+	spendableVtxos, spentVtxos, err := a.ListVtxos(ctx)
 	if err != nil {
 		return err
 	}
 
-	newTxs := append(offchainTxs, boardingTxs...)
-	if err := a.refreshTxDb(newTxs); err != nil {
+	if err := a.refreshTxDb(history); err != nil {
 		return err
 	}
 
@@ -3030,17 +2998,7 @@ func (a *covenantlessArkClient) handleCommitmentTx(
 
 	for _, vtxo := range commitmentTx.SpendableVtxos {
 		if _, ok := myPubkeys[vtxo.Script]; ok {
-			vtxosToAdd = append(vtxosToAdd, types.Vtxo{
-				VtxoKey: types.VtxoKey{
-					Txid: vtxo.Txid,
-					VOut: vtxo.VOut,
-				},
-				Script:         vtxo.Script,
-				Amount:         vtxo.Amount,
-				CommitmentTxid: vtxo.CommitmentTxid,
-				ExpiresAt:      vtxo.ExpiresAt,
-				CreatedAt:      time.Now(),
-			})
+			vtxosToAdd = append(vtxosToAdd, vtxo)
 		}
 	}
 
@@ -3333,3 +3291,41 @@ func (a *covenantlessArkClient) handleOptions(
 
 	return sessions, signerPubKeys, nil
 }
+
+func (a *covenantlessArkClient) fetchTxHistory(ctx context.Context) ([]types.Transaction, error) {
+	_, offchainAddrs, _, _, err := a.wallet.GetAddresses(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	indexedHistory := make(map[string]types.Transaction)
+	for _, addr := range offchainAddrs {
+		resp, err := a.indexer.GetTransactionHistory(ctx, addr.Address)
+		if err != nil {
+			return nil, err
+		}
+		for _, tx := range resp.History {
+			indexedHistory[tx.String()] = tx
+		}
+	}
+
+	boardingTxs, commitmentTxsToIgnore, err := a.getBoardingTxs(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	for txid := range commitmentTxsToIgnore {
+		delete(indexedHistory, txid)
+	}
+
+	allHistory := append([]types.Transaction{}, boardingTxs...)
+	for _, tx := range indexedHistory {
+		allHistory = append(allHistory, tx)
+	}
+
+	sort.SliceStable(allHistory, func(i, j int) bool {
+		return allHistory[i].CreatedAt.IsZero() || allHistory[i].CreatedAt.After(allHistory[j].CreatedAt)
+	})
+
+	return allHistory, nil
+}

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

@@ -116,16 +116,16 @@ func (v vtxo) toVtxo() types.Vtxo {
 			Txid: v.GetOutpoint().GetTxid(),
 			VOut: v.GetOutpoint().GetVout(),
 		},
-		Script:         v.GetScript(),
-		Amount:         v.GetAmount(),
-		CommitmentTxid: v.GetCommitmentTxid(),
-		CreatedAt:      time.Unix(v.GetCreatedAt(), 0),
-		ExpiresAt:      time.Unix(v.GetExpiresAt(), 0),
-		Preconfirmed:   v.GetPreconfirmed(),
-		Swept:          v.GetSwept(),
-		Redeemed:       v.GetRedeemed(),
-		Spent:          v.GetSpent(),
-		SpentBy:        v.GetSpentBy(),
+		Script:          v.GetScript(),
+		Amount:          v.GetAmount(),
+		CommitmentTxids: v.GetCommitmentTxids(),
+		CreatedAt:       time.Unix(v.GetCreatedAt(), 0),
+		ExpiresAt:       time.Unix(v.GetExpiresAt(), 0),
+		Preconfirmed:    v.GetPreconfirmed(),
+		Swept:           v.GetSwept(),
+		Redeemed:        v.GetRedeemed(),
+		Spent:           v.GetSpent(),
+		SpentBy:         v.GetSpentBy(),
 	}
 }
 

pkg/client-sdk/client.go

@@ -542,16 +542,16 @@ func vtxosFromRest(restVtxos []*models.V1Vtxo) []types.Vtxo {
 				Txid: v.Outpoint.Txid,
 				VOut: uint32(v.Outpoint.Vout),
 			},
-			Script:         v.Script,
-			Amount:         uint64(amount),
-			CommitmentTxid: v.CommitmentTxid,
-			ExpiresAt:      expiresAt,
-			CreatedAt:      createdAt,
-			Preconfirmed:   v.Preconfirmed,
-			Swept:          v.Swept,
-			Redeemed:       v.Redeemed,
-			Spent:          v.Spent,
-			SpentBy:        v.SpentBy,
+			Script:          v.Script,
+			Amount:          uint64(amount),
+			CommitmentTxids: v.CommitmentTxids,
+			ExpiresAt:       expiresAt,
+			CreatedAt:       createdAt,
+			Preconfirmed:    v.Preconfirmed,
+			Swept:           v.Swept,
+			Redeemed:        v.Redeemed,
+			Spent:           v.Spent,
+			SpentBy:         v.SpentBy,
 		}
 	}
 	return vtxos

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

@@ -375,16 +375,21 @@ func (a *grpcClient) GetTransactionHistory(
 		return nil, err
 	}
 
-	history := make([]indexer.TxHistoryRecord, 0, len(resp.GetHistory()))
+	history := make([]types.Transaction, 0, len(resp.GetHistory()))
 	for _, record := range resp.GetHistory() {
-		history = append(history, indexer.TxHistoryRecord{
-			CommitmentTxid: record.GetCommitmentTxid(),
-			ArkTxid:        record.GetVirtualTxid(),
-			Type:           indexer.TxType(record.GetType()),
-			Amount:         record.GetAmount(),
-			CreatedAt:      record.GetCreatedAt(),
-			IsSettled:      record.GetIsSettled(),
-			SettledBy:      record.GetSettledBy(),
+		txType := types.TxSent
+		if record.GetType() == arkv1.IndexerTxType_INDEXER_TX_TYPE_RECEIVED {
+			txType = types.TxReceived
+		}
+		history = append(history, types.Transaction{
+			TransactionKey: types.TransactionKey{
+				CommitmentTxid: record.GetCommitmentTxid(),
+				ArkTxid:        record.GetVirtualTxid(),
+			},
+			Type:      txType,
+			Amount:    record.GetAmount(),
+			CreatedAt: time.Unix(record.GetCreatedAt(), 0),
+			Settled:   record.GetIsSettled(),
 		})
 	}
 
@@ -580,15 +585,15 @@ func newIndexerVtxo(vtxo *arkv1.IndexerVtxo) types.Vtxo {
 			Txid: vtxo.GetOutpoint().GetTxid(),
 			VOut: vtxo.GetOutpoint().GetVout(),
 		},
-		Script:         vtxo.GetScript(),
-		CommitmentTxid: vtxo.GetCommitmentTxid(),
-		Amount:         vtxo.GetAmount(),
-		CreatedAt:      time.Unix(vtxo.GetCreatedAt(), 0),
-		ExpiresAt:      time.Unix(vtxo.GetExpiresAt(), 0),
-		Preconfirmed:   vtxo.GetIsPreconfirmed(),
-		Swept:          vtxo.GetIsSwept(),
-		Spent:          vtxo.GetIsSpent(),
-		Redeemed:       vtxo.GetIsRedeemed(),
-		SpentBy:        vtxo.GetSpentBy(),
+		Script:          vtxo.GetScript(),
+		CommitmentTxids: vtxo.GetCommitmentTxids(),
+		Amount:          vtxo.GetAmount(),
+		CreatedAt:       time.Unix(vtxo.GetCreatedAt(), 0),
+		ExpiresAt:       time.Unix(vtxo.GetExpiresAt(), 0),
+		Preconfirmed:    vtxo.GetIsPreconfirmed(),
+		Swept:           vtxo.GetIsSwept(),
+		Spent:           vtxo.GetIsSpent(),
+		Redeemed:        vtxo.GetIsRedeemed(),
+		SpentBy:         vtxo.GetSpentBy(),
 	}
 }

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

@@ -368,7 +368,7 @@ func (a *restClient) GetTransactionHistory(
 		return nil, err
 	}
 
-	history := make([]indexer.TxHistoryRecord, 0, len(resp.Payload.History))
+	history := make([]types.Transaction, 0, len(resp.Payload.History))
 	for _, record := range resp.Payload.History {
 		amount, err := strconv.ParseUint(record.Amount, 10, 64)
 		if err != nil {
@@ -380,29 +380,27 @@ func (a *restClient) GetTransactionHistory(
 		}
 
 		// Use a zero value for TxType if Type is nil, otherwise use a numeric conversion
-		var txType indexer.TxType
+		var txType types.TxType
 		if record.Type != nil {
 			// Convert the string enum to a numeric value
 			typeStr := string(*record.Type)
 			switch typeStr {
 			case "INDEXER_TX_TYPE_RECEIVED":
-				txType = indexer.TxTypeReceived
+				txType = types.TxReceived
 			case "INDEXER_TX_TYPE_SENT":
-				txType = indexer.TxTypeSent
-			default:
-				// Default to unspecified for unknown types
-				txType = indexer.TxTypeUnspecified
+				txType = types.TxSent
 			}
 		}
 
-		history = append(history, indexer.TxHistoryRecord{
-			CommitmentTxid: record.CommitmentTxid,
-			ArkTxid:        record.VirtualTxid,
-			Type:           txType,
-			Amount:         amount,
-			CreatedAt:      createdAt,
-			IsSettled:      record.IsSettled,
-			SettledBy:      record.SettledBy,
+		history = append(history, types.Transaction{
+			TransactionKey: types.TransactionKey{
+				CommitmentTxid: record.CommitmentTxid,
+				ArkTxid:        record.VirtualTxid,
+			},
+			Type:      txType,
+			Amount:    amount,
+			CreatedAt: time.Unix(createdAt, 0),
+			Settled:   record.IsSettled,
 		})
 	}
 
@@ -700,15 +698,15 @@ func newIndexerVtxo(vtxo *models.V1IndexerVtxo) (*types.Vtxo, error) {
 			Txid: vtxo.Outpoint.Txid,
 			VOut: uint32(vtxo.Outpoint.Vout),
 		},
-		Script:         vtxo.Script,
-		CommitmentTxid: vtxo.CommitmentTxid,
-		Amount:         amount,
-		CreatedAt:      time.Unix(createdAt, 0),
-		ExpiresAt:      time.Unix(expiresAt, 0),
-		Preconfirmed:   vtxo.IsPreconfirmed,
-		Swept:          vtxo.IsSwept,
-		Redeemed:       vtxo.IsRedeemed,
-		Spent:          vtxo.IsSpent,
-		SpentBy:        vtxo.SpentBy,
+		Script:          vtxo.Script,
+		CommitmentTxids: vtxo.CommitmentTxids,
+		Amount:          amount,
+		CreatedAt:       time.Unix(createdAt, 0),
+		ExpiresAt:       time.Unix(expiresAt, 0),
+		Preconfirmed:    vtxo.IsPreconfirmed,
+		Swept:           vtxo.IsSwept,
+		Redeemed:        vtxo.IsRedeemed,
+		Spent:           vtxo.IsSpent,
+		SpentBy:         vtxo.SpentBy,
 	}, nil
 }