cryptum 0.0.275 → 0.0.277

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa0e97a03d33ebdf5f3b3cdf06bc5b80a6315380a25ee3bf472777387e05852
-  data.tar.gz: 7b677b783b0beb34c32f6dd48dc5198c807f5123b30ee741252f16e1f8905221
+  metadata.gz: c354df9fefd484e816648d7da8b39ccca19a4847d598f432f326f8d8acad0009
+  data.tar.gz: 6fd13b14adedf7d0dc2acce933b4b7cc2ea158763709394c714e52660995bdf0
 SHA512:
-  metadata.gz: 8666c51fbc50b5910334fda2c8f0faacf8b636e647f671cf604d28a5b503de97e93708f7a3dae34729a28f4180ee2faf53f767a1bcfb9c98cd6343b0c003d02f
-  data.tar.gz: ab5539626474fc75d0a72eac9d9046697f1dfcdb356a6cd83b6cb1d895151483917624c791e36eadcf58e6a40f9da5ffdaaebad5536892b85149831fe54bb282
+  metadata.gz: 71738c751bbcdc4f8a8fffa4c0a9b65161f978de27ec9c0f8804aade9617fdf8d418cb78606f0f2aff2df3a0bf43f101ae7ae96e0e214a4e3d864f2e19707978
+  data.tar.gz: 68c037b9705a16f3850ac637031b34604215a0994b986520184fdcc5733f6e242bd295756e8752f075084b1233fa374a8aa24874dc75c4b68647f1e79159635c

data/etc/bot_confs/BOT_CONF.TEMPLATE

@@ -7,4 +7,4 @@ artifical_intelligence: true
 # Goals & Risk Management %s            #
 #---------------------------------------#
 autotrade_portfolio_percent: 10.00
-target_profit_margin_percent: 5.00
+target_profit_margin_percent: 20.00

data/lib/cryptum/event.rb

@@ -38,7 +38,7 @@ module Cryptum
       fiat_portfolio_file = "#{option_choice.repo_root}/order_books/#{fiat}_PORTFOLIO.json"
 
       # Determine if Summary UI needs updated data
-      event_history = Cryptum::Portfolio::Balance.refresh(
+      Cryptum::Portfolio::Balance.refresh(
         env: env,
         option_choice: option_choice,
         terminal_win: terminal_win,
@@ -116,13 +116,17 @@ module Cryptum
         Cryptum::UI::OrderPlan.refresh(
           option_choice: option_choice,
           order_plan_win: terminal_win.order_plan_section,
+          env: env,
           event_history: event_history,
           key_press_event: terminal_win.key_press_event,
           indicator_status: indicator_status,
           bot_conf: bot_conf,
           fiat_portfolio_file: fiat_portfolio_file
         )
-        # event_history.recalculate_order_plan = false
+        recalc_op = event_history.recalculate_order_plan
+        order_plan = event_history.order_book[:order_plan]
+        terminal_win.key_press_event.key_w = true if recalc_op || order_plan.empty?
+        event_history.recalculate_order_plan = false
       end
 
       if event_history.order_plan_details_win_active
@@ -135,7 +139,7 @@ module Cryptum
       end
 
       unless event_history.order_execute_details_win_active
-        event_history = Cryptum::UI::OrderExecution.refresh(
+        Cryptum::UI::OrderExecution.refresh(
           option_choice: option_choice,
           order_execute_win: terminal_win.order_execute_section,
           env: env,
@@ -162,9 +166,9 @@ module Cryptum
         key_press_event: terminal_win.key_press_event
       )
 
-      last_ticker_price = event_history.order_book[:ticker_price].to_f
-      second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
-      third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
+      # last_ticker_price = event_history.order_book[:ticker_price].to_f
+      # second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
+      # third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
 
       event_history
     rescue LoadError => e

data/lib/cryptum/ui/order_execute_details.rb

@@ -21,9 +21,9 @@ module Cryptum
         order_meta_data = event_history.order_execute_selected_data
         tpm = order_meta_data[:tpm]
         autotrade_percent = order_meta_data[:autotrade_percent]
-        order_color = order_meta_data[:color].to_sym
-
         order_plan_no = order_meta_data[:plan_no]
+
+        order_color = order_meta_data[:color].to_sym
         case order_color
         when :cyan, :red
           order_id = order_meta_data[:buy_order_id]
@@ -42,9 +42,9 @@ module Cryptum
         end
 
         if order_history_arr.empty? && order_color == :yellow
+          order_meta_data.delete(:sell_order_id)
           order_id = order_meta_data[:buy_order_id]
           order_meta_data[:color] = :cyan
-          order_meta_data[:sell_order_id] = nil
           order_history_arr = event_history.order_book[:order_history].select do |order|
             order if order[:id] == order_id
           end

data/lib/cryptum/ui/order_execution.rb

@@ -521,8 +521,6 @@ module Cryptum
 
         # Reset Order Ready Boolean
         event_history.order_ready = false
-
-        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/order_plan.rb

@@ -24,6 +24,8 @@ module Cryptum
         ticker_price = event_history.order_book[:ticker_price].to_f
         return unless ticker_price.positive?
 
+        market_trend_color = plan_color = :white
+
         this_product = event_history.order_book[:this_product]
         symbol_out = this_product[:id]
         quote_increment = this_product[:quote_increment]
@@ -153,13 +155,16 @@ module Cryptum
             order_slice[:invest] = format('%0.2f', fiat_investing)
             order_slice[:return] = format('%0.2f', fiat_returning)
             order_slice[:profit] = format('%0.2f', profit)
+            order_slice[:tpm] = tpm
+            order_slice[:autotrade_percent] = autotrade_percent
+            order_slice[:color] = plan_color
 
             order_plan.push(order_slice) unless event_history.recalculate_order_plan
             fiat_budget -= fiat_investing
             plan_no_slice += 1
           end
           event_history.order_book[:order_plan] = order_plan
-          event_history.recalculate_order_plan = false
+          # event_history.recalculate_order_plan = false
         end
 
         red_pill_alert = '| RED PILL ALERT |'
@@ -322,7 +327,6 @@ module Cryptum
             )
           end
         else
-          market_trend_color = plan_color = :white
           market_trend_color = indicator_status.market_trend[:color] if indicator_status.market_trend
           plan_color = :cyan if market_trend_color == :red
           plan_color = :green if market_trend_color == :green
@@ -344,8 +348,6 @@ module Cryptum
             if event_history.order_plan_row_to_select == current_line
               style = :highlight
               selected_order = order
-              selected_order[:tpm] = tpm
-              selected_order[:autotrade_percent] = autotrade_percent
               selected_order[:color] = plan_color
             end
 

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.275'
+  VERSION = '0.0.277'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.275
+  version: 0.0.277
 platform: ruby
 authors:
 - 0day Inc.