cryptum 0.0.392 → 0.0.394

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110c196928530da1a4052a8e6040d4d8059b1aa1468a7da7801e6b9be24e0d51
-  data.tar.gz: 22d185e05a7fc7a365441c3147b481e9cf5aa097c1d857f459ac5302eb3f7a61
+  metadata.gz: 4a5b4776548e4f8f6027d5661f9634a6bea22112921ce1b169fac655c98bb555
+  data.tar.gz: 2e36f3a30d983f9dab8f65ebc4f0b8d2304ad2c988053b4bf20a8767cd31da27
 SHA512:
-  metadata.gz: 4b67141f9c82d817e68c6ff494af9a40b037114347ac8c26ba8bab339042bd94c0e0372c471636763603ce30ec39a89f57dbe5694e9b374b9d36b9612772d5c9
-  data.tar.gz: 19c5f92b35ca7d11b1fa693aebcc52e6b4dac788ead664b27bf74239f765005b9870229026debde3e900edd53214b91f5be88635ca8e1d4c526eb2cd86ca587f
+  metadata.gz: 7939b9976a526e568746f1c1bb666edb9ea92e518fae246a6c7adf99fad5d549bb60862221115cd6ba25fe42efec0140815fde861b7410fc32d63d7dab598927
+  data.tar.gz: f5faa02f8418f7ff940b773e3abc56a751dc7fd62d836cec74f7c132417136ecaf47c6c6eb998ca6d857ee9a55b9af8bb4af9f4524f335fed244200dc08e91fa

data/lib/cryptum/log.rb

@@ -54,8 +54,10 @@ module Cryptum
       log_event = event_history.order_book[:path] if event_history.respond_to?('order_book')
       if msg.instance_of?(Interrupt)
         log_event += ' => CTRL+C Detected...Exiting Session.'
+        logger.level = Logger::WARN
+        exit_gracefully = true
       else
-        log_event += " => #{msg}"
+        log_event += "=> #{msg}"
       end
 
       logger.add(logger.level, log_event, which_self)

data/lib/cryptum/option/choice.rb

@@ -5,8 +5,7 @@ module Cryptum
   module Option
     # attr_accessor objects to pass through application
     class Choice
-      attr_accessor :autotrade,
-                    :driver_name,
+      attr_accessor :driver_name,
                     :list_products,
                     :proxy,
                     :reset_session_countdown,

data/lib/cryptum/option/parser.rb

@@ -19,12 +19,6 @@ module Cryptum
             '<Required - Crypto Symbol.(e.g. btc-usd, eth-usd, etc.)'
           ) { |s| option_choice.symbol = s.to_s.gsub('-', '_').downcase.to_sym }
 
-          options.on(
-            '-A',
-            '--[no-]autotrade',
-            '<Optional - Automatically Buy and Sell Crypto>'
-          ) { |a| option_choice.autotrade = a }
-
           options.on(
             '-l',
             '--[no-]list-products',

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

@@ -19,9 +19,9 @@ module Cryptum
           indicator_status = opts[:indicator_status]
           bot_conf = opts[:bot_conf]
 
-          event_type = event_history.event_type if option_choice.autotrade
-          event_side = event_history.event[:side].to_s.to_sym if option_choice.autotrade
-          event_reason = event_history.event[:reason].to_s.to_sym if option_choice.autotrade
+          event_type = event_history.event_type
+          event_side = event_history.event[:side].to_s.to_sym
+          event_reason = event_history.event[:reason].to_s.to_sym
 
           ticker_price = event_history.order_book[:ticker_price].to_f
           open_24h = event_history.order_book[:open_24h].to_f
@@ -42,11 +42,11 @@ module Cryptum
           limit_price = last_three_prices_arr.sort[1]
           return event_history unless limit_price.positive?
 
-          tpm = bot_conf[:target_profit_margin_percent].to_f
-          tpm_cast_as_decimal = tpm / 100
+          # tpm = bot_conf[:target_profit_margin_percent].to_f
+          # tpm_cast_as_decimal = tpm / 100
 
           order_history_meta = event_history.order_book[:order_history_meta]
-          order_history = event_history.order_book[:order_history] if option_choice.autotrade
+          order_history = event_history.order_book[:order_history]
 
           margin_percent_open_24h = (1 - (open_24h / ticker_price)) * 100
           cast_margin_to_sec = margin_percent_open_24h * 0.1
@@ -79,87 +79,60 @@ module Cryptum
                indicator_status.action_signal == :buy &&
                !event_history.red_pill
 
-              if option_choice.autotrade
-                this_order = event_history.order_book[:order_plan].first
+              this_order = event_history.order_book[:order_plan].first
 
-                # If price is greater than the previous order,
-                # force it to be slightly less
-                last_order = order_history_meta.select do |order|
-                  order if order[:color] == 'yellow'
-                end.last
+              # If price is greater than the previous order,
+              # force it to be slightly less
+              last_order = order_history_meta.select do |order|
+                order if order[:color] == 'yellow'
+              end.last
 
-                last_purchase_price = 0.0
-                last_purchase_price = last_order[:price].to_f if last_order
+              last_purchase_price = 0.0
+              last_purchase_price = last_order[:price].to_f if last_order
 
-                limit_price = last_purchase_price - quote_increment.to_f if last_purchase_price.positive? && last_purchase_price < limit_price
+              limit_price = last_purchase_price - quote_increment.to_f if last_purchase_price.positive? && last_purchase_price < limit_price
 
-                # Debug last order
-                File.open('/tmp/cryptum-errors.txt', 'a') do |f|
-                  f.puts "Last Order: #{last_order}"
-                  f.puts "Last Purchase Price: #{last_purchase_price}"
-                  f.puts "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
-                  f.puts "\n\n\n"
-                end
+              # Debug last order
+              File.open('/tmp/cryptum-errors.txt', 'a') do |f|
+                f.puts "Last Order: #{last_order}"
+                f.puts "Last Purchase Price: #{last_purchase_price}"
+                f.puts "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
+                f.puts "\n\n\n"
+              end
 
-                price = format(
-                  "%0.#{fiat_smallest_decimal}f",
-                  limit_price
-                )
+              price = format(
+                "%0.#{fiat_smallest_decimal}f",
+                limit_price
+              )
 
-                size = this_order[:invest].to_f / limit_price
+              size = this_order[:invest].to_f / limit_price
 
-                loop do
-                  size = size.to_f + base_increment.to_f
-                  break if (size.to_f * price.to_f) > min_market_funds.to_f
-                end
+              loop do
+                size = size.to_f + base_increment.to_f
+                break if (size.to_f * price.to_f) > min_market_funds.to_f
+              end
 
-                size = format(
-                  "%0.#{crypto_smallest_decimal}f",
-                  size
-                )
+              size = format(
+                "%0.#{crypto_smallest_decimal}f",
+                size
+              )
 
-                fiat_invested_this_order = size.to_f * price.to_f
-
-                fiat_portfolio = event_history.order_book[:fiat_portfolio]
-                fiat_avail_to_trade = format('%0.2f', fiat_portfolio.first[:available])
-
-                event_history.red_pill = true if fiat_invested_this_order > fiat_avail_to_trade.to_f
-
-                unless event_history.red_pill
-                  event_history = Cryptum::Event::Buy.crypto(
-                    option_choice: option_choice,
-                    env: env,
-                    price: price,
-                    size: size,
-                    event_history: event_history,
-                    bot_conf: bot_conf
-                  )
-                end
-              else
-                this_order = event_history.order_book[:order_plan].shift
-                # Mock Order ID
-                this_order[:buy_order_id] = format(
-                  '%0.6i',
-                  Random.rand(0..999_999)
-                )
+              fiat_invested_this_order = size.to_f * price.to_f
 
-                this_order[:price] = limit_price.to_s
-                this_order[:size] = format(
-                  "%0.#{crypto_smallest_decimal}f",
-                  this_order[:invest].to_f / limit_price
-                )
+              fiat_portfolio = event_history.order_book[:fiat_portfolio]
+              fiat_avail_to_trade = format('%0.2f', fiat_portfolio.first[:available])
 
-                targ_price = limit_price + (limit_price * tpm_cast_as_decimal)
-                this_order[:tpm] = format(
-                  '%0.2f',
-                  tpm
-                )
-                this_order[:target_price] = format(
-                  "%0.#{fiat_smallest_decimal}f",
-                  targ_price
+              event_history.red_pill = true if fiat_invested_this_order > fiat_avail_to_trade.to_f
+
+              unless event_history.red_pill
+                event_history = Cryptum::Event::Buy.crypto(
+                  option_choice: option_choice,
+                  env: env,
+                  price: price,
+                  size: size,
+                  event_history: event_history,
+                  bot_conf: bot_conf
                 )
-                this_order[:color] = :cyan
-                order_history_meta.push(this_order)
               end
 
               # SAUCE 4 (SAUCE 3 RELATES TO SAUCE 4)
@@ -181,23 +154,6 @@ module Cryptum
               # be more than event_history.time_between_orders_max
               event_history.time_between_orders = event_history.time_between_orders_max if event_history.time_between_orders > event_history.time_between_orders_max
             end
-
-            # SELL
-            # Once buy arders are fulfilled submit a
-            # limit sell order for fulfillment
-            unless option_choice.autotrade
-              # Testing logic via Mock
-              event_type_arr = %i[received open done]
-              last_et_index = event_type_arr.length - 1
-              rand_et_index = Random.rand(0..last_et_index)
-              event_type = event_type_arr[rand_et_index]
-
-              event_side_arr = %i[buy sell]
-              last_es_index = event_side_arr.length - 1
-              rand_es_index = Random.rand(0..last_es_index)
-              event_side = event_type_arr[rand_es_index].to_s.to_sym
-              event_reason = 'mock'
-            end
           end
 
           # Update Completed Sell Orders w/ Green
@@ -227,52 +183,30 @@ module Cryptum
              event_side == :buy &&
              event_reason != :canceled
 
-            if option_choice.autotrade
-              order_ready_to_sell_arr = order_history_meta.select do |meta|
-                meta[:buy_order_id] == event_history.event[:order_id]
-              end
-            else
-              last_index = order_history_meta.length - 1
-              rand_index = Random.rand(0..last_index)
-              order_ready_to_sell_arr = [
-                order_history_meta[rand_index]
-              ]
+            order_ready_to_sell_arr = order_history_meta.select do |meta|
+              meta[:buy_order_id] == event_history.event[:order_id]
             end
 
             if order_ready_to_sell_arr.length.positive?
               order_ready_to_sell = order_ready_to_sell_arr.first
               buy_order_id = order_ready_to_sell[:buy_order_id]
 
-              if option_choice.autotrade
-                price = format(
-                  "%0.#{fiat_smallest_decimal}f",
-                  order_ready_to_sell[:target_price]
-                )
+              price = format(
+                "%0.#{fiat_smallest_decimal}f",
+                order_ready_to_sell[:target_price]
+              )
 
-                size = order_ready_to_sell[:size]
+              size = order_ready_to_sell[:size]
 
-                event_history = Cryptum::Event::Sell.crypto(
-                  option_choice: option_choice,
-                  env: env,
-                  price: price,
-                  size: size,
-                  event_history: event_history,
-                  bot_conf: bot_conf,
-                  buy_order_id: buy_order_id
-                )
-              else
-                sell_order_id = format(
-                  '%0.2i',
-                  Random.rand(0..999_999)
-                )
-
-                event_history.order_book[:order_history_meta].each do |meta|
-                  if meta[:buy_order_id] == buy_order_id
-                    meta[:sell_order_id] = sell_order_id
-                    meta[:color] = :yellow
-                  end
-                end
-              end
+              event_history = Cryptum::Event::Sell.crypto(
+                option_choice: option_choice,
+                env: env,
+                price: price,
+                size: size,
+                event_history: event_history,
+                bot_conf: bot_conf,
+                buy_order_id: buy_order_id
+              )
             end
           end
 

data/lib/cryptum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.392
+  version: 0.0.394
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable