bitex_bot 0.1.6 → 0.2.0

data/bitex_bot.gemspec

@@ -27,7 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3"
   spec.add_dependency "bitstamp"
   spec.add_dependency "bitex", "0.1.4"
+  spec.add_dependency "itbit", "0.0.2"
   spec.add_dependency "mail"
+  spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/bitex_bot/database.rb

@@ -73,7 +73,7 @@ module BitexBot
           t.belongs_to :closing_flow
           t.decimal :amount, precision: 30, scale: 15
           t.decimal :quantity, precision: 30, scale: 15
-          t.integer :order_id
+          t.string :order_id
           t.timestamps
         end
         add_index :close_buys, :order_id
@@ -82,7 +82,7 @@ module BitexBot
           t.belongs_to :closing_flow
           t.decimal :amount, precision: 30, scale: 15
           t.decimal :quantity, precision: 30, scale: 15
-          t.integer :order_id
+          t.string :order_id
           t.timestamps
         end
         add_index :close_sells, :order_id
@@ -90,8 +90,8 @@ module BitexBot
 
       unless ActiveRecord::Base.connection.table_exists?('stores')
         create_table "stores", force: true do |t|
-          t.decimal  "bitstamp_usd",                precision: 20, scale: 8
-          t.decimal  "bitstamp_btc",                precision: 20, scale: 8
+          t.decimal  "taker_usd",                precision: 20, scale: 8
+          t.decimal  "taker_btc",                precision: 20, scale: 8
           t.boolean  "hold", default: false
           t.text     "log"
           t.decimal  "usd_stop",  precision: 20, scale: 8

data/lib/bitex_bot/models/bitstamp_api_wrapper.rb

@@ -0,0 +1,65 @@
+class BitstampApiWrapper
+  def self.setup(settings)
+    Bitstamp.setup do |config|
+      config.key = settings.bitstamp.key
+      config.secret = settings.bitstamp.secret
+      config.client_id = settings.bitstamp.client_id.to_s
+    end
+  end
+
+  #{
+  #  tid:i,
+  #  date: (i+1).seconds.ago.to_i.to_s,
+  #  price: price.to_s,
+  #  amount: amount.to_s
+  #}
+  def self.transactions
+    Bitstamp.transactions
+  end
+  
+  #  { 'timestamp' => DateTime.now.to_i.to_s,
+  #    'bids' =>
+  #      [['30', '3'], ['25', '2'], ['20', '1.5'], ['15', '4'], ['10', '5']],
+  #    'asks' =>
+  #      [['10', '2'], ['15', '3'], ['20', '1.5'], ['25', '3'], ['30', '3']]
+  #  }
+  def self.order_book
+    Bitstamp.order_book
+  end
+
+  # {"btc_balance"=> "10.0", "btc_reserved"=> "0", "btc_available"=> "10.0",
+  # "usd_balance"=> "100.0", "usd_reserved"=>"0", "usd_available"=> "100.0",
+  # "fee"=> "0.5000"}
+  def self.balance
+    Bitstamp.balance
+  end
+
+  # ask = double(amount: args[:amount], price: args[:price],
+  #   type: 1, id: remote_id, datetime: DateTime.now.to_s)
+  # ask.stub(:cancel!) do
+  def self.orders
+    Bitstamp.orders.all
+  end
+
+  # double(usd: (usd * ratio).to_s, btc: (btc * ratio).to_s,
+  #   btc_usd: o.price.to_s, order_id: o.id, fee: "0.5", type: 2,
+  #   datetime: DateTime.now.to_s)
+  def self.user_transactions
+    Bitstamp.user_transactions.all
+  end
+  
+  def self.order_is_done?(order)
+    order.nil?
+  end
+  
+  def self.amount_and_quantity(order_id, transactions)
+    closes = transactions.select{|t| t.order_id.to_s == order_id}
+    amount = closes.collect{|x| x.usd.to_d }.sum.abs
+    quantity = closes.collect{|x| x.btc.to_d }.sum.abs
+    [amount, quantity]
+  end
+  
+  def self.place_order(type, price, quantity)
+    Bitstamp.orders.send(type, amount: quantity, price: price)
+  end
+end

data/lib/bitex_bot/models/closing_flow.rb

@@ -34,8 +34,8 @@ module BitexBot
     end
 
     def create_order_and_close_position(quantity, price)
-      order = Bitstamp.orders.send(order_method,
-        amount: quantity.round(4), price: price.round(2))
+      order = BitexBot::Robot.taker.place_order(
+        order_method, price.round(2), quantity.round(4))
       if order.nil? || order.id.nil?
         Robot.logger.error("Closing: Error on #{order_method} for "\
           "#{self.class.name} ##{id} #{quantity} BTC @ $#{price}."\
@@ -44,7 +44,7 @@ module BitexBot
       end
       Robot.logger.info("Closing: Going to #{order_method} ##{order.id} for"\
         "#{self.class.name} ##{id} #{quantity} BTC @ $#{price}")
-      close_positions.create!(order_id: order.id.to_i)
+      close_positions.create!(order_id: order.id)
     end
 
     def sync_closed_positions(orders, transactions)
@@ -57,14 +57,14 @@ module BitexBot
         return
       end
 
-      order = orders.find{|x| x.id.to_s == latest_close.order_id.to_s }
-      
+      order_id = latest_close.order_id.to_s
+      order = orders.find{|x| x.id.to_s == order_id }
+
       # When ask is nil it means the other exchange is done executing it
       # so we can now have a look of all the sales that were spawned from it.
       if order.nil?
-        closes = transactions.select{|t| t.order_id.to_s == latest_close.order_id.to_s}
-        latest_close.amount = closes.collect{|x| x.usd.to_d }.sum.abs
-        latest_close.quantity = closes.collect{|x| x.btc.to_d }.sum.abs
+        latest_close.amount, latest_close.quantity =
+          BitexBot::Robot.taker.amount_and_quantity(order_id, transactions)
         latest_close.save!
         
         next_price, next_quantity = get_next_price_and_quantity

data/lib/bitex_bot/models/itbit_api_wrapper.rb

@@ -0,0 +1,51 @@
+class ItbitApiWrapper
+  def self.setup(settings)
+    Itbit.client_key = settings.itbit.client_key
+    Itbit.secret = settings.itbit.secret
+    Itbit.user_id = settings.itbit.user_id
+    Itbit.default_wallet_id = settings.itbit.default_wallet_id
+    Itbit.sandbox = settings.sandbox
+  end
+
+  def self.transactions
+    Itbit::XBTUSDMarketData.trades.collect{|t| Hashie::Mash.new(t) }
+  end
+  
+  def self.order_book
+    Itbit::XBTUSDMarketData.orders.stringify_keys
+  end
+
+  def self.balance
+    balances = Itbit::Wallet.all
+      .find{|i| i[:id] == Itbit.default_wallet_id }[:balances]
+    usd = balances.find{|x| x[:currency] == :usd }
+    btc = balances.find{|x| x[:currency] == :xbt }
+    { "btc_balance" => btc[:total_balance],
+      "btc_reserved" => btc[:total_balance] - btc[:available_balance],
+      "btc_available" => btc[:available_balance],
+      "usd_balance" => usd[:total_balance],
+      "usd_reserved" => usd[:total_balance] - usd[:available_balance],
+      "usd_available" => usd[:available_balance],
+      "fee" => 0.5
+    }
+  end
+
+  def self.orders
+    Itbit::Order.all(status: :open)
+  end
+
+  # We don't need to fetch the list of transactions
+  # for itbit since we wont actually use them later.
+  def self.user_transactions
+    []
+  end
+  
+  def self.amount_and_quantity(order_id, transactions)
+    order = Itbit::Order.find(order_id)
+    [order.volume_weighted_average_price * order.amount_filled, order.amount_filled]
+  end
+  
+  def self.place_order(type, price, quantity)
+    Itbit::Order.create!(type, :xbtusd, quantity, price)
+  end
+end

data/lib/bitex_bot/robot.rb

@@ -13,6 +13,9 @@ module BitexBot
     cattr_accessor :graceful_shutdown
     cattr_accessor :cooldown_until
     cattr_accessor :test_mode
+    cattr_accessor :taker do
+      Settings.taker == 'itbit' ? ItbitApiWrapper : BitstampApiWrapper
+    end
     cattr_accessor :logger do
       Logger.new(Settings.log.try(:file) || STDOUT, 10, 10240000).tap do |l|
         l.level = Logger.const_get(Settings.log.level.upcase)
@@ -45,11 +48,8 @@ module BitexBot
     
     def self.setup
       Bitex.api_key = Settings.bitex
-      Bitstamp.setup do |config|
-        config.key = Settings.bitstamp.key
-        config.secret = Settings.bitstamp.secret
-        config.client_id = Settings.bitstamp.client_id.to_s
-      end
+      Bitex.sandbox = Settings.sandbox
+      taker.setup(Settings)
     end
   
     def self.with_cooldown(&block)
@@ -99,8 +99,8 @@ module BitexBot
     end
     
     def sync_closing_flows
-      orders = with_cooldown{ Bitstamp.orders.all }
-      transactions = with_cooldown{ Bitstamp.user_transactions.all }
+      orders = with_cooldown{ BitexBot::Robot.taker.orders }
+      transactions = with_cooldown{ BitexBot::Robot.taker.user_transactions }
 
       [BuyClosingFlow, SellClosingFlow].each do |kind|
         kind.active.each do |flow|
@@ -140,14 +140,14 @@ module BitexBot
         return
       end
       
-      balances = with_cooldown{ Bitstamp.balance }
+      balances = with_cooldown{ BitexBot::Robot.taker.balance }
       profile = Bitex::Profile.get
       
       total_usd = balances['usd_balance'].to_d + profile[:usd_balance]
       total_btc = balances['btc_balance'].to_d + profile[:btc_balance]
       
-      store.update_attributes(bitstamp_usd: balances['usd_balance'],
-        bitstamp_btc: balances['btc_balance'])
+      store.update_attributes(taker_usd: balances['usd_balance'],
+        taker_btc: balances['btc_balance'])
       
       if store.last_warning.nil? || store.last_warning < 30.minutes.ago 
         if store.usd_warning && total_usd <= store.usd_warning
@@ -172,8 +172,8 @@ module BitexBot
         return
       end
 
-      order_book = with_cooldown{ Bitstamp.order_book }
-      transactions = with_cooldown{ Bitstamp.transactions }
+      order_book = with_cooldown{ BitexBot::Robot.taker.order_book }
+      transactions = with_cooldown{ BitexBot::Robot.taker.transactions }
       
       unless recent_buying
         BuyOpeningFlow.create_for_market(

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/bitex_bot.rb

@@ -1,4 +1,5 @@
 require "bitex_bot/version"
+require 'hashie'
 require "active_support"
 require "active_record"
 require "active_model"
@@ -6,6 +7,7 @@ require "mail"
 require "logger"
 require "bitex"
 require "bitstamp"
+require "itbit"
 require "bitex_bot/settings"
 require "bitex_bot/database"
 require "bitex_bot/models/opening_flow.rb"

data/settings.yml.sample

@@ -12,6 +12,14 @@ log:
 # competitive. About 20 seconds is a good number here.
 time_to_live: 20
 
+# Use sandbox environments instead of live environments
+# only available for bitex and itbit
+sandbox: false
+
+# Which market to use for taking (we're always makers on bitex)
+# itbit or bitstamp
+taker: bitstamp
+
 # Settings for buying on bitex and selling on bitstamp.
 buying:
   # Dollars to spend on each initial bitex bid.
@@ -58,6 +66,14 @@ bitstamp:
   secret: YOUR_API_SECRET
   client_id: YOUR_BITSTAMP_USERNAME
 
+# These are passed in to the itbit gem:
+# see https://github.com/bitex-la/itbit for more info.
+itbit:
+  client_key = 'the-client-key'
+  secret = 'the-secret'
+  user_id = 'the-user-id'
+  default_wallet_id = 'wallet-000'
+
 # Settings for the ActiveRecord Database to use.
 # sqlite is just fine. Check this link for more options:
 # http://apidock.com/rails/ActiveRecord/Base/establish_connection/class

data/spec/models/buy_closing_flow_spec.rb

@@ -12,7 +12,7 @@ describe BitexBot::BuyClosingFlow do
     flow.btc_profit.should be_nil
     flow.usd_profit.should be_nil
     close = flow.close_positions.first
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end
@@ -30,7 +30,7 @@ describe BitexBot::BuyClosingFlow do
     flow.quantity.should == 2.01
     flow.btc_profit.should be_nil
     flow.usd_profit.should be_nil
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end
@@ -54,7 +54,7 @@ describe BitexBot::BuyClosingFlow do
     stub_bitstamp_sell
     flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
     close = flow.close_positions.first
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end

data/spec/models/robot_spec.rb

@@ -167,10 +167,10 @@ describe BitexBot::Robot do
     end.to change{ Mail::TestMailer.deliveries.count }.by(1)
   end
   
-  it 'updates bitstamp_usd and bitstamp_btc' do
+  it 'updates taker_usd and taker_btc' do
     bot.trade!
-    bot.store.bitstamp_usd.should_not be_nil
-    bot.store.bitstamp_btc.should_not be_nil
+    bot.store.taker_usd.should_not be_nil
+    bot.store.taker_btc.should_not be_nil
   end
  
   it 'notifies exceptions and sleeps' do
@@ -182,4 +182,8 @@ describe BitexBot::Robot do
     end.to change{ Mail::TestMailer.deliveries.count }.by(1)
   end
 
+  it 'knows how to setup sandbox mode for both gems' do
+    pending
+    fail
+  end
 end

data/spec/models/sell_closing_flow_spec.rb

@@ -13,7 +13,7 @@ describe BitexBot::SellClosingFlow do
     flow.btc_profit.should be_nil
     flow.usd_profit.should be_nil
     close = flow.close_positions.first
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end
@@ -32,7 +32,7 @@ describe BitexBot::SellClosingFlow do
     flow.amount.should == 604
     flow.btc_profit.should be_nil
     flow.usd_profit.should be_nil
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end
@@ -56,7 +56,7 @@ describe BitexBot::SellClosingFlow do
     stub_bitstamp_buy
     flow.sync_closed_positions(Bitstamp.orders.all, Bitstamp.user_transactions.all)
     close = flow.close_positions.first
-    close.order_id.should == 1
+    close.order_id.should == '1'
     close.amount.should be_nil
     close.quantity.should be_nil
   end

data/spec/spec_helper.rb

@@ -43,3 +43,5 @@ RSpec.configure do |config|
   config.order = "random"
 end
 
+I18n.enforce_available_locales = false
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
@@ -108,6 +108,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: itbit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +140,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -289,11 +321,13 @@ files:
 - bitex_bot.gemspec
 - lib/bitex_bot.rb
 - lib/bitex_bot/database.rb
+- lib/bitex_bot/models/bitstamp_api_wrapper.rb
 - lib/bitex_bot/models/buy_closing_flow.rb
 - lib/bitex_bot/models/buy_opening_flow.rb
 - lib/bitex_bot/models/close_buy.rb
 - lib/bitex_bot/models/close_sell.rb
 - lib/bitex_bot/models/closing_flow.rb
+- lib/bitex_bot/models/itbit_api_wrapper.rb
 - lib/bitex_bot/models/open_buy.rb
 - lib/bitex_bot/models/open_sell.rb
 - lib/bitex_bot/models/opening_flow.rb