cryptum 0.0.312 → 0.0.314

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0adc69cdbbde0908575f0c4696b09be24b0fc67a7457bf99da92f2391ce46e2f
-  data.tar.gz: 3aaf362ef9a5d4863ea279224afff4d4f07669f5954ceb0f9dde6d56bce2469d
+  metadata.gz: 2ab9f5b8899b906bfb3513dc4fc3fad39607dc52a62f067703fec47fd82f59e1
+  data.tar.gz: 8de5152998ff10668b8b871e97d8b60e19add14f4f67ff5f2a05ade3b1e1684a
 SHA512:
-  metadata.gz: 6317706ccad3922075e7d3f3cdec208f8b5f34c5a7cc78eb3fcd5dde6d987d3847112cf96892c8965e063d9062ce5bf9c56c424174ea907448c0b3dd7b86dc08
-  data.tar.gz: bd6df428c60303db065011915fb94351131cd04c6f510c2ec3c0c4e8bdfd0ef7287d042b595a3f925484fbfa16b81b6e9b10e04e2eed0a1843b1f07300ef74d7
+  metadata.gz: dc5f8b121978b119733c2df5f08bdc782a2a65a9de75cea7236645ab03ccff3adca327cc844be54aaa2956e2cebf4a24af78305be77b161d75a908b99f2f8495
+  data.tar.gz: 37d87a451bd6cbc10adeabaa41e68474e264b87e34b05346770ac41f805b91b5e993b04c60f95cd533673ce8f00e862505f3d496ab6cc7920ca13bf694de6655

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/version.rb

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

data/lib/cryptum/web_sock/event_machine.rb

@@ -241,7 +241,8 @@ module Cryptum
           end
         rescue Faye::WebSocket::API::ErrorEvent,
                Errno::ECONNREFUSED,
-               Errno::ECONNRESET => e
+               Errno::ECONNRESET,
+               LoadError => e
 
           File.open('/tmp/cryptum-errors.txt', 'a') do |f|
             f.puts Time.now.strftime('%Y-%m-%d %H:%M:%S.%N %z')

metadata

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