cryptum 0.0.270 → 0.0.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f112246033a05eecb95d6b71d0ce96e7206d9aaef1cf7b675ddd453baafd8de
-  data.tar.gz: 399946d0c1100458ef8adcf300c190271af2cd936181c5f259153310c52e1eff
+  metadata.gz: 33789e9885b695c15c6910051688172381d800d5621266ff531d0b7445478b2a
+  data.tar.gz: 84ec9383263bb2e98d4aa9b7e53535581e8c1a879062ff6cbef25f98fb19d475
 SHA512:
-  metadata.gz: d6d3a544bcbca635371547cf272a051f24585c0d8530f7356c5c466fb5202ca2c03cd75fde6ca42baafd410fd03c1ebc6f315e4666942cab00769e5982f568e9
-  data.tar.gz: af57efd0263bb5ead63ddb9a8e5b5c9e289d234a71183a727ee56f10cbb2139df62df7858335379f487208dd7a5d8a5f8d0d5b1b345d9efc2ce73b6d07550b72
+  metadata.gz: 6ffa742a34ef7e6bd05bc1464c469d2e0767657d30957ff87a4b8762b248fdfe6b619f1c2f6b04f1e3c2c48f70002cf6b4b833bfd4df867496036c0d5c60bab6
+  data.tar.gz: b4986392cfdfffd83b09e17ca37515fb5264521cc2c5f0d64695e344c793e99947e065cd11c6fe2f250d24159a84877c9503d81371a14de27b26d6281545475b

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-05 22:19:37 UTC using RuboCop version 1.39.0.
+# on 2022-12-06 15:52:44 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,7 +87,7 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 84
+# Offense count: 85
 Lint/UselessAssignment:
   Enabled: false
 
@@ -100,7 +100,7 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 145
+  Max: 146
 
 # Offense count: 4
 # Configuration parameters: CountBlocks.
@@ -222,4 +222,4 @@ Style/TrailingCommaInArrayLiteral:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 221
+  Max: 216

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,12 +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
-
   # Connect to WebSocket
   # Trigger Events as Event Data
   # is Generated via Coinbase Pro

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

@@ -20,6 +20,7 @@ module Cryptum
         option_choice = opts[:option_choice]
         env = opts[:env]
         bot_conf = opts[:bot_conf]
+        terminal_win = opts[:terminal_win]
 
         order_book_file = "#{option_choice.repo_root}/order_books/#{option_choice.symbol}.ORDER_BOOK.json"
 
@@ -85,12 +86,16 @@ module Cryptum
         )
 
         # Write order_book to file at session initiation
-        File.open(order_book_file, 'w') do |f|
-          f.puts order_book.to_json
-        end
-
+        # File.open(order_book_file, 'w') do |f|
+        #   f.puts order_book.to_json
+        # end
         event_history.order_book = order_book
 
+        Cryptum::Event::OrderBook.write(
+          terminal_win: terminal_win,
+          event_history: event_history
+        )
+
         event_history
       rescue StandardError => e
         raise e

data/lib/cryptum/ui/order_execute_details.rb

@@ -21,7 +21,55 @@ module Cryptum
         order = event_history.order_execute_selected_data
         tpm = order[:tpm]
         autotrade_percent = order[:autotrade_percent]
-        order_color = order[:color]
+        order_color = order[:color].to_sym
+
+        order_plan_no = order[:plan_no]
+        case order_color
+        when :cyan, :red
+          order_id = order[:buy_order_id]
+          order_type = 'Buy'
+        when :green, :magenta, :yellow
+          order_id = order[:sell_order_id]
+          order_type = 'Sell'
+        when :black
+          order_id = 'Expired'
+          order_type = 'Expired'
+        else
+          order_id = 'N/A'
+          order_type = 'N/A'
+        end
+
+        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_id_details = "#{order_type} Order ID: #{order_id}"
+        order_exec_ln = "Details: #{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -71,42 +119,23 @@ module Cryptum
         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]
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: style,
+          string: order_id_details.ljust(col_just1, ' ')
         )
-        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}"
+        # ROW 5
+        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_exec_ln.ljust(col_just1, '.')
+          string: order_exec_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.270'
+  VERSION = '0.0.272'
 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

metadata

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