cryptum 0.0.269 → 0.0.271

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40a387e6624886030d8bdaf44ffc1fe19d7d776810f6b369d4e0bc06f658b36
-  data.tar.gz: 26f2281e64fbfac162390bcc25be978e7e58498dd7fb4c6fa67e0e7c1d0f4e5e
+  metadata.gz: a2a99684100eded0f7b6ca6e94cd2b7afa4f1a46f4d173fcf8f6d23929f412ed
+  data.tar.gz: d01f3f8a7de3c65f295785f5fb38d781e0e3f2c4694eb8fe90e9a9e792442bf7
 SHA512:
-  metadata.gz: 62511617e610526d54b285f2fb8ae2b450ed9042c382edfcb7eaea4e88b60ea346c7401ba5ecba563b12e48cfba63ac51c6cbdede6097c67d78abf0c672369d9
-  data.tar.gz: f31542bfaa39f3a6d8c16b0362285bfc9cd79f6f36deec22957c1774348660f4a8a4cc8d6981b6490970403e4032bec28e82bf470c5d28129934f4fb4dcc6164
+  metadata.gz: 3323a2fd4c747bb7daf655eff588ab7bf2e5010eb9cc707e1f44157f62b328a9ee3866beb4785e1423eae08ff82adb8dfb0771c3fc733ce6f3baf775948d4e12
+  data.tar.gz: c6de579395b53f951f12ef615aca7540b647d7d13a5bab05a27115ec88c8636a47b13df6e44edce7b8fd908ab81e889aeee6611e32529df9d0f2a8cbcebc0826

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-05 19:21:30 UTC using RuboCop version 1.39.0.
+# on 2022-12-05 23:34:03 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
@@ -127,7 +127,7 @@ Metrics/ModuleLength:
 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.
@@ -217,7 +218,7 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 18
+# Offense count: 22
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/lib/cryptum/ui/order_execute_details.rb

@@ -21,7 +21,56 @@ 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_plan_details = "Order Slice #: #{order_plan_no}"
+        order_exec_ln = "Details: #{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
@@ -53,7 +102,7 @@ module Cryptum
           string: ''.ljust(col_just1, ' ')
         )
 
-        header_str = "- ##{order[:plan_no]} ORDER HISTORY DETAILS -"
+        header_str = "- ORDER ##{order[:plan_no]} DETAILS -"
         order_execute_details_win.setpos(
           out_line_no,
           Cryptum::UI.col_center(str: header_str)
@@ -62,7 +111,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_execute_details_win,
           color: order_color,
-          style: :bold,
+          style: header_style,
           string: header_str
         )
 
@@ -71,42 +120,35 @@ 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]
+        # ROW 5
+        out_line_no += 1
+        order_execute_details_win.setpos(out_line_no, Cryptum::UI.col_first)
+        order_execute_details_win.clrtoeol
 
-        invest = "$#{invest_out} @ "
-        tick = "$#{price_out} = "
-        size = "*#{size_out} + "
-        tpm_out = "#{order[:tpm]}% = "
-        targ_tick = "$#{target_price_out}"
-        profit = "|Profit: $#{order[:profit]}"
+        Cryptum::UI.colorize(
+          ui_win: order_execute_details_win,
+          color: order_color,
+          style: style,
+          string: order_plan_details.ljust(col_just1, ' ')
+        )
 
-        order_exec_ln = "#{created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+        # 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_exec_ln.ljust(col_just1, '.')
+          string: order_exec_ln.ljust(col_just1, ' ')
         )
 
         # Clear to OK ROW

data/lib/cryptum/ui/order_plan.rb

@@ -109,9 +109,6 @@ module Cryptum
 
             next unless fiat_investing > min_market_funds.to_f
 
-            # fiat_investing = min_market_funds.to_f
-            # allocation_decimal = fiat_investing / ticker_price
-
             risk_alloc = fiat_budget * autotrade_cast_as_decimal
             allocation_percent = allocation_decimal * 100
             fiat_returning = fiat_investing + (
@@ -119,12 +116,14 @@ module Cryptum
             )
             profit = fiat_returning - fiat_investing
   
-            # Implemented a bugfix here to avoid a bogus single order when Tradeable
-            # Balances are low.  Ensure everything still works as expected when
-            # balances are higher.
             break if order_plan.map { |op| op[:invest].to_f }.sum > risk_target ||
                      allocation_percent > 100
 
+            # Avoid a bogus single order at the end when tradeable balances are low.
+            # TODO: Add remaining amount to last order
+            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}"
             order_slice[:fiat_available] = format('%0.2f', fiat_budget)
@@ -137,6 +136,8 @@ module Cryptum
               '%0.2f',
               allocation_percent
             )
+            order_slice[:slice_alloc] = format('%0.2f', slice_alloc)
+            order_slice[:risk_target] = format('%0.2f', risk_target)
             order_slice[:invest] = format('%0.2f', fiat_investing)
             order_slice[:return] = format('%0.2f', fiat_returning)
             order_slice[:profit] = format('%0.2f', profit)
@@ -341,6 +342,9 @@ module Cryptum
             risk_alloc_out = Cryptum.beautify_large_number(
               value: order[:risk_alloc]
             )
+            slice_alloc_out = Cryptum.beautify_large_number(
+              value: order[:slice_alloc]
+            )
             invest_out = Cryptum.beautify_large_number(
               value: order[:invest]
             )
@@ -354,7 +358,7 @@ module Cryptum
             plan_no = "#{order[:plan_no]}|"
             fiat = "#{autotrade_percent}% of $#{fiat_avail_out} = "
             alloc = "$#{risk_alloc_out} @ #{order[:allocation_percent]}% = "
-            invest = "$#{invest_out} + #{tpm_out}% = "
+            invest = "$#{slice_alloc_out} OR MIN OF $#{invest_out} + #{tpm_out}% = "
 
             returns = "$#{return_out}|"
             profit = "Profit: $#{profit_out}"

data/lib/cryptum/ui/order_plan_details.rb

@@ -23,6 +23,32 @@ module Cryptum
         autotrade_percent = order[:autotrade_percent]
         order_color = order[:color]
 
+        fiat_avail_out = Cryptum.beautify_large_number(
+          value: order[:fiat_available]
+        )
+        risk_alloc_out = Cryptum.beautify_large_number(
+          value: order[:risk_alloc]
+        )
+        slice_alloc_out = Cryptum.beautify_large_number(
+          value: order[:slice_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]
+        )
+        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}."
+
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
         col_just3 = (Curses.cols - Cryptum::UI.col_third) - 1
@@ -62,7 +88,7 @@ module Cryptum
         Cryptum::UI.colorize(
           ui_win: order_plan_details_win,
           color: order_color,
-          style: :bold,
+          style: header_style,
           string: header_str
         )
 
@@ -71,38 +97,71 @@ module Cryptum
         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]
+        Cryptum::UI.colorize(
+          ui_win: order_plan_details_win,
+          color: order_color,
+          style: style,
+          string: autotrade_details.ljust(col_just1, ' ')
         )
-        invest_out = Cryptum.beautify_large_number(
-          value: order[:invest]
+
+        # 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, ' ')
         )
-        profit_out = Cryptum.beautify_large_number(
-          value: order[:profit]
+
+        # ROW 5
+        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: slice_alloc_details.ljust(col_just1, ' ')
         )
-        tpm_out = format('%0.2f', tpm)
-        return_out = Cryptum.beautify_large_number(
-          value: order[:return]
+
+        # ROW 6
+        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: invest_details.ljust(col_just1, ' ')
         )
-        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}"
+        # ROW 7
+        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: tpm_details.ljust(col_just1, ' ')
+        )
 
-        order_plan_invest = "#{plan_no}#{fiat}#{alloc}#{invest}"
-        order_plan_return = "#{returns}#{profit}"
+        # ROW 8
+        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: "#{order_plan_invest}#{order_plan_return}".ljust(col_just1, '.')
+          string: profit.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.269'
+  VERSION = '0.0.271'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.269
+  version: 0.0.271
 platform: ruby
 authors:
 - 0day Inc.