add tx "tree" to apitypes.TxShort

decred · Dec 9, 2022 · 1e883bb · 1e883bb
1 parent 5d2df4b
commit 1e883bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/api/types/apitypes.go b/api/types/apitypes.go
@@ -100,6 +100,7 @@ type TxShort struct {
 	Expiry   uint32 `json:"expiry"`
 	Vin      []Vin  `json:"vin"`
 	Vout     []Vout `json:"vout"`
+	Tree     int8   `json:"tree"`
 }
 
 // AgendasInfo holds the high level details about an agenda.

diff --git a/db/dcrpg/pgblockchain.go b/db/dcrpg/pgblockchain.go
@@ -4827,6 +4827,17 @@ func (pgb *ChainDB) GetAPITransaction(txid *chainhash.Hash) *apitypes.Tx {
 		return nil
 	}
 
+	msgTx, err := txhelpers.MsgTxFromHex(txraw.Hex)
+	if err != nil {
+		log.Errorf("Cannot create MsgTx for tx %v: %v", txid.String(), err)
+		return nil
+	}
+
+	treasuryActive := true
+	if txraw.BlockHeight > 0 {
+		treasuryActive = txhelpers.IsTreasuryActive(pgb.chainParams.Net, txraw.BlockHeight)
+	}
+
 	tx := &apitypes.Tx{
 		TxShort: apitypes.TxShort{
 			TxID:     txraw.Txid,
@@ -4836,6 +4847,7 @@ func (pgb *ChainDB) GetAPITransaction(txid *chainhash.Hash) *apitypes.Tx {
 			Expiry:   txraw.Expiry,
 			Vin:      make([]apitypes.Vin, len(txraw.Vin)),
 			Vout:     make([]apitypes.Vout, len(txraw.Vout)),
+			Tree:     txhelpers.TxTree(msgTx, treasuryActive),
 		},
 		Confirmations: txraw.Confirmations,
 		Block: &apitypes.BlockID{