bitex_bot 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec3db346eb39cba7b7760969b32205f778bdf89
-  data.tar.gz: 4117298e216bc463273d303ea82b0d4f549958af
+  metadata.gz: 0341a8eb9da405634fc53dd2165a30c31f46674d
+  data.tar.gz: 6a468573664f6efc3a00e7811b31ce658e9dc11c
 SHA512:
-  metadata.gz: b73d5b0ea727152b76ab15052ca7501fa5beae556d6946ddb5d2e0f26e1d76a93d86210283488a57e44c04c2b4ed36fe993a297debc39bb3234e657a90a570dd
-  data.tar.gz: 2958fc14136fb77f4b578bda495d27050a6bc14886f78fc784fda7dc2ab00703bbbe5fb55860214a5c0ec21374335163da2aa760c0dfbe9f755d10c30ce4aca1
+  metadata.gz: 4529d05e2353bcbf5a91d7ad05bfa261a83cb97bcf4df9d36d235508d31b64cf5ffa66953984095ba72a206c183dd6bec25955f9a648190535f6c967a4d4255f
+  data.tar.gz: 280af9b62f157ffaa0932b8781fcfcb06bfdb8dd322b41e5a6014f362ef37d991b0a1e2358ad8b51163090c3db287b9aeacfc2da1cba8cc31d495f3731d6dca7

data/lib/bitex_bot/models/buy_opening_flow.rb

@@ -49,8 +49,8 @@ module BitexBot
     # end: sought_transaction helpers
 
     # create_for_market helpers
-    def self.maker_price(bitcoin_to_resell)
-      value_to_use / bitcoin_to_resell * (1 - profit / 100)
+    def self.maker_price(crypto_to_resell)
+      value_to_use / crypto_to_resell * (1 - profit / 100)
     end
 
     def self.order_class
@@ -62,11 +62,11 @@ module BitexBot
     end
 
     def self.remote_value_to_use(value_to_use_needed, safest_price)
-      value_to_use_needed / safest_price
+      (value_to_use_needed / fx_rate) / safest_price
     end
 
-    def self.safest_price(transactions, order_book, dollars_to_use)
-      OrderBookSimulator.run(Settings.time_to_live, transactions, order_book, dollars_to_use, nil)
+    def self.safest_price(transactions, order_book, amount_to_use)
+      OrderBookSimulator.run(Settings.time_to_live, transactions, order_book, amount_to_use / fx_rate, nil)
     end
 
     def self.value_to_use

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) * fx_rate
+      bitex_price = maker_price(remote_value)
       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)

data/lib/bitex_bot/models/order_book_simulator.rb

@@ -28,10 +28,11 @@ module BitexBot
 
         # An order may be partially or completely skipped due to volatility.
         if to_skip.positive?
-          dropped = [quantity, to_skip].min
-          to_skip -= dropped
-          quantity -= dropped
-          Robot.log(:debug, "Skipped #{dropped} BTC @ $#{price}")
+          [quantity, to_skip].min.tap do |dropped|
+            to_skip -= dropped
+            quantity -= dropped
+            Robot.log(:debug, "Skipped #{dropped} BTC @ $#{price}")
+          end
           next if quantity.zero?
         end
 
@@ -54,7 +55,7 @@ module BitexBot
       threshold = transactions.first.timestamp - volatility
       transactions
         .select { |t| t.timestamp > threshold }
-        .map { |t| t.amount.to_d }
+        .map(&:amount)
         .sum
     end
 
@@ -63,8 +64,7 @@ module BitexBot
     end
 
     def self.best_price(currency, target, price)
-      Robot.log(:debug, "Best price to get #{currency} #{target} is $#{price}")
-      price
+      price.tap { Robot.log(:debug, "Best price to get #{currency} #{target} is $#{price}") }
     end
 
     # end: private class methods

data/lib/bitex_bot/models/sell_opening_flow.rb

@@ -14,6 +14,7 @@ module BitexBot
     # Start a workflow for selling bitcoin on bitex and buying on the other exchange. The quantity to be sold on bitex is
     # retrieved from Settings, if there is not enough BTC on bitex or USD on the other exchange then no order will be placed and
     # an exception will be raised instead.
+    #
     # The amount a SellOpeningFlow will try to sell and the price it will try to charge are derived from these parameters:
     #
     # @param usd_balance [BigDecimal] amount of usd available in the other exchange that can be spent to balance this sale.
@@ -48,8 +49,8 @@ module BitexBot
     # end: sought_transaction helpers
 
     # create_for_market helpers
-    def self.maker_price(usd_to_spend_re_buying)
-      usd_to_spend_re_buying / value_to_use * (1 + profit / 100)
+    def self.maker_price(fiat_to_spend_re_buying)
+      fiat_to_spend_re_buying * fx_rate / value_to_use * (1 + profit / 100)
     end
 
     def self.order_class

data/lib/bitex_bot/version.rb

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

data/spec/models/buy_closing_flow_spec.rb

@@ -72,7 +72,7 @@ describe BitexBot::BuyClosingFlow do
     end.not_to change { BitexBot::BuyClosingFlow.count }
   end
 
-  describe 'when syncinc executed orders' do
+  describe 'when sync executed orders' do
     before(:each) do
       stub_bitstamp_sell
       stub_bitstamp_empty_user_transactions

data/spec/models/buy_opening_flow_spec.rb

@@ -29,8 +29,6 @@ describe BitexBot::BuyOpeningFlow do
     end
 
     let(:order_id) { 12_345 }
-    let(:usd_price) { '14.888_059_701_492'.to_d }
-    let(:suggested_closing_price) { 15.to_d }
     let(:amount_to_spend) { 100.to_d }
     let(:btc_balance) { 100_000.to_d }
     let(:maker_fee) { 0.5.to_d }
@@ -39,6 +37,8 @@ describe BitexBot::BuyOpeningFlow do
     let(:transactions) { bitstamp_api_wrapper_transactions_stub }
 
     it 'spends 100 usd' do
+      suggested_closing_price = 15.to_d
+
       BitexBot::Settings.stub(
         time_to_live: 3,
         buying: double(amount_to_spend_per_order: amount_to_spend, profit: 0)
@@ -57,14 +57,15 @@ describe BitexBot::BuyOpeningFlow do
 
       flow.order_id.should eq order_id
       flow.value_to_use.should eq amount_to_spend
-      flow.price.should.should <= flow.suggested_closing_price
-      flow.price.truncate(12).should eq usd_price
+      flow.price.should <= suggested_closing_price
       flow.suggested_closing_price.should eq suggested_closing_price
     end
 
     let(:other_fx_rate) { 10.to_d }
 
     it 'spends 100 usd with other fx_rate' do
+      suggested_closing_price = 25.to_d
+
       BitexBot::Settings.stub(
         buying_foreign_exchange_rate: other_fx_rate,
         time_to_live: 3,
@@ -84,8 +85,7 @@ describe BitexBot::BuyOpeningFlow do
 
       flow.order_id.should eq order_id
       flow.value_to_use.should eq amount_to_spend
-      flow.price.should <= flow.suggested_closing_price * other_fx_rate
-      flow.price.truncate(11).should eq usd_price * other_fx_rate
+      flow.price.should <= suggested_closing_price * other_fx_rate
       flow.suggested_closing_price.should eq suggested_closing_price
     end
 

data/spec/models/sell_closing_flow_spec.rb

@@ -113,7 +113,7 @@ describe BitexBot::SellClosingFlow do
     end.not_to change{ BitexBot::SellClosingFlow.count }
   end
 
-  describe 'when syncinc executed orders' do
+  describe 'when sync executed orders' do
     before(:each) do
       stub_bitstamp_buy
       stub_bitstamp_empty_user_transactions

data/spec/models/sell_opening_flow_spec.rb

@@ -29,8 +29,6 @@ describe BitexBot::SellOpeningFlow do
     end
 
     let(:order_id) { 12_345 }
-    let(:usd_price) { '25.18_796_992_481_203'.to_d }
-    let(:suggested_closing_price) { 25.to_d }
     let(:amount_to_sell) { 4.to_d }
     let(:btc_balance) { 100_000.to_d }
     let(:maker_fee) { 0.5.to_d }
@@ -58,8 +56,6 @@ describe BitexBot::SellOpeningFlow do
       flow.order_id.should eq order_id
       flow.value_to_use.should eq amount_to_sell
       flow.price.should >= flow.suggested_closing_price
-      flow.price.should eq usd_price
-      flow.suggested_closing_price.should eq suggested_closing_price
     end
 
     let(:other_fx_rate) { 10.to_d }
@@ -85,8 +81,6 @@ describe BitexBot::SellOpeningFlow do
       flow.order_id.should eq order_id
       flow.value_to_use.should eq amount_to_sell
       flow.price.should >= flow.suggested_closing_price * other_fx_rate
-      flow.price.truncate(13).should eq usd_price * other_fx_rate
-      flow.suggested_closing_price.should eq suggested_closing_price
     end
 
     it 'raises the price to charge on bitex to take a profit' do

metadata

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