cryptum 0.0.267 → 0.0.268

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2062d12344f14e33eb69ae94a6590348e11ece15f71faf88fb29c9ae41917d0
-  data.tar.gz: 8928742f4e03be3180e453456f968d7e5899b73633c88f022622df8db13b7cd8
+  metadata.gz: d384463e4c37155226e6cedb4a2156b77d7a9df8660f420acb15fc04de7875f0
+  data.tar.gz: 82e3e395beb272f6634ae1335093cee1ffa10504229720fe5a5821c5d811d6e9
 SHA512:
-  metadata.gz: 25f5c7e69a16c95f47c27ad94eee574b9efa84d3a8907a8421bb5b89fdcee2abae4120aa546a46f89ca80f4598ad04a7adbdb16ab800034876dc9429227c8822
-  data.tar.gz: c5c942d55ce5a293c7126c214417c057968048ae60ba489caae66720a6956dd7fd393d57f8d721f0995a77fad92f51dcd1b9647a6833804381256aa2e3be9d9f
+  metadata.gz: d60b522b67253efd740f0fb41943f3fcdc9c76ec0441c0880c0e409b9769d5d30544857573fe42411bf4e0ebac89808348e8ba34b9d274521dfb75e16c93edc6
+  data.tar.gz: a4edd8b79853a7d59135b4e9d136a2f4556a8de663adf9c926f1bd7f1491aa1a655095216845543e5d0d9c0996155f525b3659b236c460de54dfc97e23e65695

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-03 04:05:10 UTC using RuboCop version 1.39.0.
+# on 2022-12-05 18:21:06 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
@@ -41,13 +41,6 @@ Layout/EmptyLines:
   Exclude:
     - 'lib/cryptum/api.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'lib/cryptum/ui/order_plan.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -82,14 +75,6 @@ Layout/MultilineOperationIndentation:
     - 'lib/cryptum/ui/order_execution.rb'
     - 'lib/cryptum/ui/ticker.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
-# SupportedStylesForExponentOperator: space, no_space
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/cryptum/ui/order_plan.rb'
-
 # Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
@@ -102,14 +87,14 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 75
+# Offense count: 81
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 47
+# Offense count: 49
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 400
+  Max: 405
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
@@ -122,22 +107,22 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 73
 
-# Offense count: 66
+# Offense count: 68
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 383
+  Max: 389
 
-# Offense count: 16
+# Offense count: 17
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 538
 
-# Offense count: 18
+# Offense count: 19
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 76
@@ -194,6 +179,12 @@ Style/RedundantAssignment:
   Exclude:
     - 'lib/cryptum/api.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RedundantInterpolation:
+  Exclude:
+    - 'lib/cryptum/ui/order_execute_details.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleReturnValues.

data/lib/cryptum/event/history.rb

@@ -29,11 +29,13 @@ module Cryptum
                     :order_plan_index_offset,
                     :order_plan_max_rows_to_display,
                     :order_plan_row_to_select,
+                    :order_plan_selected_data,
                     :order_execute_win_active,
                     :order_execute_details_win_active,
                     :order_execute_index_offset,
                     :order_execute_max_rows_to_display,
-                    :order_execute_row_to_select
+                    :order_execute_row_to_select,
+                    :order_execute_selected_data
 
       def initialize(opts = {})
         # option_choice = opts[:option_choice]
@@ -55,11 +57,13 @@ module Cryptum
         self.order_plan_index_offset = 0
         self.order_plan_max_rows_to_display = 6
         self.order_plan_row_to_select = order_plan_index_offset
+        self.order_plan_selected_data = { color: :white }
         self.order_execute_win_active = false
         self.order_execute_details_win_active = false
         self.order_execute_index_offset = 0
         self.order_execute_max_rows_to_display = 6
         self.order_execute_row_to_select = order_execute_index_offset
+        self.order_execute_selected_data = { color: :white }
 
         # TODO: Implement market_trend_reset / 144
         # Default = 10 minutes

data/lib/cryptum/event.rb

@@ -112,26 +112,48 @@ module Cryptum
         fiat_portfolio_file: fiat_portfolio_file
       )
 
-      Cryptum::UI::OrderPlan.refresh(
-        option_choice: option_choice,
-        order_plan_win: terminal_win.order_plan_section,
-        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
-      )
+      unless event_history.order_plan_details_win_active
+        Cryptum::UI::OrderPlan.refresh(
+          option_choice: option_choice,
+          order_plan_win: terminal_win.order_plan_section,
+          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
+        )
+      end
 
-      event_history = Cryptum::UI::OrderExecution.refresh(
-        option_choice: option_choice,
-        order_execute_win: terminal_win.order_execute_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
-      )
+      if event_history.order_plan_details_win_active
+        Cryptum::UI::OrderPlanDetails.refresh(
+          option_choice: option_choice,
+          order_plan_details_win: terminal_win.order_plan_details_section,
+          event_history: event_history,
+          key_press_event: terminal_win.key_press_event
+        )
+      end
+
+      unless event_history.order_execute_details_win_active
+        event_history = Cryptum::UI::OrderExecution.refresh(
+          option_choice: option_choice,
+          order_execute_win: terminal_win.order_execute_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
+        )
+      end
+
+      if event_history.order_execute_details_win_active
+        Cryptum::UI::OrderExecuteDetails.refresh(
+          option_choice: option_choice,
+          order_execute_details_win: terminal_win.order_execute_details_section,
+          event_history: event_history,
+          key_press_event: terminal_win.key_press_event
+        )
+      end
 
       # Refresh Command Section for Cryptum Session Usage
       Cryptum::UI::Command.refresh(

data/lib/cryptum/ui/order_execute_details.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module Cryptum
+  module UI
+    # This plugin is used to Display Order Execute Details
+    # selected from the Order Execute Window Pane.
+    module OrderExecuteDetails
+      # Supported Method Parameters::
+      # Cryptum::UI::OrderExecuteDetails.refresh(
+      # )
+
+      public_class_method def self.refresh(opts = {})
+        option_choice = opts[:option_choice]
+        event_history = opts[:event_history]
+        order_execute_details_win = opts[:order_execute_details_win]
+        indicator_status = opts[:indicator_status]
+        key_press_event = opts[:key_press_event]
+
+        order = event_history.order_execute_selected_data
+        tpm = order[:tpm]
+        autotrade_percent = order[:autotrade_percent]
+        order_color = order[:color]
+
+        # UI
+        col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
+        col_just3 = (Curses.cols - Cryptum::UI.col_third) - 1
+        col_just4 = Curses.cols - Cryptum::UI.col_fourth
+
+        # ROW 1
+        out_line_no = 0
+        line_color = order_color
+        header_color = order_color
+        header_style = :bold
+        style = :bold
+        header_style = :reverse if event_history.order_execute_details_win_active
+
+        Cryptum::UI.line(
+          ui_win: order_execute_details_win,
+          out_line_no: out_line_no,
+          color: line_color
+        )
+
+        # ROW 2
+        out_line_no += 1
+        order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_execute_details_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = "- ##{order[:plan_no]} ORDER HISTORY DETAILS -"
+        order_execute_details_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: :bold,
+          string: header_str
+        )
+
+        # ROW 3
+        out_line_no += 1
+        order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_execute_details_win.clrtoeol
+
+        risk_alloc_out = Cryptum.beautify_large_number(
+          value: order[:risk_alloc]
+        )
+        invest_out = Cryptum.beautify_large_number(
+          value: order[:invest]
+        )
+        price_out = Cryptum.beautify_large_number(
+          value: order[:price]
+        )
+        size_out = Cryptum.beautify_large_number(
+          value: order[:size]
+        )
+        target_price_out = Cryptum.beautify_large_number(
+          value: order[:target_price]
+        )
+        profit_out = Cryptum.beautify_large_number(
+          value: order[:profit]
+        )
+        plan_no = "#{order[:plan_no]}|"
+
+        created_at = order[:created_at]
+
+        invest = "$#{invest_out} @ "
+        tick = "$#{price_out} = "
+        size = "*#{size_out} + "
+        tpm_out = "#{order[:tpm]}% = "
+        targ_tick = "$#{target_price_out}"
+        profit = "|Profit: $#{order[:profit]}"
+
+        order_exec_ln = "#{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: style,
+          string: order_exec_ln.ljust(col_just1, '.')
+        )
+
+        # Clear to OK ROW
+        ok_row = 9
+        out_line_no += 1
+        to_ok_row = ok_row - 1
+        (out_line_no..to_ok_row).each do |clr_line|
+          order_execute_details_win.setpos(clr_line, Cryptum::UI.col_first)
+          Cryptum::UI.colorize(
+            ui_win: order_execute_details_win,
+            color: order_color,
+            style: :normal,
+            string: ''.ljust(col_just1, ' ')
+          )
+        end
+
+        # OK ROW
+        out_line_no = ok_row
+        order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_execute_details_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = '- OK -'
+        order_execute_details_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: :reverse,
+          string: header_str
+        )
+
+        order_execute_details_win.refresh
+      rescue Interrupt
+        # Exit Gracefully if CTRL+C is Pressed During Session
+        Cryptum.exit_gracefully(which_self: self)
+      rescue StandardError => e
+        raise e
+      end
+
+      # Display Usage for this Module
+
+      public_class_method def self.help
+        puts "USAGE:
+         #{self}.refresh(
+         )
+        "
+      end
+    end
+  end
+end

data/lib/cryptum/ui/order_execution.rb

@@ -421,12 +421,18 @@ module Cryptum
         end
 
         if order_history_meta.any?
+          selected_order = event_history.order_execute_selected_data
           order_history_meta.reverse[first_row..last_row].each do |meta|
             out_line_no += 1
             current_line = out_line_no - 2
 
             style = :normal
-            style = :highlight if event_history.order_execute_row_to_select == current_line
+            if event_history.order_execute_row_to_select == current_line
+              style = :highlight
+              selected_order = meta
+              selected_order[:color] = meta[:color]
+            end
+
             risk_alloc_out = Cryptum.beautify_large_number(
               value: meta[:risk_alloc]
             )
@@ -476,6 +482,7 @@ module Cryptum
               string: order_exec_ln.ljust(col_just1, '.')
             )
           end
+          event_history.order_execute_selected_data = selected_order
         end
 
         # ROW 10

data/lib/cryptum/ui/order_plan.rb

@@ -321,12 +321,20 @@ module Cryptum
             event_history.order_plan_index_offset = first_row
           end
 
+          selected_order = event_history.order_plan_selected_data
           order_plan[first_row..last_row].each do |order|
             out_line_no += 1
             current_line = out_line_no - 2
 
             style = :normal
-            style = :highlight if event_history.order_plan_row_to_select == current_line
+            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
+
             fiat_avail_out = Cryptum.beautify_large_number(
               value: order[:fiat_available]
             )
@@ -348,11 +356,11 @@ module Cryptum
             alloc = "$#{risk_alloc_out} @ #{order[:allocation_percent]}% = "
             invest = "$#{invest_out} + #{tpm_out}% = "
 
-            returns  = "$#{return_out}|"
+            returns = "$#{return_out}|"
             profit = "Profit: $#{profit_out}"
 
             order_plan_invest = "#{plan_no}#{fiat}#{alloc}#{invest}"
-            order_plan_return  = "#{returns}#{profit}"
+            order_plan_return = "#{returns}#{profit}"
 
             order_plan_win.setpos(out_line_no, Cryptum::UI.col_first)
             order_plan_win.clrtoeol
@@ -363,6 +371,7 @@ module Cryptum
               string: "#{order_plan_invest}#{order_plan_return}".ljust(col_just1, '.')
             )
           end
+          event_history.order_plan_selected_data = selected_order
 
           if order_plan.length < 9
             lines_to_clear = 9 - order_plan.length
@@ -407,8 +416,6 @@ module Cryptum
         )
 
         order_plan_win.refresh
-
-        # 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_details.rb

@@ -18,21 +18,128 @@ module Cryptum
         indicator_status = opts[:indicator_status]
         key_press_event = opts[:key_press_event]
 
-        color = :white
+        order = event_history.order_plan_selected_data
+        tpm = order[:tpm]
+        autotrade_percent = order[:autotrade_percent]
+        order_color = order[:color]
 
         # UI
-        col_just4 = (Curses.cols - Cryptum::UI.col_fourth) - 1
+        col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
+        col_just3 = (Curses.cols - Cryptum::UI.col_third) - 1
+        col_just4 = Curses.cols - Cryptum::UI.col_fourth
 
         # ROW 1
-        # COLUMN 1
         out_line_no = 0
+        line_color = order_color
+        header_color = order_color
+        header_style = :bold
+        style = :bold
+        header_style = :reverse if event_history.order_plan_details_win_active
+
+        Cryptum::UI.line(
+          ui_win: order_plan_details_win,
+          out_line_no: out_line_no,
+          color: line_color
+        )
+
+        # ROW 2
+        out_line_no += 1
         order_plan_details_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_plan_details_win.clrtoeol
         Cryptum::UI.colorize(
           ui_win: order_plan_details_win,
-          color: :white,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = "- ##{order[:plan_no]} ORDER SLICE DETAILS -"
+        order_plan_details_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_plan_details_win,
+          color: order_color,
           style: :bold,
-          string: 'Order Details'
+          string: header_str
+        )
+
+        # ROW 3
+        out_line_no += 1
+        order_plan_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_plan_details_win.clrtoeol
+
+        fiat_avail_out = Cryptum.beautify_large_number(
+          value: order[:fiat_available]
+        )
+        risk_alloc_out = Cryptum.beautify_large_number(
+          value: order[:risk_alloc]
+        )
+        invest_out = Cryptum.beautify_large_number(
+          value: order[:invest]
+        )
+        profit_out = Cryptum.beautify_large_number(
+          value: order[:profit]
+        )
+        tpm_out = format('%0.2f', tpm)
+        return_out = Cryptum.beautify_large_number(
+          value: order[:return]
+        )
+        plan_no = "#{order[:plan_no]}|"
+        fiat = "#{autotrade_percent}% of $#{fiat_avail_out} = "
+        alloc = "$#{risk_alloc_out} @ #{order[:allocation_percent]}% = "
+        invest = "$#{invest_out} + #{tpm_out}% = "
+
+        returns = "$#{return_out}|"
+        profit = "Profit: $#{profit_out}"
+
+        order_plan_invest = "#{plan_no}#{fiat}#{alloc}#{invest}"
+        order_plan_return = "#{returns}#{profit}"
+
+        Cryptum::UI.colorize(
+          ui_win: order_plan_details_win,
+          color: order_color,
+          style: style,
+          string: "#{order_plan_invest}#{order_plan_return}".ljust(col_just1, '.')
+        )
+
+        # Clear to OK ROW
+        ok_row = 9
+        out_line_no += 1
+        to_ok_row = ok_row - 1
+        (out_line_no..to_ok_row).each do |clr_line|
+          order_plan_details_win.setpos(clr_line, Cryptum::UI.col_first)
+          Cryptum::UI.colorize(
+            ui_win: order_plan_details_win,
+            color: order_color,
+            style: :normal,
+            string: ''.ljust(col_just1, ' ')
+          )
+        end
+
+        # OK ROW
+        out_line_no = ok_row
+        order_plan_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_plan_details_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_plan_details_win,
+          color: order_color,
+          string: ''.ljust(col_just1, ' ')
+        )
+
+        header_str = '- OK -'
+        order_plan_details_win.setpos(
+          out_line_no,
+          Cryptum::UI.col_center(str: header_str)
+        )
+
+        Cryptum::UI.colorize(
+          ui_win: order_plan_details_win,
+          color: order_color,
+          style: :reverse,
+          string: header_str
         )
 
         order_plan_details_win.refresh

data/lib/cryptum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.267
+  version: 0.0.268
 platform: ruby
 authors:
 - 0day Inc.
@@ -409,6 +409,7 @@ files:
 - lib/cryptum/ui/command.rb
 - lib/cryptum/ui/key_press_event.rb
 - lib/cryptum/ui/market_trend.rb
+- lib/cryptum/ui/order_execute_details.rb
 - lib/cryptum/ui/order_execution.rb
 - lib/cryptum/ui/order_plan.rb
 - lib/cryptum/ui/order_plan_details.rb