cryptum 0.0.272 → 0.0.274

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33789e9885b695c15c6910051688172381d800d5621266ff531d0b7445478b2a
-  data.tar.gz: 84ec9383263bb2e98d4aa9b7e53535581e8c1a879062ff6cbef25f98fb19d475
+  metadata.gz: 456e40a2bee690096338d88ddc7add455131802b7b272d799ac626f8e616d6e3
+  data.tar.gz: a7e8ab91160b716cdc4f210ec90682cb37114fa408b7e5885dfd8a5c29e9d8c3
 SHA512:
-  metadata.gz: 6ffa742a34ef7e6bd05bc1464c469d2e0767657d30957ff87a4b8762b248fdfe6b619f1c2f6b04f1e3c2c48f70002cf6b4b833bfd4df867496036c0d5c60bab6
-  data.tar.gz: b4986392cfdfffd83b09e17ca37515fb5264521cc2c5f0d64695e344c793e99947e065cd11c6fe2f250d24159a84877c9503d81371a14de27b26d6281545475b
+  metadata.gz: a12cd5a525df52d7a401b862ad784a723526ab180330a43120a8db4707d97f7eff0bf01ea02d6b46945e0d5a0967d15196a16e99a837729da0e5a5fd056757a6
+  data.tar.gz: c9ad2167536a5d44878d1b293d59da200ee6b7620da04d21a7ad8ae05275effd458a8a090a06d2823d12144bee86d0eff8ba300ba9601b0316b4638276d69fd4

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-06 15:52:44 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: 85
+# Offense count: 87
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 48
+# Offense count: 47
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 405
@@ -107,7 +107,7 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 73
@@ -122,12 +122,12 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 538
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 76
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
@@ -135,6 +135,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/cryptum/event/pane.rb'
     - 'lib/cryptum/option.rb'
+    - 'lib/cryptum/ui/order_execute_details.rb'
 
 # Offense count: 1
 # Configuration parameters: AllowedConstants.

data/bin/cryptum

@@ -43,6 +43,7 @@ begin
     bot_conf: bot_conf,
     terminal_win: terminal_win
   )
+  terminal_win.key_press_event.key_w = true
 
   # Connect to WebSocket
   # Trigger Events as Event Data

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

@@ -20,7 +20,6 @@ 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"
 
@@ -41,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,
@@ -85,17 +84,8 @@ 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
 
-        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

@@ -18,58 +18,112 @@ 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
+
+        if order_history_arr.empty? && order_color == :yellow
+          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
+        end
+
+        order_type_ln = '- Type: N/A'
+        order_status_ln = '- Status: N/A'
+        fill_fees = 'N/A'
+        fill_size = 'N/A'
+        executed_value = 'N/A'
+        market_type = 'N/A'
+        settled = '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]
+          fill_fees = order_history[:fill_fees]
+          fill_size = order_history[:filled_size]
+          executed_value = order_history[:executed_value]
+          market_type = order_history[:market_type]
+          settled = order_history[:settled]
+
+          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_meta_data[:color] = :cyan if done_at
+          when :Sell
+            done_at = order_history[:done_at]
+          end
+
+          order_type_ln = "- Type: #{order_type} #{order_side} #{time_in_force}"
+          order_type_ln = "- Type: #{order_type} #{order_side} #{time_in_force} 1m" if time_in_force == 'GTT'
+          order_status_ln = "- Status: #{order_status}"
+        end
+
+        if created_at && (!expire_time || !done_at)
+          order_hist_created_finished_ln = "- Creation Date: #{created_at} | Finished Date: N/A"
+        elsif created_at && expire_time && !done_at
+          order_hist_created_finished_ln = "- Creation Date: #{created_at} | Expiring Date: #{expire_time}"
+        elsif created_at && done_at
+          order_hist_created_finished_ln = "- Creation Date: #{created_at} | Finished Date: #{done_at}"
+        else
+          order_hist_created_finished_ln = '- Creation Date: N/A | Finished Date: N/A'
         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_exec_ln = "Details: #{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+        details_ln1 = "- Slice Plan: #{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+        details_ln2 = "- Fees: $#{fill_fees} | Fill Size: *#{fill_size}"
+        details_ln3 = "- Executed Value: $#{executed_value} | Market Type: #{market_type} | Settled: #{settled}"
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -101,7 +155,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)
@@ -126,6 +180,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)
@@ -135,7 +201,55 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: order_exec_ln.ljust(col_just1, ' ')
+          string: order_status_ln.ljust(col_just1, ' ')
+        )
+
+        # 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_finished_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: details_ln1.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: details_ln2.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
+
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: style,
+          string: details_ln3.ljust(col_just1, ' ')
         )
 
         # Clear to OK ROW

data/lib/cryptum/ui/order_plan_details.rb

@@ -42,11 +42,13 @@ module Cryptum
         return_out = Cryptum.beautify_large_number(
           value: order[:return]
         )
-        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."
+        autotrade_ln1_details = "1. Autotrade is set to #{autotrade_percent}% of $#{fiat_avail_out}, making $#{risk_alloc_out} available for this slice in"
+        autotrade_ln2_details = '   the order plan.'
+        slice_alloc_ln1_details = "2. With $#{risk_alloc_out} available and a slice allocation of #{order[:allocation_percent]}%, $#{slice_alloc_out} OR AN ORDER MINIMUM"
+        slice_alloc_ln2_details = "   of $#{invest_out} will be allocated for this slice (whichever is highest)."
+        profit_ln1_details = "3. With a slice allocation of $#{invest_out}, plus a TPM equal to #{tpm_out}%, $#{return_out} will be returned"
+        profit_ln2_details = "   once sold.  With $#{invest_out} invested, the gross profit equals $#{profit_out}, minus any Maker &"
+        profit_ln3_details = '   Taker (transaction) fees.'
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -100,7 +102,19 @@ module Cryptum
           ui_win: order_plan_details_win,
           color: order_color,
           style: style,
-          string: autotrade_details.ljust(col_just1, ' ')
+          string: autotrade_ln1_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: autotrade_ln2_details.ljust(col_just1, ' ')
         )
 
         # ROW 5
@@ -112,7 +126,7 @@ module Cryptum
           ui_win: order_plan_details_win,
           color: order_color,
           style: style,
-          string: slice_alloc_details.ljust(col_just1, ' ')
+          string: slice_alloc_ln1_details.ljust(col_just1, ' ')
         )
 
         # ROW 6
@@ -124,7 +138,7 @@ module Cryptum
           ui_win: order_plan_details_win,
           color: order_color,
           style: style,
-          string: invest_details.ljust(col_just1, ' ')
+          string: slice_alloc_ln2_details.ljust(col_just1, ' ')
         )
 
         # ROW 7
@@ -136,7 +150,7 @@ module Cryptum
           ui_win: order_plan_details_win,
           color: order_color,
           style: style,
-          string: tpm_details.ljust(col_just1, ' ')
+          string: profit_ln1_details.ljust(col_just1, ' ')
         )
 
         # ROW 8
@@ -148,7 +162,19 @@ module Cryptum
           ui_win: order_plan_details_win,
           color: order_color,
           style: style,
-          string: profit.ljust(col_just1, ' ')
+          string: profit_ln2_details.ljust(col_just1, ' ')
+        )
+
+        # ROW 9
+        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: profit_ln3_details.ljust(col_just1, ' ')
         )
 
         # Clear to OK ROW

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.272'
+  VERSION = '0.0.274'
 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.272
+  version: 0.0.274
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable