cryptum 0.0.320 → 0.0.321

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1dc9a031f9016aa51791a274952b89497f99019ba4df6b53d3a0f7fc4b928ef
-  data.tar.gz: fabcdebed66a003cb1e7ac823b10aa5ee547bdf9703aad930d49615358bff579
+  metadata.gz: 618890a4abd0cf25d2ed57e8c159e24809f002d00bf1f80477ee527e9c10af80
+  data.tar.gz: f440a2343fc364c1889b0808101fbd86a6d543bd193ab226255c386740abea78
 SHA512:
-  metadata.gz: 8942cf6e920fa3f6172f2987d15163604e9a975dc65290dd883fbbe827a69c6a77333e46e840c1a85e37985e5d720cb4645f6a9d38ea26cdcdac15bf36a23cec
-  data.tar.gz: 2062bfe9757f0c9babf2df1b98768338d9f13ffa6338fadf90d7bb821d752a337b1af3b9734262f7a0b6529014008159b7c19207fc2ad72df4c8296b2adc080b
+  metadata.gz: cc9cb05b462c3e2384249c6e6465793cbdfee40d0ac1d89fb86ece35e9e47e72294730b758f284fb88a6ae38cb22b17a672dbed94a4adc5322ba1996b796eb15
+  data.tar.gz: eeeee4adb494120eb55fe8301cdbbc00d1176e3a83494a0293d12cea3bbd2c4ba697ec7891bcd431275accc4074a72bd0198676e79ce9f8d6acaea65503db67e

data/Gemfile

@@ -27,7 +27,7 @@ gem 'rest-client', '2.1.0'
 gem 'rspec', '3.12.0'
 gem 'rubocop', '1.40.0'
 gem 'rubocop-rake', '0.6.0'
-gem 'rubocop-rspec', '2.15.0'
+gem 'rubocop-rspec', '2.16.0'
 gem 'ruby-prof', '1.4.3'
 gem 'rvm', '1.11.3.9'
 gem 'sinatra', '3.0.4'

data/lib/cryptum/bot_conf.rb

@@ -50,7 +50,9 @@ module Cryptum
       raise e
     end
 
-    # Update Key/Value Pair in Bot Conf and Serialize to YAML File
+    # SAUCE 1
+    # Calculate Target Profit Margin Percent Based Upon
+    # Observed Margins of Change in the Past 24hrs.
     public_class_method def self.recalculate_tpm(opts = {})
       option_choice = opts[:option_choice]
       event_history = opts[:event_history]

data/lib/cryptum/event/history.rb

@@ -11,10 +11,27 @@ module Cryptum
                     :event_type,
                     :first_event,
                     :market_trend_event,
+                    :open_sell_orders,
+                    :open_sell_orders_max,
+                    :open_sell_orders_merge,
                     :order_book,
                     :order_canceled,
-                    :order_submitted,
+                    :order_execute_win_active,
+                    :order_execute_details_win_active,
+                    :order_execute_index_offset,
+                    :order_execute_max_rows_to_display,
+                    :order_execute_max_records_available_to_display,
+                    :order_execute_row_to_select,
+                    :order_execute_selected_data,
+                    :order_plan_win_active,
+                    :order_plan_details_win_active,
+                    :order_plan_index_offset,
+                    :order_plan_max_rows_to_display,
+                    :order_plan_max_records_available_to_display,
+                    :order_plan_row_to_select,
+                    :order_plan_selected_data,
                     :order_ready,
+                    :order_submitted,
                     :plan_no,
                     :reconnected,
                     :red_pill,
@@ -24,20 +41,6 @@ module Cryptum
                     :time_between_orders_max,
                     :time_between_orders_min,
                     :time_between_orders_reset,
-                    :order_plan_win_active,
-                    :order_plan_details_win_active,
-                    :order_plan_index_offset,
-                    :order_plan_max_rows_to_display,
-                    :order_plan_max_records_available_to_display,
-                    :order_plan_row_to_select,
-                    :order_plan_selected_data,
-                    :order_execute_win_active,
-                    :order_execute_details_win_active,
-                    :order_execute_index_offset,
-                    :order_execute_max_rows_to_display,
-                    :order_execute_max_records_available_to_display,
-                    :order_execute_row_to_select,
-                    :order_execute_selected_data,
                     :recalculate_order_plan
 
       def initialize(opts = {})
@@ -47,21 +50,11 @@ module Cryptum
 
         self.bullish_trend = true
         self.first_event = true
-        self.order_canceled = false
-        self.order_submitted = false
-        self.order_ready = false
+        self.open_sell_orders = 0
+        self.open_sell_orders_max = 500
+        self.open_sell_orders_merge = false
         self.order_book = order_book
-        self.plan_no = 1
-        self.start_time = start_time
-        self.reconnected = false
-        self.red_pill = false
-        self.order_plan_win_active = true
-        self.order_plan_details_win_active = false
-        self.order_plan_index_offset = 0
-        self.order_plan_max_rows_to_display = 6
-        self.order_plan_max_records_available_to_display = 6
-        self.order_plan_row_to_select = order_plan_index_offset
-        self.order_plan_selected_data = { color: :white }
+        self.order_canceled = false
         self.order_execute_win_active = false
         self.order_execute_details_win_active = false
         self.order_execute_index_offset = 0
@@ -69,14 +62,26 @@ module Cryptum
         self.order_execute_max_records_available_to_display = 6
         self.order_execute_row_to_select = order_execute_index_offset
         self.order_execute_selected_data = { color: :white }
+        self.order_plan_win_active = true
+        self.order_plan_details_win_active = false
+        self.order_plan_index_offset = 0
+        self.order_plan_max_rows_to_display = 6
+        self.order_plan_max_records_available_to_display = 6
+        self.order_plan_row_to_select = order_plan_index_offset
+        self.order_plan_selected_data = { color: :white }
+        self.order_ready = false
+        self.order_submitted = false
+        self.plan_no = 1
+        self.reconnected = false
+        self.red_pill = false
         self.recalculate_order_plan = false
+        self.start_time = start_time
 
-        # TODO: Implement market_trend_reset / 144
-        # Default = 10 minutes
+        # FAST BUY = 10 minutes
         self.time_between_orders = 600
         self.time_between_orders_reset = time_between_orders
 
-        # 1 hour
+        # SLOW BUY = 1 hour
         self.time_between_orders_max = 3_600
 
         # 5 seconds

data/lib/cryptum/ui/order_execution.rb

@@ -157,6 +157,9 @@ module Cryptum
               this_order[:color] = :cyan
               order_history_meta.push(this_order)
             end
+
+            # SAUCE 3
+            # Time between orders
             # Increment n Seconds between buys to
             # account for bearish and bullish trends
             dynamic_time_increment = cast_margin_to_sec * -1
@@ -361,7 +364,11 @@ module Cryptum
         total_to_sell = order_history.select do |oh|
           oh[:status].to_sym == :open && oh[:side].to_sym == :sell
         end.length
-        total_to_sell = "#{total_to_sell}+" if total_to_sell == 1000
+        event_history.open_sell_orders = total_to_sell
+        # 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.
+        event_history.open_sell_orders_merge = true if total_to_sell > event_history.open_sell_orders_max
 
         # TODO: Everything Above this Line Needs to be Indicators ^
 
@@ -566,8 +573,9 @@ module Cryptum
 
         order_execute_win.refresh
 
-        # Reset Order Ready Boolean
+        # Reset Order Ready && Open Sell Orders Merge (If Applicable) Booleans
         event_history.order_ready = false
+        event_history.open_sell_orders_merge = false
 
         event_history
       rescue Interrupt

data/lib/cryptum/ui/order_plan.rb

@@ -16,10 +16,8 @@ module Cryptum
         option_choice = opts[:option_choice]
         order_plan_win = opts[:order_plan_win]
         event_history = opts[:event_history]
-        # key_press_event = opts[:key_press_event]
         indicator_status = opts[:indicator_status]
         bot_conf = opts[:bot_conf]
-        # fiat_portfolio_file = opts[:fiat_portfolio_file]
 
         ticker_price = event_history.order_book[:ticker_price].to_f
         return event_history unless ticker_price.positive?
@@ -27,13 +25,9 @@ module Cryptum
         market_trend_color = plan_color = :white
 
         this_product = event_history.order_book[:this_product]
-        # symbol_out = this_product[:id]
-        # quote_increment = this_product[:quote_increment]
         base_increment = this_product[:base_increment]
-        # base_min_size = this_product[:base_min_size].to_f
         min_market_funds = this_product[:min_market_funds]
 
-        # fiat_smallest_decimal = quote_increment.to_s.split('.')[-1].length
         crypto_smallest_decimal = base_increment.to_s.split('.')[-1].length
 
         autotrade_percent = bot_conf[:autotrade_portfolio_percent].to_f
@@ -50,23 +44,11 @@ module Cryptum
         raise "ID for Crypto Currency, #{crypto_currency} Not Found" if this_account.empty?
 
         balance = format("%0.#{crypto_smallest_decimal}f", this_account.first[:balance])
-        # avail_for_trade = format("%0.#{crypto_smallest_decimal}f", this_account.first[:available])
-
         fiat_portfolio = event_history.order_book[:fiat_portfolio]
         total_holdings = format('%0.2f', fiat_portfolio.first[:total_holdings])
-        # fiat_balance = format('%0.2f', fiat_portfolio.first[:balance])
         fiat_avail_for_trade = format('%0.2f', fiat_portfolio.first[:available])
 
         fiat_budget = fiat_avail_for_trade.to_f
-        # current_fiat_invested_percent = (
-        #   1 - (fiat_budget / total_holdings.to_f)
-        # ) * 100
-
-        # order_history = event_history.order_book[:order_history]
-        # open_orders = order_history.select do |order|
-        #   order[:status] == 'open'
-        # end
-        # total_open_orders = open_orders.length
 
         order_plan = event_history.order_book[:order_plan]
 
@@ -75,10 +57,6 @@ module Cryptum
           balance.to_f * ticker_price
         )
 
-        # crypto_invested_percent = format(
-        #   '%0.2f',
-        #   (current_crypto_fiat_value.to_f / total_holdings.to_f) * 100
-        # )
         crypto_invested_percent = format(
           '%0.2f',
           current_crypto_fiat_value.to_f.fdiv(total_holdings.to_f) * 100
@@ -86,6 +64,8 @@ module Cryptum
 
         event_history.red_pill = true if crypto_invested_percent.to_f > autotrade_percent
 
+        # SAUCE 2
+        # Generating and/or recalculating order plan
         if event_history.recalculate_order_plan || (
              crypto_invested_percent.to_f <= autotrade_percent &&
              autotrade_percent.positive? && (
@@ -114,6 +94,9 @@ module Cryptum
           risk_target = fiat_budget * autotrade_cast_as_decimal
           risk_alloc = risk_target
 
+          # TODO: Order Plan <= event_history.max_open_sell_orders
+          previous_slice_fiat_investing = 0.00
+          last_slice_detected = false
           loop do
             # Calculate min order size
             allocation_decimal += 0.0001
@@ -121,21 +104,30 @@ module Cryptum
 
             next unless fiat_investing > min_market_funds.to_f
 
+            # Increase amount invested in each slice as we increment
+            # plan numbers (i.e. slices) in the order plan cycle
+            slice_alloc = fiat_budget * allocation_decimal
+            fiat_investing = slice_alloc + previous_slice_fiat_investing
+
             risk_alloc = fiat_budget * autotrade_cast_as_decimal
             allocation_percent = allocation_decimal * 100
-            fiat_returning = fiat_investing + (
-              fiat_investing * tpm_cast_as_decimal
-            )
-            profit = fiat_returning - fiat_investing
 
             break if order_plan.map { |op| op[:invest].to_f }.sum > risk_target ||
-                     allocation_percent > 100
+                     allocation_percent > 100 ||
+                     last_slice_detected
 
-            # 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
+            if fiat_investing > fiat_budget
+              last_slice_detected = true
+              fiat_investing = fiat_budget
+            end
+
+            fiat_returning = fiat_investing + (
+              fiat_investing * tpm_cast_as_decimal
+            )
+            profit = fiat_returning - fiat_investing
+
             this_plan_no = "#{plan_no}.#{plan_no_slice}"
             if event_history.recalculate_order_plan
               order_slice = order_plan.find do |order|
@@ -156,19 +148,24 @@ module Cryptum
             )
             order_slice[:slice_alloc] = format('%0.2f', slice_alloc)
             order_slice[:risk_target] = format('%0.2f', risk_target)
+            order_slice[:previous_slice_invest] = format(
+              '%0.2f',
+              previous_slice_fiat_investing
+            )
             order_slice[:invest] = format('%0.2f', fiat_investing)
             order_slice[:return] = format('%0.2f', fiat_returning)
             order_slice[:profit] = format('%0.2f', profit)
             order_slice[:tpm] = tpm
             order_slice[:autotrade_percent] = autotrade_percent
             order_slice[:color] = plan_color
+            order_slice[:last_slice] = last_slice_detected
 
             order_plan.push(order_slice) unless event_history.recalculate_order_plan
             fiat_budget -= fiat_investing
+            previous_slice_fiat_investing = fiat_investing
             plan_no_slice += 1
           end
           event_history.order_book[:order_plan] = order_plan
-          # event_history.recalculate_order_plan = false
         end
 
         red_pill_alert = '| RED PILL ALERT |'
@@ -213,7 +210,6 @@ module Cryptum
 
         # UI
         col_just1 = (Curses.cols - Cryptum::UI.col_first) - 1
-        # col_just3 = (Curses.cols - Cryptum::UI.col_third) - 1
         col_just4 = Curses.cols - Cryptum::UI.col_fourth
 
         # ROW 1
@@ -294,6 +290,7 @@ module Cryptum
             string: red_pill_alert
           )
 
+          order_plan_win.setpos(out_line_no, Cryptum::UI.col_fourth)
           Cryptum::UI.colorize(
             ui_win: order_plan_win,
             color: :red,
@@ -380,6 +377,9 @@ module Cryptum
             slice_alloc_out = Cryptum.beautify_large_number(
               value: order[:slice_alloc]
             )
+            previous_slice_invest_out = Cryptum.beautify_large_number(
+              value: order[:previous_slice_invest]
+            )
             invest_out = Cryptum.beautify_large_number(
               value: order[:invest]
             )
@@ -393,7 +393,9 @@ module Cryptum
             plan_no = "#{order[:plan_no]}|"
             fiat = "#{autotrade_percent}% of $#{fiat_avail_out} = "
             alloc = "$#{risk_alloc_out} @ #{order[:allocation_percent]}% = "
-            invest = "$#{slice_alloc_out} OR MIN OF $#{invest_out} + #{tpm_out}% = "
+            alloc = "$#{risk_alloc_out}" if order[:last_slice]
+            invest = "$#{slice_alloc_out} + $#{previous_slice_invest_out} = $#{invest_out} + #{tpm_out}% = "
+            invest = " + #{tpm_out}% = " if order[:last_slice]
 
             returns = "$#{return_out}|"
             profit = "Profit: $#{profit_out}"

data/lib/cryptum/ui/order_plan_details.rb

@@ -32,6 +32,9 @@ module Cryptum
         slice_alloc_out = Cryptum.beautify_large_number(
           value: order[:slice_alloc]
         )
+        previous_slice_invest_out = Cryptum.beautify_large_number(
+          value: order[:previous_slice_invest]
+        )
         invest_out = Cryptum.beautify_large_number(
           value: order[:invest]
         )
@@ -44,8 +47,13 @@ module Cryptum
         )
         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)."
+        if order[:last_slice]
+          slice_alloc_ln1_details = "2. Since $#{risk_alloc_out} is the remaining amount within the criteria defined in the Autotrade % above,"
+          slice_alloc_ln2_details = "   $#{invest_out} will be allocated for this slice."
+        else
+          slice_alloc_ln1_details = "2. With $#{risk_alloc_out} available and a slice allocation of #{order[:allocation_percent]}%, $#{slice_alloc_out} plus the previous"
+          slice_alloc_ln2_details = "   slice of $#{previous_slice_invest_out} results in $#{invest_out} being allocated for this slice."
+        end
         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.'

data/lib/cryptum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.320
+  version: 0.0.321
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement