cryptum 0.0.276 → 0.0.278

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289e6ff276b55bdc7ccb0c31829f8b1feaf2686492add253419711c18ec45f6e
-  data.tar.gz: a3ad4fb287d349cf02d1448748479c69510ae94b793b0b4e47127be822ab174b
+  metadata.gz: 60041b70d1546198473f4cfef476cd56635ffa6d0de8581a6f051c48e837b2ef
+  data.tar.gz: 3c89c5fd826431cc5ee95ce5368238875fb5be4df2de38cc5cd7a9dc4d7b6e85
 SHA512:
-  metadata.gz: 97ab7d98b9572561b0d20c4b2ba8c327b99d6b430ee3fcb5748cd7bb9450fb07549e2a00ae782b601558626687363096f060fdf7eed2887ffd21336ad91df38e
-  data.tar.gz: e2354f2f11ed78d73d73b3897cf06e89210dcff2a55a4e9488d728304a57a5211baff213bbcd032f70774dbd7004c5d830815b57ea52e5ad55ed3d64342362a5
+  metadata.gz: d412ba56bd5bc779f923c921007730d4733adbb43c9ff8d5b94093c79e6a7538760e26c4dc7af03d753b39daca070448754d8e059d7a211e2caa9629a129a877
+  data.tar.gz: 39395c647bb87925cd64d74143e04c3e7b252922f7e06517692596c2945cc20d418800628204eb1bffc25774cfbc98067eceb5d373a257f30ad957230acddf8c

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/order_book/market_trend.rb

@@ -74,9 +74,9 @@ module Cryptum
         # Only retain past 24 hours of
         # order history meta for bought, sold, and expired
         # keep open limit sell orders indefintely
-        before_twenty_four_hrs_ago = Time.now - 86400
         order_history = event_history.order_book[:order_history]
         order_history_meta = event_history.order_book[:order_history_meta]
+        before_twenty_four_hrs_ago = Time.now - 86_400
         order_history_meta.delete_if do |ohm|
           next unless ohm[:done_at]
           Time.parse(ohm[:done_at]) < before_twenty_four_hrs_ago &&

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.276'
+  VERSION = '0.0.278'
 end

data/lib/cryptum/web_sock/event_machine.rb

@@ -212,11 +212,12 @@ module Cryptum
                 # Ready to Submit a BUY order
                 event_history.order_ready = true
 
-                # Reload Bot Conf (i.e. Risk Allocation)
+                # Reload Bot Conf (i.e. Risk Allocation),
+                # Recalculate Order Plan, and Write to File
                 terminal_win.key_press_event.key_r = true
 
                 # Write Order Book to Disk
-                terminal_win.key_press_event.key_w = true
+                # terminal_win.key_press_event.key_w = true
               end
             end
 
@@ -227,11 +228,15 @@ module Cryptum
                 event_history: event_history,
                 bot_conf: bot_conf
               )
+
               # Reload Bot Conf (i.e. Risk Allocation)
+              # Recalculate Order Plan, and Write to File
               terminal_win.key_press_event.key_r = true
-
-              # Write Order Book to Disk
-              terminal_win.key_press_event.key_w = true
+              # IMPORTANT:
+              # Wait for Order Plan recalculation to occur
+              # once Cryptum::UI::OrderPlan is refreshed
+              # in Cryptum::Event _BEFORE_ writing the order
+              # book to file.
             end
           end
         rescue Faye::WebSocket::API::ErrorEvent,

metadata

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