cryptum 0.0.313 → 0.0.315

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af2b52f852e9bbf4444145d1ac3a0e65d2c2cbb2bad6f9b38937bfbe6b3ad11
-  data.tar.gz: ceb7f155e11fe50e2e310e56f7b5dca5bec277830acb62393cb4650791198794
+  metadata.gz: 5782ff4633552d6cde3f64425b5b51f03582a75d6c11554583468c8f63250720
+  data.tar.gz: 9f2dd4006140a57225b7cfbf6ea4a58bce3953de8ffd2ddc408e65699ed89bb9
 SHA512:
-  metadata.gz: 01bd5b1d9b7ed32b82ba267a793ae62d6ae45cac9cc26db42100ca31239d23d6ad209fd48259075d877f0160954d64284011cc828afb258a7dcb7ec69fe6477f
-  data.tar.gz: 0f592c80e061b21e352b068d31019def360be9f67a7d4eac26f6844b876e366e267a3b6e6e89a55a5763269d6d8c6deaaecdabd1e29033a35f8bde11ae7a2473
+  metadata.gz: 1bb9a76cd89fdecda6135b5e68371b062a71b565e8e786f330361a2b21e9cf5a65f4b29cd2bfa496ac7ac3acd28883686779af458be1e92588b273d9e8b5ccfa
+  data.tar.gz: 6b581cb215d04766cbdc1d20cbeda2b34bc577ad9c8bd6b407b74184a376a958f2a7f718de4dc4e956bba39ced88ea27bae602d98346bb041c65eaba2d4d5804

data/lib/cryptum/option.rb

@@ -122,7 +122,8 @@ module Cryptum
       when 60
         option_choice.market_trend_reset_label = '1m'
       else
-        option_choice.market_trend_reset_label = option_choice.market_trend_reset
+        usage = true
+        reason = :market_trend_reset
       end
 
       if usage
@@ -132,7 +133,7 @@ module Cryptum
         when :repo_root
           puts "ERROR: #{option_choice.repo_root} does not exist.\n\n"
         when :market_trend_reset
-          puts "ERROR: #{option_choice.market_trend_reset} Must be a positive integer between 60-86_400.\n\n"
+          puts "ERROR: #{option_choice.market_trend_reset} - Possible values are: 604_800 || 86_400 || 14_400 || 10_800 || 7_200 || 3_600 || 2_700 || 1_800 || 900 || 300 || 180 || 60\n\n"
         end
 
         puts `#{option_choice.driver_name} --help`

data/lib/cryptum/order_book/market_trend.rb

@@ -112,21 +112,68 @@ module Cryptum
         # Refactor TPM to be 0.01 > than fee tier,
         # particularly as fee tier goes up or down
         fees = event_history.order_book[:fees]
-        taker_rate = 0.5
+        maker_rate = 0.4
+        maker_rate = fees[:maker_fee_rate].to_f unless fees.empty?
+        maker_fee = format('%0.2f', maker_rate * 100)
+
+        taker_rate = 0.6
         taker_rate = fees[:taker_fee_rate].to_f unless fees.empty?
         taker_fee = format('%0.2f', taker_rate * 100)
-        default_net_tpm = 3
+        # BE EXTREMELY CAREFUL CHANGING THIS VALUE AS IT DICTATES
+        # THE TARGET PRICE AND SUBSEQUENT TIME IT TAKES FOR AN OPEN
+        # SELL ORDER TO BE TRIGGERED!!! SHOULD NEVER BE > 1
+        default_net_tpm = 1
 
         if ai_enabled
+          # Set default_net_tpm if AI is true in bot_conf.
           low_24h = event_history.order_book[:low_24h].to_f
           high_24h = event_history.order_book[:high_24h].to_f
-          ai_net_tpm = (1 - (low_24h / high_24h)) * 100
+
+          case option_choice.market_trend_reset
+          when 604_800
+            # 1W Chart
+            ai_net_tpm = ((1 - (low_24h / high_24h)) * 100) * 7
+          when 86_400
+            # 1D Chart
+            ai_net_tpm = (1 - (low_24h / high_24h)) * 100
+          when 14_400
+            # 4H Chart
+            ai_net_tpm = ((1 - (low_24h / high_24h)) * 100) / 6
+          when 10_800
+            # 3H Chart
+            ai_net_tpm = ((1 - (low_24h / high_24h)) * 100) / 8
+          when 7_200
+            # 2H Chart
+            ai_net_tpm = ((1 - (low_24h / high_24h)) * 100) / 12
+          when 3_600
+            # 1H Chart
+            ai_net_tpm = ((1 - (low_24h / high_24h)) * 100) / 24
+          when 2_700
+            # 45m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.75
+          when 1_800
+            # 30m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.5
+          when 900
+            # 15m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.25
+          when 300
+            # 5m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.083
+          when 180
+            # 3m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.05
+          when 60
+            # 1m Chart
+            ai_net_tpm = (((1 - (low_24h / high_24h)) * 100) / 24) * 0.017
+          end
+
           default_net_tpm = ai_net_tpm if ai_net_tpm > default_net_tpm
         end
 
         min_gross_tpm = format(
           '%0.2f',
-          (taker_fee.to_f * 2) + default_net_tpm
+          (maker_fee.to_f + taker_fee.to_f) + default_net_tpm
         )
 
         if ai_enabled && min_gross_tpm != gross_tpm.to_s

data/lib/cryptum/ui/order_execution.rb

@@ -378,7 +378,7 @@ module Cryptum
         style = :bold
         if event_history.order_execute_win_active
           line_color = :blue
-          header_color = :yellow
+          header_color = :blue
           header_style = :reverse
         end
 
@@ -412,6 +412,15 @@ module Cryptum
           string: header_str
         )
 
+        order_execute_win.setpos(out_line_no, Cryptum::UI.col_fourth)
+        order_execute_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_execute_win,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just4, ' ')
+        )
+
         # ROWS 3-10
         remaining_blank_rows = 0
         remaining_blank_rows = max_rows_to_display if order_history_meta.empty?
@@ -538,6 +547,15 @@ module Cryptum
           string: header_str
         )
 
+        order_execute_win.setpos(out_line_no, Cryptum::UI.col_fourth)
+        order_execute_win.clrtoeol
+        Cryptum::UI.colorize(
+          ui_win: order_execute_win,
+          color: header_color,
+          style: header_style,
+          string: ''.ljust(col_just4, ' ')
+        )
+
         # ROW 11
         out_line_no += 1
         Cryptum::UI.line(

data/lib/cryptum/ui/order_plan.rb

@@ -224,7 +224,7 @@ module Cryptum
         style = :bold
         if event_history.order_plan_win_active
           line_color = :blue
-          header_color = :yellow
+          header_color = :blue
           header_style = :reverse
         end
 

data/lib/cryptum/version.rb

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

metadata

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