cryptum 0.0.277 → 0.0.280

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c354df9fefd484e816648d7da8b39ccca19a4847d598f432f326f8d8acad0009
-  data.tar.gz: 6fd13b14adedf7d0dc2acce933b4b7cc2ea158763709394c714e52660995bdf0
+  metadata.gz: 8b7e5b4b12f22c90d12706f639b1e58a97789a8de8fc3ebc8191cf37a4874fa0
+  data.tar.gz: 859098f14afce0affd6d1225ebc121e4e3f0f0b57b3c9df5fa41a94d10eaf5c6
 SHA512:
-  metadata.gz: 71738c751bbcdc4f8a8fffa4c0a9b65161f978de27ec9c0f8804aade9617fdf8d418cb78606f0f2aff2df3a0bf43f101ae7ae96e0e214a4e3d864f2e19707978
-  data.tar.gz: 68c037b9705a16f3850ac637031b34604215a0994b986520184fdcc5733f6e242bd295756e8752f075084b1233fa374a8aa24874dc75c4b68647f1e79159635c
+  metadata.gz: ad27f846924423c7b6615091591d4af8d9e8c13b6011f706f58fa7e3b619d37963d97fedf9d47db31e2b8f0c7f394f76cffc97f6a345e4f69a7c30ec095bd477
+  data.tar.gz: 057a58470a7873ebe704740664c0f08c765f78870f212a82eb335475ac2d2dd1c637b97e037536ba2d87a3a02758a5d4829594b817678b79c7509e3114ef2eb9

data/lib/cryptum/event/cancel.rb

@@ -15,27 +15,6 @@ module Cryptum
         # order_type = opts[:order_type]
         # order_action = opts[:order_action]
 
-        # Consume Latest Order History Justification from
-        # Order Book & cancel orders tagged as pie
-        # event_history = Cryptum::API.cancel_synced_oj_and_oh(
-        #   option_choice: option_choice,
-        #   env: env,
-        #   event_history: event_history,
-        #   order_type: order_type,
-        #   order_action: order_action
-        # )
-
-        # event_history
-        # event_history.order_canceled = true
-        # event_history.event_notes = "{ \"event_type\": \"#{event_history.event_type}\", \"cancel\": \"#{event_history.order_canceled}\", \"submitted\": \"#{event_history.order_submitted}\" }" if option_choice.proxy
-
-        # Cryptum::API.cancel_all_open_orders(
-        #   env: env,
-        #   option_choice: option_choice,
-        #   order_type: order_type,
-        #   event_notes: event_history.event_notes
-        # )
-
         terminal_win.key_press_event.key_c = false
         Cryptum::API.cancel_all_open_orders(
           env: env,

data/lib/cryptum/order_book/market_trend.rb

@@ -74,29 +74,35 @@ module Cryptum
         # 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 - 86400
-        order_history = event_history.order_book[:order_history]
-        order_history_meta = event_history.order_book[:order_history_meta]
-        order_history_meta.delete_if do |ohm|
-          next unless ohm[:done_at]
-          Time.parse(ohm[:done_at]) < before_twenty_four_hrs_ago &&
-          (
-            ohm[:color].to_sym == :white ||
-            ohm[:color].to_sym == :green ||
-            ohm[:color].to_sym == :cyan ||
-            ohm[:color].to_sym == :red
-          )
-        end
+        # order_history = event_history.order_book[:order_history]
+        # order_history_meta = event_history.order_book[:order_history_meta]
+        # 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
+            (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

data/lib/cryptum/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -212,11 +212,12 @@ module Cryptum
                 # Ready to Submit a BUY order
                 event_history.order_ready = true
 
-                # Reload Bot Conf (i.e. Risk Allocation)
+                # Reload Bot Conf (i.e. Risk Allocation),
+                # Recalculate Order Plan, and Write to File
                 terminal_win.key_press_event.key_r = true
 
                 # Write Order Book to Disk
-                terminal_win.key_press_event.key_w = true
+                # terminal_win.key_press_event.key_w = true
               end
             end
 
@@ -227,11 +228,15 @@ module Cryptum
                 event_history: event_history,
                 bot_conf: bot_conf
               )
+
               # Reload Bot Conf (i.e. Risk Allocation)
+              # Recalculate Order Plan, and Write to File
               terminal_win.key_press_event.key_r = true
-
-              # Write Order Book to Disk
-              terminal_win.key_press_event.key_w = true
+              # IMPORTANT:
+              # Wait for Order Plan recalculation to occur
+              # once Cryptum::UI::OrderPlan is refreshed
+              # in Cryptum::Event _BEFORE_ writing the order
+              # book to file.
             end
           end
         rescue Faye::WebSocket::API::ErrorEvent,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.277
+  version: 0.0.280
 platform: ruby
 authors:
 - 0day Inc.