cryptum 0.0.429 → 0.0.431

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2380db0865bfa954a012a595702a708c13fe6bf18cfd0958d510239addf00186
-  data.tar.gz: fc72a86ba6f45138bf5171e766581ccf3e0fc970eb3eeda90c456d9aaecc9306
+  metadata.gz: efc9ac08fc48ca7aa7674359ea95d662af6cade3fc2a0249b19ce03bc996f3fb
+  data.tar.gz: 3b6ddc0e658f076ee6f80f2f4a399d9192292c2ce090a7056b26c51a0cb7fd2a
 SHA512:
-  metadata.gz: c76b40bba10f43ff918eae4f8fce19368a92d2e20e3c4baf7b29da3a0165f4c8a8c05bb2ef45a34d088c0f1ae7ca28acc09c1538cd211a70c6c774d3db1ed5a1
-  data.tar.gz: 4394275cfa271f7cace9ed98b905fedf42eabafba11a292a2eb23af927f184c095c08ce487fbf0aacc22fb029a3ada517468bebe08090390613347b744e027a3
+  metadata.gz: aff4e41fe11057b9d0b401c78b27dae432a8756ec6a02b265b5b1eb580999954d0ae8ace3390804544920f89eeed141467d240f346603582a100ba6b1885ed61
+  data.tar.gz: da014125c73aba67a997bb76b2a9476a1074b35ae51973b4b6a44833ab3bc5c410c572d249ddfae3116f1e75581c18ec74daf6254a2610c56bdd4b632322fe43

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 417.7
+  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/lib/cryptum/log.rb

@@ -68,7 +68,7 @@ module Cryptum
         logger.level = Logger::WARN
       else
         level_error = "ERROR: Invalid log level. Valid options are:\n"
-        level_error += ":info\n:warn\n:unknown\n:fatal\n:error\n:debug"
+        level_error += ":debug\n:error\n:fatal\n:info\n:learning\n:unknown\n:warn\n"
         raise level_error
       end
 

data/lib/cryptum/order_book/generate.rb

@@ -70,6 +70,24 @@ module Cryptum
             File.read(order_book_file),
             symbolize_names: true
           )
+
+          # Only keep order history meta for those hashes
+          # that exist in the last order history response
+          # :white ones will be kept for 24 hrs and handled
+          # via Cryptum::OrderBook::MarketTrend.reset
+          # This exist primarily to clean up meta data if the
+          # bot crashes.
+          order_book[:order_history_meta].keep_if do |ohm|
+            order_book[:order_history].find do |oh|
+              (oh[:id] == ohm[:buy_order_id] || oh[:id] == ohm[:sell_order_id]) && (
+                ohm[:color].to_sym == :cyan ||
+                ohm[:color].to_sym == :green ||
+                ohm[:color].to_sym == :magenta ||
+                ohm[:color].to_sym == :red ||
+                ohm[:color].to_sym == :yellow
+              )
+            end
+          end
         end
 
         event_history = Cryptum::Event::History.new(

data/lib/cryptum/order_book/market_trend.rb

@@ -67,22 +67,16 @@ module Cryptum
         # 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|
+        event_history.order_book[: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

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

@@ -457,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} @ "
@@ -475,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.429'
+  VERSION = '0.0.431'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.429
+  version: 0.0.431
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable