cryptum 0.0.372 → 0.0.374

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa120fa4d511dc9bf69d5a1ab014f6a64a25240c2c82d24e3b5174577f909db
-  data.tar.gz: 635cd8ee8edc14f8af8fb0e231f93ec56b9ca2ca8ef76c956437545fa2237cd4
+  metadata.gz: a78297f3f507363560f8127ddbe5a801975c0d9741d0b06eb255260388cf9393
+  data.tar.gz: 49279724c8c8bbda01f2a987f32f94fae70fddaa003941ff3a05dd7fd8bbbe0f
 SHA512:
-  metadata.gz: 95e9e47b4ed784434434e59d26ce36d6390570800f2121d69062afefe9a7b298c2b5efb672454541ea7d8341f2221a1a6e8e0ad10105fc764a0117b9d1149376
-  data.tar.gz: d8c64d255c32e4f7c93e0dd9bf6266001c1d4d3c8f8753ca8e5db88ec8821c65661dafc0654e22e474c5df39fde6460fcf896c41e0206b1f62b749580aba6dbd
+  metadata.gz: da4280d0b8c0d77526d999437e1643828cf00510722186d3c6408a679e1577c905956fb27ba2550ada2505af3baebd11f9242b73cf331467876f8589517b80fb
+  data.tar.gz: f52c1f848a9fe79f6861c989e985e73d5797b90a860288d49d7f68a249e923872fffc7446545f46220eea8c1a20f6adccada401c97cb81fa1cf91dd8edb3af36

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-01-10 17:06:46 UTC using RuboCop version 1.43.0.
+# on 2023-03-29 14:29:26 UTC using RuboCop version 1.48.1.
 # 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
@@ -15,6 +15,11 @@ Lint/UselessAssignment:
 Lint/UselessRescue:
   Enabled: false
 
+# Offense count: 1
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 131
+
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
@@ -24,7 +29,7 @@ Style/ConditionalAssignment:
     - 'lib/cryptum/event/pane.rb'
     - 'lib/cryptum/ui/order_execute_details.rb'
 
-# Offense count: 22
+# Offense count: 23
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false

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/event/history.rb

@@ -44,7 +44,7 @@ module Cryptum
                     :recalculate_order_plan
 
       def initialize(opts = {})
-        # option_choice = opts[:option_choice]
+        option_choice = opts[:option_choice]
         start_time = opts[:start_time]
         order_book = opts[:order_book]
 
@@ -78,20 +78,119 @@ module Cryptum
         self.start_time = start_time
 
         # -------------------------------------------------- #
-        # SAUCE 4
-        # TODO: develop algorithm to calculate
-        # FAST BUY && SLOW BUY values taking
-        # market_trend_reset values into account
+        # SAUCE 3 (SAUCE 4 RELATES TO SAUCE 3)
+        case option_choice.market_trend_reset_label
+        when '1W'
+          # SLOW BUY = 1 day
+          self.time_between_orders_max = 86_400
 
-        # FAST BUY = 4 hours
-        self.time_between_orders = 14_400
-        self.time_between_orders_reset = time_between_orders
+          # FAST BUY = 4 hours
+          self.time_between_orders = 14_400
+          self.time_between_orders_reset = time_between_orders
 
-        # SLOW BUY = 1 day
-        self.time_between_orders_max = 86_400
+          # 1 hour
+          self.time_between_orders_min = 3_600
+        when '1D'
+          # SLOW BUY = 4 hours
+          self.time_between_orders_max = 14_400
 
-        # 1 hour
-        self.time_between_orders_min = 3_600
+          # FAST BUY = 3 hours
+          self.time_between_orders = 10_800
+          self.time_between_orders_reset = time_between_orders
+
+          # 45 minutes
+          self.time_between_orders_min = 2_700
+        when '4h'
+          # SLOW BUY = 3 hours
+          self.time_between_orders_max = 10_800
+
+          # FAST BUY = 2 hours
+          self.time_between_orders = 7_200
+          self.time_between_orders_reset = time_between_orders
+
+          # 30 minutes
+          self.time_between_orders_min = 1_800
+        when '3h'
+          # SLOW BUY = 2 hours
+          self.time_between_orders_max = 7_200
+
+          # FAST BUY = 1 hour
+          self.time_between_orders = 3_600
+          self.time_between_orders_reset = time_between_orders
+
+          # 15 minutes
+          self.time_between_orders_min = 900
+        when '2h'
+          # SLOW BUY = 1 hour
+          self.time_between_orders_max = 3_600
+
+          # FAST BUY = 45 minutes
+          self.time_between_orders = 2_700
+          self.time_between_orders_reset = time_between_orders
+
+          # 5 minutes
+          self.time_between_orders_min = 300
+        when '1h'
+          # SLOW BUY = 45 minutes
+          self.time_between_orders_max = 2_700
+
+          # FAST BUY = 30 minutes
+          self.time_between_orders = 1_800
+          self.time_between_orders_reset = time_between_orders
+
+          # 3 minutes
+          self.time_between_orders_min = 180
+        when '45m'
+          # SLOW BUY = 30 minutes
+          self.time_between_orders_max = 1_800
+
+          # FAST BUY = 15 minutes
+          self.time_between_orders = 900
+          self.time_between_orders_reset = time_between_orders
+
+          # 1 minute
+          self.time_between_orders_min = 60
+        when '30m'
+          # SLOW BUY = 15 minutes
+          self.time_between_orders_max = 900
+
+          # FAST BUY = 5 minutes
+          self.time_between_orders = 300
+          self.time_between_orders_reset = time_between_orders
+
+          # 1 minute
+          self.time_between_orders_min = 60
+        when '15m'
+          # SLOW BUY = 5 minutes
+          self.time_between_orders_max = 300
+
+          # FAST BUY = 3 minutes
+          self.time_between_orders = 180
+          self.time_between_orders_reset = time_between_orders
+
+          # 1 minute
+          self.time_between_orders_min = 60
+        when '5m'
+          # SLOW BUY = 3 minutes
+          self.time_between_orders_max = 180
+
+          # FAST BUY = 1 minute
+          self.time_between_orders = 60
+          self.time_between_orders_reset = time_between_orders
+
+          # 1 minute
+          self.time_between_orders_min = 60
+        when '3m', '1m'
+          # SLOW BUY = 1 minute
+          self.time_between_orders_max = 60
+
+          # FAST BUY = 1 minute
+          self.time_between_orders = 60
+          self.time_between_orders_reset = time_between_orders
+
+          # 1 minute
+          self.time_between_orders_min = 60
+        end
         # -------------------------------------------------- #
       end
     rescue Interrupt

data/lib/cryptum/ui/order_execution.rb

@@ -88,11 +88,20 @@ 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}"
+                f.puts "\n\n\n"
+              end
+
               price = format(
                 "%0.#{fiat_smallest_decimal}f",
                 limit_price
@@ -155,7 +164,7 @@ module Cryptum
               order_history_meta.push(this_order)
             end
 
-            # SAUCE 3
+            # SAUCE 4 (SAUCE 3 RELATES TO SAUCE 4)
             # Time between orders
             # Increment n Seconds between buys to
             # account for bearish and bullish trends
@@ -312,6 +321,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 +330,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 +345,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 +373,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 +562,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 +578,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/ui/order_timer.rb

@@ -65,7 +65,7 @@ module Cryptum
           # TODO: add condition to check if open sell orders exist.
           # If so intent should be something like, "- SEE ORDER HISTORY -"
           # Otherwise, intent should be something like, "- WAIT FOR MARKET TREND SHIFT -"
-          intent = "- SEE ORDER HISTORY #{Cryptum.down_arrow} -"
+          intent = "- #{Cryptum.down_arrow} SEE ORDER HISTORY #{Cryptum.down_arrow} -"
         else
           speed = 'FAST'
           speed = 'SLOW' if buy_total >= sell_total

data/lib/cryptum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.372
+  version: 0.0.374
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-29 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
@@ -523,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Coinbase Pro High-Frequency Trading Bot