增加公共黑名单、兑换完成后查询最新余额

Author: ZhangYiQiu

src/Telegram.CoinConvertBot/BgServices/BotHandler/UpdateHandlers.cs

@@ -306,6 +306,7 @@ async Task<Message> PriceTRX(ITelegramBotClient botClient, Message message)
         //通用回复
         static async Task<Message> Start(ITelegramBotClient botClient, Message message)
         {
+            var HideGithub = configuration.GetValue("HideGithub", false);
             string usage = @$"欢迎使用货币兑换服务！
 当前支持兑换以下币种：
 <code>USDT-TRC20 --> TRX</code>
@@ -315,7 +316,15 @@ static async Task<Message> Start(ITelegramBotClient botClient, Message message)
 
 如有需要，请联系管理员： {AdminUserUrl}
 ";
+            if (HideGithub)
+            {
+                usage = @$"欢迎使用货币兑换服务！
+当前支持兑换以下币种：
+<code>USDT-TRC20 --> TRX</code>
 
+如有需要，请联系管理员： {AdminUserUrl}
+";
+            }
             return await botClient.SendTextMessageAsync(chatId: message.Chat.Id,
                                                         text: usage,
                                                         parseMode: ParseMode.Html,

src/Telegram.CoinConvertBot/BgServices/TransferTrxService.cs

@@ -54,8 +54,14 @@ protected override async Task ExecuteAsync()
             {
                 return;
             }
+            #region 黑名单地址处理
             var BlackList = _configuration.GetSection("BlackList").Get<string[]>() ?? new string[0];
+            var PublicBlackList = _configuration.GetSection("PublicBlackList").Get<List<PublicBlackList>>() ?? new List<PublicBlackList>();
+            BlackList = BlackList.Concat(PublicBlackList.Select(x => x.Address)).Distinct().ToArray();
+            #endregion
+            var start = DateTime.Now.AddDays(-1);//仅查询一天内的交易
             var Orders = await _repository
+                .Where(x => x.CreateTime >= start)
                 .Where(x => x.OriginalCurrency == Currency.USDT)
                 .Where(x => x.Status == Status.Pending)
                 .Where(x => x.OriginalAmount >= UpdateHandlers.MinUSDT)
@@ -154,15 +160,6 @@ await _botClient.SendTextMessageAsync(bind.UserId, $@"<b>我们已向您发送{r
                         }
                         if (AdminUserId > 0)
                         {
-                            var _myTronConfig = provider.GetRequiredService<IOptionsSnapshot<MyTronConfig>>();
-                            var _wallet = provider.GetRequiredService<IWalletClient>();
-                            var protocol = _wallet.GetProtocol();
-                            var addr = _wallet.ParseAddress(_myTronConfig.Value.Address);
-                            var account = await protocol.GetAccountAsync(new TronNet.Protocol.Account
-                            {
-                                Address = addr
-                            });
-                            var TRX = Convert.ToDecimal(account.Balance) / 1_000_000L;
 
                             await _botClient.SendTextMessageAsync(AdminUserId, $@"<b>{record.ConvertCurrency}出账通知！({record.OriginalAmount:#.######} {record.OriginalCurrency} -> {record.ConvertAmount:#.######} {record.ConvertCurrency})</b>
 
@@ -171,10 +168,32 @@ await _botClient.SendTextMessageAsync(AdminUserId, $@"<b>{record.ConvertCurrency
 转出：<b>{record.ConvertAmount:#.######} {record.ConvertCurrency}</b>
 时间：<b>{record.PayTime:yyyy-MM-dd HH:mm:ss}</b>
 地址：<code>{record.FromAddress}</code>
------------------------------
-余额：<b>{TRX} TRX</b>
-已用带宽：<b>{account.FreeNetUsage + account.NetUsage}</b>
 ", Bot.Types.Enums.ParseMode.Html, replyMarkup: inlineKeyboard);
+#pragma warning disable CS4014
+                            Task.Run(async () =>
+                            {
+                                await Task.Delay(5000);//确保数据准确，延迟5秒再查询
+                                var _myTronConfig = provider.GetRequiredService<IOptionsSnapshot<MyTronConfig>>();
+                                var _wallet = provider.GetRequiredService<IWalletClient>();
+                                var _contractClientFactory = provider.GetRequiredService<IContractClientFactory>();
+                                var protocol = _wallet.GetProtocol();
+                                var addr = _wallet.ParseAddress(_myTronConfig.Value.Address);
+                                var account = await protocol.GetAccountAsync(new TronNet.Protocol.Account
+                                {
+                                    Address = addr
+                                });
+                                var TRX = Convert.ToDecimal(account.Balance) / 1_000_000L;
+                                var contractAddress = _myTronConfig.Value.USDTContractAddress;
+                                var contractClient = _contractClientFactory.CreateClient(ContractProtocol.TRC20);
+                                var USDT = await contractClient.BalanceOfAsync(contractAddress, _wallet.GetAccount(_myTronConfig.Value.PrivateKey));
+
+                                await _botClient.SendTextMessageAsync(AdminUserId, $@"<b>当前余额</b>
+
+TRX余额：<b>{TRX} TRX</b>
+USDT余额：<b>{USDT} USDT</b>
+", Bot.Types.Enums.ParseMode.Html, replyMarkup: inlineKeyboard);
+                            });
+#pragma warning restore CS4014
                         }
                     }
                     else

src/Telegram.CoinConvertBot/Models/PublicBlackList.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Telegram.CoinConvertBot.Models
+{
+    public class PublicBlackList
+    {
+        public string Name { get; set; }
+        public string Address { get; set; }
+    }
+}

src/Telegram.CoinConvertBot/Program.cs

@@ -1,4 +1,5 @@
 
+using Flurl.Http;
 using FreeSql;
 using FreeSql.DataAnnotations;
 using Microsoft.Extensions.Configuration;
@@ -15,14 +16,27 @@
 using Telegram.CoinConvertBot.Domains;
 using Telegram.CoinConvertBot.Models;
 using TronNet;
+using static TronNet.Protocol.Transaction.Types;
+
+const string Version = "v1.0.6";
 
 Log.Logger = new LoggerConfiguration()
     .MinimumLevel.Information()
     .WriteTo.Console()
     .CreateBootstrapLogger();
-
+Serilog.Log.Information("当前版本：{result}", Version);
+if (!System.IO.File.Exists("BlackList.json") || (DateTime.Now - System.IO.File.GetLastWriteTime("BlackList.json")).TotalDays > 1)
+{
+    var result = await "https://raw.githubusercontent.com/LightCountry/CoinConvertBot/master/json/BlackList.json"
+        .DownloadFileAsync("./");
+    Serilog.Log.Information("下载公共黑名单地址：{result}", result);
+}
+else
+{
+    Serilog.Log.Information("无需更新公共黑名单地址");
+}
 var host = Host.CreateDefaultBuilder(args);
-
+host.ConfigureAppConfiguration(config => config.AddJsonFile("BlackList.json", optional: false, reloadOnChange: true));
 host.UseSerilog((context, services, configuration) => configuration
                     .ReadFrom.Configuration(context.Configuration)
                     .ReadFrom.Services(services)
@@ -97,7 +111,7 @@ static void ConfigureServices(HostBuilderContext Context, IServiceCollection Ser
     Log.Logger.Information("开始{UseProxy}连接Telegram服务器...", (useProxy ? "使用代理" : "不使用代理"));
     var me = botClient.GetMeAsync().GetAwaiter().GetResult();
     UpdateHandlers.BotUserName = me.Username;
-    var SetDefaultMenu = Configuration.GetValue<bool>("SetDefaultMenu");
+    var SetDefaultMenu = Configuration.GetValue<bool>("SetDefaultMenu", true);
     if (SetDefaultMenu)
     {
         botClient.SetMyCommandsAsync(new BotCommand[]

src/Telegram.CoinConvertBot/appsettings.Example.json

@@ -42,5 +42,6 @@
   "USDTFeeRate": 0, //USDT手续费，设置0.01表示抽成1%，不足1U扣1U，设为0时不扣此项手续费
   "SendTo": 0, //目标群组的TG ID，通常是一个很大的负数 可以将@QueryCoinBot拉入群，发送查id获取群id
   "BlackList": [ "Txx1" ], //黑名单地址，不处理此地址的兑换请求，多个地址以逗号隔开
-  "SetDefaultMenu": true //设置默认菜单，机器人初始菜单
+  "SetDefaultMenu": true, //设置默认菜单，机器人初始菜单
+  "HideGithub": false //隐藏/start的项目宣传
 }