Add onboard tx to tx history

Co-authored-by: Pietralberto Mazza <[email protected]>

Author: bordalix

pkg/client-sdk/covenant_client.go

@@ -521,10 +521,12 @@ func (a *covenantArkClient) GetTransactionHistory(ctx context.Context) ([]Transa
 		return nil, err
 	}
 
-	return vtxosToTxsCovenant(config.RoundLifetime, spendableVtxos, spentVtxos)
+	claimableUtxos, _ := a.getClaimableBoardingUtxos(ctx)
+
+	return vtxosToTxsCovenant(config.RoundLifetime, spendableVtxos, spentVtxos, claimableUtxos)
 }
 
-func vtxosToTxsCovenant(roundLifetime int64, spendable, spent []client.Vtxo) ([]Transaction, error) {
+func vtxosToTxsCovenant(roundLifetime int64, spendable, spent []client.Vtxo, claimableUtxos []explorer.Utxo) ([]Transaction, error) {
 	transactions := make([]Transaction, 0)
 
 	for _, v := range append(spendable, spent...) {
@@ -578,6 +580,17 @@ func vtxosToTxsCovenant(roundLifetime int64, spendable, spent []client.Vtxo) ([]
 		})
 	}
 
+	for _, u := range claimableUtxos {
+		transactions = append(transactions, Transaction{
+			Amount:       u.Amount,
+			BoardingTxid: u.Txid,
+			Type:         TxReceived,
+			Pending:      true,
+			Claimed:      false,
+			CreatedAt:    u.CreatedAt,
+		})
+	}
+
 	// Sort the slice by age
 	sort.Slice(transactions, func(i, j int) bool {
 		txi := transactions[i]

pkg/client-sdk/covenantless_client.go

@@ -649,10 +649,12 @@ func (a *covenantlessArkClient) GetTransactionHistory(ctx context.Context) ([]Tr
 	xxx, _ := a.getClaimableBoardingUtxos(ctx)
 	log.Infof("xxx %v", xxx)
 
-	return vtxosToTxsCovenantless(config.RoundLifetime, spendableVtxos, spentVtxos)
+	claimableUtxos, _ := a.getClaimableBoardingUtxos(ctx)
+
+	return vtxosToTxsCovenantless(config.RoundLifetime, spendableVtxos, spentVtxos, claimableUtxos)
 }
 
-func vtxosToTxsCovenantless(roundLifetime int64, spendable, spent []client.Vtxo) ([]Transaction, error) {
+func vtxosToTxsCovenantless(roundLifetime int64, spendable, spent []client.Vtxo, claimableUtxos []explorer.Utxo) ([]Transaction, error) {
 	transactions := make([]Transaction, 0)
 
 	for _, v := range append(spendable, spent...) {
@@ -706,6 +708,17 @@ func vtxosToTxsCovenantless(roundLifetime int64, spendable, spent []client.Vtxo)
 		})
 	}
 
+	for _, u := range claimableUtxos {
+		transactions = append(transactions, Transaction{
+			Amount:       u.Amount,
+			BoardingTxid: u.Txid,
+			Type:         TxReceived,
+			Pending:      true,
+			Claimed:      false,
+			CreatedAt:    u.CreatedAt,
+		})
+	}
+
 	// Sort the slice by age
 	sort.Slice(transactions, func(i, j int) bool {
 		txi := transactions[i]

pkg/client-sdk/explorer/explorer.go

@@ -31,6 +31,7 @@ type Utxo struct {
 	Asset       string // liquid only
 	Delay       uint
 	SpendableAt time.Time
+	CreatedAt   time.Time
 }
 
 func (u *Utxo) Sequence() (uint32, error) {
@@ -39,8 +40,10 @@ func (u *Utxo) Sequence() (uint32, error) {
 
 func newUtxo(explorerUtxo ExplorerUtxo, delay uint) Utxo {
 	utxoTime := explorerUtxo.Status.Blocktime
+	createdAt := time.Unix(utxoTime, 0)
 	if utxoTime == 0 {
-		utxoTime = time.Now().Unix()
+		createdAt = time.Now()
+		utxoTime = createdAt.Unix()
 	}
 
 	return Utxo{
@@ -50,6 +53,7 @@ func newUtxo(explorerUtxo ExplorerUtxo, delay uint) Utxo {
 		Asset:       explorerUtxo.Asset,
 		Delay:       delay,
 		SpendableAt: time.Unix(utxoTime, 0).Add(time.Duration(delay) * time.Second),
+		CreatedAt:   createdAt,
 	}
 }
 

pkg/client-sdk/types.go

@@ -139,11 +139,12 @@ const (
 type TxType string
 
 type Transaction struct {
-	RoundTxid  string
-	RedeemTxid string
-	Amount     uint64
-	Type       TxType
-	Pending    bool
-	Claimed    bool
-	CreatedAt  time.Time
+	BoardingTxid string
+	RoundTxid    string
+	RedeemTxid   string
+	Amount       uint64
+	Type         TxType
+	Pending      bool
+	Claimed      bool
+	CreatedAt    time.Time
 }