add utxoQuery

palletone · Aug 4, 2021 · fda81f1 · fda81f1
1 parent 21f1b69
commit fda81f1
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/ptnjson/txhistoryjson.go b/ptnjson/txhistoryjson.go
@@ -53,17 +53,18 @@ func ConvertTx2HistoryJson(tx *modules.TransactionWithUnitInfo, utxoQuery module
 		if m.App == modules.APP_PAYMENT {
 			pay := m.Payload.(*modules.PaymentPayload)
 
-			pj := ConvertPayment2Json(pay)
+			//pj := ConvertPayment2Json(pay)
+
+			pj := &PaymentJson{}
+			if utxoQuery == nil {
+				pj = ConvertPayment2Json(pay)
+				//json.Payment = pj
+			} else {
+				pj = ConvertPayment2JsonIncludeFromAddr(pay, utxoQuery)
+				//json.Payment = pj
+			}
 			payJson.Outputs = append(payJson.Outputs, pj.Outputs...)
 			payJson.Inputs = append(payJson.Inputs, pj.Inputs...)
-
-			//if utxoQuery == nil {
-			//	payJson := ConvertPayment2Json(pay)
-			//	json.Payment = payJson
-			//} else {
-			//	payJson := ConvertPayment2JsonIncludeFromAddr(pay, utxoQuery)
-			//	json.Payment = payJson
-			//}
 		} else if m.App == modules.APP_DATA {
 			data := m.Payload.(*modules.DataPayload)
 			json.Data = &DataJson{