cryptum 0.0.325 → 0.0.326

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10328af02cf519e0d0909c39eebeef68636167861ce9c29f853cf3226aa3fe5f
-  data.tar.gz: 8acc998468938e4b9b368ebb23dcfdbe50e1f2365095be73ba2b4f3b552e8ef9
+  metadata.gz: 8d8c54730d0149d694842e5297e5507aa11fd7c2da04db91a21a1ec0e8c05330
+  data.tar.gz: 481624b37f1ac33a111bd0feb7f4767f981ed0af5eea741d52a4ca6cb812a803
 SHA512:
-  metadata.gz: 033467601d7fbfabb46747e51093f14c28320ad5cdb3fed2b35a5d75d0b576d7bb4d44de9b0239cba3a292b61fda8f99a1c1976e00225c46bae7cacfd677333f
-  data.tar.gz: bcaf51a3743fcabab91e43c539d558d9d281fbfc3e79bc1d7ff35b4ca46b44f754106e82f392ab27839f43915bdff1076c32ec0d2bdd18adb2db18c1acae93f4
+  metadata.gz: 331909ca683994e595a9021d3ffcdb5c16b602a3a442bd4f9a922ebc9f6bf2998945795d9ec1e4f45ddc1e8ea8eb12a8084e471a4e803a0d3f8a6656a81557b6
+  data.tar.gz: f1c7da8bcde3d6d379fcb7192041c36f11881d787cd4232c14195b23cb7f2c66970b8c5a093961c979b0d44bd22b5b1041f0b6f1c2f9a6b74c020e18ee35b8d3

data/bin/cryptum

@@ -35,6 +35,7 @@ begin
     option_choice: option_choice,
     env: env
   )
+  terminal_win.key_press_event.key_w = true if option_choice.reset_session_countdown
 
   # Automatically Create Bot Confs if they don't
   # Exist and Initialize Automated Trading Parameters

data/lib/cryptum/event.rb

@@ -17,179 +17,6 @@ module Cryptum
     autoload :Scroll, 'cryptum/event/scroll'
     autoload :Sell, 'cryptum/event/sell'
 
-    # Supported Method Parameters::
-    # Cryptum::Event.parse(
-    # )
-
-    public_class_method def self.parse(opts = {})
-      option_choice = opts[:option_choice]
-      env = opts[:env]
-      terminal_win = opts[:terminal_win]
-      event_history = opts[:event_history]
-      indicator_status = opts[:indicator_status]
-      # indicator_history = opts[:indicator_history]
-      bot_conf = opts[:bot_conf]
-      # ai_enabled = opts[:ai_enabled]
-
-      # candles = event_history.order_book[:candles]
-      # order_history = event_history.order_book[:order_history]
-      this_product = event_history.order_book[:this_product]
-      fiat = this_product[:quote_currency]
-      fiat_portfolio_file = "#{option_choice.session_root}/order_books/#{fiat}_PORTFOLIO.json"
-
-      # Determine if Summary UI needs updated data
-      event_history = Cryptum::Portfolio::Balance.refresh(
-        env: env,
-        option_choice: option_choice,
-        terminal_win: terminal_win,
-        event_history: event_history,
-        fiat_portfolio_file: fiat_portfolio_file
-      )
-
-      # If the Terminal Window has been Resized, Resize the UI
-      if Curses.cols != terminal_win.cols
-        terminal_win.cols = Curses.cols
-        terminal_win.ticker_ui_resize = true
-        terminal_win.market_trend_ui_resize = true
-      end
-
-      event_history = Cryptum::UI::Portfolio.refresh(
-        option_choice: option_choice,
-        portfolio_win: terminal_win.portfolio_section,
-        event_history: event_history,
-        key_press_event: terminal_win.key_press_event,
-        indicator_status: indicator_status,
-        bot_conf: bot_conf,
-        fiat_portfolio_file: fiat_portfolio_file
-      )
-
-      if event_history.event_type == :ticker ||
-         terminal_win.ticker_ui_resize
-
-        ticker_event = event_history.ticker_event = event_history.event if event_history.event_type == :ticker
-        ticker_event = event_history.ticker_event if terminal_win.ticker_ui_resize
-        Cryptum::UI::Ticker.refresh(
-          option_choice: option_choice,
-          start_time: event_history.start_time,
-          ticker_win: terminal_win.ticker_section,
-          key_press_event: terminal_win.key_press_event,
-          order_book: event_history.order_book,
-          event: ticker_event
-        )
-      end
-
-      Cryptum::UI::OrderTimer.refresh(
-        option_choice: option_choice,
-        event_history: event_history,
-        order_timer_win: terminal_win.order_timer_section,
-        indicator_status: indicator_status,
-        key_press_event: terminal_win.key_press_event
-      )
-
-      if event_history.event_type == :l2update ||
-         terminal_win.market_trend_ui_resize
-
-        market_trend_event = event_history.market_trend_event = event_history.event if event_history.event_type == :l2update
-        market_trend_event = event_history.market_trend_event if terminal_win.market_trend_ui_resize
-        event_history = Cryptum::UI::MarketTrend.refresh(
-          option_choice: option_choice,
-          market_trend_win: terminal_win.market_trend_section,
-          event_history: event_history,
-          key_press_event: terminal_win.key_press_event,
-          event: market_trend_event,
-          indicator_status: indicator_status,
-          bot_conf: bot_conf
-        )
-      end
-
-      indicator_status = Cryptum::UI::SignalEngine.refresh(
-        option_choice: option_choice,
-        signal_engine_win: terminal_win.signal_engine_section,
-        event_history: event_history,
-        key_press_event: terminal_win.key_press_event,
-        indicator_status: indicator_status,
-        bot_conf: bot_conf,
-        fiat_portfolio_file: fiat_portfolio_file
-      )
-
-      unless event_history.order_plan_details_win_active
-        event_history = Cryptum::UI::OrderPlan.refresh(
-          option_choice: option_choice,
-          order_plan_win: terminal_win.order_plan_section,
-          env: env,
-          event_history: event_history,
-          key_press_event: terminal_win.key_press_event,
-          indicator_status: indicator_status,
-          bot_conf: bot_conf,
-          fiat_portfolio_file: fiat_portfolio_file
-        )
-        recalc_op = event_history.recalculate_order_plan
-        order_plan = event_history.order_book[:order_plan]
-        terminal_win.key_press_event.key_w = true if (recalc_op || order_plan.empty?) &&
-                                                     !event_history.red_pill
-        event_history.recalculate_order_plan = false
-      end
-
-      if event_history.order_plan_details_win_active
-        event_history = Cryptum::UI::OrderPlanDetails.refresh(
-          option_choice: option_choice,
-          order_plan_details_win: terminal_win.order_plan_details_section,
-          event_history: event_history,
-          key_press_event: terminal_win.key_press_event
-        )
-      end
-
-      unless event_history.order_execute_details_win_active
-        event_history = Cryptum::UI::OrderExecution.refresh(
-          option_choice: option_choice,
-          order_execute_win: terminal_win.order_execute_section,
-          env: env,
-          event_history: event_history,
-          key_press_event: terminal_win.key_press_event,
-          indicator_status: indicator_status,
-          bot_conf: bot_conf,
-          fiat_portfolio_file: fiat_portfolio_file
-        )
-      end
-
-      if event_history.order_execute_details_win_active
-        event_history = Cryptum::UI::OrderExecuteDetails.refresh(
-          option_choice: option_choice,
-          order_execute_details_win: terminal_win.order_execute_details_section,
-          event_history: event_history,
-          key_press_event: terminal_win.key_press_event
-        )
-      end
-
-      # Refresh Command Section for Cryptum Session Usage
-      Cryptum::UI::Command.refresh(
-        command_win: terminal_win.command_section,
-        key_press_event: terminal_win.key_press_event
-      )
-
-      # last_ticker_price = event_history.order_book[:ticker_price].to_f
-      # second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
-      # third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
-
-      event_history
-    rescue LoadError => e
-      # This happens when autoloading modules fail.
-      File.open('/tmp/cryptum-errors.txt', 'a') do |f|
-        f.puts Time.now.strftime('%Y-%m-%d %H:%M:%S.%N %z')
-        f.puts "Module: #{self}"
-        f.puts "#{e}\n\n\n"
-      end
-
-      retry
-    rescue Interrupt
-      # Exit Gracefully if CTRL+C is Pressed During Session
-      Cryptum.exit_gracefully(which_self: self)
-    rescue StandardError => e
-      raise e
-    ensure
-      $stdout.flush
-    end
-
     # Display Usage for this Module
 
     public_class_method def self.help

data/lib/cryptum/option/choice.rb

@@ -9,6 +9,7 @@ module Cryptum
                     :driver_name,
                     :list_products,
                     :proxy,
+                    :reset_session_countdown,
                     :session_root,
                     :sandbox,
                     :symbol,

data/lib/cryptum/option.rb

@@ -41,6 +41,12 @@ module Cryptum
           '<Optional - HTTP Proxy e.g. "http://127.0.0.1:8080">'
         ) { |p| option_choice.proxy = p }
 
+        options.on(
+          '-R',
+          '--[no-]reset-session-countdown',
+          '<Optional - Reset Timers / Market Trend Stats at Session Init (Defaults to false)>'
+        ) { |t| option_choice.reset_session_countdown = t }
+
         options.on(
           '-rPATH',
           '--session-root=PATH',

data/lib/cryptum/order_book/generate.rb

@@ -82,6 +82,16 @@ module Cryptum
         end
 
         event_history.order_book = order_book
+        if option_choice.reset_session_countdown
+          event_history.order_book[:market_trend][:buy] = 0
+          event_history.order_book[:market_trend][:sell] = 0
+          event_history.order_book[:last_trend_reset] = Time.now.strftime(
+            '%Y-%m-%d %H:%M:%S.%N%z'
+          )
+          event_history.order_book[:last_order_exec] = Time.now.strftime(
+            '%Y-%m-%d %H:%M:%S.%N%z'
+          )
+        end
 
         event_history
       rescue StandardError => e

data/lib/cryptum/order_book/indicator.rb

@@ -8,7 +8,6 @@ module Cryptum
     class Indicator
       attr_accessor :market_trend,
                     :profit_margin,
-                    :weighted_avg,
                     :action_signal,
                     :last_action_signal
     end

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -55,23 +55,157 @@ module Cryptum
               # Explore another way to decouple required events
               # (such as keypresses) from only being triggered
               # when messages come through.
-              ai_enabled = bot_conf[:artifical_intelligence]
 
               event_history.event = JSON.parse(
                 event.data,
                 symbolize_names: true
               )
               event_history.event_type = event_history.event[:type].to_s.to_sym
-              event_history = Cryptum::Event.parse(
+
+              this_product = event_history.order_book[:this_product]
+              fiat = this_product[:quote_currency]
+              fiat_portfolio_file = "#{option_choice.session_root}/order_books/#{fiat}_PORTFOLIO.json"
+
+              # Determine if Summary UI needs updated data
+              event_history = Cryptum::Portfolio::Balance.refresh(
                 env: env,
+                option_choice: option_choice,
                 terminal_win: terminal_win,
+                event_history: event_history,
+                fiat_portfolio_file: fiat_portfolio_file
+              )
+
+              # If the Terminal Window has been Resized, Resize the UI
+              if Curses.cols != terminal_win.cols
+                terminal_win.cols = Curses.cols
+                terminal_win.ticker_ui_resize = true
+                terminal_win.market_trend_ui_resize = true
+              end
+
+              event_history = Cryptum::UI::Portfolio.refresh(
                 option_choice: option_choice,
+                portfolio_win: terminal_win.portfolio_section,
                 event_history: event_history,
+                key_press_event: terminal_win.key_press_event,
                 indicator_status: indicator_status,
                 bot_conf: bot_conf,
-                ai_enabled: ai_enabled
+                fiat_portfolio_file: fiat_portfolio_file
+              )
+
+              if event_history.event_type == :ticker ||
+                 terminal_win.ticker_ui_resize
+
+                ticker_event = event_history.ticker_event = event_history.event if event_history.event_type == :ticker
+                ticker_event = event_history.ticker_event if terminal_win.ticker_ui_resize
+                Cryptum::UI::Ticker.refresh(
+                  option_choice: option_choice,
+                  start_time: event_history.start_time,
+                  ticker_win: terminal_win.ticker_section,
+                  key_press_event: terminal_win.key_press_event,
+                  order_book: event_history.order_book,
+                  event: ticker_event
+                )
+              end
+
+              Cryptum::UI::OrderTimer.refresh(
+                option_choice: option_choice,
+                event_history: event_history,
+                order_timer_win: terminal_win.order_timer_section,
+                indicator_status: indicator_status,
+                key_press_event: terminal_win.key_press_event
               )
 
+              if event_history.event_type == :l2update ||
+                 terminal_win.market_trend_ui_resize
+
+                market_trend_event = event_history.market_trend_event = event_history.event if event_history.event_type == :l2update
+                market_trend_event = event_history.market_trend_event if terminal_win.market_trend_ui_resize
+                event_history = Cryptum::UI::MarketTrend.refresh(
+                  option_choice: option_choice,
+                  market_trend_win: terminal_win.market_trend_section,
+                  event_history: event_history,
+                  key_press_event: terminal_win.key_press_event,
+                  event: market_trend_event,
+                  indicator_status: indicator_status,
+                  bot_conf: bot_conf
+                )
+              end
+
+              indicator_status = Cryptum::UI::SignalEngine.refresh(
+                option_choice: option_choice,
+                signal_engine_win: terminal_win.signal_engine_section,
+                event_history: event_history,
+                key_press_event: terminal_win.key_press_event,
+                indicator_status: indicator_status,
+                bot_conf: bot_conf,
+                fiat_portfolio_file: fiat_portfolio_file
+              )
+
+              unless event_history.order_plan_details_win_active
+                event_history = Cryptum::UI::OrderPlan.refresh(
+                  option_choice: option_choice,
+                  order_plan_win: terminal_win.order_plan_section,
+                  env: env,
+                  event_history: event_history,
+                  key_press_event: terminal_win.key_press_event,
+                  indicator_status: indicator_status,
+                  bot_conf: bot_conf,
+                  fiat_portfolio_file: fiat_portfolio_file
+                )
+                recalc_op = event_history.recalculate_order_plan
+                order_plan = event_history.order_book[:order_plan]
+                terminal_win.key_press_event.key_w = true if (recalc_op || order_plan.empty?) &&
+                                                             !event_history.red_pill
+                event_history.recalculate_order_plan = false
+              end
+
+              if event_history.order_plan_details_win_active
+                event_history = Cryptum::UI::OrderPlanDetails.refresh(
+                  option_choice: option_choice,
+                  order_plan_details_win: terminal_win.order_plan_details_section,
+                  event_history: event_history,
+                  key_press_event: terminal_win.key_press_event
+                )
+              end
+
+              unless event_history.order_execute_details_win_active
+                event_history = Cryptum::UI::OrderExecution.refresh(
+                  option_choice: option_choice,
+                  order_execute_win: terminal_win.order_execute_section,
+                  env: env,
+                  event_history: event_history,
+                  key_press_event: terminal_win.key_press_event,
+                  indicator_status: indicator_status,
+                  bot_conf: bot_conf,
+                  fiat_portfolio_file: fiat_portfolio_file
+                )
+              end
+
+              if event_history.order_execute_details_win_active
+                event_history = Cryptum::UI::OrderExecuteDetails.refresh(
+                  option_choice: option_choice,
+                  order_execute_details_win: terminal_win.order_execute_details_section,
+                  event_history: event_history,
+                  key_press_event: terminal_win.key_press_event
+                )
+              end
+
+              # Refresh Command Section for Cryptum Session Usage
+              Cryptum::UI::Command.refresh(
+                command_win: terminal_win.command_section,
+                key_press_event: terminal_win.key_press_event
+              )
+
+              # event_history = Cryptum::Event.parse(
+              #   env: env,
+              #   terminal_win: terminal_win,
+              #   option_choice: option_choice,
+              #   event_history: event_history,
+              #   indicator_status: indicator_status,
+              #   bot_conf: bot_conf,
+              #   ai_enabled: ai_enabled
+              # )
+
               # Detect Key Press Events
               Cryptum::Event::KeyPress.detect(terminal_win: terminal_win)
 
@@ -249,6 +383,8 @@ module Cryptum
 
           sleep 1
           retry
+        ensure
+          $stdout.flush
         end
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.325
+  version: 0.0.326
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -401,7 +401,6 @@ files:
 - lib/cryptum/order_book/indicator.rb
 - lib/cryptum/order_book/market_trend.rb
 - lib/cryptum/order_book/profit_margin.rb
-- lib/cryptum/order_book/weighted_avg.rb
 - lib/cryptum/portfolio.rb
 - lib/cryptum/portfolio/balance.rb
 - lib/cryptum/ui.rb

data/lib/cryptum/order_book/weighted_avg.rb

@@ -1,157 +0,0 @@
-# frozen_string_literal: true
-
-module Cryptum
-  # This plugin is used to indicate if the Weighted Executed Buy Orders are less than the Weighted Excuted Sell Orders
-
-  module OrderBook
-    module WeightedAvg
-      # Supported Method Parameters::
-      # Cryptum::OrderBook::WeightedAvg.status(
-      #   order_book: 'required - order_book data structure'
-      # )
-
-      public_class_method def self.status(opts = {})
-        order_book = opts[:order_book]
-        order_history = order_book[:order_history]
-        indicator_status = opts[:indicator_status]
-        invested = opts[:invested]
-
-        indicator_hash = {}
-        indicator_hash[:invested] = invested
-
-        buy_orders_done = order_history.select do |orders|
-          orders[:side] == 'buy' &&
-            orders[:status] == 'done' &&
-            orders[:done_reason] == 'filled'
-        end
-
-        total_buy_orders_done = buy_orders_done.length
-        avg_buy_exec = format('%0.7f', 0.00).to_f
-        # total_buy_executed = 0.00
-        # total_invested = 0.00
-        # buy_fees = 0.00
-        if total_buy_orders_done.positive?
-          # Calculate Weighted Avg. of Completed Buy Orders
-          weighted_buy_prices_arr = []
-          buy_orders_done.each do |order|
-            weighted_hash = {}
-            executed_value = order[:executed_value].to_f
-            filled_size = order[:filled_size].to_f
-            weighted_hash[:price] = (executed_value / filled_size).to_f
-            weighted_hash[:filled_size] = filled_size
-            weighted_hash[:price_times_filled_size] = weighted_hash[:price] * filled_size
-            weighted_buy_prices_arr.push(weighted_hash)
-          end
-
-          price_times_filled_size = weighted_buy_prices_arr.sum do |orders|
-            orders[:price_times_filled_size].to_f
-          end
-
-          this_filled_size = weighted_buy_prices_arr.sum do |orders|
-            orders[:filled_size]
-          end
-
-          calc_avg_buy_exec = price_times_filled_size / this_filled_size
-          avg_buy_exec = format('%0.7f', calc_avg_buy_exec).to_f
-
-          executed_value = buy_orders_done.sum do |orders|
-            orders[:executed_value].to_f
-          end
-
-          # total_buy_executed = format('%0.7f', executed_value).to_f
-
-          # fill_fees = buy_orders_done.sum do |orders|
-          #   orders[:fill_fees].to_f
-          # end
-
-          # buy_fees = format('%0.7f', fill_fees).to_f
-
-          # calc_total_invested = total_buy_executed.to_f - buy_fees.to_f
-          # total_invested = format('%0.7f', calc_total_invested).to_f
-        end
-        order_book[:avg_buy_exec] = avg_buy_exec
-
-        sell_orders_done = order_history.select do |orders|
-          orders[:side] == 'sell' &&
-            orders[:status] == 'done' &&
-            orders[:done_reason] == 'filled'
-        end
-
-        total_sell_orders_done = sell_orders_done.length
-        avg_sell_exec = format('%0.7f', 0.00).to_f
-        # total_sell_executed = format('%0.7f', 0.00).to_f
-        # total_return = format('%0.7f', 0.00).to_f
-        # sell_fees = format('%0.7f', 0.00).to_f
-        if total_sell_orders_done.positive?
-          # Calculate Weighted Avg. of Completed Sell Orders
-          weighted_sell_prices_arr = []
-          sell_orders_done.each do |order|
-            weighted_hash = {}
-            executed_value = order[:executed_value].to_f
-            filled_size = order[:filled_size].to_f
-            weighted_hash[:price] = (executed_value / filled_size).to_f
-            weighted_hash[:filled_size] = filled_size
-            weighted_hash[:price_times_filled_size] = weighted_hash[:price] * filled_size
-            weighted_sell_prices_arr.push(weighted_hash)
-          end
-
-          price_times_filled_size = weighted_sell_prices_arr.sum do |orders|
-            orders[:price_times_filled_size].to_f
-          end
-
-          this_filled_size = weighted_sell_prices_arr.sum do |orders|
-            orders[:filled_size]
-          end
-
-          calc_avg_sell_exec = price_times_filled_size / this_filled_size
-          avg_sell_exec = format('%0.7f', calc_avg_sell_exec).to_f
-
-          executed_value = sell_orders_done.sum do |orders|
-            orders[:executed_value].to_f
-          end
-
-          # total_sell_executed = format('%0.7f', executed_value).to_f
-
-          # fill_fees = sell_orders_done.sum do |orders|
-          #   orders[:fill_fees].to_f
-          # end
-
-          # sell_fees = format('%0.7f', fill_fees).to_f
-          # calc_total_made = total_sell_executed.to_f - sell_fees.to_f
-          # total_return = format('%0.7f', calc_total_made).to_f
-        end
-        order_book[:avg_sell_exec] = avg_sell_exec
-
-        if avg_buy_exec < avg_sell_exec
-          indicator_hash[:color] = :green
-          weight_op = '<'
-        elsif avg_buy_exec > avg_sell_exec
-          indicator_hash[:color] = :red
-          weight_op = '>'
-        else
-          indicator_hash[:color] = :yellow
-          weight_op = '=='
-        end
-        weighted_avg_status_out = "VWAPB #{weight_op} VWAPS"
-        order_book[:candles].last[:weighted_avg_status] = weighted_avg_status_out
-        indicator_hash[:status] = weighted_avg_status_out
-        # indicator_hash[:order_book] = order_book
-
-        indicator_status.weighted_avg = indicator_hash
-        # indicator_hash
-      rescue StandardError => e
-        raise e
-      end
-
-      # Display Usage for this Module
-
-      public_class_method def self.help
-        puts "USAGE:
-         weighted_avg_indicator_hash = #{self}.status(
-           order_book: 'required - order_book data structure'
-         )
-        "
-      end
-    end
-  end
-end