切换数据查询Api，增加静态汇率设置

ZhangYiQiu · ZhangYiQiu · commit b9418e18a1b7 · 2022-09-28T23:25:13.000+08:00
diff --git a/src/Telegram.CoinConvertBot/BgServices/USDT_TRC20Service.cs b/src/Telegram.CoinConvertBot/BgServices/USDT_TRC20Service.cs
@@ -8,11 +8,11 @@
 using Microsoft.Extensions.Options;
 using Telegram.Bot;
 using Telegram.CoinConvertBot.BgServices.Base;
-using Telegram.CoinConvertBot.BgServices.BotHandler;
 using Telegram.CoinConvertBot.Domains.Tables;
 using Telegram.CoinConvertBot.Extensions;
 using Telegram.CoinConvertBot.Helper;
 using Telegram.CoinConvertBot.Models;
+using Telegram.CoinConvertBot.Models.TronModel;
 
 namespace Telegram.CoinConvertBot.BgServices
 {
@@ -21,16 +21,19 @@ public class USDT_TRC20Service : BaseScheduledService
         private readonly ILogger<USDT_TRC20Service> _logger;
         private readonly IConfiguration _configuration;
         private readonly ITelegramBotClient _botClient;
+        private readonly IHostEnvironment _env;
         private readonly IServiceProvider _serviceProvider;
 
         public USDT_TRC20Service(ILogger<USDT_TRC20Service> logger,
             IConfiguration configuration,
             ITelegramBotClient botClient,
-            IServiceProvider serviceProvider) : base("USDT-TRC20记录检测", TimeSpan.FromSeconds(30), logger)
+            IHostEnvironment env,
+            IServiceProvider serviceProvider) : base("USDT-TRC20记录检测", TimeSpan.FromSeconds(10), logger)
         {
             _logger = logger;
             _configuration = configuration;
             _botClient = botClient;
+            _env = env;
             _serviceProvider = serviceProvider;
         }
 
@@ -44,50 +47,61 @@ protected override async Task ExecuteAsync()
             var _bindRepository = provider.GetRequiredService<IBaseRepository<TokenBind>>();
 
             var payMinTime = DateTime.Now.AddSeconds(-60 * 5);
-            var payMaxTime = DateTime.Now;
             var addressArray = _configuration.GetSection("Address:USDT-TRC20").Get<string[]>();
             if (addressArray.Length == 0)
             {
                 _logger.LogWarning("未配置USDT收款地址！");
                 return;
             }
+            var ContractAddress = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
+            var BaseUrl = "https://api.trongrid.io";
+            if (!_env.IsProduction())
+            {
+                ContractAddress = "TG3XXyExBkPp9nzdajDZsozEu4BkaSJozs";
+                BaseUrl = "https://api.shasta.trongrid.io";
+            }
             foreach (var address in addressArray)
             {
 
-                var data = new
-                {
-                    start = 0,
-                    limit = 200,
-                    direction = "in",
-                    tokens = _myTronConfig.Value.USDTContractAddress,
-                    relatedAddress = address,
-                    toAddress = address,
-                    start_timestamp = (long)payMinTime.ToUnixTimeStamp(),
-                    end_timestamp = (long)payMaxTime.ToUnixTimeStamp()
-                };
-                var transfers = await _myTronConfig.Value.ApiHost
-                    .AppendPathSegment("api/token_trc20/transfers")
-                    .SetQueryParams(data)
-                    .GetJsonAsync();
-                if (transfers.total > 0)
+                var query = new Dictionary<string, object>();
+                query.Add("only_confirmed", true);
+                query.Add("only_to", true);
+                query.Add("limit", 50);
+                query.Add("min_timestamp", (long)payMinTime.ToUnixTimeStamp());
+                query.Add("contract_address", ContractAddress);
+                var req = BaseUrl
+                    .AppendPathSegment($"v1/accounts/{address}/transactions/trc20")
+                    .SetQueryParams(query)
+                    .WithTimeout(15);
+                if (_env.IsProduction())
+                    req = req.WithHeader("TRON-PRO-API-KEY", _configuration.GetValue("TRON-PRO-API-KEY", ""));
+                var result = await req
+                    .GetJsonAsync<BaseResponse<Transactions>>();
+
+                if (result.Success && result.Data?.Count > 0)
                 {
-                    var list = (IList<dynamic>)transfers.token_transfers;
-                    foreach (var item in list)
+                    foreach (var item in result.Data)
                     {
-                        //收款地址相同，已确认的订单
-                        if (item.to_address != address || item.finalResult != "SUCCESS") continue;
+                        //合约地址不匹配
+                        if (item.TokenInfo?.Address != ContractAddress)
+                        {
+                            continue;
+                        }
+                        //收款地址相同
+                        if (item.To != address) continue;
                         //实际支付金额
-                        var amount = Convert.ToDecimal(item.quant) / 1_000_000;
+                        var amount = item.Amount;
                         var record = new TokenRecord
                         {
-                            BlockTransactionId = item.transaction_id,
-                            FromAddress = item.from_address,
-                            ToAddress = item.to_address,
+                            BlockTransactionId = item.TransactionId,
+                            FromAddress = item.From,
+                            ToAddress = item.To,
+                            //ContractAddress = item.TokenInfo.Address,
                             OriginalAmount = amount,
                             OriginalCurrency = Currency.USDT,
                             ConvertCurrency = Currency.TRX,
                             Status = Status.Pending,
-                            ReceiveTime = ((long)item.block_ts).ToDateTime()
+                            ReceiveTime = item.BlockTimestamp.ToDateTime()
                         };
                         if (!await _repository.Where(x => x.BlockTransactionId == record.BlockTransactionId).AnyAsync())
                         {
@@ -96,7 +110,7 @@ protected override async Task ExecuteAsync()
                             var AdminUserId = _configuration.GetValue<long>("BotConfig:AdminUserId");
                             try
                             {
-                                var viewUrl = $"https://nile.tronscan.org/#/transaction/{record.BlockTransactionId}";
+                                var viewUrl = $"https://shasta.tronscan.org/#/transaction/{record.BlockTransactionId}";
                                 if (hostEnvironment.IsProduction())
                                 {
                                     viewUrl = $"https://tronscan.org/#/transaction/{record.BlockTransactionId}";
@@ -109,21 +123,19 @@ protected override async Task ExecuteAsync()
                                                 Bot.Types.ReplyMarkups.InlineKeyboardButton.WithUrl("查看区块",viewUrl),
                                             },
                                     });
-                                var _rateRepository = provider.GetRequiredService<IBaseRepository<TokenRate>>();
-                                var rate = await _rateRepository.Where(x => x.Currency == Currency.USDT && x.ConvertCurrency == Currency.TRX).FirstAsync(x => x.Rate);
+
                                 var binds = await _bindRepository.Where(x => x.Currency == Currency.TRX && x.Address == record.FromAddress).ToListAsync();
                                 if (binds.Count > 0)
                                 {
                                     foreach (var bind in binds)
                                     {
                                         try
                                         {
-                                            await _botClient.SendTextMessageAsync(bind.UserId, $@"<b>我们已经收到您的USDT</b>
+                                            await _botClient.SendTextMessageAsync(bind.UserId, $@"<b>我们已经收到您转出的USDT</b>
 金额：<b>{record.OriginalAmount:#.######} {record.OriginalCurrency}</b>
 哈希：<code>{record.BlockTransactionId}</code>
 时间：<b>{record.ReceiveTime:yyyy-MM-dd HH:mm:ss}</b>
 地址：<code>{record.FromAddress}</code>
-预估：<b>{record.OriginalAmount.USDT_To_TRX(rate, UpdateHandlers.FeeRate)} TRX</b>
 
 您的兑换申请已进入队列，预计5分钟内转入您的账户！
 ", Bot.Types.Enums.ParseMode.Html, replyMarkup: inlineKeyboard);
@@ -136,13 +148,17 @@ await _botClient.SendTextMessageAsync(bind.UserId, $@"<b>我们已经收到您
                                 }
                                 if (AdminUserId > 0)
                                 {
+                                    var _rateRepository = provider.GetRequiredService<IBaseRepository<TokenRate>>();
+                                    var rate = await _rateRepository.Where(x => x.Currency == Currency.USDT && x.ConvertCurrency == Currency.TRX).FirstAsync(x => x.Rate);
                                     await _botClient.SendTextMessageAsync(AdminUserId, $@"<b>USDT入账通知！({record.OriginalAmount:#.######} {record.OriginalCurrency})</b>
 
 订单：<code>{record.BlockTransactionId}</code>
+原币：<b>{record.OriginalCurrency}</b>
 转入：<b>{record.OriginalAmount:#.######} {record.OriginalCurrency}</b>
 来源：<code>{record.FromAddress}</code>
 接收：<code>{record.ToAddress}</code>
-预估：<b>{record.OriginalAmount.USDT_To_TRX(rate, UpdateHandlers.FeeRate)} TRX</b>
+转换：<b>{record.ConvertCurrency}</b>
+预估：<b>{record.OriginalAmount.USDT_To_TRX(rate)} TRX</b>
 时间：<b>{record.ReceiveTime:yyyy-MM-dd HH:mm:ss}</b>
 ", Bot.Types.Enums.ParseMode.Html, replyMarkup: inlineKeyboard);
                                 }
diff --git a/src/Telegram.CoinConvertBot/BgServices/UpdateRateService.cs b/src/Telegram.CoinConvertBot/BgServices/UpdateRateService.cs
@@ -38,50 +38,66 @@ public UpdateRateService(
 
         protected override async Task ExecuteAsync()
         {
+            var list = new List<TokenRate>();
             _logger.LogInformation("------------------{tips}------------------", "开始更新汇率");
             using IServiceScope scope = _serviceProvider.CreateScope();
             var _repository = scope.ServiceProvider.GetRequiredService<IBaseRepository<TokenRate>>();
 
-            var list = new List<TokenRate>();
-            var side = "buy";
-            try
+            var rate = _configuration.GetValue("TrxRate", 0m);
+            if (rate > 0)
+            {
+                list.Add(new TokenRate
+                {
+                    Id = $"USDT_{Currency.TRX}",
+                    Currency = Currency.USDT,
+                    ConvertCurrency = Currency.TRX,
+                    LastUpdateTime = DateTime.Now,
+                    Rate = rate,
+                    ReverseRate = 1m / rate,
+                });
+            }
+            else
             {
+                var side = "buy";
+                try
+                {
 
-                var convert1 = await baseUrl
-                    .WithClient(client)
-                    .WithHeaders(new { User_Agent })
-                    .AppendPathSegment("v2/asset/quick/exchange/quote")
-                    //.SetQueryParams()
-                    .PostJsonAsync(new
+                    var convert1 = await baseUrl
+                        .WithClient(client)
+                        .WithHeaders(new { User_Agent })
+                        .AppendPathSegment("v2/asset/quick/exchange/quote")
+                        //.SetQueryParams()
+                        .PostJsonAsync(new
+                        {
+                            side,
+                            baseCcy = Currency.TRX.ToString(),
+                            quoteCcy = Currency.USDT.ToString(),
+                            rfqSz = 1,
+                            rfqSzCcy = Currency.USDT.ToString(),
+                        })
+                        .ReceiveJson<Root>();
+                    if (convert1.code == 0)
                     {
-                        side,
-                        baseCcy = Currency.TRX.ToString(),
-                        quoteCcy = Currency.USDT.ToString(),
-                        rfqSz = 1,
-                        rfqSzCcy = Currency.USDT.ToString(),
-                    })
-                    .ReceiveJson<Root>();
-                if (convert1.code == 0)
-                {
-                    list.Add(new TokenRate
+                        list.Add(new TokenRate
+                        {
+                            Id = $"USDT_{Currency.TRX}",
+                            Currency = Currency.USDT,
+                            ConvertCurrency = Currency.TRX,
+                            LastUpdateTime = DateTime.Now,
+                            Rate = convert1.data.askBaseSz,
+                            ReverseRate = convert1.data.askPx,
+                        });
+                    }
+                    else
                     {
-                        Id = $"USDT_{Currency.TRX}",
-                        Currency = Currency.USDT,
-                        ConvertCurrency = Currency.TRX,
-                        LastUpdateTime = DateTime.Now,
-                        Rate = convert1.data.askBaseSz,
-                        ReverseRate = convert1.data.askPx,
-                    });
+                        //_logger.LogWarning("TRX -> USDT 汇率获取失败！错误信息：{msg}", convert1.msg ?? convert1.error_message);
+                    }
                 }
-                else
+                catch (Exception e)
                 {
-                    //_logger.LogWarning("TRX -> USDT 汇率获取失败！错误信息：{msg}", convert1.msg ?? convert1.error_message);
+                    _logger.LogWarning("TRX -> USDT 汇率获取失败！错误信息：{msg}", e?.InnerException?.Message + "; " + e?.Message);
                 }
             }
-            catch (Exception e)
-            {
-                _logger.LogWarning("TRX -> USDT 汇率获取失败！错误信息：{msg}", e?.InnerException?.Message + "; " + e?.Message);
-            }
 
             foreach (var item in list)
             {
diff --git a/src/Telegram.CoinConvertBot/Models/TronModel/BaseResponse.cs b/src/Telegram.CoinConvertBot/Models/TronModel/BaseResponse.cs
@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace Telegram.CoinConvertBot.Models.TronModel
+{
+#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
+    public class Meta
+    {
+        [JsonProperty("at")]
+        public long At { get; set; }
+
+        [JsonProperty("page_size")]
+        public int PageSize { get; set; }
+    }
+
+    public class BaseResponse<T>
+    {
+        [JsonProperty("data")]
+        public List<T> Data { get; set; }
+
+        [JsonProperty("success")]
+        public bool Success { get; set; }
+
+        [JsonProperty("meta")]
+        public Meta Meta { get; set; }
+    }
+#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
+}
diff --git a/src/Telegram.CoinConvertBot/Models/TronModel/Transactions.cs b/src/Telegram.CoinConvertBot/Models/TronModel/Transactions.cs
@@ -0,0 +1,49 @@
+using Newtonsoft.Json;
+
+namespace Telegram.CoinConvertBot.Models.TronModel
+{
+#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
+    public class Transactions
+    {
+        [JsonProperty("transaction_id")]
+        public string TransactionId { get; set; }
+
+        [JsonProperty("token_info")]
+        public TokenInfo TokenInfo { get; set; }
+
+        [JsonProperty("block_timestamp")]
+        public long BlockTimestamp { get; set; }
+
+        [JsonProperty("from")]
+        public string From { get; set; }
+
+        [JsonProperty("to")]
+        public string To { get; set; }
+
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("value")]
+        public decimal Value { get; set; }
+        /// <summary>
+        /// 实际USDT金额，需要计算精度
+        /// </summary>
+        public decimal Amount => Value / 1_000_000;
+    }
+
+    public class TokenInfo
+    {
+        [JsonProperty("symbol")]
+        public string Symbol { get; set; }
+
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("decimals")]
+        public int Decimals { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
+}
diff --git a/src/Telegram.CoinConvertBot/appsettings.Example.json b/src/Telegram.CoinConvertBot/appsettings.Example.json
@@ -37,5 +37,6 @@
   "MinToken": {
     "USDT": 5 //最小兑换USDT数量
   },
+  "TrxRate": 0,//1 USDT兑换的TRX汇率，不设置或设为0使用实时汇率
   "FeeRate": 0.1 //从最终用户获取的TRX中的抽成比例，默认10%
 }

Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,6 @@`
`37`	`37`	`"MinToken": {`
`38`	`38`	`"USDT": 5 //最小兑换USDT数量`
`39`	`39`	`},`
	`40`	`+ "TrxRate": 0,//1 USDT兑换的TRX汇率，不设置或设为0使用实时汇率`
`40`	`41`	`"FeeRate": 0.1 //从最终用户获取的TRX中的抽成比例，默认10%`
`41`	`42`	`}`