bitex_bot 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '027380d0b5310a8656d1e4ea0357617f1c750c1a'
-  data.tar.gz: 66974805bb9b7b130181e737f688512d8f234d17
+  metadata.gz: 1ec3db346eb39cba7b7760969b32205f778bdf89
+  data.tar.gz: 4117298e216bc463273d303ea82b0d4f549958af
 SHA512:
-  metadata.gz: d70e171eb1bae487ab0866d441c7c7ac3711d129976a4bf0351d1a1848834dbb9b4f2cb9227af7d2f73df7a3aa200052dc48028b8a8b0c0fa753d775ba21070a
-  data.tar.gz: 4bc5ae223b7ddde9b07b8397ce2c5fcbc25b89b289084b57bc357448c8d6c822e301a0814f657ccf89a9d12a57f6d56d5cabdd1d2d88f7393a36b00e18c1480b
+  metadata.gz: b73d5b0ea727152b76ab15052ca7501fa5beae556d6946ddb5d2e0f26e1d76a93d86210283488a57e44c04c2b4ed36fe993a297debc39bb3234e657a90a570dd
+  data.tar.gz: 2958fc14136fb77f4b578bda495d27050a6bc14886f78fc784fda7dc2ab00703bbbe5fb55860214a5c0ec21374335163da2aa760c0dfbe9f755d10c30ce4aca1

data/lib/bitex_bot.rb

@@ -24,9 +24,7 @@ require 'bitex_bot/models/closing_flow.rb'
 Dir[File.dirname(__FILE__) + '/bitex_bot/models/*.rb'].each { |file| require file }
 require 'bitex_bot/robot'
 
-# #
 # Get version and bitex-bot as user-agent
-#
 module BitexBot
   def self.user_agent
     "Bitexbot/#{VERSION} (https://github.com/bitex-la/bitex-bot)"
@@ -34,20 +32,14 @@ module BitexBot
 end
 
 module Bitex
-  # #
   # Set bitex-bot user-agent on request.
-  #
   module WithUserAgent
     def grab_curl
-      super.tap do |curl|
-        curl.headers['User-Agent'] = BitexBot.user_agent
-      end
+      super.tap { |curl| curl.headers['User-Agent'] = BitexBot.user_agent }
     end
   end
 
-  ##
   # Mixing to include request behaviour and set user-agent.
-  #
   class Api
     class << self
       prepend WithUserAgent
@@ -56,18 +48,14 @@ module Bitex
 end
 
 module RestClient
-  # #
   # On Itbit and Bitstamp, the mechanism to set bitex-bot user-agent are different.
-  #
   module WithUserAgent
     def default_headers
       super.merge(user_agent: BitexBot.user_agent)
     end
   end
 
-  ##
   # Mixing to include request behaviour and set user-agent.
-  #
   class Request
     prepend WithUserAgent
   end

data/lib/bitex_bot/database.rb

@@ -53,7 +53,7 @@ module BitexBot
           t.decimal    :quantity,      precision: 30, scale: 15
           t.decimal    :amount,        precision: 30, scale: 15
           t.boolean    :done,          null: false,   default: false
-          t.decimal    :btc_profit,    precision: 30, scale: 15
+          t.decimal    :crypto_profit,    precision: 30, scale: 15
           t.decimal    :fiat_profit,   precision: 30, scale: 15
           t.decimal    :fx_rate,       precision: 20, scale: 8
           t.timestamps null: true
@@ -64,7 +64,7 @@ module BitexBot
           t.decimal    :quantity,      precision: 30, scale: 15
           t.decimal    :amount,        precision: 30, scale: 15
           t.boolean    :done,          null: false,   default: false
-          t.decimal    :btc_profit,    precision: 30, scale: 15
+          t.decimal    :crypto_profit,    precision: 30, scale: 15
           t.decimal    :fiat_profit,   precision: 30, scale: 15
           t.decimal    :fx_rate,       precision: 20, scale: 8
           t.timestamps null: true
@@ -91,20 +91,32 @@ module BitexBot
 
       unless ActiveRecord::Base.connection.table_exists?('stores')
         create_table   :stores, force: true do |t|
+          t.decimal    :maker_crypto,                       precision: 20,   scale: 8
+          t.decimal    :maker_crypto_stop,                  precision: 20,   scale: 8
+          t.decimal    :maker_crypto_warning,               precision: 20,   scale: 8
+          t.decimal    :maker_fiat,                         precision: 20,   scale: 8
+          t.decimal    :maker_fiat_stop,                    precision: 20,   scale: 8
+          t.decimal    :maker_fiat_warning,                 precision: 20,   scale: 8
+
+          t.decimal    :taker_crypto,                       precision: 20,   scale: 8
+          t.decimal    :taker_crypto_stop,                  precision: 20,   scale: 8
+          t.decimal    :taker_crypto_warning,               precision: 20,   scale: 8
           t.decimal    :taker_fiat,                         precision: 20,   scale: 8
-          t.decimal    :taker_btc,                          precision: 20,   scale: 8
+          t.decimal    :taker_fiat_stop,                    precision: 20,   scale: 8
+          t.decimal    :taker_fiat_warning,                 precision: 20,   scale: 8
+
+          t.decimal    :buying_amount_to_spend_per_order,   precision: 20,   scale: 8
+          t.decimal    :buying_fx_rate,                     precision: 20,   scale: 8
+          t.decimal    :buying_profit,                      precision: 20,   scale: 8
+
+          t.decimal    :selling_quantity_to_sell_per_order, precision: 20,   scale: 8
+          t.decimal    :selling_fx_rate,                    precision: 20,   scale: 8
+          t.decimal    :selling_profit,                     precision: 20,   scale: 8
+
           t.boolean    :hold,                               default:   false
           t.text       :log
-          t.decimal    :fiat_stop,                          precision: 20,   scale: 8
-          t.decimal    :fiat_warning,                       precision: 20,   scale: 8
-          t.decimal    :btc_stop,                           precision: 20,   scale: 8
-          t.decimal    :btc_warning,                        precision: 20,   scale: 8
           t.datetime   :last_warning
-          t.decimal    :buying_profit,                      precision: 20,   scale: 8
-          t.decimal    :selling_profit,                     precision: 20,   scale: 8
-          t.decimal    :buying_amount_to_spend_per_order,   precision: 20,   scale: 8
-          t.decimal    :selling_quantity_to_sell_per_order, precision: 20,   scale: 8
-          t.decimal    :fx_rate,                            precision: 20,   scale: 8
+
           t.timestamps null: true
         end
       end

data/lib/bitex_bot/models/api_wrappers/api_wrapper.rb

@@ -38,9 +38,9 @@ class ApiWrapper
   )
 
   BalanceSummary = Struct.new(
-    :btc, # Balance
-    :usd, # Balance
-    :fee  # Decimal
+    :crypto, # Balance
+    :fiat,   # Balance
+    :fee     # Decimal
   )
 
   Balance = Struct.new(

data/lib/bitex_bot/models/buy_closing_flow.rb

@@ -10,11 +10,15 @@ module BitexBot
       OpenBuy
     end
 
+    def fx_rate
+      Settings.buying_fx_rate
+    end
+
     private
 
     # create_or_cancel! hookers
     # The coins we actually bought minus the coins we were supposed to re-buy
-    def estimate_btc_profit
+    def estimate_crypto_profit
       quantity - close_positions.sum(:quantity)
     end
 

data/lib/bitex_bot/models/buy_opening_flow.rb

@@ -73,5 +73,9 @@ module BitexBot
       store.buying_amount_to_spend_per_order || Settings.buying.amount_to_spend_per_order
     end
     # end: create_for_market helpers
+
+    def self.fx_rate
+      Settings.buying_fx_rate
+    end
   end
 end

data/lib/bitex_bot/models/closing_flow.rb

@@ -46,7 +46,7 @@ module BitexBot
     end
 
     def positions_balance_amount
-      close_positions.sum(:amount) * Settings.fx_rate
+      close_positions.sum(:amount) * fx_rate
     end
 
     private
@@ -87,7 +87,7 @@ module BitexBot
     end
 
     # This use hooks methods, these must be defined in the subclass:
-    #   estimate_btc_profit
+    #   estimate_crypto_profit
     #   amount_positions_balance
     #   next_price_and_quantity
     def create_next_position!
@@ -95,8 +95,8 @@ module BitexBot
       if Robot.taker.enough_order_size?(next_quantity, next_price)
         create_order_and_close_position(next_quantity, next_price)
       else
-        update!(btc_profit: estimate_btc_profit, fiat_profit: estimate_fiat_profit, fx_rate: Settings.fx_rate, done: true)
-        Robot.logger.info("Closing: Finished #{self.class.name} ##{id} earned $#{fiat_profit} and #{btc_profit} BTC.")
+        update!(crypto_profit: estimate_crypto_profit, fiat_profit: estimate_fiat_profit, fx_rate: fx_rate, done: true)
+        Robot.logger.info("Closing: Finished #{self.class.name} ##{id} earned $#{fiat_profit} and #{crypto_profit} BTC.")
       end
     end
 

data/lib/bitex_bot/models/opening_flow.rb

@@ -36,7 +36,7 @@ module BitexBot
       raise CannotCreateFlow, "Needed #{remote_value} but you only have #{remote_balance}" unless
         enough_remote_funds?(remote_balance, remote_value)
 
-      bitex_price = maker_price(remote_value) * Settings.fx_rate
+      bitex_price = maker_price(remote_value) * fx_rate
       order = create_order!(bitex_price)
       raise CannotCreateFlow, "You need to have #{value_to_use} on bitex to place this #{order_class.name}." unless
         enough_funds?(order)
@@ -94,7 +94,7 @@ module BitexBot
     def self.sync_open_positions
       threshold = open_position_class.order('created_at DESC').first.try(:created_at)
       Bitex::Trade.all.map do |transaction|
-        next if sought_transaction?(threshold, transaction)
+        next unless sought_transaction?(threshold, transaction)
 
         flow = find_by_order_id(transaction_order_id(transaction))
         next unless flow.present?
@@ -122,16 +122,16 @@ module BitexBot
     # This use hooks methods, these must be defined in the subclass:
     #   #transaction_class
     def self.sought_transaction?(threshold, transaction)
-      !transaction.is_a?(transaction_class) ||
-        active_transaction?(transaction, threshold) ||
-        open_position?(transaction) ||
-        !expected_order_book?(transaction)
+      transaction.is_a?(transaction_class) &&
+        !active_transaction?(transaction, threshold) &&
+        !open_position?(transaction) &&
+        expected_order_book?(transaction)
     end
     # end: sync_open_positions helpers
 
     # sought_transaction helpers
     def self.active_transaction?(transaction, threshold)
-      threshold && transaction.created_at < (threshold - 30.minutes)
+      threshold.present? && transaction.created_at < (threshold - 30.minutes)
     end
 
     def self.open_position?(transaction)

data/lib/bitex_bot/models/sell_closing_flow.rb

@@ -10,6 +10,10 @@ module BitexBot
       OpenSell
     end
 
+    def fx_rate
+      Settings.selling_fx_rate
+    end
+
     private
 
     # create_or_cancel! helpers
@@ -19,7 +23,7 @@ module BitexBot
     end
 
     # The coins we actually bought minus the coins we were supposed to re-buy.
-    def estimate_btc_profit
+    def estimate_crypto_profit
       close_positions.sum(:quantity) - quantity
     end
 

data/lib/bitex_bot/models/sell_opening_flow.rb

@@ -72,5 +72,9 @@ module BitexBot
       store.selling_quantity_to_sell_per_order || Settings.selling.quantity_to_sell_per_order
     end
     # end: create_for_market helpers
+
+    def self.fx_rate
+      Settings.selling_fx_rate
+    end
   end
 end

data/lib/bitex_bot/robot.rb

@@ -63,13 +63,13 @@ module BitexBot
     def_delegator self, :log
 
     def self.with_cooldown
-      result = yield
-      self.current_cooldowns += 1
-      sleep_for(0.1)
-      result
+      yield.tap do
+        self.current_cooldowns += 1
+        sleep_for(0.1)
+      end
     end
 
-    # private class methods
+    private_class_method
 
     def self.start_robot
       setup
@@ -77,8 +77,6 @@ module BitexBot
       new
     end
 
-    # end: private class methods
-
     # rubocop:disable Metrics/AbcSize
     def trade!
       sync_opening_flows if active_opening_flows?
@@ -106,11 +104,11 @@ module BitexBot
     # rubocop:enable Metrics/AbcSize
 
     def active_closing_flows?
-      [BuyClosingFlow.active, SellClosingFlow.active].any?(&:exists?)
+      [BuyClosingFlow, SellClosingFlow].map(&:active).any?(&:exists?)
     end
 
     def active_opening_flows?
-      [BuyOpeningFlow.active, SellOpeningFlow.active].any?(&:exists?)
+      [BuyOpeningFlow, SellOpeningFlow].map(&:active).any?(&:exists?)
     end
 
     # The trader has a Store
@@ -158,7 +156,7 @@ module BitexBot
     end
 
     def open_positions?
-      [OpenBuy.open, OpenSell.open].any?(&:exists?)
+      [OpenBuy, OpenSell].map(&:open).any?(&:exists?)
     end
 
     def sync_closing_flows
@@ -179,14 +177,16 @@ module BitexBot
       recent_buying, recent_selling = recent_operations
       return log(:debug, 'Not placing new orders, recent ones exist.') if recent_buying && recent_selling
 
-      taker_balance = with_cooldown { Robot.taker.balance }
       profile = Bitex::Profile.get
-      total_fiat, total_btc = balances(taker_balance, profile)
+      taker_balance = with_cooldown { Robot.taker.balance }
+      sync_log_and_store(taker_balance, profile)
 
-      sync_log(taker_balance)
-      check_balance_warning(total_fiat, total_btc) if expired_last_warning?
-      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if target_met?(:fiat, total_fiat)
-      return log(:debug, 'Not placing new orders, BTC target not met') if target_met?(:btc, total_btc)
+      check_balance_warning if expired_last_warning?
+
+      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if alert?(:maker, :fiat, :stop)
+      return log(:debug, "Not placing new orders, #{Settings.base} target not met") if alert?(:maker, :crypto, :stop)
+      return log(:debug, 'Not placing new orders, USD target not met') if alert?(:taker, :fiat, :stop)
+      return log(:debug, "Not placing new orders, #{Settings.quote} target not met") if alert?(:taker, :crypto, :stop)
 
       order_book = with_cooldown { Robot.taker.order_book }
       transactions = with_cooldown { Robot.taker.transactions }
@@ -203,38 +203,37 @@ module BitexBot
       end
     end
 
-    def balances(taker_balance, maker_balance)
-      total_fiat = maker_balance[:"#{Settings.quote}_balance"] + taker_balance.usd.total * Settings.fx_rate
-      total_btc = maker_balance[:btc_balance] + taker_balance.btc.total
-
-      [total_fiat, total_btc]
-    end
-
-    def sync_log(taker_balance)
+    def sync_log_and_store(taker_balance, maker_balance)
       file = Settings.log.try(:file)
       last_log = `tail -c 61440 #{file}` if file.present?
-      store.update(taker_fiat: taker_balance.usd.total * Settings.fx_rate, taker_btc: taker_balance.btc.total, log: last_log)
+
+      store.update(
+        maker_fiat: maker_balance[:"#{Settings.quote}_balance"], maker_crypto: maker_balance[:"#{Settings.base}_balance"],
+        taker_fiat: taker_balance.fiat.total, taker_crypto: taker_balance.crypto.total,
+        log: last_log
+      )
     end
 
     def expired_last_warning?
       store.last_warning.nil? || store.last_warning < 30.minutes.ago
     end
 
-    def check_balance_warning(total_fiat, total_btc)
-      notify_balance_warning(Settings.quote, total_fiat, store.fiat_warning) if balance_warning_notify?(:fiat, total_fiat)
-      notify_balance_warning(:btc, total_btc, store.btc_warning) if balance_warning_notify?(:btc, total_btc)
-    end
-
-    def balance_warning_notify?(currency, total)
-      store.send("#{currency}_warning").present? && total <= store.send("#{currency}_warning")
+    # rubocop:disable Metrics/AbcSize
+    def check_balance_warning
+      notify_balance_warning(Settings.base, store.maker_crypto, store.maker_crypto_warning) if alert?(:maker, :crypto, :warning)
+      notify_balance_warning(Settings.quote, store.maker_fiat, store.maker_fiat_warning) if alert?(:maker, :fiat, :warning)
+      notify_balance_warning(Settings.base, store.taker_crypto, store.taker_crypto_warning) if alert?(:taker, :crypto, :warning)
+      notify_balance_warning(:usd, store.taker_fiat, store.taker_fiat_warning) if alert?(:taker, :fiat, :warning)
     end
+    # rubocop:enable Metrics/AbcSize
 
-    def target_met?(currency, total)
-      store.send("#{currency}_stop").present? && total <= store.send("#{currency}_stop")
+    def alert?(market, currency, flag)
+      return unless store.send("#{market}_#{currency}_#{flag}").present?
+      store.send("#{market}_#{currency}") <= store.send("#{market}_#{currency}_#{flag}")
     end
 
-    def notify_balance_warning(currency, total, warning_amount)
-      notify("#{currency.upcase} balance is too low, it's #{total}, make it #{warning_amount} to stop this warning.")
+    def notify_balance_warning(currency, amount, warning_amount)
+      notify("#{currency.upcase} balance is too low, it's #{amount}, make it #{warning_amount} to stop this warning.")
       store.update(last_warning: Time.now)
     end
 
@@ -242,9 +241,9 @@ module BitexBot
       log(:error, message)
       return unless Settings.mailer.present?
 
-      mail = new_mail(subj, message)
-      mail.delivery_method(Settings.mailer.delivery_method.to_sym, Settings.mailer.options.to_hash)
-      mail.deliver!
+      new_mail(subj, message).tap do |mail|
+        mail.delivery_method(Settings.mailer.delivery_method.to_sym, Settings.mailer.options.to_hash)
+      end.deliver!
     end
 
     def new_mail(subj, message)
@@ -257,11 +256,11 @@ module BitexBot
     end
 
     def create_buy_opening_flow(balance, order_book, transactions, profile)
-      BuyOpeningFlow.create_for_market(balance.btc.available, order_book.bids, transactions, profile[:fee], balance.fee, store)
+      BuyOpeningFlow.create_for_market(balance.crypto.available, order_book.bids, transactions, profile[:fee], balance.fee, store)
     end
 
     def create_sell_opening_flow(balance, order_book, transactions, profile)
-      SellOpeningFlow.create_for_market(balance.usd.available, order_book.asks, transactions, profile[:fee], balance.fee, store)
+      SellOpeningFlow.create_for_market(balance.fiat.available, order_book.asks, transactions, profile[:fee], balance.fee, store)
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/bitex_bot/settings.rb

@@ -29,8 +29,12 @@ module BitexBot
       load_settings(path)
     end
 
-    def fx_rate
-      Store.first.try(:fx_rate) || foreign_exchange_rate
+    def buying_fx_rate
+      Store.first.try(:buying_fx_rate) || buying_foreign_exchange_rate
+    end
+
+    def selling_fx_rate
+      Store.first.try(:selling_fx_rate) || selling_foreign_exchange_rate
     end
 
     def base

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'.freeze
 end

data/settings.rb.sample

@@ -36,8 +36,11 @@ buying amount_to_spend_per_order: 10.0.to_d, profit: 0.5.to_d
 #   places an ask on Bitex charging a higher price.
 selling quantity_to_sell_per_order: 0.1.to_d, profit: 0.5.to_d
 
-# Quote fx rate for maker order book
-foreign_exchange_rate 1.to_d
+# Quote fx rate for selling for order book
+selling_foreign_exchange_rate 1.to_d
+
+# Quote fx rate for buying for order book
+buying_foreign_exchange_rate 1.to_d
 
 # This is your maker, at the moment only will operates with bitex
 #   api_key: it's passed in to the bitex gem: https://github.com/bitex-la/bitex-ruby.

data/spec/bitex_bot/settings_spec.rb

@@ -8,7 +8,8 @@ describe BitexBot::Settings do
         time_to_live: 20,
         buying: { amount_to_spend_per_order: 10, profit: 0.5 },
         selling: { quantity_to_sell_per_order: 0.1, profit: 0.5 },
-        foreign_exchange_rate: 1,
+        buying_foreign_exchange_rate: 1,
+        selling_foreign_exchange_rate: 1,
 
         maker: { bitex: { api_key: 'your_bitex_api_key_which_should_be_kept_safe', order_book: :btc_usd, sandbox: false } },
         # By default Bitstamp is taker market.
@@ -31,22 +32,26 @@ describe BitexBot::Settings do
       )
     end
 
-    context 'fx_rate' do
-      context 'when Store isn´t loaded' do
-        it 'by default' do
-          described_class.fx_rate.should eq(1)
-        end
+    context 'fx rate' do
+      context 'when Store isn´t loaded, by default' do
+        it { described_class.buying_fx_rate.should eq(1) }
+        it { described_class.selling_fx_rate.should eq(1) }
       end
 
-      context 'when Store is loaded' do
-        before(:each) do
-          BitexBot::Store.stub(first: BitexBot::Store.new )
-          BitexBot::Store.any_instance.stub(fx_rate: fx_rate)
-        end
+      context 'when Store is loaded, take rate from' do
+        before(:each) { BitexBot::Store.stub(first: BitexBot::Store.new) }
         let(:fx_rate) { rand(10) }
 
-        it 'take rate from it' do
-          described_class.fx_rate.should eq(fx_rate)
+        context 'buying' do
+          before(:each) { BitexBot::Store.any_instance.stub(buying_fx_rate: fx_rate) }
+
+          it { described_class.buying_fx_rate.should eq(fx_rate) }
+        end
+
+        context 'selling' do
+          before(:each) { BitexBot::Store.any_instance.stub(selling_fx_rate: fx_rate) }
+
+          it { described_class.selling_fx_rate.should eq(fx_rate) }
         end
       end
     end

data/spec/models/api_wrappers/bitstamp_api_wrapper_spec.rb

@@ -44,18 +44,18 @@ describe BitstampApiWrapper do
 
     balance = api_wrapper.balance
     balance.should be_a(ApiWrapper::BalanceSummary)
-    balance.btc.should be_a(ApiWrapper::Balance)
-    balance.usd.should be_a(ApiWrapper::Balance)
-
-    btc = balance.btc
-    btc.total.should be_a(BigDecimal)
-    btc.reserved.should be_a(BigDecimal)
-    btc.available.should be_a(BigDecimal)
-
-    usd = balance.usd
-    usd.total.should be_a(BigDecimal)
-    usd.reserved.should be_a(BigDecimal)
-    usd.available.should be_a(BigDecimal)
+    balance.crypto.should be_a(ApiWrapper::Balance)
+    balance.fiat.should be_a(ApiWrapper::Balance)
+
+    crypto = balance.crypto
+    crypto.total.should be_a(BigDecimal)
+    crypto.reserved.should be_a(BigDecimal)
+    crypto.available.should be_a(BigDecimal)
+
+    fiat = balance.fiat
+    fiat.total.should be_a(BigDecimal)
+    fiat.reserved.should be_a(BigDecimal)
+    fiat.available.should be_a(BigDecimal)
 
     balance.fee.should be_a(BigDecimal)
   end

data/spec/models/api_wrappers/itbit_api_wrapper_spec.rb

@@ -53,18 +53,18 @@ describe ItbitApiWrapper do
 
     balance = api_wrapper.balance
     balance.should be_a(ApiWrapper::BalanceSummary)
-    balance.btc.should be_a(ApiWrapper::Balance)
-    balance.usd.should be_a(ApiWrapper::Balance)
-
-    btc = balance.btc
-    btc.total.should be_a(BigDecimal)
-    btc.reserved.should be_a(BigDecimal)
-    btc.available.should be_a(BigDecimal)
-
-    usd = balance.usd
-    usd.total.should be_a(BigDecimal)
-    usd.reserved.should be_a(BigDecimal)
-    usd.available.should be_a(BigDecimal)
+    balance.crypto.should be_a(ApiWrapper::Balance)
+    balance.fiat.should be_a(ApiWrapper::Balance)
+
+    crypto = balance.crypto
+    crypto.total.should be_a(BigDecimal)
+    crypto.reserved.should be_a(BigDecimal)
+    crypto.available.should be_a(BigDecimal)
+
+    fiat = balance.fiat
+    fiat.total.should be_a(BigDecimal)
+    fiat.reserved.should be_a(BigDecimal)
+    fiat.available.should be_a(BigDecimal)
 
     balance.fee.should be_a(BigDecimal)
   end

data/spec/models/api_wrappers/kraken_api_wrapper_spec.rb

@@ -77,18 +77,18 @@ describe KrakenApiWrapper do
 
     balance = api_wrapper.balance
     balance.should be_a(ApiWrapper::BalanceSummary)
-    balance.btc.should be_a(ApiWrapper::Balance)
-    balance.usd.should be_a(ApiWrapper::Balance)
-
-    btc = balance.btc
-    btc.total.should be_a(BigDecimal)
-    btc.reserved.should be_a(BigDecimal)
-    btc.available.should be_a(BigDecimal)
-
-    usd = balance.usd
-    usd.total.should be_a(BigDecimal)
-    usd.reserved.should be_a(BigDecimal)
-    usd.available.should be_a(BigDecimal)
+    balance.crypto.should be_a(ApiWrapper::Balance)
+    balance.fiat.should be_a(ApiWrapper::Balance)
+
+    crypto = balance.crypto
+    crypto.total.should be_a(BigDecimal)
+    crypto.reserved.should be_a(BigDecimal)
+    crypto.available.should be_a(BigDecimal)
+
+    fiat = balance.fiat
+    fiat.total.should be_a(BigDecimal)
+    fiat.reserved.should be_a(BigDecimal)
+    fiat.available.should be_a(BigDecimal)
 
     balance.fee.should be_a(BigDecimal)
   end

data/spec/models/buy_closing_flow_spec.rb

@@ -26,7 +26,7 @@ describe BitexBot::BuyClosingFlow do
     flow.desired_price.should == 310
     flow.quantity.should == 2
     flow.amount.should == 600
-    flow.btc_profit.should be_nil
+    flow.crypto_profit.should be_nil
     flow.fiat_profit.should be_nil
 
     close = flow.close_positions.first
@@ -51,7 +51,7 @@ describe BitexBot::BuyClosingFlow do
     flow.desired_price.round(10).should == '310.4_975_124_378'.to_d
     flow.quantity.should == 2.01
     flow.amount.should == 604
-    flow.btc_profit.should be_nil
+    flow.crypto_profit.should be_nil
     flow.fiat_profit.should be_nil
 
     close.order_id.should == '1'
@@ -92,7 +92,7 @@ describe BitexBot::BuyClosingFlow do
       close.quantity.should == 2.01
 
       flow.should be_done
-      flow.btc_profit.should be_zero
+      flow.crypto_profit.should be_zero
       flow.fiat_profit.should == 20.105
     end
 
@@ -111,7 +111,7 @@ describe BitexBot::BuyClosingFlow do
 
       it 'syncs the executed orders, calculates profit with other fx rate' do
         flow.should be_done
-        flow.btc_profit.should be_zero
+        flow.crypto_profit.should be_zero
         flow.fiat_profit.should eq positions_balance_amount
       end
     end
@@ -161,7 +161,7 @@ describe BitexBot::BuyClosingFlow do
         close.quantity.should == 1.005
       end
       flow.should be_done
-      flow.btc_profit.should be_zero
+      flow.crypto_profit.should be_zero
       flow.fiat_profit.should == 20.07_485
     end
 
@@ -176,7 +176,7 @@ describe BitexBot::BuyClosingFlow do
       end.not_to change { BitexBot::CloseBuy.count }
 
       flow.should be_done
-      flow.btc_profit.should == 0.00_201
+      flow.crypto_profit.should == 0.00_201
       flow.fiat_profit.should == 19.480_895
     end
 
@@ -195,7 +195,7 @@ describe BitexBot::BuyClosingFlow do
 
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       flow.reload.should be_done
-      flow.btc_profit.should be_zero
+      flow.crypto_profit.should be_zero
       flow.fiat_profit.should == -34.165
     end
   end
@@ -216,7 +216,7 @@ describe BitexBot::BuyClosingFlow do
       flow.open_positions.should == [open]
       flow.desired_price.should == 310
       flow.quantity.should == 2
-      flow.btc_profit.should be_nil
+      flow.crypto_profit.should be_nil
       flow.fiat_profit.should be_nil
       flow.close_positions.should be_empty
     end

data/spec/models/buy_opening_flow_spec.rb

@@ -66,7 +66,7 @@ describe BitexBot::BuyOpeningFlow do
 
     it 'spends 100 usd with other fx_rate' do
       BitexBot::Settings.stub(
-        fx_rate: other_fx_rate,
+        buying_foreign_exchange_rate: other_fx_rate,
         time_to_live: 3,
         buying: double(amount_to_spend_per_order: amount_to_spend, profit: 0)
       )

data/spec/models/robot_spec.rb

@@ -50,11 +50,12 @@ describe BitexBot::Robot do
     stub_bitex_orders
     stub_bitstamp_api_wrapper_order_book
     bot.trade!
+
     stub_bitex_transactions
     buying = BitexBot::BuyOpeningFlow.last
     selling = BitexBot::SellOpeningFlow.last
 
-    Timecop.travel 10.minutes.from_now
+    Timecop.travel(10.minutes.from_now)
     bot.trade!
 
     buying.reload.should be_settling
@@ -68,39 +69,36 @@ describe BitexBot::Robot do
   it 'creates alternating opening flows' do
     Bitex::Trade.stub(all: [])
     bot.trade!
-    BitexBot::BuyOpeningFlow.active.count.should == 1
-    Timecop.travel 2.seconds.from_now
+    BitexBot::BuyOpeningFlow.active.count.should eq 1
+
+    Timecop.travel(2.seconds.from_now)
     bot.trade!
-    BitexBot::BuyOpeningFlow.active.count.should == 1
-    Timecop.travel 5.seconds.from_now
+    BitexBot::BuyOpeningFlow.active.count.should eq 1
+
+    Timecop.travel(5.seconds.from_now)
     bot.trade!
-    BitexBot::BuyOpeningFlow.active.count.should == 2
+    BitexBot::BuyOpeningFlow.active.count.should eq 2
 
-    # When transactions appear, all opening flows
-    # should get old and die.
-    # We stub our finder to make it so all orders
-    # have been successfully cancelled.
+    # When transactions appear, all opening flows should get old and die.
+    # We stub our finder to make it so all orders have been successfully cancelled.
     stub_bitex_transactions
 
     Timecop.travel 5.seconds.from_now
-    bot.trade!
-    bot.trade!
-    BitexBot::BuyOpeningFlow.active.count.should == 1
+    2.times { bot.trade! }
+    BitexBot::BuyOpeningFlow.active.count.should eq 1
+
     Timecop.travel 5.seconds.from_now
     bot.trade!
-    BitexBot::BuyOpeningFlow.active.count.should == 0
+    BitexBot::BuyOpeningFlow.active.count.should eq 0
   end
 
   it 'does not place new opening flows until all closing flows are done' do
     bot.trade!
     stub_bitex_transactions
-    expect do
-      bot.trade!
-    end.to change { BitexBot::BuyClosingFlow.count }.by(1)
+    expect { bot.trade! }.to change { BitexBot::BuyClosingFlow.count }.by(1)
 
     Timecop.travel 15.seconds.from_now
-    bot.trade!
-    bot.trade!
+    2.times { bot.trade! }
     bot.should be_active_closing_flows
     bot.should_not be_active_opening_flows
 
@@ -111,97 +109,110 @@ describe BitexBot::Robot do
     end.to change { BitexBot::BuyOpeningFlow.count }.by(1)
   end
 
-  it 'does not place new opening flows when ordered to hold' do
-    other_bot = BitexBot::Robot.new
-    other_bot.store.hold = true
-    other_bot.store.save!
-    expect do
-      bot.trade!
-    end.not_to change { BitexBot::BuyOpeningFlow.count }
-  end
-
-  it 'stops trading when fiat stop is reached' do
-    other_bot = BitexBot::Robot.new
-    other_bot.store.btc_stop = 30
-    other_bot.store.save!
-    expect do
-      bot.trade!
-    end.not_to change { BitexBot::BuyOpeningFlow.count }
-  end
-
-  it 'stops trading when usd stop is reached' do
-    other_bot = BitexBot::Robot.new
-    other_bot.store.btc_stop = 30
-    other_bot.store.save!
-    expect do
-      bot.trade!
-    end.not_to change { BitexBot::BuyOpeningFlow.count }
+  context 'stops trading when' do
+    before(:each) do
+      Bitex::Profile.stub(get: {
+        fee: 0.5,
+        usd_balance:   10.00,
+        usd_reserved:  10.00,
+        usd_available: 10.00,
+        btc_balance:   10.00,
+        btc_reserved:  10.00,
+        btc_available: 10.00
+      })
+
+      stub_bitstamp_api_wrapper_balance(10, 10, 0.05)
+    end
+
+    after(:each) { expect { bot.trade! }.not_to change { BitexBot::BuyOpeningFlow.count } }
+
+    let(:other_bot) { described_class.new  }
+
+    it 'does not place new opening flows when ordered to hold' do
+      other_bot.store.update(hold: true)
+    end
+
+    context 'maker' do
+      it 'crypto stop is reached' do
+        other_bot.store.update(maker_crypto_stop: 30)
+      end
+
+      it 'fiat stop is reached' do
+        other_bot.store.update(maker_fiat_stop: 30)
+      end
+    end
+
+    context 'taker' do
+      it 'crypto stop is reached' do
+        other_bot.store.update(taker_crypto_stop: 30)
+      end
+
+      it 'fiat stop is reached' do
+        other_bot.store.update(taker_fiat_stop: 30)
+      end
+    end
   end
 
-  it 'stops trading when btc stop is reached' do
-    other_bot = BitexBot::Robot.new
-    other_bot.store.fiat_stop = 11000
-    other_bot.store.save!
-    expect do
-      bot.trade!
-    end.not_to change { BitexBot::BuyOpeningFlow.count }
+  context 'warns every 30 minutes when' do
+    before(:each) do
+      Bitex::Profile.stub(get: {
+        fee: 0.5,
+        usd_balance:   10.00,
+        usd_reserved:   1.00,
+        usd_available:  9.00,
+        btc_balance:   10.00,
+        btc_reserved:   1.00,
+        btc_available:  9.00
+      })
+      Bitex::Trade.stub(all: [])
+      stub_bitstamp_api_wrapper_balance(100, 100)
+      other_bot.store.update(maker_crypto_warning: 0, taker_crypto_warning: 0, maker_fiat_warning: 0, taker_fiat_warning: 0)
+    end
+
+    after(:each) do
+      expect { bot.trade! }.to change { Mail::TestMailer.deliveries.count }.by(1)
+
+      Timecop.travel 1.minute.from_now
+      stub_bitstamp_order_book # Re-stub so order book does not get old
+      expect { bot.trade! }.not_to change { Mail::TestMailer.deliveries.count }
+
+      Timecop.travel 31.minutes.from_now
+      stub_bitstamp_order_book # Re-stub so order book does not get old
+      expect { bot.trade! }.to change { Mail::TestMailer.deliveries.count }.by(1)
+    end
+
+    let(:other_bot) { described_class.new  }
+
+    context 'maker' do
+      it 'crypto warning is reached' do
+        other_bot.store.update(maker_crypto_warning: 100)
+      end
+
+      it 'fiat warning is reached' do
+        other_bot.store.update(maker_fiat_warning: 100)
+      end
+    end
+
+    context 'taker' do
+      it 'crypto warning is reached' do
+        other_bot.store.update(taker_crypto_warning: 100)
+      end
+
+      it 'fiat warning is reached' do
+        other_bot.store.update(taker_fiat_warning: 100)
+      end
+    end
   end
 
-  it 'warns every 30 minutes when usd warn is reached' do
-    Bitex::Trade.stub(all: [])
-    other_bot = BitexBot::Robot.new
-    other_bot.store.fiat_warning = 11000
-    other_bot.store.save!
-    expect do
-      bot.trade!
-    end.to change { Mail::TestMailer.deliveries.count }.by(1)
-    Timecop.travel 1.minute.from_now
-    stub_bitstamp_order_book # Re-stub so order book does not get old
-    expect do
-      bot.trade!
-    end.not_to change { Mail::TestMailer.deliveries.count }
-    Timecop.travel 31.minutes.from_now
-    stub_bitstamp_order_book # Re-stub so order book does not get old
-    expect do
-      bot.trade!
-    end.to change { Mail::TestMailer.deliveries.count }.by(1)
-  end
-
-  it 'warns every 30 minutes when btc warn is reached' do
-    Bitex::Trade.stub(all: [])
-    other_bot = BitexBot::Robot.new
-    other_bot.store.btc_warning = 30
-    other_bot.store.save!
-
-    expect do
-      bot.trade!
-    end.to change { Mail::TestMailer.deliveries.count }.by(1)
-
-    Timecop.travel 1.minute.from_now
-    stub_bitstamp_order_book # Re-stub so order book does not get old
-    expect do
-      bot.trade!
-    end.not_to change { Mail::TestMailer.deliveries.count }
-
-    Timecop.travel 31.minutes.from_now
-    stub_bitstamp_order_book # Re-stub so order book does not get old
-
-    expect do
-      bot.trade!
-    end.to change { Mail::TestMailer.deliveries.count }.by(1)
-  end
-
-  it 'updates taker_fiat and taker_btc' do
+  it 'updates taker_fiat and taker_crypto' do
     bot.trade!
     bot.store.taker_fiat.should_not be_nil
-    bot.store.taker_btc.should_not be_nil
+    bot.store.taker_crypto.should_not be_nil
   end
 
   it 'notifies exceptions and sleeps' do
     BitstampApiWrapper.stub(:balance) { raise StandardError.new('oh moova') }
 
-    expect do
-      bot.trade!
-    end.to change { Mail::TestMailer.deliveries.count }.by(1)
+    expect { bot.trade! }.to change { Mail::TestMailer.deliveries.count }.by(1)
   end
 end

data/spec/models/sell_closing_flow_spec.rb

@@ -26,7 +26,7 @@ describe BitexBot::SellClosingFlow do
     flow.desired_price.should == 290
     flow.quantity.should == 2
     flow.amount.should == 600
-    flow.btc_profit.should be_nil
+    flow.crypto_profit.should be_nil
     flow.fiat_profit.should be_nil
 
     close = flow.close_positions.first
@@ -51,7 +51,7 @@ describe BitexBot::SellClosingFlow do
     flow.desired_price.round(10).should == '290.4975124378'.to_d
     flow.quantity.should == 2.01
     flow.amount.should == 604
-    flow.btc_profit.should be_nil
+    flow.crypto_profit.should be_nil
     flow.fiat_profit.should be_nil
 
     close.order_id.should == '1'
@@ -75,7 +75,7 @@ describe BitexBot::SellClosingFlow do
       flow.open_positions.should == [open]
       flow.desired_price.should == 290
       flow.quantity.should == 2
-      flow.btc_profit.should be_nil
+      flow.crypto_profit.should be_nil
       flow.fiat_profit.should be_nil
       flow.close_positions.should be_empty
     end
@@ -133,7 +133,7 @@ describe BitexBot::SellClosingFlow do
       close.quantity.should == 2.01
 
       flow.should be_done
-      flow.btc_profit.should == 0
+      flow.crypto_profit.should == 0
       flow.fiat_profit.should == '20.095'.to_d
     end
 
@@ -152,7 +152,7 @@ describe BitexBot::SellClosingFlow do
 
       it 'syncs the executed orders, calculates profit with other fx rate' do
         flow.should be_done
-        flow.btc_profit.should be_zero
+        flow.crypto_profit.should be_zero
         flow.fiat_profit.should eq positions_balance_amount
       end
     end
@@ -203,7 +203,7 @@ describe BitexBot::SellClosingFlow do
         close.quantity.should == '1.0049'.to_d
       end
       flow.should be_done
-      flow.btc_profit.should == '-0.0001'.to_d
+      flow.crypto_profit.should == '-0.0001'.to_d
       flow.fiat_profit.should == '20.093903'.to_d
     end
 
@@ -224,7 +224,7 @@ describe BitexBot::SellClosingFlow do
       end.not_to change{ BitexBot::CloseSell.count }
 
       flow.should be_done
-      flow.btc_profit.should == '-0.0224895'.to_d
+      flow.crypto_profit.should == '-0.0224895'.to_d
       flow.fiat_profit.should == '20.66566825'.to_d
     end
 
@@ -243,7 +243,7 @@ describe BitexBot::SellClosingFlow do
 
       flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
       flow.reload.should be_done
-      flow.btc_profit.should == '-0.1709'.to_d
+      flow.crypto_profit.should == '-0.1709'.to_d
       flow.fiat_profit.should == '20.08575'.to_d
 
       close = flow.close_positions.last

data/spec/models/sell_opening_flow_spec.rb

@@ -66,7 +66,7 @@ describe BitexBot::SellOpeningFlow do
 
     it 'sells 4 bitcoin' do
       BitexBot::Settings.stub(
-        fx_rate: other_fx_rate,
+        selling_foreign_exchange_rate: other_fx_rate,
         time_to_live: 3,
         selling: double(quantity_to_sell_per_order: amount_to_sell, profit: 0)
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord