abot-info 0.1.1 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127b62eb518c63d6b7ba0bbcccc85ef22964b44555d92a1dae386dd48dcae3ae
-  data.tar.gz: b82f5cb6291ee3e612982fda79fb5430694f6fd0127f41ecaae9f9e1c57620af
+  metadata.gz: c356808904955eec165f429c9a0012bc095865983303853d48ff09239e988e19
+  data.tar.gz: 930de8a6a519242048f9e02603090cdd9560c8040866ec0d23f80b3affa2062e
 SHA512:
-  metadata.gz: 03e4168d791452a1faccaa0ac91754101df5d9db3e7f1916dd116686cede9d4df51d9c89c71623c8c08804ab03c3726ce4b0579026e0ba9577c49162bdd165fe
-  data.tar.gz: f74ff5924ec5bb3270e4503f5c30dacbda788837a48543deafc255a43e665c4b7211fed1a97d04e145480fb7364926697f084c6c804ef88edc10173dd321ef1c
+  metadata.gz: a5fbf25ee4fc34c87213f122de255590ae13e316741b0d049f6bde84dd3cacb52f10e8a002eafb6c4eb269b13f4396e8ea06d6d99acf6f2763d59f29dfbe448d
+  data.tar.gz: f833ee553da12be027dd6e72ebc2544527ec2e64e9080939b2bcbc15628675111e70c1caaf691cbfca2229540bb2778f64c0a0a7f46e3777ca129ebbe7ad35cb

data/Gemfile

@@ -5,3 +5,4 @@ gem 'paint', '~> 2.2.1'
 gem 'sqlite3', '~> 1.4.2'
 gem 'terminal-table', '~> 3.0.1'
 gem 'binance-ruby', '~> 1.3.1'
+gem 'telegram-bot-ruby', '~> 0.16.0'

data/abot-info.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3", '~> 1.4.2'
   spec.add_dependency "terminal-table", '~> 3.0.1'
   spec.add_dependency "binance-ruby", '~> 1.3.1'
+  spec.add_dependency 'telegram-bot-ruby', '~> 0.16.0'
 end

data/lib/abot/info/binance_account.rb

@@ -79,6 +79,33 @@ module Abot
         symbol_info(symbol).try(:[], :highPrice).to_f
       end
 
+      def coins_without_order(quote_assets)
+        exception_coins = quote_assets + ['BNB'] + Coin::FIAT
+        balances = account_info[:balances]
+        result = balances.select do |s|
+          s[:free].to_f != 0 &&
+            !exception_coins.include?(s[:asset]) &&
+            symbol_info(s[:asset] + 'USDT').try(:[], :askPrice).to_f * s[:free].to_f > 5 &&
+            (
+              begin
+                btcusdt = get_symbols.find { |f| f[:symbol] == 'BTCUSDT' }[:askPrice].to_f
+                if s[:asset] == 'BTC'
+                  symbol_info("#{s[:asset]}USDT").try(:[], :askPrice).to_f * s[:free].to_f > 5
+                elsif get_symbols.find { |f| f[:symbol] == "#{s[:asset]}USDT" }.nil?
+                  coin = get_symbols.find { |f| f[:symbol] == "#{name}BTC" }
+                  coin[:askPrice].to_f * s[:free].to_f * btcusdt > 5
+                else
+                  coin = get_symbols.find { |f| f[:symbol] == "#{s[:asset]}USDT" }
+                  coin[:askPrice].to_f * s[:free].to_f > 5
+                end
+              rescue StandardError
+                false
+              end
+            )
+        end
+        result.pluck(:asset)
+      end
+
       private
 
       def calculation_current_balance_btc

data/lib/abot/info/coin.rb

@@ -8,9 +8,11 @@ module Abot
       include Abot::Info::Coin::CoinDecorator
 
       attr_reader :base_asset, :quote_asset, :average_price, :current_price, :sell_price, :volume, :num_averaging,
-                  :total_quote, :buy_price, :step_averaging, :tick_size, :account, :timer, :trade_params
+                  :total_quote, :buy_price, :step_averaging, :tick_size, :account, :timer, :trade_params,
+                  :pump_detector
+
+      FIAT = %w[USDT BUSD AUD BIDR BRL EUR GBR RUB TRY TUSD USDC DAI IDRT PAX UAH NGN VAI BVND]
 
-      FIAT = ['USDT', 'BUSD', 'AUD', 'BIDR', 'BRL', 'EUR', 'GBR', 'RUB', 'TRY', 'TUSD', 'USDC', 'DAI', 'IDRT', 'PAX', 'UAH', 'NGN', 'VAI', 'BVND']
 
       def initialize(options = {})
         @trade_params = options[:trade_params]
@@ -27,6 +29,7 @@ module Abot
         @step_averaging = options[:step_averaging]
         @tick_size = options[:tick_size]
         @timer = options[:timer]
+        @pump_detector = options[:pump_detector]
       end
 
       def self.current_coins(account, trade_params)
@@ -46,6 +49,7 @@ module Abot
             step_averaging: coin['stepAveraging'].to_f,
             tick_size: coin['tickSize'],
             timer: coin['timer'].to_s[0..9],
+            pump_detector: coin['pumpDetector'],
           )
         end
       end
@@ -74,6 +78,10 @@ module Abot
         @percent_to_order ||= ((sell_price / current_price - 1) * 100)
       end
 
+      def percent_from_order
+        @percent_from_order ||= ((1 - current_price / sell_price) * 100)
+      end
+
       def percent_from_min_to_average
         @percent_to_min ||= ((min_price / next_average_price - 1) * 100)
       end
@@ -82,6 +90,10 @@ module Abot
         @percent_to_max ||= ((sell_price / max_price - 1) * 100)
       end
 
+      def percent_from_max
+        @percent_from_max ||= ((1 - max_price / sell_price) * 100)
+      end
+
       def min_price
         @min_price ||= account.symbol_min_price(symbol)
       end

data/lib/abot/info/database_table.rb

@@ -14,6 +14,8 @@ module Abot
       API_KEY_TABLE = BASE_CONNECTION.execute('SELECT * FROM api_key').freeze
       API_KEY = API_KEY_TABLE.first['api'].freeze
       SECRET_KEY = API_KEY_TABLE.first['secret'].freeze
+      TG_TOKEN = API_KEY_TABLE.first['tg_token'].freeze
+      TG_NAME = API_KEY_TABLE.first['tg_name'].freeze
 
       class << self
         def data_coins
@@ -25,7 +27,7 @@ module Abot
         end
 
         def data_daily_profit
-          BASE_CONNECTION.execute("SELECT quote, sum(profit) FROM daily_profit GROUP BY quote")
+          BASE_CONNECTION.execute("SELECT quote, sum(profit) as sum, count(*) as count FROM daily_profit GROUP BY quote")
         end
       end
     end

data/lib/abot/info/decorators/coin_decorator.rb

@@ -5,15 +5,9 @@ module Abot
     class Coin
       module CoinDecorator
         def decorated_sell_up
-          rounded_sell_up = sell_up.round(2)
-          case num_averaging
-          when 1, 2
-            rounded_sell_up > 2 ? Paint[rounded_sell_up, :red] : rounded_sell_up
-          when 3, 4, 5
-            rounded_sell_up > 2 ? rounded_sell_up : Paint[rounded_sell_up, :red]
-          else
-            rounded_sell_up
-          end
+          return '-' if sell_up == Float::INFINITY
+
+          sell_up.round(2)
         end
 
         def decorated_current_profit
@@ -38,22 +32,19 @@ module Abot
         end
 
         def decorated_next_average_price
-          "#{next_average_price} (#{decorated_next_average_price_percent})"
+          next_average_price.zero? ? '-' : "#{next_average_price} (#{decorated_next_average_price_percent})"
         end
 
         def decorated_name
-          arrow = if account.symbol_info(symbol).try(:[], :lastPrice).to_f < account.symbol_info(symbol).try(:[], :askPrice).to_f
-                    Paint[' ↑', :green]
-                  elsif account.symbol_info(symbol).try(:[], :lastPrice).to_f > account.symbol_info(symbol).try(:[], :askPrice).to_f
-                    Paint[' ↓', :red]
-                  else
-                    ''
-                  end
-          "#{name}(#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
+          "#{name} (#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{pump}"
+        end
+
+        def pump
+          pump_detector == 'True' ? Paint[' (P)', :blue] : ''
         end
 
         def decorated_name_mobile
-          name
+          "#{name} #{pump}"
         end
 
         def decorated_sell_price
@@ -64,6 +55,10 @@ module Abot
           "#{current_price} (#{percent_to_order.round(2)}%)"
         end
 
+        def decorated_current_price_perc_of_order
+          "#{current_price} (#{percent_from_order.round(2)}%)"
+        end
+
         def decorated_min_price
           "#{min_price} (#{percent_from_min_to_average.round(2)}%)"
         end
@@ -72,6 +67,10 @@ module Abot
           "#{max_price} (#{percent_to_max.round(2)}%)"
         end
 
+        def decorated_max_price_perc_of_order
+          "#{max_price} (#{percent_from_max.round(2)}%)"
+        end
+
         def decorated_current_quote
           current_quote.round(2)
         end
@@ -97,7 +96,7 @@ module Abot
           sec = timer.to_s[0..9].to_f
           return '-' if sec < 1_577_836_800 # 2020-01-01 00:00:00 +0000
 
-          medidas = ["г", "мес", "д", "ч", "м", "c"]
+          medidas = %w[г мес д ч м c]
           array = [1970, 1, 1, 0, 0, 0]
           text = ''
           Time.at(Time.now.to_i - sec).utc.to_a.take(6).reverse.each_with_index do |k, i|

data/lib/abot/info/helpers.rb

@@ -12,13 +12,18 @@ module Abot
         magenta
       ].freeze
 
-      def self.daily_profit_str
+      def self.today_info_str
+        profit_array = DatabaseTable.data_daily_profit
+        return "Сегодня сделок не было \n" if profit_array.blank?
+
         profit = 'Профит сегодня:'
-        DatabaseTable.data_daily_profit.each do |c|
+        transactions_count = 'Сделок '
+        profit_array.each do |c|
           tick_size = (c['quote'] == 'BTC' ? 7 : 2)
-          profit += Paint[" #{c['sum(profit)'].round(tick_size)} #{c['quote']};", :green]
+          profit += "#{Paint[" #{c['sum'].round(tick_size)} #{c['quote']}", :green]};"
+          transactions_count += "#{c['quote']}: #{Paint[c['count'], :green]}; "
         end
-        profit
+        "#{profit} #{transactions_count}\n"
       end
 
       def self.balance_str(account, current_coins, trade_params)
@@ -55,8 +60,54 @@ module Abot
         "#{symbol_name}: " + Paint["#{symbol[:askPrice].to_f} (#{symbol[:priceChangePercent]}%)", percent_color]
       end
 
-      def self.check_abot
-        Paint['WARNING: ПРОВЕРЬТЕ БОТА !!!', :black, :red] + "\n" if (Time.now - File.mtime(DatabaseTable::DB_PATH)) > 10
+      def self.check_abot(current_coins, telegram)
+        if (Time.now - File.mtime(DatabaseTable::DB_PATH)) > 40
+          if TelegramSender::SENDED_ERROR.blank?
+            TelegramSender::SENDED_ERROR[:warn_send] = true
+            telegram.send_message('WARNING: ПРОВЕРЬТЕ БОТА !!!') if telegram.present?
+          end
+          return Paint['WARNING: ПРОВЕРЬТЕ БОТА !!!', :black, :red] + "\n"
+        elsif TelegramSender::SENDED_ERROR
+          TelegramSender::SENDED_ERROR.clear
+        end
+
+        error_coins = current_coins.map { |c| c.current_price > c.sell_price ? c.name : nil }.compact
+        TelegramSender::SENDED_SELL_ERROR.delete_if { |key, _| !error_coins.include?(key) }
+
+        error_coins.each do |c|
+          if TelegramSender::SENDED_SELL_ERROR[c].to_i < 4
+            TelegramSender::SENDED_SELL_ERROR[c] = TelegramSender::SENDED_SELL_ERROR[c].to_i + 1
+          end
+        end
+
+        error_coins.select! { |s| TelegramSender::SENDED_SELL_ERROR[s].to_i > 2 }
+
+        return nil if error_coins.blank?
+
+        if telegram.present? &&
+           error_coins.find { |c| TelegramSender::SENDED_SELL_ERROR[c] == 3 }.present? &&
+           error_coins.find { |c| TelegramSender::SENDED_SELL_ERROR[c] == 4 }.blank?
+          telegram.send_message('WARNING: ПРОВЕРЬТЕ БОТА, ВОЗМОЖНО НУЖЕН РЕБУТ')
+        end
+        Paint['WARNING: ПРОВЕРЬТЕ БОТА, ВОЗМОЖНО НУЖЕН РЕБУТ', :black, :red] + "\n"\
+      end
+
+      def self.check_coins(account, quote_assets, telegram)
+        coins_without_order = account.coins_without_order(quote_assets)
+        TelegramSender::SENDED_LOST_COINS.delete_if { |key, _| !coins_without_order.include?(key) }
+
+        coins_without_order.each do |c|
+          if TelegramSender::SENDED_LOST_COINS[c].to_i < 4
+            TelegramSender::SENDED_LOST_COINS[c] = TelegramSender::SENDED_LOST_COINS[c].to_i + 1
+          end
+        end
+
+        coins_without_order.select! { |s| TelegramSender::SENDED_LOST_COINS[s].to_i > 2 }
+
+        return nil if coins_without_order.blank?
+
+        telegram.send_lost_coins(coins_without_order) if telegram.present?
+        Paint["Монеты без ордера: #{coins_without_order.join(', ')}", :black, :red] + "\n"\
       end
     end
   end

data/lib/abot/info/table.rb

@@ -6,7 +6,7 @@ module Abot
     class Table < Terminal::Table
       include Abot::Info::Helpers
 
-      attr_reader :current_coins, :account, :rate_coins, :columns, :trade_params
+      attr_reader :current_coins, :account, :rate_coins, :columns, :trade_params, :telegram
 
       ALL_HEADINGS = {
         name: 'Coin',
@@ -22,6 +22,8 @@ module Abot
         potential_profit: "Пот.\nпрофит",
         buy_date: "Дата покупки",
         timer: 'Время',
+        current_price_perc_of_order: 'Тек.цена',
+        max_price_perc_of_order: 'Максимум 24h',
       }.freeze
       HEADINGS_COINS_TABLE_DEFAULT = %i[
         name
@@ -55,12 +57,13 @@ module Abot
         @rate_coins = options.fetch(:rate_coins, [])
         @trade_params ||= DatabaseTable.data_settings
         @current_coins = Coin.current_coins(account, trade_params)
-
+        @telegram = Info::TelegramSender.new if options[:telegram_enable] == 'true'
 
         options = {
           headings: columns.map { |h| { value: ALL_HEADINGS[h], alignment: :center } },
           style: { border_x: '=' }
         }
+
         super options
       end
 
@@ -95,11 +98,12 @@ module Abot
       end
 
       def info_str
-        "#{Helpers.check_abot}" \
-        "#{Helpers.daily_profit_str}\n" \
-          "#{Helpers.balance_str(account, current_coins, trade_params)}\n" \
-          "#{Helpers.potential_balance_str(account, current_coins, trade_params)}\n" \
-          "#{rate_coins_str}"
+        "#{Helpers.check_coins(account, trade_params["quote_asset"].split(' '), telegram)}" \
+        "#{Helpers.check_abot(current_coins, telegram)}" \
+        "#{Helpers.today_info_str}" \
+        "#{Helpers.balance_str(account, current_coins, trade_params)}\n" \
+        "#{Helpers.potential_balance_str(account, current_coins, trade_params)}\n" \
+        "#{rate_coins_str}"
       end
 
       def rate_coins_str

data/lib/abot/info/telegram_sender.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Abot
+  module Info
+    class TelegramSender
+      attr_reader :chat_id, :token
+      SENDED_LOST_COINS = {}
+      SENDED_ERROR = {}
+      SENDED_SELL_ERROR = {}
+
+      def initialize
+        @chat_id = DatabaseTable::TG_NAME
+        @token = DatabaseTable::TG_TOKEN
+      end
+
+      def send_message(text)
+        Telegram::Bot::Client.run(token) do |bot|
+          message = bot.api.send_message(chat_id: chat_id, text: text)
+          if message['ok'] == true
+            bot.api.pin_chat_message(chat_id: chat_id, message_id: message.dig('result', 'message_id'))
+          end
+        end
+      end
+
+      def send_lost_coins(coins_without_order)
+        coins_without_order.each do |coin|
+          send_message("WARNING обнаружена монета без ордера: #{coin}") if SENDED_LOST_COINS[coin].to_i == 3
+        end
+      end
+    end
+  end
+end

data/lib/abot/info/version.rb

@@ -2,6 +2,6 @@
 
 module Abot
   module Info
-    VERSION = '0.1.1'
+    VERSION = '0.2.8'
   end
 end

data/lib/abot/info.rb

@@ -5,12 +5,14 @@ require 'sqlite3'
 require 'terminal-table'
 require 'paint'
 require 'binance-ruby'
+require 'telegram/bot'
 
 require_relative 'info/option_parser'
 require_relative 'info/coin'
 require_relative 'info/binance_account'
 require_relative 'info/table'
 require_relative 'info/version'
+require_relative 'info/telegram_sender'
 
 module Abot
   module Info
@@ -43,6 +45,8 @@ module Abot
             "                                     timer: Время с покупки\n" \
             "                                     current_profit: Текущая прибыль\n" \
             "                                     potential_profit: Потенциальная прибыль\n",
+            "                                     current_price_perc_of_order: Текущая цена (подсчет процента от ордера за продажу)\n" \
+            "                                     max_price_perc_of_order: Максимальная цена за 24ч (подсчет процента от ордера за продажу)\n" \
           )
           parser.add_option(
             :del, '--del=COLUMN1,COLUMN2,COLUMN3',
@@ -60,6 +64,8 @@ module Abot
             "                                     timer: Время с покупки\n" \
             "                                     current_profit: Текущая прибыль\n" \
             "                                     potential_profit: Потенциальная прибыль\n",
+            "                                     current_price_perc_of_order: Текущая цена (подсчет процента от ордера за продажу)\n" \
+            "                                     max_price_perc_of_order: Максимальная цена за 24ч (подсчет процента от ордера за продажу)\n"
           )
           parser.add_option(
             :db_path, '--db_path=DB_PATH',
@@ -70,11 +76,19 @@ module Abot
             :symbols, '--symbols=SYMBOL1,SYMBOL2,SYMBOL3',
             'Пары для отображения курсов',
           )
+          parser.add_option(
+            :telegram_enable, '--telegram_enable=true',
+            'Отправка в телеграм канал справочной информации',
+            )
+          parser.add_option(
+            :update_time, '--update_time=SECONDS',
+            'Период обновления информации, секунд, мин. 10',
+            )
         end.final!
 
         require_relative 'info/database_table'
 
-        start_stats({ rate_coins: rate_coins, columns: columns })
+        start_stats({ rate_coins: rate_coins, columns: columns, telegram_enable: telegram_enable, update_time: update_time })
       end
 
       def start_stats(opts)
@@ -88,7 +102,7 @@ module Abot
             puts "ERROR: #{e.message}"
           end
 
-          sleep 10
+          sleep update_time
         end
       end
 
@@ -102,6 +116,10 @@ module Abot
         @template ||= Info::OptionParser.instance.options[:template]
       end
 
+      def telegram_enable
+        @telegram_enable ||= Info::OptionParser.instance.options[:telegram_enable]
+      end
+
       def columns
         add = Info::OptionParser.instance.options[:add]&.split(',')&.map { |m| m.to_sym } || []
         del = Info::OptionParser.instance.options[:del]&.split(',')&.map { |m| m.to_sym } || []
@@ -121,6 +139,11 @@ module Abot
       def binance_account
         BinanceAccount.new(DatabaseTable::API_KEY, DatabaseTable::SECRET_KEY)
       end
+
+      def update_time
+        sec = Info::OptionParser.instance.options[:update_time].to_i
+        sec > 10 ? sec : 10
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abot-info
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.8
 platform: ruby
 authors:
 - w_dmitrii
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: telegram-bot-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 description:
 email:
 - wiz.work2021@gmail.com
@@ -146,6 +160,7 @@ files:
 - lib/abot/info/helpers.rb
 - lib/abot/info/option_parser.rb
 - lib/abot/info/table.rb
+- lib/abot/info/telegram_sender.rb
 - lib/abot/info/version.rb
 - spec/abot/statistics_spec.rb
 homepage: