bitex_bot 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee843a4baa723bdd9e31d57f8c8ed732e00517e
-  data.tar.gz: cc4acde842e3f0bec10163a55b3dd17567f65995
+  metadata.gz: b8994e54974f11a72d84fe860f4089d59561e6ac
+  data.tar.gz: 70e62bb47abb627a4b1f71312bc7b5b9f6c3389e
 SHA512:
-  metadata.gz: 13725177100dd9fdc419c1fe6a8d6039e71322bb6fe15d208d431acec1569b26758ad8061c793872bdc620257f99924f3c1dff3ab93856b12cda0d0faeba4522
-  data.tar.gz: 41ed89f74566c6e45fee4441a62ee846051dfae9b020b5dc247b6008bac2b5a004be0877d6dbd1a3e01e6231a6cbe75e24d34daf12c67d82c6f1c82446b2cf78
+  metadata.gz: a26decc7d2f8f81c37e6bf3a751f9b3f84acdc4be6149320869a0343c36801d6e94dc8ec43d0bd52e03599c3b1262b75c26b1f060e84f2740887e9f54d132c21
+  data.tar.gz: 34359e33f27d99d5be888e8c4fe641c4031adf8787b1629aa82958c0376df67fd385c3025b950368b8c690ac3af2db9bc5be17b222c0891010475a5da326b0e0

data/bitex_bot.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bitstamp"
   spec.add_dependency "bitex", "0.2.6"
   spec.add_dependency "itbit", "0.0.6"
+  spec.add_dependency "bitfinex-rb", "0.0.6"
   spec.add_dependency "mail"
   spec.add_dependency "hashie"
 

data/lib/bitex_bot/models/bitfinex_api_wrapper.rb

@@ -0,0 +1,102 @@
+require "bigdecimal"
+require "bigdecimal/util"
+
+class BitfinexApiWrapper
+  def self.setup(settings)
+    Bitfinex::Client.configure do |conf|
+      conf.api_key = settings.bitfinex.api_key
+      conf.secret = settings.bitfinex.api_secret 
+    end
+  end
+
+  def self.with_retry(action, &block)
+    begin
+      block.call
+    rescue StandardError, Bitfinex::ClientError => e
+      BitexBot::Robot.logger.info("Bitfinex #{action} failed. Retrying in 5 seconds.")
+      sleep 5
+      retry
+    end
+  end
+
+  def self.transactions
+    with_retry 'transactions' do
+      Bitfinex::Client.new.trades.collect do |t|
+        { tid: t['tid'].to_i,
+          price: t['price'],
+          amount: t['amount'],
+          date: t['timestamp']
+        }
+      end
+    end
+  end
+  
+  def self.order_book
+    with_retry 'order_book' do
+      book = Bitfinex::Client.new.orderbook
+      { 'bids' => book['bids'].collect{|b| [b['price'], b['amount']] },
+        'asks' => book['asks'].collect{|a| [a['price'], a['amount']] } }
+    end
+  end
+
+  def self.balance
+    with_retry 'balance' do
+      balances = Bitfinex::Client.new.balances(type: 'exchange')
+      sleep 1 # Sleep to avoid sending two consecutive requests to bitfinex.
+      fee = Bitfinex::Client.new.account_info.first['taker_fees']
+      btc = balances.find{|b| b['currency'] == 'btc' } || {}
+      usd = balances.find{|b| b['currency'] == 'usd' } || {}
+      { "btc_balance" => btc['amount'].to_d,
+        "btc_reserved" => btc['amount'].to_d - btc['available'].to_d,
+        "btc_available" => btc['available'].to_d,
+        "usd_balance" => usd['amount'].to_d,
+        "usd_reserved" => usd['amount'].to_d - usd['available'].to_d,
+        "usd_available" => usd['available'].to_d,
+        "fee" => fee.to_d
+      }
+    end
+  end
+
+  def self.orders
+    with_retry 'orders' do
+      Bitfinex::Client.new.orders.collect{|o| BitfinexOrder.new(o) }
+    end
+  end
+
+  # We don't need to fetch the list of transactions
+  # for bitfinex
+  def self.user_transactions
+    []
+  end
+  
+  def self.amount_and_quantity(order_id, transactions)
+    with_retry "find order #{order_id}" do
+      order = Bitfinex::Client.new.order_status(order_id)
+      [order['avg_execution_price'].to_d * order['executed_amount'].to_d, order['executed_amount'].to_d]
+    end
+  end
+  
+  def self.place_order(type, price, quantity)
+    with_retry "place order #{type} #{price} #{quantity}" do
+      order_data = Bitfinex::Client.new
+        .new_order('btcusd', quantity, 'exchange limit', type.to_s, price)
+      BitfinexOrder.new(order_data)
+    end
+  end
+end
+
+class BitfinexOrder
+  attr_accessor :id, :amount, :price, :type, :datetime
+  def initialize(order_data)
+    self.id = order_data['id'].to_i
+    self.amount = order_data['original_amount'].to_d
+    self.price = order_data['price'].to_d
+    self.type = order_data['side'].to_sym
+    self.datetime = order_data['timestamp'].to_i
+  end
+
+  def cancel!
+    Bitfinex::Client.new.cancel_orders(id)
+  end
+end
+

data/lib/bitex_bot/robot.rb

@@ -14,7 +14,14 @@ module BitexBot
     cattr_accessor :cooldown_until
     cattr_accessor :test_mode
     cattr_accessor :taker do
-      Settings.taker == 'itbit' ? ItbitApiWrapper : BitstampApiWrapper
+      case Settings.taker
+      when 'itbit'
+        ItbitApiWrapper
+      when 'bitstamp'
+        BitstampApiWrapper
+      when 'bitfinex'
+        BitfinexApiWrapper
+      end
     end
     cattr_accessor :logger do
       Logger.new(Settings.log.try(:file) || STDOUT, 10, 10240000).tap do |l|

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/lib/bitex_bot.rb

@@ -8,6 +8,7 @@ require "logger"
 require "bitex"
 require "bitstamp"
 require "itbit"
+require 'bitfinex'
 require "bitex_bot/settings"
 require "bitex_bot/database"
 require "bitex_bot/models/opening_flow.rb"

data/settings.yml.sample

@@ -17,7 +17,7 @@ time_to_live: 20
 sandbox: false
 
 # Which market to use for taking (we're always makers on bitex)
-# itbit or bitstamp
+# itbit, bitstamp or bitfinex
 taker: bitstamp
 
 # Settings for buying on bitex and selling on bitstamp.
@@ -69,10 +69,17 @@ bitstamp:
 # 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'
+  client_key: 'the-client-key'
+  secret: 'the-secret'
+  user_id: 'the-user-id'
+  default_wallet_id: 'wallet-000'
+
+# These are passed in to the bitfinex gem:
+# see https://github.com/bitfinexcom/bitfinex-api-rb for more info.
+bitfinex:
+  api_key: 'your_api_key'
+  api_secret: 'your_api_secret'
+
 
 # Settings for the ActiveRecord Database to use.
 # sqlite is just fine. Check this link for more options:

data/spec/models/buy_closing_flow_spec.rb

@@ -26,7 +26,7 @@ describe BitexBot::BuyClosingFlow do
     open_one.reload.closing_flow.should == flow
     open_two.reload.closing_flow.should == flow
     flow.open_positions.should == [open_one, open_two]
-    flow.desired_price.should == '310.497512437810945273631840797'.to_d
+    flow.desired_price.round(15).should == '310.497512437810945'.to_d
     flow.quantity.should == 2.01
     flow.btc_profit.should be_nil
     flow.usd_profit.should be_nil

data/spec/models/buy_opening_flow_spec.rb

@@ -10,7 +10,7 @@ describe BitexBot::BuyOpeningFlow do
   it { should validate_presence_of :price }
   it { should validate_presence_of :value_to_use }
   it { should validate_presence_of :order_id }
-  it { should(ensure_inclusion_of(:status)
+  it { should(validate_inclusion_of(:status)
     .in_array(BitexBot::BuyOpeningFlow.statuses)) }
 
   describe "when creating a buying flow" do
@@ -24,7 +24,7 @@ describe BitexBot::BuyOpeningFlow do
       
       flow.value_to_use.should == 50
       flow.price.should <= flow.suggested_closing_price
-      flow.price.should == "19.85074626865672".to_d
+      flow.price.round(14).should == "19.85074626865672".to_d
       flow.suggested_closing_price.should == 20
       flow.order_id.should == 12345
     end
@@ -52,7 +52,7 @@ describe BitexBot::BuyOpeningFlow do
         bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
       flow.value_to_use.should == 100
       flow.price.should <= flow.suggested_closing_price
-      flow.price.should == "7.444029850746269".to_d
+      flow.price.round(15).should == "7.44402985074627".to_d
       flow.suggested_closing_price.should == 15
       flow.order_id.should == 12345
     end
@@ -95,7 +95,7 @@ describe BitexBot::BuyOpeningFlow do
       flow = BitexBot::BuyOpeningFlow.create_for_market(100,
         bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
-      flow.price.should == "19.75149253731344".to_d
+      flow.price.round(13).should == "19.7514925373134".to_d
     end
   end
   

data/spec/models/sell_closing_flow_spec.rb

@@ -27,7 +27,7 @@ describe BitexBot::SellClosingFlow do
     open_one.reload.closing_flow.should == flow
     open_two.reload.closing_flow.should == flow
     flow.open_positions.should == [open_one, open_two]
-    flow.desired_price.should == '290.497512437810945273631840797'.to_d
+    flow.desired_price.round(15).should == '290.497512437810945'.to_d
     flow.quantity.should == 2.01
     flow.amount.should == 604
     flow.btc_profit.should be_nil

data/spec/models/sell_opening_flow_spec.rb

@@ -10,7 +10,7 @@ describe BitexBot::SellOpeningFlow do
   it { should validate_presence_of :price }
   it { should validate_presence_of :value_to_use }
   it { should validate_presence_of :order_id }
-  it { should(ensure_inclusion_of(:status)
+  it { should(validate_inclusion_of(:status)
     .in_array(BitexBot::SellOpeningFlow.statuses)) }
 
   describe "when creating a selling flow" do
@@ -39,7 +39,7 @@ describe BitexBot::SellOpeningFlow do
       
       flow.value_to_use.should == 4
       flow.price.should >= flow.suggested_closing_price
-      flow.price.should == "25.18796992481203".to_d
+      flow.price.round(14).should == "25.18796992481203".to_d
       flow.suggested_closing_price.should == 25
       flow.order_id.should == 12345
     end
@@ -54,7 +54,7 @@ describe BitexBot::SellOpeningFlow do
       
       flow.value_to_use.should == 4
       flow.price.should >= flow.suggested_closing_price
-      flow.price.should == "37.78195488721804".to_d
+      flow.price.round(14).should == "37.78195488721804".to_d
       flow.suggested_closing_price.should == 25
       flow.order_id.should == 12345
     end
@@ -97,7 +97,7 @@ describe BitexBot::SellOpeningFlow do
       flow = BitexBot::SellOpeningFlow.create_for_market(1000,
         bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
-      flow.price.should == "20.25112781954887".to_d
+      flow.price.round(14).should == "20.25112781954887".to_d
     end
   end
   

data/spec/spec_helper.rb

@@ -22,6 +22,8 @@ DatabaseCleaner.strategy = :truncation
 
 RSpec.configure do |config|
   config.include(FactoryGirl::Syntax::Methods)
+  config.include(Shoulda::Matchers::ActiveModel)
+  config.include(Shoulda::Matchers::ActiveRecord)
   config.mock_with :rspec do |mocks|
     mocks.yield_receiver_to_any_instance_implementation_blocks = true
     mocks.syntax = [:expect, :should]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
@@ -109,6 +109,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: bitfinex-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +299,7 @@ files:
 - bitex_bot.gemspec
 - lib/bitex_bot.rb
 - lib/bitex_bot/database.rb
+- lib/bitex_bot/models/bitfinex_api_wrapper.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