cryptum 0.0.271 → 0.0.273

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a99684100eded0f7b6ca6e94cd2b7afa4f1a46f4d173fcf8f6d23929f412ed
-  data.tar.gz: d01f3f8a7de3c65f295785f5fb38d781e0e3f2c4694eb8fe90e9a9e792442bf7
+  metadata.gz: 448c1b3f990829ef87c5adc398ddcaea4b46c62acee1723785bf79572c6d2b89
+  data.tar.gz: 76fdd8d8e3258291eb3644417d9094a926cfa425c126ff7b3a2f7bb37d7fb31b
 SHA512:
-  metadata.gz: 3323a2fd4c747bb7daf655eff588ab7bf2e5010eb9cc707e1f44157f62b328a9ee3866beb4785e1423eae08ff82adb8dfb0771c3fc733ce6f3baf775948d4e12
-  data.tar.gz: c6de579395b53f951f12ef615aca7540b647d7d13a5bab05a27115ec88c8636a47b13df6e44edce7b8fd908ab81e889aeee6611e32529df9d0f2a8cbcebc0826
+  metadata.gz: 92418c47f83fe60acf22473eff5d72516e41d903f03f4484b6e67943287102758d24a1c08299f8a832136658a48876efdbc293b03adb323c10d2dcec0d2c4eed
+  data.tar.gz: 6150d6bdf97804e728a707cbdb06a93f174fae0da0f18a7883a0abbded5a6ba615377eff28dc68ace6004406a2867282b70dc3b1bdc641acd90cc6d0788fde3e

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-05 23:34:03 UTC using RuboCop version 1.39.0.
+# on 2022-12-06 22:57:28 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
@@ -87,11 +87,11 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 84
+# Offense count: 87
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 48
+# Offense count: 47
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 405
@@ -100,14 +100,14 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 145
+  Max: 146
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 73
@@ -122,7 +122,7 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 538
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 76
@@ -218,7 +218,7 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 22
+# Offense count: 21
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/bin/cryptum

@@ -28,6 +28,9 @@ begin
   # Exist and Initialize Automated Trading Parameters
   bot_conf = Cryptum::BotConf.read(option_choice: option_choice)
 
+  # Initialize Curses UI
+  terminal_win = Cryptum::UI.init
+
   # Generate an Order Book for Session Tracking
   # Load previous order_book_justification from
   # Order Book File (if it exists) to preserve
@@ -37,11 +40,10 @@ begin
     start_time: start_time,
     option_choice: option_choice,
     env: env,
-    bot_conf: bot_conf
+    bot_conf: bot_conf,
+    terminal_win: terminal_win
   )
-
-  # Initialize Curses UI
-  terminal_win = Cryptum::UI.init
+  terminal_win.key_press_event.key_w = true
 
   # Connect to WebSocket
   # Trigger Events as Event Data

data/lib/cryptum/event/bot_conf.rb

@@ -9,8 +9,10 @@ module Cryptum
       # )
       public_class_method def self.reload(opts = {})
         terminal_win = opts[:terminal_win]
+        event_history = opts[:event_history]
         option_choice = opts[:option_choice]
 
+        event_history.recalculate_order_plan = true
         terminal_win.key_press_event.key_r = false
         Cryptum.read_bot_conf(option_choice: option_choice)
       rescue StandardError => e

data/lib/cryptum/event/history.rb

@@ -35,7 +35,8 @@ module Cryptum
                     :order_execute_index_offset,
                     :order_execute_max_rows_to_display,
                     :order_execute_row_to_select,
-                    :order_execute_selected_data
+                    :order_execute_selected_data,
+                    :recalculate_order_plan
 
       def initialize(opts = {})
         # option_choice = opts[:option_choice]
@@ -48,7 +49,7 @@ module Cryptum
         self.order_submitted = false
         self.order_ready = false
         self.order_book = order_book
-        self.plan_no = 0
+        self.plan_no = 1
         self.start_time = start_time
         self.reconnected = false
         self.red_pill = false
@@ -64,6 +65,7 @@ module Cryptum
         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 }
+        self.recalculate_order_plan = false
 
         # TODO: Implement market_trend_reset / 144
         # Default = 10 minutes

data/lib/cryptum/event/order_book.rb

@@ -14,9 +14,11 @@ module Cryptum
 
         terminal_win.key_press_event.key_w = false
         order_book_file = event_history.order_book[:path]
-        File.open(order_book_file, 'w') do |f|
-          f.puts event_history.order_book.to_json
-        end
+
+        File.write(
+          order_book_file,
+          JSON.pretty_generate(event_history.order_book)
+        )
       rescue StandardError => e
         raise e
       end

data/lib/cryptum/event.rb

@@ -122,6 +122,7 @@ module Cryptum
           bot_conf: bot_conf,
           fiat_portfolio_file: fiat_portfolio_file
         )
+        # event_history.recalculate_order_plan = false
       end
 
       if event_history.order_plan_details_win_active

data/lib/cryptum/option.rb

@@ -56,7 +56,7 @@ module Cryptum
         options.on(
           '-tSECONDS',
           '--time-between-market-trend-reset=SECONDS',
-          '<Optional - Seconds Between Market Trend Reset (Default 3_600 i.e. 1 hour)>'
+          '<Optional - Seconds Between Market Trend Reset (Default 60 i.e. 1 hour)>'
         ) { |t| option_choice.market_trend_reset = t.to_i }
       end.parse!
 
@@ -89,7 +89,7 @@ module Cryptum
         reason = :repo_root
       end
 
-      option_choice.market_trend_reset = 3_600 if option_choice.market_trend_reset.to_i.zero?
+      option_choice.market_trend_reset = 60 if option_choice.market_trend_reset.to_i.zero?
       unless option_choice.market_trend_reset.to_i >= 60 &&
              option_choice.market_trend_reset <= 86_400
         usage = true

data/lib/cryptum/order_book/generate.rb

@@ -40,7 +40,7 @@ module Cryptum
         this_product_arr = products.select do |product|
           product if product[:id] == option_choice.symbol.to_s.gsub('_', '-').upcase
         end
-        this_product = this_product_arr.first
+        this_product = this_product_arr.last
 
         order_book = {
           path: order_book_file,
@@ -84,11 +84,6 @@ module Cryptum
           order_book: order_book
         )
 
-        # Write order_book to file at session initiation
-        File.open(order_book_file, 'w') do |f|
-          f.puts order_book.to_json
-        end
-
         event_history.order_book = order_book
 
         event_history

data/lib/cryptum/ui/order_execute_details.rb

@@ -18,59 +18,86 @@ module Cryptum
         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].to_sym
+        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[:plan_no]
+        order_plan_no = order_meta_data[:plan_no]
         case order_color
         when :cyan, :red
-          order_id = order[:buy_order_id]
-          order_type = 'Buy'
+          order_id = order_meta_data[:buy_order_id]
         when :green, :magenta, :yellow
-          order_id = order[:sell_order_id]
-          order_type = 'Sell'
+          order_id = order_meta_data[:sell_order_id]
         when :black
           order_id = 'Expired'
-          order_type = 'Expired'
         else
           order_id = 'N/A'
-          order_type = 'N/A'
+        end
+
+        order_id_details = "- ID: #{order_id}"
+
+        order_history_arr = event_history.order_book[:order_history].select do |order|
+          order if order[:id] == order_id
+        end
+
+        order_type_ln = '- Type: N/A'
+        order_status_ln = '- Status: N/A'
+        order_hist_created_ln = '- Creation Date: N/A'
+        order_hist_finished_ln = '- Finished Date: N/A'
+        if order_history_arr.any?
+          order_history = order_history_arr.first
+          order_type = order_history[:type].capitalize
+          time_in_force = order_history[:time_in_force].upcase
+          order_status = order_history[:status].upcase
+          created_at = order_history[:created_at]
+          order_hist_created_ln = "- Creation Date: #{created_at}"
+
+          order_side = order_history[:side].capitalize
+          case order_side.to_sym
+          when :Buy
+            expire_time = order_history[:expire_time]
+            done_at = order_history[:done_at]
+            order_hist_finished_ln = "- Expiring Date: #{expire_time}"
+          when :Sell
+            done_at = order_history[:done_at]
+          end
+          order_hist_finished_ln = "- Finished Date: #{done_at}" if done_at
+
+          order_type_ln = "- Type: #{order_type} #{order_side} #{time_in_force}"
+          order_status_ln = "- Status: #{order_status}"
         end
 
         risk_alloc_out = Cryptum.beautify_large_number(
-          value: order[:risk_alloc]
+          value: order_meta_data[:risk_alloc]
         )
         invest_out = Cryptum.beautify_large_number(
-          value: order[:invest]
+          value: order_meta_data[:invest]
         )
         price_out = Cryptum.beautify_large_number(
-          value: order[:price]
+          value: order_meta_data[:price]
         )
         size_out = Cryptum.beautify_large_number(
-          value: order[:size]
+          value: order_meta_data[:size]
         )
         target_price_out = Cryptum.beautify_large_number(
-          value: order[:target_price]
+          value: order_meta_data[:target_price]
         )
         profit_out = Cryptum.beautify_large_number(
-          value: order[:profit]
+          value: order_meta_data[:profit]
         )
-        plan_no = "#{order[:plan_no]}|"
-
-        created_at = order[:created_at]
+        plan_no = "#{order_meta_data[:plan_no]}|"
 
         invest = "$#{invest_out} @ "
         tick = "$#{price_out} = "
         size = "*#{size_out} + "
-        tpm_out = "#{order[:tpm]}% = "
+        tpm_out = "#{order_meta_data[:tpm]}% = "
         targ_tick = "$#{target_price_out}"
-        profit = "|Profit: $#{order[:profit]}"
+        profit = "|Profit: $#{order_meta_data[:profit]}"
 
-        order_id_details = "#{order_type} Order ID: #{order_id}"
-        order_plan_details = "Order Slice #: #{order_plan_no}"
-        order_exec_ln = "Details: #{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+        meta_ln = "- Metadata: #{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+        meta_ln = '- Metadata:'
+        meta_color_ln = "  - Color: #{order_color}"
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -102,7 +129,7 @@ module Cryptum
           string: ''.ljust(col_just1, ' ')
         )
 
-        header_str = "- ORDER ##{order[:plan_no]} DETAILS -"
+        header_str = "- ORDER ##{order_meta_data[:plan_no]} DETAILS -"
         order_execute_details_win.setpos(
           out_line_no,
           Cryptum::UI.col_center(str: header_str)
@@ -127,6 +154,18 @@ module Cryptum
           string: order_id_details.ljust(col_just1, ' ')
         )
 
+        # ROW 4
+        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: order_color,
+          style: style,
+          string: order_type_ln.ljust(col_just1, ' ')
+        )
+
         # ROW 5
         out_line_no += 1
         order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
@@ -136,10 +175,46 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: order_plan_details.ljust(col_just1, ' ')
+          string: order_status_ln.ljust(col_just1, ' ')
         )
 
-        # ROW 4
+        # ROW 6
+        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: order_color,
+          style: style,
+          string: order_hist_created_ln.ljust(col_just1, ' ')
+        )
+
+        # ROW 7
+        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: order_color,
+          style: style,
+          string: order_hist_finished_ln.ljust(col_just1, ' ')
+        )
+
+        # ROW 8
+        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: order_color,
+          style: style,
+          string: meta_ln.ljust(col_just1, ' ')
+        )
+
+        # ROW 9
         out_line_no += 1
         order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_execute_details_win.clrtoeol
@@ -148,7 +223,7 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: order_exec_ln.ljust(col_just1, ' ')
+          string: meta_color_ln.ljust(col_just1, ' ')
         )
 
         # Clear to OK ROW

data/lib/cryptum/ui/order_plan.rb

@@ -80,21 +80,27 @@ module Cryptum
 
         event_history.red_pill = true if crypto_invested_percent.to_f > autotrade_percent
 
-        if crypto_invested_percent.to_f <= autotrade_percent &&
-           autotrade_percent.positive? && (
-             order_plan.empty? || (
-               indicator_status.action_signal == :buy &&
-               indicator_status.last_action_signal == :sell
+        if event_history.recalculate_order_plan || (
+             crypto_invested_percent.to_f <= autotrade_percent &&
+             autotrade_percent.positive? && (
+               order_plan.empty? || (
+                 indicator_status.action_signal == :buy &&
+                 indicator_status.last_action_signal == :sell
+               )
              )
            )
 
           event_history.red_pill = false
-          # Reset time between orders when generating new order plan
-          event_history.time_between_orders = event_history.time_between_orders_reset if order_plan.empty?
+          if indicator_status.action_signal == :buy &&
+             indicator_status.last_action_signal == :sell
+
+            order_plan = []
+            # Reset time between orders
+            event_history.time_between_orders = event_history.time_between_orders_reset
+            event_history.plan_no += 1
+          end
 
-          order_plan = []
           plan_no_slice = 1
-          event_history.plan_no += 1
           plan_no = event_history.plan_no
           # Sum up currently invested amount so we don't
           # exceed autotrade % for next order plan generation
@@ -124,8 +130,14 @@ module Cryptum
             next unless fiat_budget >= min_market_funds.to_f
 
             slice_alloc = risk_alloc * allocation_decimal
-            order_slice = {}
-            order_slice[:plan_no] = "#{plan_no}.#{plan_no_slice}"
+            this_plan_no = "#{plan_no}.#{plan_no_slice}"
+            if event_history.recalculate_order_plan
+              order_slice = order_plan.find do |order|
+                order[:plan_no] == this_plan_no
+              end
+            end
+            order_slice ||= {}
+            order_slice[:plan_no] = this_plan_no
             order_slice[:fiat_available] = format('%0.2f', fiat_budget)
             order_slice[:risk_alloc] = format('%0.2f', risk_alloc)
             order_slice[:allocation_decimal] = format(
@@ -142,11 +154,12 @@ module Cryptum
             order_slice[:return] = format('%0.2f', fiat_returning)
             order_slice[:profit] = format('%0.2f', profit)
 
-            order_plan.push(order_slice)
+            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
         end
 
         red_pill_alert = '| RED PILL ALERT |'

data/lib/cryptum/ui/order_plan_details.rb

@@ -42,12 +42,11 @@ module Cryptum
         return_out = Cryptum.beautify_large_number(
           value: order[:return]
         )
-        autotrade_details = "1. bot_conf[:autotrade_portfolio_percent] is set to #{autotrade_percent}% of $#{fiat_avail_out},"
-        risk_alloc_details = "   making $#{risk_alloc_out} available for this slice in the order plan cycle."
-        slice_alloc_details = "2. With $#{risk_alloc_out} available and a slice allocation of #{order[:allocation_percent]}%, $#{slice_alloc_out} OR AN ORDER MINIMUM"
-        invest_details = "   of $#{invest_out} will be allocated for this slice (whichever is highest)."
-        tpm_details = "3. With a slice allocation of $#{invest_out} plus bot_conf[:target_profit_margin_percent] (TPM)"
-        profit = "   equal to #{tpm_out}% $#{return_out} will be returned.  With $#{invest_out} invested the profit equals $#{profit_out}."
+        autotrade_details = "1. Autotrade is set to #{autotrade_percent}% of $#{fiat_avail_out}, making $#{risk_alloc_out} available for this slice in the order plan."
+        slice_alloc_details = "2. With $#{risk_alloc_out} available and a slice allocation of #{order[:allocation_percent]}%, $#{slice_alloc_out} OR AN ORDER MINIMUM of $#{invest_out} will"
+        invest_details = '   be allocated for this slice (whichever is highest).'
+        tpm_details = "3. With a slice allocation of $#{invest_out}, plus a TPM equal to #{tpm_out}%, $#{return_out} will be returned once sold."
+        profit = "   With $#{invest_out} invested the gross profit equals $#{profit_out}, minus any transaction fees."
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -104,18 +103,6 @@ module Cryptum
           string: autotrade_details.ljust(col_just1, ' ')
         )
 
-        # ROW 4
-        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: order_color,
-          style: style,
-          string: risk_alloc_details.ljust(col_just1, ' ')
-        )
-
         # ROW 5
         out_line_no += 1
         order_plan_details_win.setpos(out_line_no, Cryptum::UI.col_first)

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -104,6 +104,7 @@ module Cryptum
               if terminal_win.key_press_event.key_r
                 bot_conf = Cryptum::Event::BotConf.reload(
                   terminal_win: terminal_win,
+                  event_history: event_history,
                   option_choice: option_choice
                 )
               end

data/lib/cryptum.rb

@@ -158,10 +158,10 @@ module Cryptum
     # Cryptum Statistics Only Apply to
     # Live Sessions
     if event_history
-      order_book_file = event_history.order_book[:path]
-      File.open(order_book_file, 'w') do |f|
-        f.puts event_history.order_book.to_json
-      end
+      File.write(
+        order_book_file,
+        JSON.pretty_generate(event_history.order_book)
+      )
     end
 
     Curses.close_screen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.271
+  version: 0.0.273
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable