cryptum 0.0.276 → 0.0.277
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cryptum/event.rb +10 -6
- data/lib/cryptum/ui/order_execute_details.rb +3 -3
- data/lib/cryptum/ui/order_execution.rb +0 -2
- data/lib/cryptum/ui/order_plan.rb +6 -4
- data/lib/cryptum/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c354df9fefd484e816648d7da8b39ccca19a4847d598f432f326f8d8acad0009
|
4
|
+
data.tar.gz: 6fd13b14adedf7d0dc2acce933b4b7cc2ea158763709394c714e52660995bdf0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 71738c751bbcdc4f8a8fffa4c0a9b65161f978de27ec9c0f8804aade9617fdf8d418cb78606f0f2aff2df3a0bf43f101ae7ae96e0e214a4e3d864f2e19707978
|
7
|
+
data.tar.gz: 68c037b9705a16f3850ac637031b34604215a0994b986520184fdcc5733f6e242bd295756e8752f075084b1233fa374a8aa24874dc75c4b68647f1e79159635c
|
data/lib/cryptum/event.rb
CHANGED
@@ -38,7 +38,7 @@ module Cryptum
|
|
38
38
|
fiat_portfolio_file = "#{option_choice.repo_root}/order_books/#{fiat}_PORTFOLIO.json"
|
39
39
|
|
40
40
|
# Determine if Summary UI needs updated data
|
41
|
-
|
41
|
+
Cryptum::Portfolio::Balance.refresh(
|
42
42
|
env: env,
|
43
43
|
option_choice: option_choice,
|
44
44
|
terminal_win: terminal_win,
|
@@ -116,13 +116,17 @@ module Cryptum
|
|
116
116
|
Cryptum::UI::OrderPlan.refresh(
|
117
117
|
option_choice: option_choice,
|
118
118
|
order_plan_win: terminal_win.order_plan_section,
|
119
|
+
env: env,
|
119
120
|
event_history: event_history,
|
120
121
|
key_press_event: terminal_win.key_press_event,
|
121
122
|
indicator_status: indicator_status,
|
122
123
|
bot_conf: bot_conf,
|
123
124
|
fiat_portfolio_file: fiat_portfolio_file
|
124
125
|
)
|
125
|
-
|
126
|
+
recalc_op = event_history.recalculate_order_plan
|
127
|
+
order_plan = event_history.order_book[:order_plan]
|
128
|
+
terminal_win.key_press_event.key_w = true if recalc_op || order_plan.empty?
|
129
|
+
event_history.recalculate_order_plan = false
|
126
130
|
end
|
127
131
|
|
128
132
|
if event_history.order_plan_details_win_active
|
@@ -135,7 +139,7 @@ module Cryptum
|
|
135
139
|
end
|
136
140
|
|
137
141
|
unless event_history.order_execute_details_win_active
|
138
|
-
|
142
|
+
Cryptum::UI::OrderExecution.refresh(
|
139
143
|
option_choice: option_choice,
|
140
144
|
order_execute_win: terminal_win.order_execute_section,
|
141
145
|
env: env,
|
@@ -162,9 +166,9 @@ module Cryptum
|
|
162
166
|
key_press_event: terminal_win.key_press_event
|
163
167
|
)
|
164
168
|
|
165
|
-
last_ticker_price = event_history.order_book[:ticker_price].to_f
|
166
|
-
second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
|
167
|
-
third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
|
169
|
+
# last_ticker_price = event_history.order_book[:ticker_price].to_f
|
170
|
+
# second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
|
171
|
+
# third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
|
168
172
|
|
169
173
|
event_history
|
170
174
|
rescue LoadError => e
|
@@ -21,9 +21,9 @@ module Cryptum
|
|
21
21
|
order_meta_data = event_history.order_execute_selected_data
|
22
22
|
tpm = order_meta_data[:tpm]
|
23
23
|
autotrade_percent = order_meta_data[:autotrade_percent]
|
24
|
-
order_color = order_meta_data[:color].to_sym
|
25
|
-
|
26
24
|
order_plan_no = order_meta_data[:plan_no]
|
25
|
+
|
26
|
+
order_color = order_meta_data[:color].to_sym
|
27
27
|
case order_color
|
28
28
|
when :cyan, :red
|
29
29
|
order_id = order_meta_data[:buy_order_id]
|
@@ -42,9 +42,9 @@ module Cryptum
|
|
42
42
|
end
|
43
43
|
|
44
44
|
if order_history_arr.empty? && order_color == :yellow
|
45
|
+
order_meta_data.delete(:sell_order_id)
|
45
46
|
order_id = order_meta_data[:buy_order_id]
|
46
47
|
order_meta_data[:color] = :cyan
|
47
|
-
order_meta_data[:sell_order_id] = nil
|
48
48
|
order_history_arr = event_history.order_book[:order_history].select do |order|
|
49
49
|
order if order[:id] == order_id
|
50
50
|
end
|
@@ -24,6 +24,8 @@ module Cryptum
|
|
24
24
|
ticker_price = event_history.order_book[:ticker_price].to_f
|
25
25
|
return unless ticker_price.positive?
|
26
26
|
|
27
|
+
market_trend_color = plan_color = :white
|
28
|
+
|
27
29
|
this_product = event_history.order_book[:this_product]
|
28
30
|
symbol_out = this_product[:id]
|
29
31
|
quote_increment = this_product[:quote_increment]
|
@@ -153,13 +155,16 @@ module Cryptum
|
|
153
155
|
order_slice[:invest] = format('%0.2f', fiat_investing)
|
154
156
|
order_slice[:return] = format('%0.2f', fiat_returning)
|
155
157
|
order_slice[:profit] = format('%0.2f', profit)
|
158
|
+
order_slice[:tpm] = tpm
|
159
|
+
order_slice[:autotrade_percent] = autotrade_percent
|
160
|
+
order_slice[:color] = plan_color
|
156
161
|
|
157
162
|
order_plan.push(order_slice) unless event_history.recalculate_order_plan
|
158
163
|
fiat_budget -= fiat_investing
|
159
164
|
plan_no_slice += 1
|
160
165
|
end
|
161
166
|
event_history.order_book[:order_plan] = order_plan
|
162
|
-
event_history.recalculate_order_plan = false
|
167
|
+
# event_history.recalculate_order_plan = false
|
163
168
|
end
|
164
169
|
|
165
170
|
red_pill_alert = '| RED PILL ALERT |'
|
@@ -322,7 +327,6 @@ module Cryptum
|
|
322
327
|
)
|
323
328
|
end
|
324
329
|
else
|
325
|
-
market_trend_color = plan_color = :white
|
326
330
|
market_trend_color = indicator_status.market_trend[:color] if indicator_status.market_trend
|
327
331
|
plan_color = :cyan if market_trend_color == :red
|
328
332
|
plan_color = :green if market_trend_color == :green
|
@@ -344,8 +348,6 @@ module Cryptum
|
|
344
348
|
if event_history.order_plan_row_to_select == current_line
|
345
349
|
style = :highlight
|
346
350
|
selected_order = order
|
347
|
-
selected_order[:tpm] = tpm
|
348
|
-
selected_order[:autotrade_percent] = autotrade_percent
|
349
351
|
selected_order[:color] = plan_color
|
350
352
|
end
|
351
353
|
|
data/lib/cryptum/version.rb
CHANGED