cryptum 0.0.372 → 0.0.373

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa120fa4d511dc9bf69d5a1ab014f6a64a25240c2c82d24e3b5174577f909db
-  data.tar.gz: 635cd8ee8edc14f8af8fb0e231f93ec56b9ca2ca8ef76c956437545fa2237cd4
+  metadata.gz: ad583e315522b51751a336aff7cff06e1f9efa4a6b0227ebaf21149835ef03f4
+  data.tar.gz: e269e281bb9de22cf6049cb965e20566d0a0fcce00d45ef7d7c94129017b54f2
 SHA512:
-  metadata.gz: 95e9e47b4ed784434434e59d26ce36d6390570800f2121d69062afefe9a7b298c2b5efb672454541ea7d8341f2221a1a6e8e0ad10105fc764a0117b9d1149376
-  data.tar.gz: d8c64d255c32e4f7c93e0dd9bf6266001c1d4d3c8f8753ca8e5db88ec8821c65661dafc0654e22e474c5df39fde6460fcf896c41e0206b1f62b749580aba6dbd
+  metadata.gz: dc070fb8cac58f2c2bec2444c667c1aba3c6c7078c3d72fe3d5de92bd42ebd2a2b1b1920ab8bc3f4d7fb2fbfafb27d9546eff148fb05d738bee0151ebb470e8b
+  data.tar.gz: 8d948d008ac22ff81af033efb9367e3600c8bb2b41c8a84286dd8ed571ddb63e4b11671dfd922f61b946c6f5814e92daf80ebf57836e548d69796a7d4de935c1

data/Gemfile

@@ -12,7 +12,7 @@ gemspec
 # to build appropriately.  Defer to ./reinstall_coinbot_gemset.sh
 # to review these custom flags
 gem 'addressable', '2.8.1'
-gem 'bundler', '>=2.4.9'
+gem 'bundler', '>=2.4.10'
 gem 'bundler-audit', '0.9.1'
 gem 'curses', '1.4.4'
 gem 'eventmachine', '1.2.7'

data/lib/cryptum/ui/order_execution.rb

@@ -88,11 +88,19 @@ module Cryptum
               last_order = order_history_meta.select do |order|
                 order if order[:color] == 'yellow'
               end.last
+
               last_purchase_price = 0.0
               last_purchase_price = last_order[:price].to_f if last_order
 
               limit_price = last_purchase_price - quote_increment.to_f if last_purchase_price.positive? && last_purchase_price < limit_price
 
+              # Debug last order
+              File.open('/tmp/cryptum-errors.txt', 'a') do |f|
+                f.puts "Last Order: #{last_order}"
+                f.puts "Last Purchase Price: #{last_purchase_price}"
+                f.puts "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
+              end
+
               price = format(
                 "%0.#{fiat_smallest_decimal}f",
                 limit_price
@@ -312,6 +320,7 @@ module Cryptum
         oh_meta_sold_arr = order_history_meta.select do |ohm|
           ohm[:color].to_sym == :green && ohm.key?(:done_at)
         end
+        order_hist_meta_sold = oh_meta_sold_arr.length
 
         # Snag all sold orders within past 24 hrs
         ohm_sold_twenty_four_arr = []
@@ -320,12 +329,13 @@ module Cryptum
             Time.parse(o[:done_at]) >= twenty_four_hrs_ago
           end
         end
-        order_hist_meta_sold = ohm_sold_twenty_four_arr.length
+        order_hist_meta_sold_twenty_four = ohm_sold_twenty_four_arr.length
 
         # Snag all expired orders
         oh_meta_expired_arr = order_history_meta.select do |ohm|
           ohm[:color].to_sym == :white && ohm.key?(:done_at)
         end
+        order_hist_meta_expired = oh_meta_expired_arr.length
 
         # Snag all expired orders within past 24 hrs
         ohm_expire_twenty_four_arr = []
@@ -334,9 +344,20 @@ module Cryptum
             Time.parse(o[:done_at]) >= twenty_four_hrs_ago
           end
         end
-        order_hist_meta_expired = ohm_expire_twenty_four_arr.length
+        order_hist_meta_24h_expired = ohm_expire_twenty_four_arr.length
+
+        # Calculate total gains and gains within past 24 hrs
+        gains_sum = oh_meta_sold_arr.map do |ohms|
+          ohms[:profit].to_f
+        end.sum
+
+        gains_out = Cryptum.beautify_large_number(
+          value: format(
+            '%0.2f',
+            gains_sum
+          )
+        )
 
-        # Calculate gains within past 24 hrs
         gains_24h_sum = ohm_sold_twenty_four_arr.map do |ohms|
           ohms[:profit].to_f
         end.sum
@@ -351,7 +372,23 @@ module Cryptum
         total_to_sell = order_history.select do |oh|
           oh[:status].to_sym == :open && oh[:side].to_sym == :sell
         end.length
+
         event_history.open_sell_orders = total_to_sell
+        oh_meta_total_selling_profit_arr = order_history_meta.select do |ohm|
+          ohm[:color].to_sym == :yellow
+        end
+
+        total_selling_profit = oh_meta_total_selling_profit_arr.map do |ohms|
+          ohms[:profit].to_f
+        end.sum
+
+        total_selling_profit_out = Cryptum.beautify_large_number(
+          value: format(
+            '%0.2f',
+            total_selling_profit
+          )
+        )
+
         # TODO: when event_history.open_sell_orders > event_history.open_sell_orders_max
         # Capture highest amount to sell, cancel all orders, and create _one_ limit sell
         # order set to a price of the previously captured highest amount to sell.
@@ -524,7 +561,10 @@ module Cryptum
           string: ''.ljust(col_just1, ' ')
         )
 
-        header_str = "24 HR SUMMARY | Open Sell Orders: #{total_to_sell} | Sold: #{order_hist_meta_sold} | Gains: $#{gains_24h_out} | Expired: #{order_hist_meta_expired}"
+        header_str = "SELLING: #{total_to_sell} w tProf: $#{total_selling_profit_out} | "
+        header_str += "SOLD 24h: #{order_hist_meta_sold_twenty_four} Tot: #{order_hist_meta_sold} | "
+        header_str += "GAINS 24h: $#{gains_24h_out} Tot: $#{gains_out} | "
+        header_str += "EXPIRED 24h: #{order_hist_meta_24h_expired} Tot: #{order_hist_meta_expired}"
         order_execute_win.setpos(
           out_line_no,
           Cryptum::UI.col_center(str: header_str)
@@ -537,14 +577,14 @@ module Cryptum
           string: header_str
         )
 
-        order_execute_win.setpos(out_line_no, Cryptum::UI.col_fourth)
-        order_execute_win.clrtoeol
-        Cryptum::UI.colorize(
-          ui_win: order_execute_win,
-          color: header_color,
-          style: header_style,
-          string: ''.ljust(col_just4, ' ')
-        )
+        # order_execute_win.setpos(out_line_no, Cryptum::UI.col_fourth)
+        # order_execute_win.clrtoeol
+        # Cryptum::UI.colorize(
+        #   ui_win: order_execute_win,
+        #   color: header_color,
+        #   style: header_style,
+        #   string: ''.ljust(col_just4, ' ')
+        # )
 
         # ROW 11
         out_line_no += 1

data/lib/cryptum/ui/order_plan.rb

@@ -456,7 +456,9 @@ module Cryptum
             string: ''.ljust(col_just1, ' ')
           )
 
-          header_str = "CYCLE SUMMARY | Risk Allocated: $#{order_plan_volume_out} | Profit: $#{order_plan_profit_sum_out} | #{order_plan_exec_percent}% Done"
+          header_str = "RISK ALLOCATED: $#{order_plan_volume_out} | "
+          header_str += "PROJECTED PROFIT: $#{order_plan_profit_sum_out} | "
+          header_str += "#{order_plan_exec_percent}% DONE"
           order_plan_win.setpos(
             out_line_no,
             Cryptum::UI.col_center(str: header_str)
@@ -469,14 +471,14 @@ module Cryptum
             string: header_str
           )
 
-          order_plan_win.setpos(out_line_no, Cryptum::UI.col_fourth)
-          order_plan_win.clrtoeol
-          Cryptum::UI.colorize(
-            ui_win: order_plan_win,
-            color: header_color,
-            style: header_style,
-            string: ''.ljust(col_just4, ' ')
-          )
+          # order_plan_win.setpos(out_line_no, Cryptum::UI.col_fourth)
+          # order_plan_win.clrtoeol
+          # Cryptum::UI.colorize(
+          #   ui_win: order_plan_win,
+          #   color: header_color,
+          #   style: header_style,
+          #   string: ''.ljust(col_just4, ' ')
+          # )
         end
 
         # ROW 11

data/lib/cryptum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.372
+  version: 0.0.373
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: 2.4.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement