cryptum 0.0.424 → 0.0.426

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be55cd7655b11bf979acce2ea8273e8dc7ffb299379c2382f48732cd0538bfe
-  data.tar.gz: d1c2de61701aa0d65fc2ae4cd1cd697d30af6e90ed2a2f09c0e9559da01ba02c
+  metadata.gz: 127ea736102e9f1d3ef7223fba59992eefc164f9f91cb63888503794925ae11b
+  data.tar.gz: a95b0a42d443aa539127bf0b17c2fb80eabc64a0d6d17a025c558ddb75b90488
 SHA512:
-  metadata.gz: 3fcfb5f5457e240a8f16415218f0261dd1f2fd6833862e45be3936278231738ae267139f83c3d1ab3f166eebd9d3d7fce6159a59feb059ea0046266560c0bcfd
-  data.tar.gz: 0c671eca62a2e26ff352228d6bc2002b94b480c87eae5e8621a90534945f2750e1a87a48d8cf20e76d2ca9e66e9232630e7c2321d8ae773ddc2ff98d0ff2b961
+  metadata.gz: 24834242320b3db874db4377bfd80cf3e6cab555fb7fb50635a1b084699e845eb4e7ec8c5170fcb4920bd8c0897bee1915a52a3e450ea712ba9bb6505a357c50
+  data.tar.gz: d2778232f88959d84424dc921edab4a41786656f568a3bdf367e68c7de667d6e1c4a9d3d81b129974db60b3e6206aa5d33c4869274694d3e14d65dd1e904b520

data/.rubocop.yml

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

data/lib/cryptum/log.rb

@@ -26,9 +26,13 @@ module Cryptum
       datetime_str = '%Y-%m-%d %H:%M:%S.%N%z'
 
       # Always append to log file
-      log_file_path = '/tmp/cryptum.log'
-      log_file_path = "/tmp/cryptum-ai-#{session}-#{symbol}.json" if level == :learning
-      log_file = File.open(log_file_path, 'a')
+      if level == :learning
+        log_file_path = "/tmp/cryptum-ai-#{session}-#{symbol}.json" if level == :learning
+        log_file = File.open(log_file_path, 'w')
+      else
+        log_file_path = '/tmp/cryptum.log'
+        log_file = File.open(log_file_path, 'a')
+      end
 
       # Leave 10 "old" log files where
       # each file is ~ 1,024,000 bytes
@@ -69,17 +73,12 @@ module Cryptum
       end
 
       if level == :learning
-        logger.formatter = proc do |_severity, datetime, progname, json_msg|
-          date = datetime.strftime(datetime_str)
+        log_event = msg
+        logger.formatter = proc do |_severity, _datetime, _progname, learning_arr|
           JSON.pretty_generate(
-            date: date,
-            session: session,
-            symbol: symbol,
-            progname: progname,
-            msg: json_msg
+            learning_data: learning_arr
           )
         end
-        log_event = msg
       else
         log_event = "driver: #{driver_name}"
         if event_history.respond_to?('order_book')

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

@@ -237,6 +237,12 @@ module Cryptum
             end
           end
 
+          # Snag all sold orders
+          oh_meta_sold_arr = order_history_meta.select do |ohm|
+            ohm[:color].to_sym == :green && ohm.key?(:done_at)
+          end
+          order_hist_meta_sold = oh_meta_sold_arr.length
+
           # Update Completed Sell Orders w/ Green &&
           # Include done_at Timestamp for 24h gain calc
           if event_type == :done &&
@@ -247,6 +253,18 @@ module Cryptum
             order_history_meta.each do |meta|
               next unless meta[:sell_order_id] == sell_order_id
 
+              learning_arr = []
+              oh_meta_sold_arr.each do |ohm|
+                learning = ohm
+                buy_order_id = ohm[:buy_order_id]
+                sell_order_id = ohm[:sell_order_id]
+                order_history_buy_details = order_history.select { |oh| oh[:id] == buy_order_id }
+                order_history_sell_details = order_history.select { |oh| oh[:id] == sell_order_id }
+                learning[:buy_details] = order_history_buy_details.first
+                learning[:sell_details] = order_history_sell_details.first
+                learning_arr.push(learning)
+              end
+
               meta[:done_at] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%N%z')
               meta[:color] = :green
 
@@ -259,9 +277,11 @@ module Cryptum
               order_history_sell_details = order_history.select { |oh| oh[:id] == sell_order_id }
               learning[:buy_details] = order_history_buy_details.first
               learning[:sell_details] = order_history_sell_details.first
+              learning_arr.push(learning)
+
               Cryptum::Log.append(
                 level: :learning,
-                msg: learning,
+                msg: learning_arr,
                 which_self: self,
                 event_history: event_history
               )
@@ -271,12 +291,6 @@ module Cryptum
           # OK, now let's tally up everything...
           twenty_four_hrs_ago = Time.now - 86_400
 
-          # Snag all sold orders
-          oh_meta_sold_arr = order_history_meta.select do |ohm|
-            ohm[:color].to_sym == :green && ohm.key?(:done_at)
-          end
-          order_hist_meta_sold = oh_meta_sold_arr.length
-
           # Snag all sold orders within past 24 hrs
           ohm_sold_twenty_four_arr = []
           unless oh_meta_sold_arr.empty?

data/lib/cryptum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.424
+  version: 0.0.426
 platform: ruby
 authors:
 - 0day Inc.
@@ -537,7 +537,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.11
 signing_key:
 specification_version: 4
 summary: Coinbase Pro High-Frequency Trading Bot