merge pull request

CREDITSCOM · Jul 30, 2020 · bd77a46 · bd77a46
2 parents d40cb08 + ab72a75
commit bd77a46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,5 +44,6 @@ Publish/
 sample.json
 node_info.json
 wal_bal.json
-tools/python/list_txs.json
-*.db
+[Pp]ublish
+/tools/python/list_txs.json
+*.db
diff --git a/WebApiNode/CS.Service/RestApiNode/MonitorService.Convert.cs b/WebApiNode/CS.Service/RestApiNode/MonitorService.Convert.cs
@@ -1,4 +1,5 @@
-using CS.Service.RestApiNode.Models;
+using CS.Service.Monitor;
+using CS.Service.RestApiNode.Models;
 using NodeApi;
 using System;
 
@@ -19,6 +20,7 @@ public TransactionInfo ToTransactionInfo(long idx, TransactionId id, Transaction
                 //Fee = Utils.ConvertCommission(tr.Fee.Commission, roundFee),
                 Fee = Utils.FeeByIndex(tr.Fee.Commission),
                 InnerId = tr.Id,
+                UserData = System.Text.Encoding.UTF8.GetString(tr.UserFields), 
                 Time = Utils.UnixTimeStampToDateTime(tr.TimeCreation),
                 Status = "Success",//?????????????????????????????????
                 Signature = Utils.ConvertHash(tr.Signature),