cryptum 0.0.273 → 0.0.275

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448c1b3f990829ef87c5adc398ddcaea4b46c62acee1723785bf79572c6d2b89
-  data.tar.gz: 76fdd8d8e3258291eb3644417d9094a926cfa425c126ff7b3a2f7bb37d7fb31b
+  metadata.gz: bfa0e97a03d33ebdf5f3b3cdf06bc5b80a6315380a25ee3bf472777387e05852
+  data.tar.gz: 7b677b783b0beb34c32f6dd48dc5198c807f5123b30ee741252f16e1f8905221
 SHA512:
-  metadata.gz: 92418c47f83fe60acf22473eff5d72516e41d903f03f4484b6e67943287102758d24a1c08299f8a832136658a48876efdbc293b03adb323c10d2dcec0d2c4eed
-  data.tar.gz: 6150d6bdf97804e728a707cbdb06a93f174fae0da0f18a7883a0abbded5a6ba615377eff28dc68ace6004406a2867282b70dc3b1bdc641acd90cc6d0788fde3e
+  metadata.gz: 8666c51fbc50b5910334fda2c8f0faacf8b636e647f671cf604d28a5b503de97e93708f7a3dae34729a28f4180ee2faf53f767a1bcfb9c98cd6343b0c003d02f
+  data.tar.gz: ab5539626474fc75d0a72eac9d9046697f1dfcdb356a6cd83b6cb1d895151483917624c791e36eadcf58e6a40f9da5ffdaaebad5536892b85149831fe54bb282

data/lib/cryptum/order_book/market_trend.rb

@@ -72,7 +72,7 @@ module Cryptum
         gross_tpm = bot_conf[:target_profit_margin_percent].to_f
 
         # Only retain past 24 hours of
-        # order history meta for expired and sold
+        # order history meta for bought, sold, and expired
         # keep open limit sell orders indefintely
         before_twenty_four_hrs_ago = Time.now - 86400
         order_history = event_history.order_book[:order_history]
@@ -81,7 +81,7 @@ module Cryptum
           next unless ohm[:done_at]
           Time.parse(ohm[:done_at]) < before_twenty_four_hrs_ago &&
           (
-            ohm[:color].to_sym == :black ||
+            ohm[:color].to_sym == :white ||
             ohm[:color].to_sym == :green ||
             ohm[:color].to_sym == :cyan ||
             ohm[:color].to_sym == :red
@@ -95,7 +95,7 @@ module Cryptum
           order_history.find do |oh|
             oh[:id] == ohm[:buy_order_id] ||
             oh[:id] == ohm[:sell_order_id] ||
-            ohm[:color].to_sym == :black ||
+            ohm[:color].to_sym == :white ||
             ohm[:color].to_sym == :green
           end
         end

data/lib/cryptum/ui/order_execute_details.rb

@@ -29,7 +29,7 @@ module Cryptum
           order_id = order_meta_data[:buy_order_id]
         when :green, :magenta, :yellow
           order_id = order_meta_data[:sell_order_id]
-        when :black
+        when :white
           order_id = 'Expired'
         else
           order_id = 'N/A'
@@ -41,33 +41,59 @@ module Cryptum
           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'
-        order_hist_created_ln = '- Creation Date: N/A'
-        order_hist_finished_ln = '- Finished Date: 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]
-          order_hist_created_ln = "- Creation Date: #{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_hist_finished_ln = "- Expiring Date: #{expire_time}"
+            order_meta_data[:color] = :cyan if done_at
           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_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_meta_data[:risk_alloc]
         )
@@ -93,11 +119,11 @@ module Cryptum
         size = "*#{size_out} + "
         tpm_out = "#{order_meta_data[:tpm]}% = "
         targ_tick = "$#{target_price_out}"
-        profit = "|Profit: $#{order_meta_data[:profit]}"
+        profit = " | Profit: $#{order_meta_data[:profit]}"
 
-        meta_ln = "- Metadata: #{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
-        meta_ln = '- Metadata:'
-        meta_color_ln = "  - Color: #{order_color}"
+        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
@@ -187,7 +213,7 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: order_hist_created_ln.ljust(col_just1, ' ')
+          string: order_hist_created_finished_ln.ljust(col_just1, ' ')
         )
 
         # ROW 7
@@ -199,7 +225,7 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: order_hist_finished_ln.ljust(col_just1, ' ')
+          string: details_ln1.ljust(col_just1, ' ')
         )
 
         # ROW 8
@@ -211,7 +237,7 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: meta_ln.ljust(col_just1, ' ')
+          string: details_ln2.ljust(col_just1, ' ')
         )
 
         # ROW 9
@@ -223,7 +249,7 @@ module Cryptum
           ui_win: order_execute_details_win,
           color: order_color,
           style: style,
-          string: meta_color_ln.ljust(col_just1, ' ')
+          string: details_ln3.ljust(col_just1, ' ')
         )
 
         # Clear to OK ROW

data/lib/cryptum/ui/order_execution.rb

@@ -215,7 +215,7 @@ module Cryptum
               oh[:id] == meta[:buy_order_id]
             end
             meta[:done_at] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%N%z')
-            meta[:color] = :black
+            meta[:color] = :white
           end
         end
 
@@ -291,7 +291,7 @@ module Cryptum
 
             # Reinitiate GTFO if the previous GTFO Order Expires.
             terminal_win.key_press_event.key_g = true if meta[:color] == :magenta
-            meta[:color] = :black
+            meta[:color] = :white
           end
         end
 
@@ -332,7 +332,7 @@ module Cryptum
 
         # Snag all expired orders
         oh_meta_expired_arr = order_history_meta.select do |ohm|
-          ohm[:color].to_sym == :black && ohm.key?(:done_at)
+          ohm[:color].to_sym == :white && ohm.key?(:done_at)
         end
 
         # Snag all expired orders within past 24 hrs

data/lib/cryptum/ui/order_plan.rb

@@ -322,10 +322,10 @@ module Cryptum
             )
           end
         else
-          color = plan_color = :white
-          color = indicator_status.market_trend[:color] if indicator_status.market_trend
-          plan_color = :cyan if color == :red
-          plan_color = :green if color == :green
+          market_trend_color = plan_color = :white
+          market_trend_color = indicator_status.market_trend[:color] if indicator_status.market_trend
+          plan_color = :cyan if market_trend_color == :red
+          plan_color = :green if market_trend_color == :green
 
           first_row = event_history.order_plan_index_offset
           last_row = first_row + event_history.order_plan_max_rows_to_display

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/ui.rb

@@ -129,8 +129,12 @@ module Cryptum
 
       case color
       when :black
-        color_id = 0
-        color_fg = Curses::COLOR_BLACK
+        # It's more Gray than Black
+        # color_id = 0
+        # color_fg = Curses::COLOR_BLACK
+        color_id = 256
+        Curses.init_color(color_id, 0, 0, 500)
+        color_fg = color_id
         color_bg = bg
       when :red
         color_id = 1

data/lib/cryptum/version.rb

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

metadata

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