cryptum 0.0.427 → 0.0.429

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6727655e4af558dbafa2b01ee20190a20f7833f8a6a3ee62382b209710e4697
-  data.tar.gz: a5fdae6874f69f4dd5bbb1d5901d6e5f0666ff60f56afdfda78a842b09b71d90
+  metadata.gz: 2380db0865bfa954a012a595702a708c13fe6bf18cfd0958d510239addf00186
+  data.tar.gz: fc72a86ba6f45138bf5171e766581ccf3e0fc970eb3eeda90c456d9aaecc9306
 SHA512:
-  metadata.gz: 3eec879f5b3ae0351a274b58c70e931ed987a2e62c94706928e450d9a0308fffdeb283ac53c0ea05c6fcf7102d806969a51d3e829b6aeb0c344c9ec767dd74b4
-  data.tar.gz: 05eb5192d9d556c621db29ffdf71cabbf4189595bccaed77b42ed2877f027a74a5649bee19ac4a4a8b49d036bd8fb9d9d44c7fa2ffbbe8793376f0bc5e020874
+  metadata.gz: c76b40bba10f43ff918eae4f8fce19368a92d2e20e3c4baf7b29da3a0165f4c8a8c05bb2ef45a34d088c0f1ae7ca28acc09c1538cd211a70c6c774d3db1ed5a1
+  data.tar.gz: 4394275cfa271f7cace9ed98b905fedf42eabafba11a292a2eb23af927f184c095c08ce487fbf0aacc22fb029a3ada517468bebe08090390613347b744e027a3

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 410
+  Max: 417.7
 Metrics/BlockLength:
   Max: 138
 Metrics/BlockNesting:

data/Gemfile

@@ -28,8 +28,8 @@ gem 'rest-client', '2.1.0'
 gem 'rspec', '3.12.0'
 gem 'rubocop', '1.50.2'
 gem 'rubocop-rake', '0.6.0'
-gem 'rubocop-rspec', '2.19.0'
-gem 'ruby-prof', '1.6.1'
+gem 'rubocop-rspec', '2.20.0'
+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

@@ -95,10 +95,17 @@ module Cryptum
 
               limit_price = last_purchase_price - quote_increment.to_f if last_purchase_price.positive? && last_purchase_price < limit_price
 
+              price = format(
+                "%0.#{fiat_smallest_decimal}f",
+                limit_price
+              )
+
               # Debug last order -------------------------------#
-              debug_last_order = "Last Order: #{last_order}"
-              debug_last_order += "Last Purchase Price: #{last_purchase_price}"
-              debug_last_order += "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
+              # 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}"
               debug_last_order += "\n\n\n"
 
               Cryptum::Log.append(
@@ -109,11 +116,6 @@ module Cryptum
               )
               #-------------------------------------------------#
 
-              price = format(
-                "%0.#{fiat_smallest_decimal}f",
-                limit_price
-              )
-
               size = this_order[:invest].to_f / limit_price
 
               loop do
@@ -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
 

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.427'
+  VERSION = '0.0.429'
 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.427
+  version: 0.0.429
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -254,28 +254,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement