bitex_bot 0.2.5 → 0.2.6

data/lib/bitex_bot/database.rb

@@ -88,7 +88,7 @@ module BitexBot
         add_index :close_sells, :order_id
       end
 
-      unless ActiveRecord::Base.connection.table_exists?('stores')
+      unless ActiveRecord::Base.connection.column_exists?('stores', 'buying_profit')
         create_table "stores", force: true do |t|
           t.decimal  "taker_usd",                precision: 20, scale: 8
           t.decimal  "taker_btc",                precision: 20, scale: 8
@@ -99,6 +99,8 @@ module BitexBot
           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.timestamps
         end
       end

data/lib/bitex_bot/models/buy_opening_flow.rb

@@ -32,13 +32,14 @@ module BitexBot
     # @param bitex_fee [BigDecimal] the transaction fee to pay on bitex.
     # @param other_fee [BigDecimal] the transaction fee to pay on the other
     #   exchange.
+    # @param store [Store] An updated config for this robot, mainly to use for profit.
     #
     # @return [BuyOpeningFlow] The newly created flow.
     # @raise [CannotCreateFlow] If there's any problem creating this flow, for
     #   example when you run out of USD on bitex or out of BTC on the other
     #   exchange.
     def self.create_for_market(btc_balance, order_book, transactions,
-      bitex_fee, other_fee)
+      bitex_fee, other_fee, store)
       super
     end
     
@@ -63,7 +64,7 @@ module BitexBot
     end
     
     def self.profit
-      Settings.buying.profit
+      store.buying_profit || Settings.buying.profit
     end
     
     def self.get_safest_price(transactions, order_book, dollars_to_use)
@@ -76,7 +77,7 @@ module BitexBot
     end
 
     def self.get_bitex_price(usd_to_spend, bitcoin_to_resell) 
-     (usd_to_spend / bitcoin_to_resell) * (1 - Settings.buying.profit / 100.0)
+     (usd_to_spend / bitcoin_to_resell) * (1 - self.profit / 100.0)
     end
   end
 end

data/lib/bitex_bot/models/opening_flow.rb

@@ -4,6 +4,9 @@ module BitexBot
   # transactions spawn from that order as Open positions.
   class OpeningFlow < ActiveRecord::Base
     self.abstract_class = true
+
+    # The updated config store as passed from the robot
+    cattr_accessor :store
     
     def self.active
       where('status != "finalised"')
@@ -38,7 +41,9 @@ module BitexBot
     validates_presence_of :price, :value_to_use
 
     def self.create_for_market(remote_balance, order_book, transactions,
-      bitex_fee, other_fee)
+      bitex_fee, other_fee, store)
+
+      self.store = store
 
       plus_bitex = value_to_use + (value_to_use * bitex_fee / 100.0)
       value_to_use_needed = plus_bitex / (1 - other_fee / 100.0)

data/lib/bitex_bot/models/sell_opening_flow.rb

@@ -32,13 +32,14 @@ module BitexBot
     # @param bitex_fee [BigDecimal] the transaction fee to pay on bitex.
     # @param other_fee [BigDecimal] the transaction fee to pay on the other
     #   exchange.
+    # @param store [Store] An updated config for this robot, mainly to use for profit.
     #
     # @return [SellOpeningFlow] The newly created flow.
     # @raise [CannotCreateFlow] If there's any problem creating this flow, for
     #   example when you run out of BTC on bitex or out of USD on the other
     #   exchange.
     def self.create_for_market(usd_balance, order_book, transactions,
-      bitex_fee, other_fee)
+      bitex_fee, other_fee, store)
       super
     end
     
@@ -70,9 +71,13 @@ module BitexBot
     def self.get_remote_value_to_use(value_to_use_needed, safest_price)
       value_to_use_needed * safest_price
     end
+
+    def self.profit
+      store.selling_profit || Settings.selling.profit
+    end
     
     def self.get_bitex_price(btc_to_sell, usd_to_spend_re_buying) 
-     (usd_to_spend_re_buying / btc_to_sell) * (1 + Settings.selling.profit / 100.0)
+     (usd_to_spend_re_buying / btc_to_sell) * (1 + profit / 100.0)
     end
   end
 end

data/lib/bitex_bot/robot.rb

@@ -26,7 +26,7 @@ module BitexBot
       end
     end
     cattr_accessor :current_cooldowns do 0 end
-  
+    
     # Trade constantly respecting cooldown times so that we don't get
     # banned by api clients.
     def self.run!
@@ -34,7 +34,7 @@ module BitexBot
       logger.info("Loading trading robot, ctrl+c *once* to exit gracefully.")
       self.cooldown_until = Time.now
       bot = new
-
+      
       while true
         start_time = Time.now
         next if start_time < cooldown_until
@@ -146,8 +146,10 @@ module BitexBot
       total_usd = balances['usd_balance'].to_d + profile[:usd_balance]
       total_btc = balances['btc_balance'].to_d + profile[:btc_balance]
       
+      last_log = `tail -n 500 #{Settings.log.try(:file)}` if Settings.log.try(:file)
+  
       store.update_attributes(taker_usd: balances['usd_balance'],
-        taker_btc: balances['btc_balance'])
+        taker_btc: balances['btc_balance'], log: last_log)
       
       if store.last_warning.nil? || store.last_warning < 30.minutes.ago 
         if store.usd_warning && total_usd <= store.usd_warning
@@ -181,7 +183,8 @@ module BitexBot
           order_book['bids'],
           transactions,
           profile[:fee],
-          balances['fee'].to_d )
+          balances['fee'].to_d,
+          store)
       end
       unless recent_selling
         SellOpeningFlow.create_for_market(
@@ -189,7 +192,8 @@ module BitexBot
           order_book['asks'],
           transactions,
           profile[:fee],
-          balances['fee'].to_d )
+          balances['fee'].to_d,
+          store)
       end
     end
     

data/lib/bitex_bot/version.rb

@@ -1,3 +1,3 @@
 module BitexBot
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/models/buy_opening_flow_spec.rb

@@ -4,6 +4,7 @@ describe BitexBot::BuyOpeningFlow do
   before(:each) do
     Bitex.api_key = "valid_key"
   end
+  let(:store){ BitexBot::Store.create }
 
   it { should validate_presence_of :status }
   it { should validate_presence_of :price }
@@ -19,7 +20,7 @@ describe BitexBot::BuyOpeningFlow do
         buying: double(amount_to_spend_per_order: 50, profit: 0))
 
       flow = BitexBot::BuyOpeningFlow.create_for_market(100,
-        bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+        bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
       flow.value_to_use.should == 50
       flow.price.should <= flow.suggested_closing_price
@@ -34,7 +35,7 @@ describe BitexBot::BuyOpeningFlow do
         buying: double(amount_to_spend_per_order: 100, profit: 0))
 
       flow = BitexBot::BuyOpeningFlow.create_for_market(100000,
-        bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+        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 == "14.88805970149254".to_d
@@ -48,7 +49,7 @@ describe BitexBot::BuyOpeningFlow do
         buying: double(amount_to_spend_per_order: 100, profit: 50))
 
       flow = BitexBot::BuyOpeningFlow.create_for_market(100000,
-        bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+        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
@@ -66,7 +67,7 @@ describe BitexBot::BuyOpeningFlow do
 
       expect do
         flow = BitexBot::BuyOpeningFlow.create_for_market(100000,
-          bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+          bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
         flow.should be_nil
         BitexBot::BuyOpeningFlow.count.should == 0
       end.to raise_exception(BitexBot::CannotCreateFlow)
@@ -79,11 +80,23 @@ describe BitexBot::BuyOpeningFlow do
 
       expect do
         flow = BitexBot::BuyOpeningFlow.create_for_market(1,
-          bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+          bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
         flow.should be_nil
         BitexBot::BuyOpeningFlow.count.should == 0
       end.to raise_exception(BitexBot::CannotCreateFlow)
     end
+    
+    it 'prioritizes profit from store' do
+      store = BitexBot::Store.new(buying_profit: 0.5)
+      stub_bitex_orders
+      BitexBot::Settings.stub(time_to_live: 3,
+        buying: double(amount_to_spend_per_order: 50, profit: 0))
+
+      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
+    end
   end
   
   describe "when fetching open positions" do
@@ -141,7 +154,7 @@ describe BitexBot::BuyOpeningFlow do
       buying: double(amount_to_spend_per_order: 50, profit: 0))
 
     flow = BitexBot::BuyOpeningFlow.create_for_market(100,
-      bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25)
+      bitstamp_order_book_stub['bids'], bitstamp_transactions_stub, 0.5, 0.25, store)
     
     flow.finalise!
     flow.should be_settling

data/spec/models/sell_opening_flow_spec.rb

@@ -4,6 +4,7 @@ describe BitexBot::SellOpeningFlow do
   before(:each) do
     Bitex.api_key = "valid_key"
   end
+  let(:store){ BitexBot::Store.create }
 
   it { should validate_presence_of :status }
   it { should validate_presence_of :price }
@@ -19,7 +20,7 @@ describe BitexBot::SellOpeningFlow do
         selling: double(quantity_to_sell_per_order: 2, profit: 0))
 
       flow = BitexBot::SellOpeningFlow.create_for_market(1000,
-        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
       flow.value_to_use.should == 2
       flow.price.should >= flow.suggested_closing_price
@@ -34,7 +35,7 @@ describe BitexBot::SellOpeningFlow do
         selling: double(quantity_to_sell_per_order: 4, profit: 0))
 
       flow = BitexBot::SellOpeningFlow.create_for_market(1000,
-        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
       flow.value_to_use.should == 4
       flow.price.should >= flow.suggested_closing_price
@@ -49,7 +50,7 @@ describe BitexBot::SellOpeningFlow do
         selling: double(quantity_to_sell_per_order: 4, profit: 50))
 
       flow = BitexBot::SellOpeningFlow.create_for_market(1000,
-        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+        bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
       
       flow.value_to_use.should == 4
       flow.price.should >= flow.suggested_closing_price
@@ -68,7 +69,7 @@ describe BitexBot::SellOpeningFlow do
 
       expect do
         flow = BitexBot::SellOpeningFlow.create_for_market(100000,
-          bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+          bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
         flow.should be_nil
         BitexBot::SellOpeningFlow.count.should == 0
       end.to raise_exception(BitexBot::CannotCreateFlow)
@@ -81,11 +82,23 @@ describe BitexBot::SellOpeningFlow do
 
       expect do
         flow = BitexBot::SellOpeningFlow.create_for_market(1,
-          bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+          bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
         flow.should be_nil
         BitexBot::SellOpeningFlow.count.should == 0
       end.to raise_exception(BitexBot::CannotCreateFlow)
     end
+
+    it "Prioritizes profit from store" do
+      store = BitexBot::Store.new(selling_profit: 0.5)
+      stub_bitex_orders
+      BitexBot::Settings.stub(time_to_live: 3,
+        selling: double(quantity_to_sell_per_order: 2, profit: 0))
+
+      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
+    end
   end
   
   describe "when fetching open positions" do
@@ -143,7 +156,7 @@ describe BitexBot::SellOpeningFlow do
       selling: double(quantity_to_sell_per_order: 4, profit: 50))
 
     flow = BitexBot::SellOpeningFlow.create_for_market(1000,
-      bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25)
+      bitstamp_order_book_stub['asks'], bitstamp_transactions_stub, 0.5, 0.25, store)
     
     flow.finalise!
     flow.should be_settling

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic