cryptum 0.0.256 → 0.0.258

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2687c6be08b4b287a0f9ad8192708a0f862b526933614bcd440607fa667e6e06
-  data.tar.gz: 00c9a699c865e8f91cdecafcc896e19a1481100c01e492c3bf53e15a22df9ee2
+  metadata.gz: 454825db36aecfdd354ab093bbc3f635fc48813e950bcc3a1b7792b8e1028646
+  data.tar.gz: 12d79a0af6469640bf933d3766a24c92d0986f2eebf352d9d8f87d48c6f833ef
 SHA512:
-  metadata.gz: fd74b3c4bd968db4e24b1a3fae5802b86d356619909e0d32a45d9d246d38c81a1b91714b3691f3ff7a3d95e2d4fcd0b57bdb408bfb89030062e1c57379379b5c
-  data.tar.gz: c2ec14727da1cfccc54afacb7760feb0062d640da5d7cc7e24189dcbad5c03c0e9aeacc339a619e53a192e236f43d98ddee672abc26349a20a2a630a48ae4a4d
+  metadata.gz: e08fb37dd973e62f0b068b66028a18c4cf1e9ecc8f212313fced489e685be3eb90fec26f5a29193686ff8c035fc870bfd1fecc7899c2f6be568407c0d68a5497
+  data.tar.gz: 3dd720c662229f86921f648e8adea5cf20ce10dfc2ce506413c6a1f26496133d333606a8cbc9364d868ad49d3f4d14a5a034bf6f63176b982779cfb763e89599

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-01 19:02:17 UTC using RuboCop version 1.39.0.
+# on 2022-12-01 23:43:10 UTC using RuboCop version 1.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -103,7 +103,7 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 51
+# Offense count: 52
 Lint/UselessAssignment:
   Exclude:
     - 'bin/cryptum-forecast'
@@ -113,6 +113,7 @@ Lint/UselessAssignment:
     - 'lib/cryptum/event/buy.rb'
     - 'lib/cryptum/event/cancel.rb'
     - 'lib/cryptum/order_book/generate.rb'
+    - 'lib/cryptum/order_book/market_trend.rb'
     - 'lib/cryptum/ui/market_trend.rb'
     - 'lib/cryptum/ui/order_execution.rb'
     - 'lib/cryptum/ui/order_plan.rb'
@@ -123,13 +124,13 @@ Lint/UselessAssignment:
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 388
+  Max: 387
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 135
+  Max: 141
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -207,12 +208,6 @@ Style/RedundantReturn:
   Exclude:
     - 'lib/cryptum.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/cryptum/event/history.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/StringChars:
@@ -244,7 +239,7 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 16
+# Offense count: 14
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/lib/cryptum/event/history.rb

@@ -18,7 +18,6 @@ module Cryptum
                     :plan_no,
                     :reconnected,
                     :red_pill,
-                    :reset_market_trend,
                     :start_time,
                     :ticker_event,
                     :time_between_orders,
@@ -49,22 +48,21 @@ module Cryptum
         self.start_time = start_time
         self.reconnected = false
         self.red_pill = false
-        self.reset_market_trend = false
         self.order_plan_win_active = true
         self.order_plan_index_offset = 0
         self.order_plan_max_rows_to_display = 7
-        self.order_plan_row_to_select = self.order_plan_index_offset
+        self.order_plan_row_to_select = order_plan_index_offset
         self.order_execute_win_active = false
         self.order_execute_index_offset = 0
         self.order_execute_max_rows_to_display = 6
-        self.order_execute_row_to_select = self.order_execute_index_offset
+        self.order_execute_row_to_select = order_execute_index_offset
 
-        # 10 minutes
+        # Default = 10 minutes
         self.time_between_orders = 600
-        self.time_between_orders_reset = self.time_between_orders
+        self.time_between_orders_reset = time_between_orders
 
-        # 24 hours
-        self.time_between_orders_max = self.time_between_orders_reset * 144
+        # 1 hour
+        self.time_between_orders_max = 3_600
 
         # 5 seconds
         self.time_between_orders_min = 5

data/lib/cryptum/option/choice.rb

@@ -12,7 +12,8 @@ module Cryptum
                     :repo_root,
                     :sandbox,
                     :symbol,
-                    :market_trend_reset
+                    :market_trend_reset,
+                    :market_trend_reset_label
 
     rescue Interrupt
       # Exit Gracefully if CTRL+C is Pressed During Session

data/lib/cryptum/option.rb

@@ -95,6 +95,11 @@ module Cryptum
         reason = :market_trend_reset
       end
 
+      option_choice.market_trend_reset_label = option_choice.market_trend_reset
+      option_choice.market_trend_reset_label = 'D' if option_choice.market_trend_reset == 84_600
+      option_choice.market_trend_reset_label = '1h' if option_choice.market_trend_reset == 3_600
+      option_choice.market_trend_reset_label = '1m' if option_choice.market_trend_reset == 60
+
       if usage
         case reason
         when :symbol

data/lib/cryptum/order_book/market_trend.rb

@@ -14,15 +14,6 @@ module Cryptum
         event = opts[:event]
         indicator_status = opts[:indicator_status]
 
-        # Decent for debugging.
-        # puts event.inspect
-
-        if event_history.reset_market_trend
-          event_history.order_book[:market_trend][:buy] = 0
-          event_history.order_book[:market_trend][:sell] = 0
-          event_history.reset_market_trend = false
-        end
-
         buy_or_sell = event[:changes].first[0].to_s.to_sym
         case buy_or_sell
         when :buy
@@ -134,17 +125,12 @@ module Cryptum
           )
         end
 
-        # Reload Bot Conf (i.e. Risk Allocation)
-        terminal_win.key_press_event.key_r = true
-
         # Reset Market Trend Counter
-        event_history.reset_market_trend = true
+        event_history.order_book[:market_trend][:buy] = 0
+        event_history.order_book[:market_trend][:sell] = 0
         event_history.order_book[:last_trend_reset] = Time.now.strftime(
           '%Y-%m-%d %H:%M:%S.%N%z'
         )
-
-        # Write Order Book to Disk
-        terminal_win.key_press_event.key_w = true
       rescue StandardError => e
         raise e
       end

data/lib/cryptum/ui/order_timer.rb

@@ -55,14 +55,10 @@ module Cryptum
           # Otherwise, intent should be something like, "- WAIT FOR MARKET TREND SHIFT -"
           intent = "- SEE LIMIT SELL ORDERS -"
         else
-          trend = 'BEAR'
           speed = 'FAST'
-          if event_history.bullish_trend
-            trend = 'BULL'
-            speed = 'SLOW'
-          end
+          speed = 'SLOW' if event_history.bullish_trend
 
-          intent = "#{trend} - #{speed} BUY: #{order_countdown} of #{time_between_order_exec_out}"
+          intent = "- #{speed} BUY: #{order_countdown} of #{time_between_order_exec_out} -"
           intent = '- BUYING PAUSED -' if event_history.red_pill
         end
         

data/lib/cryptum/ui/ticker.rb

@@ -18,7 +18,7 @@ module Cryptum
         quote_increment = this_product[:quote_increment]
         fiat_smallest_decimal = quote_increment.to_s.split('.')[-1].length
 
-        symbol_out = "#{this_product[:id]}.#{option_choice.market_trend_reset}s"
+        symbol_out = "#{this_product[:id]}.#{option_choice.market_trend_reset_label}"
         fiat = this_product[:quote_currency].to_sym
         fiat_symbol = '?'
         fiat_symbol = '$' if fiat == :USD
@@ -98,14 +98,17 @@ module Cryptum
         )
         if margin_percent_open_24h.positive?
           margin_percent_open_24h_color = :green
-          margin_percent_open_24h_out = "#{Cryptum.up_arrow} #{beautify_margin_percent_open_24h}%"
+          trend = 'BULL'
+          margin_percent_open_24h_out = "#{Cryptum.up_arrow} #{beautify_margin_percent_open_24h}% (#{trend})"
         elsif margin_percent_open_24h.negative?
           # Space removed to account for negative number.
           margin_percent_open_24h_color = :red
-          margin_percent_open_24h_out = "#{Cryptum.down_arrow}#{beautify_margin_percent_open_24h}%"
+          trend = 'BEAR'
+          margin_percent_open_24h_out = "#{Cryptum.down_arrow}#{beautify_margin_percent_open_24h}% (#{trend})"
         else
+          trend = 'FLAT'
           margin_percent_open_24h_color = :yellow
-          margin_percent_open_24h_out = "#{Cryptum.flat_arrow} #{beautify_margin_percent_open_24h}%"
+          margin_percent_open_24h_out = "#{Cryptum.flat_arrow} #{beautify_margin_percent_open_24h}% (#{trend})"
         end
 
         current_time_out = Time.now.strftime('%Y-%m-%d %H:%M:%S%z')

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -197,8 +197,18 @@ module Cryptum
                 key_press_event: terminal_win.key_press_event
               )
 
-              event_history.order_ready = true if order_countdown.zero? ||
-                                                  order_countdown.negative?
+              if order_countdown.zero? ||
+                 order_countdown.negative?
+
+                # Ready to Submit a BUY order
+                event_history.order_ready = true
+
+                # Reload Bot Conf (i.e. Risk Allocation)
+                terminal_win.key_press_event.key_r = true
+
+                # Write Order Book to Disk
+                terminal_win.key_press_event.key_w = true
+              end
             end
 
             EM.add_periodic_timer(option_choice.market_trend_reset) do
@@ -208,6 +218,11 @@ module Cryptum
                 event_history: event_history,
                 bot_conf: bot_conf
               )
+              # Reload Bot Conf (i.e. Risk Allocation)
+              terminal_win.key_press_event.key_r = true
+
+              # Write Order Book to Disk
+              terminal_win.key_press_event.key_w = true
             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.256
+  version: 0.0.258
 platform: ruby
 authors:
 - 0day Inc.