cryptum 0.0.428 → 0.0.430

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0b02adbb5ffcbdb8065a6f1736db690d68311c3e951827a28931b9c7a4c1f2
-  data.tar.gz: 3add711462fc12b4f22e80f1883a8559cec2929bbb16a8a10c3c8c9a19a674a3
+  metadata.gz: 2a529bc6041458959ded98c7d5a487f978a1ca4da216ef27006daa74b4882fdf
+  data.tar.gz: be3358d93281401821f0192b837717d343872a58c1b0eb759056ce8d00387a00
 SHA512:
-  metadata.gz: 7d70cdf414221746b8fd55fd6c16e9072287dae88b4e0c6bc6a76273df5e40685cdd5f417b625fd5440cebd8c73d463c70de29b4b48b19ea9eaa6bdab5904b0c
-  data.tar.gz: 9bc168b1a91812b2f7b68dfc4594eba6ab24a628daa7f04df123023f46e86bd94ac08e380fe46c4f154f066229036003910162f01f0a0c489a4ec2953ef03f77
+  metadata.gz: 7f1cad0e69a09e9754340649c6457e9bb7abbac52b6a6f2e15158ad7b6b8f1a2a667ad4afacdc9b460b30828bfa9a44a0cd4d1bdce40dd25446d39c71b1d95d8
+  data.tar.gz: 002ad29184c1b14f4dd6a6ea6bd04fd836a9d08d3db03d76e401353f4ade3acf9c05edae3045c61f104975fbc1fd536d9217ae90f3da486098699c338f1e26bf

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 410
+  Max: 436.3
 Metrics/BlockLength:
   Max: 138
 Metrics/BlockNesting:
@@ -14,13 +14,13 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 128
 Metrics/CyclomaticComplexity:
-  Max: 80
+  Max: 86
 Metrics/MethodLength:
-  Max: 397
+  Max: 418
 Metrics/ModuleLength:
-  Max: 407
+  Max: 428
 Metrics/PerceivedComplexity:
-  Max: 80
+  Max: 84
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
 

data/Gemfile

@@ -29,7 +29,7 @@ gem 'rspec', '3.12.0'
 gem 'rubocop', '1.50.2'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.20.0'
-gem 'ruby-prof', '1.6.2'
+gem 'ruby-prof', '1.6.3'
 gem 'rvm', '1.11.3.9'
 gem 'sinatra', '3.0.6'
 gem 'thin', '1.8.2'

data/lib/cryptum/order_book/market_trend.rb

@@ -62,57 +62,38 @@ module Cryptum
         Cryptum::Log.append(level: :error, msg: e, which_self: self, event_history: event_history)
       end
 
-      # public_class_method def self.reset(opts = {})
-      #   # IT IS ABSOLUTELY CRITICAL THIS METHOD IS AS FAST AS POSSIBLE
-      #   # TO AVOID TICKER PRICE SYNCING ISSUES.
-      #   event_history = opts[:event_history]
-
-      #   # order_history = event_history.order_book[:order_history]
-      #   # order_history_meta = event_history.order_book[:order_history_meta]
-
-      #   # Only retain past 24 hours of
-      #   # order history meta for bought, sold, and expired
-      #   # keep open limit sell orders indefintely
-      #   # before_twenty_four_hrs_ago = Time.now - 86_400
-      #   # order_history_meta.delete_if do |ohm|
-      #   #   order_history.find do |oh|
-      #   #     next unless oh[:done_at]
-
-      #   #     Time.parse(oh[:done_at]) < before_twenty_four_hrs_ago && (
-      #   #       oh[:id] == ohm[:buy_order_id] ||
-      #   #       oh[:id] == ohm[:sell_order_id]
-      #   #     ) && (
-      #   #       ohm[:color].to_sym == :white ||
-      #   #       ohm[:color].to_sym == :green ||
-      #   #       ohm[:color].to_sym == :cyan ||
-      #   #       ohm[:color].to_sym == :red
-      #   #     )
-      #   #   end
-      #   # end
-
-      #   # Only keep order history meta for those
-      #   # hashes that exist in the last order history
-      #   # response
-      #   # order_history_meta.keep_if do |ohm|
-      #   #   order_history.find do |oh|
-      #   #     (oh[:id] == ohm[:buy_order_id] || oh[:id] == ohm[:sell_order_id]) && (
-      #   #       ohm[:color].to_sym == :white ||
-      #   #       ohm[:color].to_sym == :green ||
-      #   #       ohm[:color].to_sym == :yellow
-      #   #     )
-      #   #   end
-      #   # end
-      #   # event_history.order_book[:order_history_meta] = order_history_meta
-
-      #   # Reset Market Trend Counter
-      #   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'
-      #   )
-      # rescue Interrupt, StandardError => e
-      #   Cryptum::Log.append(level: :error, msg: e, which_self: self)
-      # end
+      public_class_method def self.reset(opts = {})
+        # IT IS ABSOLUTELY CRITICAL THIS METHOD IS AS FAST AS POSSIBLE
+        # TO AVOID TICKER PRICE SYNCING ISSUES.
+        event_history = opts[:event_history]
+
+        # order_history = event_history.order_book[:order_history]
+        order_history_meta = event_history.order_book[:order_history_meta]
+
+        # Only retain past 24 hours of
+        # order history meta for expired
+        # keep open limit sell orders indefintely
+        before_twenty_four_hrs_ago = Time.now - 86_400
+        order_history_meta.delete_if do |ohm|
+          next unless ohm[:color] == 'white'
+
+          Time.parse(ohm[:done_at]) < before_twenty_four_hrs_ago
+        end
+
+        # Write order_history_meta back to event_history object
+        event_history.order_book[:order_history_meta] = order_history_meta
+
+        # Reset Market Trend Counter
+        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
+      rescue Interrupt, StandardError => e
+        Cryptum::Log.append(level: :error, msg: e, which_self: self)
+      end
 
       # Display Usage for this Module
 

data/lib/cryptum/ui/order/execute.rb

@@ -101,6 +101,8 @@ module Cryptum
               )
 
               # Debug last order -------------------------------#
+              # TODO: if the order attempt is unsucessful at the adjusted price,
+              # the order plan needs to be reset.
               debug_last_order = "Last Order: #{last_order}\n"
               debug_last_order += "Last Purchase Price: #{last_purchase_price}\n"
               debug_last_order += "Limit Price (Should be <= #{last_purchase_price}): #{price}"
@@ -142,6 +144,8 @@ module Cryptum
                   event_history: event_history,
                   bot_conf: bot_conf
                 )
+                order_history = event_history.order_book[:order_history]
+                order_history_meta = event_history.order_book[:order_history_meta]
               end
 
               # SAUCE 4 (SAUCE 3 RELATES TO SAUCE 4)
@@ -216,6 +220,8 @@ module Cryptum
                 bot_conf: bot_conf,
                 buy_order_id: buy_order_id
               )
+              order_history = event_history.order_book[:order_history]
+              order_history_meta = event_history.order_book[:order_history_meta]
             end
           end
 
@@ -451,15 +457,34 @@ module Cryptum
               )
               plan_no = meta[:plan_no]
 
-              buy_created_at_hash_arr = order_history.select do |oh|
-                oh[:id] == meta[:buy_order_id]
-              end
-
-              buy_created_at = '____-__-__ __:__:__-____'
-              unless buy_created_at_hash_arr.empty?
-                buy_created_at = Time.parse(
-                  buy_created_at_hash_arr.first[:created_at]
-                ).strftime('%Y-%m-%d %H:%M:%S%z')
+              order_exec_last_ln = '____-__-__ __:__:__-____'
+              case meta[:color].to_sym
+              when :cyan, :red
+                buy_created_at_hash_arr = order_history.select do |oh|
+                  oh[:id] == meta[:buy_order_id]
+                end
+
+                unless buy_created_at_hash_arr.empty?
+                  order_exec_last_ln = Time.parse(
+                    buy_created_at_hash_arr.first[:created_at]
+                  ).strftime('%Y-%m-%d %H:%M:%S%z')
+                end
+              when :green, :white
+                if meta[:done_at]
+                  order_exec_last_ln = Time.parse(
+                    meta[:done_at]
+                  ).strftime('%Y-%m-%d %H:%M:%S%z')
+                end
+              when :magenta, :yellow
+                sell_created_at_hash_arr = order_history.select do |oh|
+                  oh[:id] == meta[:sell_order_id]
+                end
+
+                unless sell_created_at_hash_arr.empty?
+                  order_exec_last_ln = Time.parse(
+                    sell_created_at_hash_arr.first[:created_at]
+                  ).strftime('%Y-%m-%d %H:%M:%S%z')
+                end
               end
 
               invest = "$#{invest_out} @ "
@@ -469,7 +494,7 @@ module Cryptum
               targ_tick = "$#{target_price_out}"
               profit = "|Profit: $#{meta[:profit]}"
 
-              order_exec_ln = "#{buy_created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}|#{plan_no}"
+              order_exec_ln = "#{order_exec_last_ln}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}|#{plan_no}"
 
               order_execute_win.setpos(out_line_no, Cryptum::UI.col_first)
               order_execute_win.clrtoeol

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -216,11 +216,12 @@ module Cryptum
             EM.add_periodic_timer(option_choice.market_trend_reset) do
               # NOTE: To ensure the integrity of event_history is maintained,
               # changes to its contents _MUST_ stay in this block.
-              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[: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 = Cryptum::OrderBook::MarketTrend.reset(event_history: event_history)
 
               # Reload Bot Conf (i.e. Risk Allocation)
               # Recalculate Order Plan, and Write to File

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.428
+  version: 0.0.430
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement