abot-info 0.1.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe9530de84f99fcba646a78e0c4a61bb02ebf2e484159817721724cfe6b7733
-  data.tar.gz: 5f1decd77bea3d406a7abe300c9a887391afe9a7991d27561c9a5a34ea8350e4
+  metadata.gz: 7d58b0e5421210e4d455de713e558820168d1a1ad094e203bdf69fe3244a7dbe
+  data.tar.gz: 4a61b59b59a4ff4fbed7219c44b1063bcd14d7f46d4ea43cb930b3b4820d7313
 SHA512:
-  metadata.gz: 4544c13838da0d2ed4af0e559b02d8c3bac17555a2cd7bdad62d0b1fcf496a13ab8e192205c537e2244775b1e4306c001eb60df1f211ae4244719265fb1565ee
-  data.tar.gz: b647a8cd960afb5e5bbaf739949cddfd6ab1fb4e2055ec9ab6e7228681df5e10cb76d8b4a92a528c48dad85eff855cd96275421da508f5bcdd5c8bc81bd6fcc9
+  metadata.gz: 96859eb095d54fe84a84f506c8356a9f7bf44b0a0ee80dd3f9e54a947390c18e3d7ebf21f39ea24cee7f105d407fa3f2b8efac62534280bdd9023bd63ce79927
+  data.tar.gz: af692d94de52095dcaa092b7829e817d60bad1f65ef9826a1843a46d4ccde0415ef3213003e165b92afd64c8ff29e9dd33fede1a0f5e460485edcafacb50e886

data/lib/abot/info.rb

@@ -43,6 +43,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 +62,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',

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

@@ -25,7 +25,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,6 +5,8 @@ module Abot
     class Coin
       module CoinDecorator
         def decorated_sell_up
+          return '-' if sell_up == Float::INFINITY
+
           rounded_sell_up = sell_up.round(2)
           case num_averaging
           when 1, 2
@@ -38,7 +40,7 @@ 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
@@ -49,11 +51,12 @@ module Abot
                   else
                     ''
                   end
-          "#{name}(#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
+          "#{decorated_name_mobile} (#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
         end
 
         def decorated_name_mobile
-          name
+          pump_det = pump_detector == 'True' ? '👁  ' : ''
+          "#{pump_det}#{name}"
         end
 
         def decorated_sell_price
@@ -64,6 +67,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 +79,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
@@ -85,16 +96,22 @@ module Abot
         end
 
         def decorated_buy_date
-          Time.at(timer.to_s[0..9].to_f).strftime('%d %h %H:%M')
+          sec = timer.to_s[0..9].to_f
+          return '-' if sec < 1_577_836_800 # 2020-01-01 00:00:00 +0000
+
+          Time.at(sec).strftime('%d %h %H:%M')
         rescue StandardError
           '-'
         end
 
         def decorated_timer
-          medidas = ["г", "мес", "д", "ч", "м", "c"]
+          sec = timer.to_s[0..9].to_f
+          return '-' if sec < 1_577_836_800 # 2020-01-01 00:00:00 +0000
+
+          medidas = %w[г мес д ч м c]
           array = [1970, 1, 1, 0, 0, 0]
           text = ''
-          Time.at(Time.now.to_i - timer.to_s[0..9].to_f).utc.to_a.take(6).reverse.each_with_index do |k, i|
+          Time.at(Time.now.to_i - sec).utc.to_a.take(6).reverse.each_with_index do |k, i|
             case i
             when 0, 1, 2
               next if text.blank? && (k - array[i]).zero?
@@ -118,6 +135,7 @@ module Abot
           value = Paint[str, (Helpers::AVERAGE_COLORS[num_averaging] || :red)]
           row = { value: value }
           row[:alignment] = :right if name == :timer
+          row[:alignment] = :center if name == :buy_date
           row
         end
       end

data/lib/abot/info/helpers.rb

@@ -12,13 +12,15 @@ module Abot
         magenta
       ].freeze
 
-      def self.daily_profit_str
+      def self.today_info_str
         profit = 'Профит сегодня:'
+        transactions_count = 'Сделок '
         DatabaseTable.data_daily_profit.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}"
       end
 
       def self.balance_str(account, current_coins, trade_params)
@@ -58,6 +60,13 @@ module Abot
       def self.check_abot
         Paint['WARNING: ПРОВЕРЬТЕ БОТА !!!', :black, :red] + "\n" if (Time.now - File.mtime(DatabaseTable::DB_PATH)) > 10
       end
+
+      def self.check_coins(account, quote_assets)
+        coins_without_order = account.coins_without_order(quote_assets)
+        if coins_without_order.present?
+          Paint["Монеты без ордера: #{coins_without_order.join(', ')}", :black, :red] + "\n"
+        end
+      end
     end
   end
 end

data/lib/abot/info/table.rb

@@ -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
@@ -95,11 +97,12 @@ module Abot
       end
 
       def info_str
+        "#{Helpers.check_coins(account, trade_params["quote_asset"].split(' '))}" \
         "#{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.today_info_str}\n" \
+        "#{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/version.rb

@@ -2,6 +2,6 @@
 
 module Abot
   module Info
-    VERSION = '0.1.0'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abot-info
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.4
 platform: ruby
 authors:
 - w_dmitrii
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler