abot-info 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b9aeef83407bb23ab6b32e573f11ce4b057f317154f4394feb126bc37abd6f
-  data.tar.gz: 4bf3c572f8efd5e92b13ace3ac581297119b11c6499ee868b7375746a1d28f67
+  metadata.gz: 53b632907a5efa4f5fd0df0e72636e8e6a2aba46df4f4f2a991a60dbd5e1677c
+  data.tar.gz: 8fec3a06980da4bb3b738c1e6945f30862956469465cb72478832164a40534e2
 SHA512:
-  metadata.gz: d01c954849a411dd94f1817d41237854d873aed81cbd2f9348c5fced45ab5dcab3a0422c23a6dd4f7819a42f24ad33225a817ebb3e71185025ad814f00a3a0df
-  data.tar.gz: 8cd4eb38ad00c13ee38e68f69acf849b880dd82aebc0505b380f86a88a6888d413c4553b44d4d1c1a6cb8584f66a5f5f1fa2b795e49547856f6efbfdb2d104b9
+  metadata.gz: 8e883e2cb07ee6d3d27ec393a1c8bc5fba77571e8fce0967c97ed0555d85ceaa261608e7f6c06e01c7b1020c90413e92028c6d50c955badc678962d570b3e1c6
+  data.tar.gz: 59d64fbed8a638e94e19a7958c554c7e1830bf18308fb379657fc594122c60a1b9093656f48756974cf843066148c2f12e29de6c2306f63b19ed483f67cb018b

data/lib/abot/info.rb

@@ -43,7 +43,6 @@ module Abot
             "                                     timer: Время с покупки\n" \
             "                                     current_profit: Текущая прибыль\n" \
             "                                     potential_profit: Потенциальная прибыль\n",
-            "                                     potential_profit: Потенциальная прибыль\n",
             "                                     current_price_perc_of_order: Текущая цена (подсчет процента от ордера за продажу)\n" \
             "                                     max_price_perc_of_order: Максимальная цена за 24ч (подсчет процента от ордера за продажу)\n" \
           )

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

@@ -10,7 +10,8 @@ module Abot
       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
 
-      FIAT = ['USDT', 'BUSD', 'AUD', 'BIDR', 'BRL', 'EUR', 'GBR', 'RUB', 'TRY', 'TUSD', 'USDC', 'DAI', 'IDRT', 'PAX', 'UAH', 'NGN', 'VAI', 'BVND']
+      FIAT = %w[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]

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,7 +51,7 @@ module Abot
                   else
                     ''
                   end
-          "#{name}(#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
+          "#{name} (#{account.symbol_info(symbol).try(:[], :priceChangePercent)}%)#{arrow}"
         end
 
         def decorated_name_mobile

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

@@ -97,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.2'
+    VERSION = '0.2.2'
   end
 end

metadata

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