cryptum 0.0.383 → 0.0.384

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a29115dd8895dca86ef8c6a0e8b506248dfdaa52c1a09b8d2625dd308a2b36
-  data.tar.gz: 41da5d973faa245b504288b2bee338b30ec50ed3b5688de053e6e588c28bb904
+  metadata.gz: 5d8298d19d8db14b27d22dc465df09455fb209218ebbeeddf1987e66042af09d
+  data.tar.gz: 4e19eb6374a6161b0a72c8d42da7897868252efffb886a414d22a173368a6238
 SHA512:
-  metadata.gz: b5f4925c93e418214bdc03923823224c124abee2acbb88ff6a8b29aba5d5072135bd2ee66639334eb6929edf94a0f4bd9b44c44d9bc7d00be5d4b2959e5f9e11
-  data.tar.gz: 671b415f45233e4719396ae939fbcd7cefa39ba04ef2d1a18024e5591d6aa8b98548fd6dfc443a961aabb164826381a1a9af0554ce1f009f79d06213486038d6
+  metadata.gz: 1fdf711cf9326842f480b14b37f4b9c826d164b8f64965cfdc25269165c97e7e2b1de2f48b0238b239da45903232117dba59cb65b59028e7057410fdb3ee3be5
+  data.tar.gz: fb896a3349b440c7ab8010fb6d2a95d30bfa13683000250f4ca7deb7ab538ce42a89164ff41941805e54f8d2331d717833ec00ca093965e466d55dc6b9304610

data/lib/cryptum/api/orders.rb

@@ -4,7 +4,7 @@ module Cryptum
   # This plugin is used to interact withbtje Coinbase REST API
   module API
     module Orders
-      public_class_method def self.submit_limit_order(opts = {})
+      public_class_method def self.submit_limit(opts = {})
         option_choice = opts[:option_choice]
         env = opts[:env]
         price = opts[:price]
@@ -237,7 +237,7 @@ module Cryptum
 
       public_class_method def self.help
         puts "USAGE:
-         event_history = #{self}.submit_limit_order(
+         event_history = #{self}.submit_limit(
            env: 'required - Coinbase::Option::Environment.get Object'
          )
 

data/lib/cryptum/event/buy.rb

@@ -12,124 +12,20 @@ module Cryptum
       public_class_method def self.crypto(opts = {})
         option_choice = opts[:option_choice]
         env = opts[:env]
-        bot_conf = opts[:bot_conf]
+        price = opts[:price]
+        size = opts[:size]
         event_history = opts[:event_history]
-        order_type = opts[:order_type]
-        fiat_smallest_decimal = opts[:fiat_smallest_decimal]
-        # fiat_portfolio_file = opts[:fiat_portfolio_file]
-        order_history = opts[:order_history]
-        crypto_smallest_decimal = opts[:crypto_smallest_decimal]
-        # base_min_size = opts[:base_min_size]
-        min_market_funds = this_product[:min_market_funds]
-        indicator_status = opts[:indicator_status]
-
-        # Initialize some bot_conf variables
-        pie_in_sky_buy_percent = bot_conf[:pie_in_sky_buy_percent].to_f
-        autotrade_portfolio_percent = bot_conf[:autotrade_portfolio_percent].to_f
-        # target_profit_margin_percent = bot_conf[:target_profit_margin_percent].to_f
-
-        crypto_currency = option_choice.symbol.to_s.upcase.split('_').first
-        portfolio = event_history.order_book[:portfolio]
-        symbol_portfolio = portfolio.select do |this_portfolio|
-          this_portfolio if this_portfolio[:currency] == crypto_currency
-        end
-
-        symbol_balance = format(
-          '%0.8f',
-          symbol_portfolio.first[:balance].to_f
-        ).to_f
-
-        # 2. Calculate Price, Size, Fees
-        # Get the middle of last 3 ticker prices
-        # to avoid over purcase blips.
-        last_three_prices_arr = []
-        last_ticker_price = event_history.order_book[:ticker_price].to_f
-        second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
-        third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
-        last_three_prices_arr.push(last_ticker_price)
-        last_three_prices_arr.push(second_to_last_ticker_price)
-        last_three_prices_arr.push(third_to_last_ticker_price)
-
-        case order_type
-        when :pie
-          limit_price = last_three_prices_arr.sort[1]
-          pie_in_sky_buy_percent_cast_as_decimal = format(
-            '%0.2f',
-            pie_in_sky_buy_percent * 0.01
-          ).to_f
-
-          limit_price -= (limit_price * pie_in_sky_buy_percent_cast_as_decimal)
-        when :tpm
-          limit_price = last_three_prices_arr.sort[1]
-        when :gtfo
-          # price = format("%0.#{fiat_smallest_decimal}f", limit_price)
-          raise "ERROR: Why is a Buy Submitted for #{order_type}?"
-        else
-          raise "ERROR: Unknown order_type: #{order_type}"
-        end
-
-        price = format("%0.#{fiat_smallest_decimal}f", limit_price)
-
-        # TODO: Determine if our N% Autotrade
-        # Threshold has already been met
-        # Buying Crypto w/ Fiat
-        autotrade_portfolio_percent_cast_as_decimal = format(
-          '%0.7f',
-          autotrade_portfolio_percent * 0.01
-        ).to_f
-
-        fiat_portfolio = event_history.order_book[:fiat_portfolio]
-        fiat_balance_available = format(
-          "%0.#{fiat_smallest_decimal}f",
-          fiat_portfolio.first[:available]
-        ).to_f
-
-        # Make sure size is within constraints
-        # of autotrade_portfolio_percent
-        total_limit_buy_orders_open = order_history.select do |orders|
-          orders[:type] == 'limit' &&
-            orders[:side] == 'buy' &&
-            orders[:status] == 'open'
-        end
-
-        total_limit_buy_order_open_tot = total_limit_buy_orders_open.length
-        total_limit_buy_orders_open_size = total_limit_buy_orders_open.inject(0) do |sum, hash|
-          sum + hash[:size].to_f
-        end.to_f
+        bot_conf = opts[:bot_conf]
 
-        fiat_to_autotrade = fiat_balance_available * autotrade_portfolio_percent_cast_as_decimal
-        calc_fiat_to_buy = (fiat_to_autotrade / last_ticker_price) - symbol_balance
-        size = format(
-          "%0.#{crypto_smallest_decimal}f",
-          calc_fiat_to_buy - total_limit_buy_orders_open_size
+        Cryptum::API::Orders.submit_limit(
+          option_choice: option_choice,
+          env: env,
+          price: price,
+          size: size,
+          buy_or_sell: :buy,
+          event_history: event_history,
+          bot_conf: bot_conf
         )
-
-        if min_market_funds.to_i >= 1
-          size = (
-            (calc_fiat_to_buy - total_limit_buy_orders_open_size).to_i - min_market_funds.to_i
-          ).to_s
-        end
-
-        if size.to_f >= min_market_funds.to_f &&
-           total_limit_buy_order_open_tot.zero? &&
-           price.to_f.positive?
-          # SUBMIT BUY ORDER
-          event_history.order_submitted = 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
-
-          event_history = Cryptum::API::Orders.submit_limit_order(
-            option_choice: option_choice,
-            env: env,
-            price: price,
-            size: size,
-            buy_or_sell: :buy,
-            order_type: order_type,
-            event_history: event_history,
-            indicator_status: indicator_status
-          )
-        end
-
-        event_history
       rescue StandardError => e
         raise e
       end

data/lib/cryptum/event/exit.rb

@@ -5,7 +5,7 @@ module Cryptum
   module Event
     module Exit
       # Supported Method Parameters::
-      # Cryptum::Event::BotConf.gracefully(
+      # Cryptum::Event::Exit.gracefully(
       # )
       public_class_method def self.gracefully(opts = {})
         terminal_win = opts[:terminal_win]

data/lib/cryptum/event/order_book.rb

@@ -6,7 +6,7 @@ module Cryptum
   module Event
     module OrderBook
       # Supported Method Parameters::
-      # Cryptum::Event::BotConf.write(
+      # Cryptum::Event::OrderBook.write(
       # )
       public_class_method def self.write(opts = {})
         terminal_win = opts[:terminal_win]

data/lib/cryptum/event/parse.rb

@@ -5,7 +5,7 @@ module Cryptum
   module Event
     module Parse
       # Supported Method Parameters::
-      # Cryptum::Event::Pane.websocket_msg(
+      # Cryptum::Event::Parse.websocket_msg(
       # )
       public_class_method def self.websocket_msg(opts = {})
         env = opts[:env]

data/lib/cryptum/event/sell.rb

@@ -12,103 +12,22 @@ module Cryptum
       public_class_method def self.crypto(opts = {})
         option_choice = opts[:option_choice]
         env = opts[:env]
-        bot_conf = opts[:bot_conf]
-        stuck_in_pos_status = opts[:stuck_in_pos_status]
+        price = opts[:price]
+        size = opts[:size]
         event_history = opts[:event_history]
-        order_type = opts[:order_type]
-        fiat_smallest_decimal = opts[:fiat_smallest_decimal]
-        crypto_smallest_decimal = opts[:crypto_smallest_decimal]
-        # base_min_size = opts[:base_min_size]
-        min_market_funds = this_product[:min_market_funds]
-        indicator_status = opts[:indicator_status]
-        quote_increment = opts[:quote_increment]
-
-        # Initialize some bot_conf variables
-        pie_in_sky_sell_percent = bot_conf[:pie_in_sky_sell_percent].to_f
-
-        crypto_currency = option_choice.symbol.to_s.upcase.split('_').first
-        portfolio = event_history.order_book[:portfolio]
-        symbol_portfolio = portfolio.select do |this_portfolio|
-          this_portfolio if this_portfolio[:currency] == crypto_currency
-        end
-
-        symbol_balance_available = format(
-          '%0.8f',
-          symbol_portfolio.first[:available].to_f
-        ).to_f
-
-        # 2. Calculate Price, Size, Fees
-        # Get the middle of last 3 ticker prices
-        # to avoid over purcase blips.
-        last_three_prices_arr = []
-        last_ticker_price = event_history.order_book[:ticker_price].to_f
-        second_to_last_ticker_price = event_history.order_book[:ticker_price_second_to_last].to_f
-        third_to_last_ticker_price = event_history.order_book[:ticker_price_third_to_last].to_f
-        last_three_prices_arr.push(last_ticker_price)
-        last_three_prices_arr.push(second_to_last_ticker_price)
-        last_three_prices_arr.push(third_to_last_ticker_price)
-        # limit_price = last_three_prices_arr.min
-        # limit_price = last_three_prices_arr.max
-
-        # Obtain our Target Price based on TPM configurations
-        target_symbol_price = stuck_in_pos_status[:target_symbol_price].to_f
-
-        case order_type
-        when :pie
-          pie_in_sky_sell_percent_cast_as_decimal = format(
-            '%0.2f',
-            pie_in_sky_sell_percent * 0.01
-          ).to_f
-
-          target_profit = target_symbol_price * pie_in_sky_sell_percent_cast_as_decimal
-          limit_price = target_symbol_price + target_profit
-
-        when :tpm
-          limit_price = target_symbol_price
-          # TODO: Ensure previous order price
-          # on last _open order_ if applicable
-          # is greater than this one.
-          order_type = :tpm
-        when :gtfo
-          # Attempt to get in front of falling price.
-          limit_price = last_three_prices_arr.sort[1]
-          gtfo_price = limit_price -= quote_increment.to_f
-          limit_price = gtfo_price if gtfo_price.positive?
-        else
-          raise "ERROR: Unknown order_type: #{order_type}"
-        end
-
-        price = format("%0.#{fiat_smallest_decimal}f", limit_price)
-
-        # Selling Available Crytpo Balance in its Entirety
-        # We Will Likely Want to Change this in the Future.
-        size = format(
-          "%0.#{crypto_smallest_decimal}f",
-          symbol_balance_available.floor(crypto_smallest_decimal)
+        bot_conf = opts[:bot_conf]
+        buy_order_id = opts[:buy_order_id]
+
+        Cryptum::API::Orders.submit_limit(
+          option_choice: option_choice,
+          env: env,
+          price: price,
+          size: size,
+          buy_or_sell: :sell,
+          event_history: event_history,
+          bot_conf: bot_conf,
+          buy_order_id: buy_order_id
         )
-
-        size = symbol_balance_available if min_market_funds.to_i == 1
-
-        if size.to_f >= min_market_funds.to_f &&
-           price.to_f.positive?
-
-          # SUBMIT SELL ORDER
-          event_history.order_submitted = 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
-
-          event_history = Cryptum::API::Orders.submit_limit_order(
-            option_choice: option_choice,
-            env: env,
-            price: price,
-            size: size,
-            buy_or_sell: :sell,
-            order_type: order_type,
-            event_history: event_history,
-            indicator_status: indicator_status
-          )
-        end
-
-        event_history
       rescue StandardError => e
         raise e
       end
@@ -116,7 +35,7 @@ module Cryptum
       # Display Usage for this Module
       public_class_method def self.help
         puts "USAGE:
-         order_book = #{self}.crypto()
+         event_history = #{self}.crypto()
         "
       end
     end

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

@@ -126,12 +126,11 @@ module Cryptum
                 event_history.red_pill = true if fiat_invested_this_order > fiat_avail_to_trade.to_f
 
                 unless event_history.red_pill
-                  event_history = Cryptum::API::Orders.submit_limit_order(
+                  event_history = Cryptum::Event::Buy.crypto(
                     option_choice: option_choice,
                     env: env,
                     price: price,
                     size: size,
-                    buy_or_sell: :buy,
                     event_history: event_history,
                     bot_conf: bot_conf
                   )
@@ -252,12 +251,11 @@ module Cryptum
 
                 size = order_ready_to_sell[:size]
 
-                Cryptum::API::Orders.submit_limit_order(
+                event_history = Cryptum::Event::Sell.crypto(
                   option_choice: option_choice,
                   env: env,
                   price: price,
                   size: size,
-                  buy_or_sell: :sell,
                   event_history: event_history,
                   bot_conf: bot_conf,
                   buy_order_id: buy_order_id

data/lib/cryptum/version.rb

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

metadata

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